From cde81089fd496be8806411ab35a5e5cce5639cd2 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 10 Nov 2021 19:13:56 +0100 Subject: [PATCH 1/8] update(package): utilisation ext-ol-3.2.3 --- DRAFT_CHANGELOG.md | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 872fd5676..ac25be1a2 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -1,12 +1,12 @@ -# SDK Geoportail 2D/3D, version 3.3.1 +# SDK Geoportail 2D/3D, version 3.3.3 -**08/11/2021 : version 3.3.1** +**10/11/2021 : version 3.3.3** > Release SDK Geoportail 2D/3D ## Summary -* Upgrade des extensions geoportail pour utilisation de l'itinéraire v2 +* Correction couche itinéraire en doublon dans le layerSwitcher ## Changelog @@ -14,14 +14,14 @@ * [Changed] - - geoportal access lib 3.0.1 (#84) - - extension geoportail pour openlayers 3.1.0 (#84) + - geoportal access lib 3.0.3 + - extension geoportail pour openlayers 3.2.3 * [Removed] * [Fixed] - - correction sur l'affichage des ponctuels sur les KML / GPX en 3D (#85) + - correction sur l'affichage des couches itinéraires dans le layerSwitcher * [Deprecated] diff --git a/package.json b/package.json index df1923373..0a0eeeec3 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", "geoportal-extensions-itowns": "2.3.3", - "geoportal-extensions-openlayers": "3.2.1", + "geoportal-extensions-openlayers": "3.2.3", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From f90aa99f5d37df3a0c3729011941d07192101bdd Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 10 Nov 2021 19:18:23 +0100 Subject: [PATCH 2/8] release 3.3.3 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0a0eeeec3..223fd76c5 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.3.2", - "date": "08/11/2021", - "SDK2DVersion": "3.3.2", - "SDK3DVersion": "3.3.2", + "version": "3.3.3", + "date": "10/11/2021", + "SDK2DVersion": "3.3.3", + "SDK3DVersion": "3.3.3", "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 9170fec44b03c4dd4fda962a3292058f421d9839 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Tue, 16 Nov 2021 17:59:35 +0100 Subject: [PATCH 3/8] update(package): extension feature-multikeys --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 223fd76c5..c397460f6 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.3.3", - "geoportal-extensions-openlayers": "3.2.3", + "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature-multikeys/build/scripts/release/geoportal-extensions-itowns-2.3.3.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature-multikeys/build/scripts/release/geoportal-extensions-openlayers-3.2.3.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From 566bb425b1810b7fcdef22cf3ca69a00424d2943 Mon Sep 17 00:00:00 2001 From: "amaury.zarzelli" Date: Fri, 3 Dec 2021 18:35:18 +0100 Subject: [PATCH 4/8] update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c397460f6..e077624b3 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature-multikeys/build/scripts/release/geoportal-extensions-itowns-2.3.3.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature-multikeys/build/scripts/release/geoportal-extensions-openlayers-3.2.3.tgz", + "geoportal-extensions-itowns": "2.3.4", + "geoportal-extensions-openlayers": "3.2.4", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From 75633958bb6fc513a26c27216391ae250193fe70 Mon Sep 17 00:00:00 2001 From: "amaury.zarzelli" Date: Fri, 3 Dec 2021 18:39:00 +0100 Subject: [PATCH 5/8] update changelog --- DRAFT_CHANGELOG.md | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index ac25be1a2..ecff532a8 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -1,28 +1,44 @@ -# SDK Geoportail 2D/3D, version 3.3.3 +# SDK Geoportail 2D/3D, version 3.3.4 -**10/11/2021 : version 3.3.3** +**03/12/2021 : version 3.3.4** > Release SDK Geoportail 2D/3D ## Summary -* Correction couche itinéraire en doublon dans le layerSwitcher - +* Possibilité de passer une liste de clés lors de l'initialisation de la carte + ## Changelog * [Added] + - Possibilité de passer une liste de clés lors de l'initialisation de la carte (#86) + Exemple : + ```js + var map = Gp.Map.load('geoportalMap',{ + apiKey : "jhyvi0fgmnuxvfv0zjzorvdn,administratif", + azimuth : 45, + zoom : 13, + center : { + x : -511270, + y : 6151620 + }, + layersOptions : { + 'ORTHOIMAGERY.ORTHOPHOTOS': { + }, + 'GEOGRAPHICALGRIDSYSTEMS.MAPS': { + }, + 'LIMITES_ADMINISTRATIVES_EXPRESS.LATEST': { + } + } + } + ``` * [Changed] - - geoportal access lib 3.0.3 - - extension geoportail pour openlayers 3.2.3 - * [Removed] * [Fixed] - - correction sur l'affichage des couches itinéraires dans le layerSwitcher - * [Deprecated] * [Security] From f3020ea6a845f9780659f28365fb7d87dbac88f8 Mon Sep 17 00:00:00 2001 From: "amaury.zarzelli" Date: Mon, 6 Dec 2021 19:08:45 +0100 Subject: [PATCH 6/8] correction samples multikey --- package.json | 4 +- .../pages/2d/page-multikey-bundle.html | 53 +++++++++++++++++++ .../pages/3d/page-multikey-bundle.html | 53 +++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 samples-src/pages/2d/page-multikey-bundle.html create mode 100644 samples-src/pages/3d/page-multikey-bundle.html diff --git a/package.json b/package.json index e077624b3..d86acf5eb 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "check": "eslint src/", "test:serve": "webpack-dev-server --config webpack.test.serve.js", "doc:serve": "webpack-dev-server --config webpack.config.3d --content-base jsdoc/ --port 9001 --open 'google-chrome'", - "sample:3d:serve": "webpack-dev-server --config webpack.config.3d --mode=development --https --open-page samples/index-3d-map.html --content-base . --output-public-path '/dist/3d/' --port 9001 --open 'google-chrome'", - "sample:2d:serve": "webpack-dev-server --config webpack.config.2d --mode=development --https --open-page samples/index-2d-map.html --content-base . --output-public-path '/dist/2d/' --port 9001 --open 'google-chrome'", + "sample:3d:serve": "webpack-dev-server --config webpack.config.3d --mode=development --https --open-page samples/index-3d-map.html --content-base . --output-public-path '/dist/3d/' --port 9001 --open 'chromium'", + "sample:2d:serve": "webpack-dev-server --config webpack.config.2d --mode=development --https --open-page samples/index-2d-map.html --content-base . --output-public-path '/dist/2d/' --port 9001 --open 'chromium'", "stat:2d": "npm run build:2d:src -- --profile --json > map-2d.json", "stat:3d": "npm run build:3d:src -- --profile --json > map-3d.json", "build": "npm-run-all --print-label --print-name build:*:*", diff --git a/samples-src/pages/2d/page-multikey-bundle.html b/samples-src/pages/2d/page-multikey-bundle.html new file mode 100644 index 000000000..aa87e7895 --- /dev/null +++ b/samples-src/pages/2d/page-multikey-bundle.html @@ -0,0 +1,53 @@ +{{#extend "sample-bundle-layout-2d"}} + +{{#content "head"}} + Sample SDK 2D multikey +{{/content}} + +{{#content "style"}} + +{{/content}} + +{{#content "body"}} +
+{{/content}} + +{{#content "js"}} + +{{/content}} +{{/extend}} diff --git a/samples-src/pages/3d/page-multikey-bundle.html b/samples-src/pages/3d/page-multikey-bundle.html new file mode 100644 index 000000000..6cff210e2 --- /dev/null +++ b/samples-src/pages/3d/page-multikey-bundle.html @@ -0,0 +1,53 @@ +{{#extend "sample-bundle-layout-3d"}} + +{{#content "head"}} + Sample SDK 3D multikey +{{/content}} + +{{#content "style"}} + +{{/content}} + +{{#content "body"}} +
+{{/content}} + +{{#content "js"}} + +{{/content}} +{{/extend}} From 6d7a78e1aa6e27522229a3ac354e7223d165e69f Mon Sep 17 00:00:00 2001 From: "amaury.zarzelli" Date: Wed, 8 Dec 2021 15:40:36 +0100 Subject: [PATCH 7/8] applying @lboulanger's remarks --- samples-src/pages/2d/page-multikey-bundle.html | 4 ++-- samples-src/pages/3d/page-multikey-bundle.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples-src/pages/2d/page-multikey-bundle.html b/samples-src/pages/2d/page-multikey-bundle.html index aa87e7895..cb117367f 100644 --- a/samples-src/pages/2d/page-multikey-bundle.html +++ b/samples-src/pages/2d/page-multikey-bundle.html @@ -21,7 +21,7 @@ {{#content "js"}}