From ea22a27d16a0cc3bcff8470c2baad946cb81d5b8 Mon Sep 17 00:00:00 2001 From: lowzonenose Date: Thu, 2 Apr 2020 17:22:49 +0200 Subject: [PATCH 1/6] =?UTF-8?q?fix=20(build)=20:=20maj=20widget=20editor?= =?UTF-8?q?=20extensions=20-=20versions=20exactes=20des=20dependances=20-?= =?UTF-8?q?=20hack=20sur=20les=20couches=20mapbox=20import=C3=A9es=20en=20?= =?UTF-8?q?3D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 19 +++++++++---------- src/Interface/IMapLayers.js | 1 + src/Itowns/ItMapListeners.js | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 31ee037ad..a83bf971a 100644 --- a/package.json +++ b/package.json @@ -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": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-itowns-2.2.8.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-openlayers-3.0.9.tgz", "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.3.0", "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/src/Interface/IMapLayers.js b/src/Interface/IMapLayers.js index b86364a02..816ce995f 100644 --- 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 index efd19df6e..1ccc0bfdd 100644 --- 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 From 584e101e1cd71aae743e82404dc3d3a6cc180191 Mon Sep 17 00:00:00 2001 From: lowzonenose Date: Thu, 2 Apr 2020 17:38:57 +0200 Subject: [PATCH 2/6] fix (build) : maj version olms 4.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a83bf971a..1057ad89a 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "mocha-webpack": "^2.0.0-beta.0", "npm-run-all": "^4.1.5", "ol": "5.3.0", - "ol-mapbox-style": "4.3.0", + "ol-mapbox-style": "4.2.1", "optimize-css-assets-webpack-plugin": "^5.0.1", "path": "^0.12.7", "proj4": "2.6.0", From d995af30e6f5813dfd858cdc3cd82f0ad4438587 Mon Sep 17 00:00:00 2001 From: Elias Couppe Date: Thu, 2 Apr 2020 20:58:09 +0200 Subject: [PATCH 3/6] =?UTF-8?q?release(2D/3D):=20met=20=C3=A0=20jour=20les?= =?UTF-8?q?=20dependances=20extensions=20geoportail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versions : - extension geoportail pour openlayers : 3.0.10 - extension geoportail pour itowns : 2.2.9 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1057ad89a..d3cd71c83 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^8.1.0", - "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-itowns-2.2.8.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-openlayers-3.0.9.tgz", + "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", From 3d58b1e80e985e90c7671c4188bd7324fbfa5343 Mon Sep 17 00:00:00 2001 From: Elias Couppe Date: Thu, 2 Apr 2020 21:06:23 +0200 Subject: [PATCH 4/6] release(2D/3D): prepare la release 3.0.11 du SDK2D et du SDK3D MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Intègre : - mise à jour de package.json - mise à jour du DRAFT_CHANGELOG --- DRAFT_CHANGELOG.md | 12 ++++++++---- package.json | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 2262a5b58..9d674adc7 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -1,11 +1,11 @@ -# 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 @@ -13,12 +13,16 @@ Hotfix sur la gestion des sprites des couches mapbox et sur l'editeur de couches * [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 index d3cd71c83..076df2471 100644 --- 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", From 33be275bdffca05d25ed504d9382860a60d076bc Mon Sep 17 00:00:00 2001 From: Elias Couppe Date: Thu, 2 Apr 2020 21:11:59 +0200 Subject: [PATCH 5/6] release(2D/3D): prepare publication npm SDK 2D et SDK3D version 3.0.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Met à jour les package.json : - gp-ol 3.0.10 - gp-itowns 2.2.9 --- scripts/release/package-SDK2D.json | 42 +++++++++++++------------- scripts/release/package-SDK3D.json | 48 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index cb604d478..d92461b80 100644 --- 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", + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], "name" : "@ignf-geoportal/sdk-2d", - "main" : "dist/GpSDK2D-src.js", - "directories" : {}, "repository" : { "type" : "git", "url" : "https://github.com/IGNF/geoportal-sdk.git" }, "scripts" : {}, + "main" : "dist/GpSDK2D-src.js", + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" + }, "license" : "CECILL-B", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "dependencies" : { + "ol" : "5.3.0", + "geoportal-extensions-openlayers" : "3.0.10" + }, + "description" : "French Geoportal SDK based on OpenLayers (2D)", "keywords" : [ "openlayers", "geoportail", "webservice", "javascript" ], + "date" : "02/04/2020", + "directories" : {}, + "version" : "3.0.11", "author" : "IGNF", - "dependencies" : { - "ol" : "5.3.0", - "geoportal-extensions-openlayers" : "3.0.9" - }, - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "version" : "3.0.10" + "module" : "src/SDK2D.js" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index e846e76e9..6a73b57c5 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,32 +1,21 @@ { - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "author" : "IGNF", - "version" : "3.0.10", - "scripts" : {}, - "main" : "dist/GpSDK3D-src.js", + "license" : "CECILL-B", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "directories" : {}, - "module" : "src/SDK3D.js", - "license" : "CECILL-B", + "scripts" : {}, + "main" : "dist/GpSDK3D-src.js", "name" : "@ignf-geoportal/sdk-3d", + "author" : "IGNF", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "module" : "src/SDK3D.js", + "version" : "3.0.11", + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "dependencies" : { - "geoportal-extensions-openlayers" : "3.0.9", "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" + "geoportal-extensions-itowns" : "2.2.9", + "ol" : "5.3.0", + "geoportal-extensions-openlayers" : "3.0.10" }, "keywords" : [ "openlayers", @@ -35,6 +24,17 @@ "webservice", "javascript" ], - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "date" : "01/04/2020" + "repository" : { + "type" : "git", + "url" : "https://github.com/IGNF/geoportal-sdk.git" + }, + "date" : "02/04/2020", + "directories" : {}, + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ] } From df8bb93eff17cdb7213d906794053506fdff159d Mon Sep 17 00:00:00 2001 From: Elias Couppe Date: Thu, 2 Apr 2020 21:21:00 +0200 Subject: [PATCH 6/6] release(2D/3D): (bis)prepare publication npm SDK 2D et SDK3D version 3.0.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Met à jour les package.json : - gp-ol 3.0.10 - gp-itowns 2.2.9 --- scripts/release/package-SDK2D.json | 38 +++++++++++++++--------------- scripts/release/package-SDK3D.json | 36 ++++++++++++++-------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index d92461b80..8c8d9af2b 100644 --- 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" - ], - "name" : "@ignf-geoportal/sdk-2d", - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" - }, - "scripts" : {}, - "main" : "dist/GpSDK2D-src.js", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "license" : "CECILL-B", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "repository" : { + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" + }, "dependencies" : { "ol" : "5.3.0", "geoportal-extensions-openlayers" : "3.0.10" }, "description" : "French Geoportal SDK based on OpenLayers (2D)", + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], "keywords" : [ "openlayers", "geoportail", "webservice", "javascript" ], - "date" : "02/04/2020", - "directories" : {}, + "main" : "dist/GpSDK2D-src.js", "version" : "3.0.11", + "license" : "CECILL-B", + "directories" : {}, + "module" : "src/SDK2D.js", "author" : "IGNF", - "module" : "src/SDK2D.js" + "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 index 6a73b57c5..aa51822a4 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,22 +1,19 @@ { - "license" : "CECILL-B", - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" - }, - "scripts" : {}, - "main" : "dist/GpSDK3D-src.js", "name" : "@ignf-geoportal/sdk-3d", - "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "module" : "src/SDK3D.js", - "version" : "3.0.11", "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.10", "itowns" : "2.19.0", - "geoportal-extensions-itowns" : "2.2.9", "ol" : "5.3.0", - "geoportal-extensions-openlayers" : "3.0.10" + "geoportal-extensions-itowns" : "2.2.9" }, + "directories" : {}, "keywords" : [ "openlayers", "itowns", @@ -24,17 +21,20 @@ "webservice", "javascript" ], - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" + "license" : "CECILL-B", + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "date" : "02/04/2020", - "directories" : {}, + "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" : {} }