diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 66a2db5b8..a4c0dca34 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -1,12 +1,12 @@ -# SDK Geoportail 2D/3D, version 3.3.9 +# SDK Geoportail 2D/3D, version 3.3.10 -**15/02/2022 : version 3.3.9** +**04/03/2022 : version 3.3.10** > Release SDK Geoportail 2D/3D ## Summary -* Mise à jour du package des Extensions OpenLayers en 3.2.9 ([release notes](https://github.com/IGNF/geoportal-extensions/releases/tag/ol-3.2.9)) +Mise à jour de l'extension géoportail pour iTowns en version 2.3.6, pour utilisation d'iTowns 2.37 dans le SDK 3D ## Changelog @@ -14,12 +14,12 @@ * [Changed] + - update iTowns en version 2.37 + * [Removed] * [Fixed] - - correction sur le layerswitcher selon le navigateur (hotfix portail) - * [Deprecated] * [Security] diff --git a/package.json b/package.json index 07c491cc5..e55a200c7 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.3.9", - "date": "15/02/2022", - "SDK2DVersion": "3.3.9", - "SDK3DVersion": "3.3.9", + "version": "3.3.10", + "date": "04/03/2022", + "SDK2DVersion": "3.3.10", + "SDK3DVersion": "3.3.10", "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", @@ -72,12 +72,12 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.3.5", + "geoportal-extensions-itowns": "2.3.6", "geoportal-extensions-openlayers": "3.2.9", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", - "itowns": "2.33.0", + "itowns": "2.37.0", "jsdoc-webpack-plugin": "^0.3.0", "loglevel": "1.6.6", "mini-css-extract-plugin": "^0.9.0", @@ -88,7 +88,7 @@ "ol-mapbox-style": "6.7.0", "optimize-css-assets-webpack-plugin": "^5.0.1", "path": "^0.12.7", - "proj4": "2.7.2", + "proj4": "2.7.5", "replace-bundle-webpack-plugin": "^1.0.0", "requirejs": "^2.3.6", "responsive-loader": "^1.2.0", @@ -97,7 +97,7 @@ "string-template": "^1.0.0", "style-loader": "^1.1.3", "terser-webpack-plugin": "^2.0.0", - "three": "0.127.0", + "three": "0.135.0", "three.meshline": "1.2.0", "url-loader": "^4.0.0", "webpack": "^4.41.5", diff --git a/samples-src/config-2d.json b/samples-src/config-2d.json index d63c84770..703292dfe 100644 --- a/samples-src/config-2d.json +++ b/samples-src/config-2d.json @@ -2,7 +2,7 @@ "baseurl" : "../..", "resources" : "../resources", "proxy" : "https://localhost/proxy/proxy.php", - "apikey" : "jhyvi0fgmnuxvfv0zjzorvdn", - "apikey2" : "kgco926a9mj4fcng4whjf5ac", + "apikey" : "essentiels,calcul", + "apikey2" : "parcellaire", "apikey3" : "an7nvfzojv5wa96dsga5nk8w" } diff --git a/samples-src/config-3d.json b/samples-src/config-3d.json index 887160f74..c3f4f101b 100644 --- a/samples-src/config-3d.json +++ b/samples-src/config-3d.json @@ -2,7 +2,9 @@ "baseurl" : "../..", "resources" : "../resources", "proxy" : "https://localhost/proxy/proxy.php", - "apikey" : "ptlp78g6fvz9daz5mg2fztvr", + "apikey" : "essentiels,altimetrie,calcul", "apikey2" : "an7nvfzojv5wa96dsga5nk8w", - "apikey3" : "jhyvi0fgmnuxvfv0zjzorvdn" + "apikey3" : "essentiels", + "apikey4" : "altimetrie", + "apikey5" : "calcul" } diff --git a/samples-src/pages/2d/page-changeLayersColor-amd.html b/samples-src/pages/2d/page-changeLayersColor-amd.html index 54e9ad1e6..73f17b63c 100644 --- a/samples-src/pages/2d/page-changeLayersColor-amd.html +++ b/samples-src/pages/2d/page-changeLayersColor-amd.html @@ -29,11 +29,11 @@

changeLayerColor

-
+



-
+

{{/content}} @@ -43,11 +43,11 @@

changeLayerColor

var map = null; var layerColored = { - "GEOGRAPHICALGRIDSYSTEMS.MAPS" : false, + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : false, "maCoucheWFS" : false, "maCoucheWMS" : false, "maCoucheWMS_CORS" : false, - "GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : false, + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : false, "maCoucheOSM" : false, } @@ -73,7 +73,7 @@

changeLayerColor

map = Gp.Map.load("geoportalMap",{ apiKey : "{{apikey}}", layersOptions : { - "GEOGRAPHICALGRIDSYSTEMS.MAPS" : { + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : { title : "maCoucheGP" }, maCoucheWFS : { @@ -105,7 +105,7 @@

changeLayerColor

layers : ["BATHY-DALLE_PYR-PNG_3857_WMSR"], outputFormat : "image/png" }, - "GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : { + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : { title : "maCoucheWMTS", format : "wmts", minZoom : 0, @@ -113,7 +113,7 @@

changeLayerColor

visibility : true, opacity : 1 , url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", - layer : "GEOGRAPHICALGRIDSYSTEMS.MAPS", + layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2", tileMatrixSet : "PM", styleName : "normal", outputFormat : "image/jpeg" diff --git a/samples-src/pages/2d/page-changeLayersColor-bundle.html b/samples-src/pages/2d/page-changeLayersColor-bundle.html index b5ef48af0..6bac102a8 100644 --- a/samples-src/pages/2d/page-changeLayersColor-bundle.html +++ b/samples-src/pages/2d/page-changeLayersColor-bundle.html @@ -33,7 +33,7 @@

changeLayerColor



-
+

{{/content}} @@ -76,7 +76,7 @@

changeLayerColor

// layers : ["BATHY-DALLE_PYR-PNG_3857_WMSR"], // outputFormat : "image/png" // }, - "GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : { + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : { title : "maCoucheWMTS", format : "wmts", minZoom : 0, @@ -84,7 +84,7 @@

changeLayerColor

visibility : true, opacity : 0.7, url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", - layer : "GEOGRAPHICALGRIDSYSTEMS.MAPS", + layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2", tileMatrixSet : "PM", styleName : "normal", outputFormat : "image/jpeg" @@ -112,7 +112,7 @@

changeLayerColor

"maCoucheWFS" : false, "maCoucheWMS" : false, // "maCoucheWMS_CORS" : false, - "GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : false, + "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : false, "maCoucheOSM" : false, } diff --git a/samples-src/pages/2d/page-changeLayersColor-es6.html b/samples-src/pages/2d/page-changeLayersColor-es6.html index c03c02fd4..9d09562e3 100644 --- a/samples-src/pages/2d/page-changeLayersColor-es6.html +++ b/samples-src/pages/2d/page-changeLayersColor-es6.html @@ -29,11 +29,11 @@

changeLayerColor

-
+



-
+

{{/content}} @@ -42,11 +42,11 @@

changeLayerColor

{{/content}} diff --git a/samples-src/pages/3d/page-kml-bundle.html b/samples-src/pages/3d/page-kml-bundle.html index 77b3aaac6..a87936089 100644 --- a/samples-src/pages/3d/page-kml-bundle.html +++ b/samples-src/pages/3d/page-kml-bundle.html @@ -35,7 +35,7 @@

Test de l'ajout d'une couche KML

format : "wmts", outputFormat : "image/x-bil;bits=32", noDataValue : -99999, - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey4}}/geoportail/wmts", layer : "ELEVATION.ELEVATIONGRIDCOVERAGE", styleName : "normal", tileMatrixSet : "WGS84G", @@ -108,7 +108,7 @@

Test de l'ajout d'une couche KML

description : "Photographies aériennes", format : "wmts", outputFormat : "image/jpeg", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey3}}/geoportail/wmts", layer : "ORTHOIMAGERY.ORTHOPHOTOS", projection : "EPSG:3857", tileMatrixSet : "PM", diff --git a/samples-src/pages/3d/page-layerSwitcher-bundle.html b/samples-src/pages/3d/page-layerSwitcher-bundle.html index 586490171..bb1a2188b 100644 --- a/samples-src/pages/3d/page-layerSwitcher-bundle.html +++ b/samples-src/pages/3d/page-layerSwitcher-bundle.html @@ -57,7 +57,7 @@

Test de l'ajout du control LayerSwitcher

format : "wmts", outputFormat : "image/x-bil;bits=32", noDataValue : -99999, - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey4}}/geoportail/wmts", layer : "ELEVATION.ELEVATIONGRIDCOVERAGE", styleName : "normal", tileMatrixSet : "WGS84G", @@ -131,7 +131,7 @@

Test de l'ajout du control LayerSwitcher

description : "Photographies aériennes", format : "wmts", outputFormat : "image/jpeg", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey3}}/geoportail/wmts", layer : "ORTHOIMAGERY.ORTHOPHOTOS", tileMatrixSet : "PM", tileMatrixSetLimits : { @@ -322,7 +322,7 @@

Test de l'ajout du control LayerSwitcher

format : "wms", title : "Ecoles maternelles et élémentaires", description : "L'école maternelle peut accueillir les enfants avant l'instruction obligatoire qui débute à 6 ans. L'école élémentaire accueille les enfants scolarisés de 6 à 11 ans. Elle est mixte et gratuite si elle est publique. En savoir plus.. Source des données : MENESR février 2014, BD TOPO 2016", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/v/wms", + url : "https://wxs.ign.fr/{{apikey3}}/geoportail/v/wms", layers : ["UTILITYANDGOVERNMENTALSERVICES.IGN.POI.ENSEIGNEMENTPRIMAIRE"], outputFormat : "image/png", queryable : true, diff --git a/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html b/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html index 8882c238a..e5a006d9b 100644 --- a/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html +++ b/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html @@ -42,7 +42,7 @@

Carte 3D.

tileMatrixSet : "PM", // url : "https://vectortiles.ign.fr/demonstrateur/styles/planign.json", url : "{{resources}}/MAPBOX/styles/planign/standard.json", - sprite : "{{resources}}/MAPBOX/geojson/sprite/PlanIgnTest", + sprite : "{{resources}}/MAPBOX/geojson/sprite/PlanIgnTest.json", styles : [ { "name" : "style 'gris'", diff --git a/samples-src/pages/3d/page-miniMap-bundle.html b/samples-src/pages/3d/page-miniMap-bundle.html index b8ed7b4dd..88e2c49c8 100644 --- a/samples-src/pages/3d/page-miniMap-bundle.html +++ b/samples-src/pages/3d/page-miniMap-bundle.html @@ -41,7 +41,7 @@

Test de l'ajout du control MiniMap

format : "wmts", outputFormat : "image/x-bil;bits=32", noDataValue : -99999, - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey4}}/geoportail/wmts", layer : "ELEVATION.ELEVATIONGRIDCOVERAGE", styleName : "normal", tileMatrixSet : "WGS84G", @@ -114,7 +114,7 @@

Test de l'ajout du control MiniMap

description : "Photographies aériennes", format : "wmts", outputFormat : "image/jpeg", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://wxs.ign.fr/{{apikey3}}/geoportail/wmts", layer : "ORTHOIMAGERY.ORTHOPHOTOS", projection : "EPSG:3857", tileMatrixSet : "PM", diff --git a/samples-src/pages/3d/page-modifyLayers-bundle.html b/samples-src/pages/3d/page-modifyLayers-bundle.html index ecb7dd962..f5d7f956d 100644 --- a/samples-src/pages/3d/page-modifyLayers-bundle.html +++ b/samples-src/pages/3d/page-modifyLayers-bundle.html @@ -26,7 +26,7 @@

Carte 3D.


-
+

{{/content}} @@ -34,14 +34,14 @@

Carte 3D.

{{#content "js"}}