Merge branch 'release-3.0.11'

IGNF · Apr 2, 2020 · 55a3a8f · 55a3a8f
2 parents e34e0c8 + df8bb93
commit 55a3a8f
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 66 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,24 +1,28 @@
-# SDK Geoportail 2D/3D, version 3.0.10
+# SDK Geoportail 2D/3D, version 3.0.11
 
-**01/04/2020 : version 3.0.10**
+**02/04/2020 : version 3.0.11**
 > Release SDK Geoportail 2D/3D
 
 ## Summary
 
-Hotfix sur la gestion des sprites des couches mapbox et sur l'editeur de couches mapbox
+Mise à jour des librairies sous-jacentes et corrections sur le controle d'edition des styles mapbox.
 
 ## Changelog
 
 * [Added]
 
 * [Changed]
 
-    - mise à jour de l'extensions géoporatil pour openlayers en version 3.0.9
+    - mise à jour de l'extension géoportail pour openlayers en version 3.0.10
+    - mise à jour de l'extension géoportail pour itowns en version 2.2.9
+    - mise à jour de la dépendance ol-mapbox-style en version 4.2.1
 
 * [Removed]
 
 * [Fixed]
 
+    - fix sur le widget editor
+
 * [Deprecated]
 
 * [Security]
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.0.10",
-    "date": "01/04/2020",
-    "SDK2DVersion": "3.0.10",
-    "SDK3DVersion": "3.0.10",
+    "version": "3.0.11",
+    "date": "02/04/2020",
+    "SDK2DVersion": "3.0.11",
+    "SDK3DVersion": "3.0.11",
     "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",
@@ -47,7 +47,7 @@
     },
     "homepage": "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
     "dependencies": {
-        "whatwg-fetch": "^3.0.0"
+        "whatwg-fetch": "3.0.0"
     },
     "devDependencies": {
         "@babel/core": "^7.8.3",
@@ -70,25 +70,24 @@
         "exports-loader": "^0.7.0",
         "expose-loader": "^0.7.5",
         "fs-extra": "^8.1.0",
-        "geoportal-extensions-itowns": "2.2.8",
-        "geoportal-extensions-openlayers": "3.0.9",
+        "geoportal-extensions-itowns": "2.2.9",
+        "geoportal-extensions-openlayers": "3.0.10",
         "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",
+        "loglevel": "1.6.6",
         "mini-css-extract-plugin": "^0.6.0",
         "mocha": "^5.2.0",
         "mocha-loader": "^2.0.1",
         "mocha-webpack": "^2.0.0-beta.0",
         "npm-run-all": "^4.1.5",
-        "ol": "^5.3.0",
-        "ol-mapbox-style": "^4.2.1",
+        "ol": "5.3.0",
+        "ol-mapbox-style": "4.2.1",
         "optimize-css-assets-webpack-plugin": "^5.0.1",
         "path": "^0.12.7",
-        "proj4": "2.5.0",
+        "proj4": "2.6.0",
         "replace-bundle-webpack-plugin": "^1.0.0",
         "requirejs": "^2.3.6",
         "responsive-loader": "^1.2.0",
@@ -97,8 +96,8 @@
         "string-template": "^1.0.0",
         "style-loader": "^0.23.1",
         "terser-webpack-plugin": "^2.0.0",
-        "three": "^0.113.2",
-        "three.meshline": "^1.2.0",
+        "three": "0.113.2",
+        "three.meshline": "1.2.0",
         "uglify-es": "github:mishoo/UglifyJS2#harmony",
         "uglifyjs-webpack-plugin": "^2.1.2",
         "url-loader": "^1.1.2",

diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json
@@ -1,37 +1,37 @@
 {
-   "module" : "src/SDK2D.js",
-   "date" : "01/04/2020",
-   "description" : "French Geoportal SDK based on OpenLayers (2D)",
    "bugs" : {
       "url" : "https://github.com/IGNF/geoportal-sdk/issues"
    },
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
-   "name" : "@ignf-geoportal/sdk-2d",
-   "main" : "dist/GpSDK2D-src.js",
-   "directories" : {},
    "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-sdk.git"
+      "url" : "https://github.com/IGNF/geoportal-sdk.git",
+      "type" : "git"
    },
-   "scripts" : {},
-   "license" : "CECILL-B",
-   "keywords" : [
-      "openlayers",
-      "geoportail",
-      "webservice",
-      "javascript"
-   ],
-   "author" : "IGNF",
    "dependencies" : {
       "ol" : "5.3.0",
-      "geoportal-extensions-openlayers" : "3.0.9"
+      "geoportal-extensions-openlayers" : "3.0.10"
    },
+   "description" : "French Geoportal SDK based on OpenLayers (2D)",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "version" : "3.0.10"
+   "keywords" : [
+      "openlayers",
+      "geoportail",
+      "webservice",
+      "javascript"
+   ],
+   "main" : "dist/GpSDK2D-src.js",
+   "version" : "3.0.11",
+   "license" : "CECILL-B",
+   "directories" : {},
+   "module" : "src/SDK2D.js",
+   "author" : "IGNF",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+   "name" : "@ignf-geoportal/sdk-2d",
+   "scripts" : {},
+   "date" : "02/04/2020"
 }
diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json
@@ -1,40 +1,40 @@
 {
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "author" : "IGNF",
-   "version" : "3.0.10",
-   "scripts" : {},
-   "main" : "dist/GpSDK3D-src.js",
-   "bugs" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
-   },
-   "directories" : {},
-   "module" : "src/SDK3D.js",
-   "license" : "CECILL-B",
    "name" : "@ignf-geoportal/sdk-3d",
+   "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
+   "date" : "02/04/2020",
+   "module" : "src/SDK3D.js",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-sdk.git",
+      "type" : "git"
+   },
    "dependencies" : {
-      "geoportal-extensions-openlayers" : "3.0.9",
+      "geoportal-extensions-openlayers" : "3.0.10",
       "itowns" : "2.19.0",
-      "geoportal-extensions-itowns" : "2.2.8",
-      "ol" : "5.3.0"
-   },
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-sdk.git"
+      "ol" : "5.3.0",
+      "geoportal-extensions-itowns" : "2.2.9"
    },
+   "directories" : {},
    "keywords" : [
       "openlayers",
       "itowns",
       "geoportail",
       "webservice",
       "javascript"
    ],
-   "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
-   "date" : "01/04/2020"
+   "license" : "CECILL-B",
+   "bugs" : {
+      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
+   },
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+   "version" : "3.0.11",
+   "main" : "dist/GpSDK3D-src.js",
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "author" : "IGNF",
+   "scripts" : {}
 }
diff --git a/src/Interface/IMapLayers.js b/src/Interface/IMapLayers.js
@@ -170,6 +170,7 @@ IMap.prototype.addLayers = function (layersOptions) {
             }
             // ... puis MAPBOX GEOPORTAIL
             if (format == null || format.toUpperCase() === "MAPBOX") {
+                // FIXME je ne comprends pas ce code !?
                 layerConf = Config.getLayerConf(layerId + "$GEOPORTAIL:GPP:TMS");
                 if (layerConf) {
                     format = "MAPBOX";

diff --git a/src/Itowns/ItMapListeners.js b/src/Itowns/ItMapListeners.js
@@ -907,7 +907,7 @@ ItMap.prototype._addGeoportalLayer = function (layerObj, layerConf) {
     var layerId = Object.keys(layerObj)[0];
     // FIXME verrue pour gestion projection MNT = IGNF:WGS84 dans autoconf...
     // itowns ne gere que 3857 et 4326
-    if (layerConf.defaultProjection !== "EPSG:3857") {
+    if (layerConf && layerConf.defaultProjection !== "EPSG:3857") {
         layerConf.defaultProjection = "EPSG:4326";
     }
     // Si on a bien un objet layerConf passé, on ajoute les params spécifiques iTowns