Merge branch 'release-3.0.9'

IGNF · Mar 31, 2020 · 6c13f9d · 6c13f9d
2 parents 39756bf + 36ecd41
commit 6c13f9d
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 58 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,20 +1,33 @@
-# SDK Geoportail 2D/3D, version 3.0.8
+# SDK Geoportail 2D/3D, version 3.0.9
 
-**06/03/2020 : version 3.0.8**
+**31/03/2020 : version 3.0.9**
 > Release SDK Geoportail 2D/3D
 
 ## Summary
 
+Amelioration des outils de deboggage et de contribution
+Correction mineure sur le vecteur tuilé
+
 ## Changelog
 
 * [Added]
 
+- Ajout des infos détaillées de build dans les bundles SDK
+- Ajout de templates pour PR et issues
+
 * [Changed]
+- Mise à jour de geoportal-extensions-itowns en version 2.2.8
+- Mise à jour de geoportal-extensions-openlayers en version 3.0.8
 
 * [Removed]
 
 * [Fixed]
 
+- Correction de l'ajout des couches mapBox en 3D qui n'ont pas de propriétés de styles annexes
+- Corrections sur la gestion de cartes multiples au sein d'une même page (et adaptation exemples)
+- Forcage de la version de mapbox-gl-style-spec (cf https://github.com/openlayers/ol-mapbox-style/issues/261)
+- Mise à jour du plugin "terser-webpack-plugin"
+
 * [Deprecated]
 
 * [Security]
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.0.8",
-    "date": "06/03/2020",
-    "SDK2DVersion": "3.0.8",
-    "SDK3DVersion": "3.0.8",
+    "version": "3.0.9",
+    "date": "31/03/2020",
+    "SDK2DVersion": "3.0.9",
+    "SDK3DVersion": "3.0.9",
     "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
     "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js",
     "module": "src/SDK2D.js, src/SDK3D.js",
@@ -53,6 +53,7 @@
         "@babel/core": "^7.8.3",
         "@babel/plugin-transform-runtime": "^7.8.3",
         "@babel/preset-env": "^7.8.3",
+        "@mapbox/mapbox-gl-style-spec": "13.11.0",
         "babel-loader": "^8.0.5",
         "chai": "^4.2.0",
         "chalk": "^2.4.2",
@@ -69,14 +70,15 @@
         "exports-loader": "^0.7.0",
         "expose-loader": "^0.7.5",
         "fs-extra": "^8.1.0",
-        "geoportal-extensions-itowns": "2.2.7",
-        "geoportal-extensions-openlayers": "3.0.7",
+        "geoportal-extensions-itowns": "2.2.8",
+        "geoportal-extensions-openlayers": "3.0.8",
         "handlebars": "^4.7.2",
         "handlebars-layouts": "^3.1.4",
         "html-webpack-plugin": "^3.1.0",
         "itowns": "2.19.0",
         "jsdoc-webpack-plugin": "^0.1.0",
         "loglevel": "^1.6.6",
+        "@mapbox/mapbox-gl-style-spec": "13.11.0",
         "mini-css-extract-plugin": "^0.6.0",
         "mocha": "^5.2.0",
         "mocha-loader": "^2.0.1",
@@ -94,7 +96,7 @@
         "speed-measure-webpack-plugin": "^1.3.0",
         "string-template": "^1.0.0",
         "style-loader": "^0.23.1",
-        "terser-webpack-plugin": "^1.4.3",
+        "terser-webpack-plugin": "^2.0.0",
         "three": "^0.113.2",
         "three.meshline": "^1.2.0",
         "uglify-es": "github:mishoo/UglifyJS2#harmony",

diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json
@@ -1,37 +1,37 @@
 {
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "description" : "French Geoportal SDK based on OpenLayers (2D)",
-   "main" : "dist/GpSDK2D-src.js",
-   "date" : "06/03/2020",
-   "bugs" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
-   },
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
    "keywords" : [
       "openlayers",
       "geoportail",
       "webservice",
       "javascript"
    ],
-   "license" : "CECILL-B",
-   "name" : "@ignf-geoportal/sdk-2d",
+   "module" : "src/SDK2D.js",
    "dependencies" : {
       "ol" : "5.3.0",
-      "geoportal-extensions-openlayers" : "3.0.7"
+      "geoportal-extensions-openlayers" : "3.0.8"
    },
    "directories" : {},
-   "version" : "3.0.8",
+   "license" : "CECILL-B",
    "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk.git",
-      "type" : "git"
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-sdk.git"
    },
-   "module" : "src/SDK2D.js",
+   "version" : "3.0.9",
+   "main" : "dist/GpSDK2D-src.js",
+   "author" : "IGNF",
+   "date" : "31/03/2020",
+   "bugs" : {
+      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
+   },
+   "description" : "French Geoportal SDK based on OpenLayers (2D)",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+   "name" : "@ignf-geoportal/sdk-2d",
    "scripts" : {},
-   "author" : "IGNF"
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ]
 }
diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json
@@ -1,40 +1,40 @@
 {
-   "name" : "@ignf-geoportal/sdk-3d",
-   "scripts" : {},
-   "author" : "IGNF",
-   "module" : "src/SDK3D.js",
-   "version" : "3.0.8",
+   "date" : "31/03/2020",
    "main" : "dist/GpSDK3D-src.js",
+   "directories" : {},
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
+   "dependencies" : {
+      "itowns" : "2.19.0",
+      "geoportal-extensions-openlayers" : "3.0.8",
+      "ol" : "5.3.0",
+      "geoportal-extensions-itowns" : "2.2.8"
+   },
    "keywords" : [
       "openlayers",
       "itowns",
       "geoportail",
       "webservice",
       "javascript"
    ],
-   "directories" : {},
-   "date" : "06/03/2020",
-   "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
+   "author" : "IGNF",
    "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
-   "dependencies" : {
-      "ol" : "5.3.0",
-      "geoportal-extensions-itowns" : "2.2.7",
-      "geoportal-extensions-openlayers" : "3.0.7",
-      "itowns" : "2.19.0"
+   "name" : "@ignf-geoportal/sdk-3d",
+   "version" : "3.0.9",
+   "scripts" : {},
+   "repository" : {
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-sdk.git"
    },
+   "license" : "CECILL-B",
    "bugs" : {
       "url" : "https://github.com/IGNF/geoportal-sdk/issues"
    },
-   "license" : "CECILL-B",
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk.git",
-      "type" : "git"
-   }
+   "module" : "src/SDK3D.js"
 }
diff --git a/src/OpenLayers/OlMapVectorTile.js b/src/OpenLayers/OlMapVectorTile.js
@@ -958,7 +958,9 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) {
         }
 
         // traitements des styles/couches
-        return fetch(_urlDefaultOrSelected)
+        return fetch(_urlDefaultOrSelected, {
+            credentials : "same-origin"
+        })
             .then(function (response) {
                 if (response.ok) {
                     response.json()
@@ -1759,7 +1761,9 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) {
 OlMap.prototype._updateStyleMapBoxLayer = function (layer, id, options) {
     var self = this;
 
-    return fetch(options.url)
+    return fetch(options.url, {
+        credentials : "same-origin"
+    })
         .then(function (response) {
             // debug
             // self.logger.warn("DEBUG:response", response);

diff --git a/webpack.config.2d.js b/webpack.config.2d.js
@@ -102,6 +102,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME qq bug avec les banner !

diff --git a/webpack.config.3d.js b/webpack.config.3d.js
@@ -112,6 +112,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME qq bug avec les banner !