release sdk-3.2.0

IGNF · Aug 3, 2021 · 4e48873 · 4e48873
2 parents 0ff1254 + 80e9951
commit 4e48873
Show file tree

Hide file tree

Showing 32 changed files with 32,227 additions and 25,286 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -1,13 +1,13 @@
-# DEPENDENCIES (16/04/2021)
+# DEPENDENCIES (26/05/2021)
 
-* geoportal-extensions-openlayers@3.0.14
-└── geoportal-access-lib@2.1.7
+* geoportal-extensions-openlayers@3.1.0
+└── geoportal-access-lib@2.1.8
 
 * geoportal-extensions-itowns@2.3.2
-└── geoportal-access-lib@2.1.7
+└── geoportal-access-lib@2.1.8
 
 * "itowns"
 └── "itowns@2.30.0"
 
 * "openlayers"
-└── "openlayers@5.3.0
+└── "openlayers@6.3.1
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,26 +1,27 @@
-# SDK Geoportail 2D/3D, version 3.1.9
+# SDK Geoportail 2D/3D, version 3.2.0
+
+**03/08/2021 : version 3.2.0**
 
-**30/06/2021 : version 3.1.9**
 > Release SDK Geoportail 2D/3D
 
 ## Summary
 
-* Upgrade extensions geoportail pour OpenLayers et pour iTowns, et travaux sur le profil alti
-
+* Upgrade d'OpenLayers et des extensions geoportail
+ 
 ## Changelog
 
 * [Added]
 
 * [Changed]
 
-    - mise à jour ext-gp-ol-3.0.19 (#82)
+    - geoportal-extensions-openlayers@3.1.0
+    - openlayers@6.3.1
+    - itowns 2.33
 
 * [Removed]
 
 * [Fixed]
-
-    - fix visuel vignette du profil alti (#82)
-
+
 * [Deprecated]
 
 * [Security]
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.1.9",
-    "date": "30/06/2021",
-    "SDK2DVersion": "3.1.9",
-    "SDK3DVersion": "3.1.9",
+    "version": "3.2.0",
+    "date": "03/08/2021",
+    "SDK2DVersion": "3.2.0",
+    "SDK3DVersion": "3.2.0",
     "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",
@@ -54,7 +54,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",
+        "@mapbox/mapbox-gl-style-spec": "13.14.0",
         "babel-loader": "^8.0.5",
         "chai": "^4.2.0",
         "chalk": "^4.0.0",
@@ -72,7 +72,7 @@
         "expose-loader": "^0.7.5",
         "fs-extra": "^9.0.0",
         "geoportal-extensions-itowns": "2.3.3",
-        "geoportal-extensions-openlayers": "3.0.19",
+        "geoportal-extensions-openlayers": "3.1.0",
         "handlebars": "^4.7.5",
         "handlebars-layouts": "^3.1.4",
         "html-webpack-plugin": "^4.0.4",
@@ -83,8 +83,8 @@
         "mocha": "^7.1.1",
         "mocha-loader": "^5.0.0",
         "npm-run-all": "^4.1.5",
-        "ol": "5.3.0",
-        "ol-mapbox-style": "4.2.1",
+        "ol": "6.3.1",
+        "ol-mapbox-style": "6.3.1",
         "optimize-css-assets-webpack-plugin": "^5.0.1",
         "path": "^0.12.7",
         "proj4": "2.7.2",
@@ -98,8 +98,6 @@
         "terser-webpack-plugin": "^2.0.0",
         "three": "0.127.0",
         "three.meshline": "1.2.0",
-        "uglify-es": "github:mishoo/UglifyJS2#harmony",
-        "uglifyjs-webpack-plugin": "^2.1.2",
         "url-loader": "^4.0.0",
         "webpack": "^4.41.5",
         "webpack-cli": "^3.3.10",

diff --git a/samples-src/pages/2d/page-controlsOptions-bundle.html b/samples-src/pages/2d/page-controlsOptions-bundle.html
@@ -283,6 +283,9 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
                     delimitations : ["Point", "Extent", "Circle"]
                 },
                 drawing : {
+                    tools : {
+                        holes : true
+                    },
                     cursorStyle : {
                         radius : 5,
                         strokeColor: '#F90',

diff --git a/samples-src/pages/2d/page-mapOptions-bundle.html b/samples-src/pages/2d/page-mapOptions-bundle.html
@@ -10,13 +10,17 @@
             height: 600px;
             width: 100%;
         }
+        #extControlDiv {
+            position : absolute;
+        }
     </style>
 {{/content}}
 
 {{#content "body"}}
     <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de mapOptions </h1>
     <div id="geoportalMap"></div>
     <input type="button" value="addLayer" onclick="addLayer();"/><br>
+    <div id="extControlDiv"></div>
 {{/content}}
 
 {{#content "js"}}

diff --git a/samples-src/pages/2d/page-mapbox-opts-grayscaled-bundle.html b/samples-src/pages/2d/page-mapbox-opts-grayscaled-bundle.html
@@ -36,10 +36,10 @@ <h1>Une carte affichant une couche MapBox avec un style externe</h1>
             layersOptions : {
                 'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
                 },
-                'monMapBoxOSM' : {
+                'monMapBox' : {
                     grayScaled : true,
                     format : "MapBox",
-                    url : "{{resources}}/MAPBOX/styles/osm.json"
+                    url : "{{resources}}/MAPBOX/styles/planign/standard.json"
                 }
             },
             zoom : 6

diff --git a/samples-src/pages/2d/page-mapbox-opts-mapboxoptions-bundle.html b/samples-src/pages/2d/page-mapbox-opts-mapboxoptions-bundle.html
@@ -36,23 +36,25 @@ <h1>Une carte affichant une couche MapBox avec un style surchargé</h1>
             layersOptions : {
                 'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
                 },
-                'monMapBoxOSM' : {
+                'monMapBox' : {
                     zoomToExtent : true,
                     format : "MapBox",
-                    url : "{{resources}}/MAPBOX/styles/osm.json",
+                    url : "{{resources}}/MAPBOX/styles/planign/accentue.json",
                     mapboxOptions : {
                         "center": [2, 48],
                         "layers": [{
-                          "id": "land",
-                          "type": "fill",
-                          "source": "osm",
-                          "source-layer": "land",
-                          "layout": {
-                            "visibility": "visible"
-                          },
-                          "paint": {
-                            "fill-color": "rgba(76, 76, 92, 1)"
-                          }
+                            "id": "bckgrd",
+                            "type": "fill",
+                            "source": "plan_ign",
+                            "source-layer": "fond_opaque",
+                            "minzoom": 0,
+                            "layout": {
+                                "visibility": "visible"
+                            },
+                            "paint": {
+                                "fill-color": "#000000",
+                                "fill-opacity": 1
+                            }
                         }]
                     }
                 }

diff --git a/samples-src/pages/2d/page-mapbox-planign-bundle.html b/samples-src/pages/2d/page-mapbox-planign-bundle.html
@@ -49,7 +49,7 @@ <h1>Une carte affichant une couche MapBox (Plan IGN)</h1>
                     format : "MapBox",
                     title : "Plan IGN",
                     description : "...",
-                    url : "{{resources}}/MAPBOX/styles/planign/muet.json",
+                    url : "{{resources}}/MAPBOX/styles/planign/standard.json",
                     quicklookUrl : "https://wxs.ign.fr/static/pictures/test.jpg",
                     metadata : [
                         {"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=TEST1.xml"},

diff --git a/...-src/pages/2d/page-mapbox-osm-bundle.html → ...age-mapbox-planign-geoportail-bundle.html b/...-src/pages/2d/page-mapbox-osm-bundle.html → ...age-mapbox-planign-geoportail-bundle.html
@@ -14,15 +14,20 @@
 {{/content}}
 
 {{#content "body"}}
-    <h1>Une carte affichant une couche MapBox avec un style externe</h1>
+    <h1>Une carte affichant une couche MapBox (Plan IGN)</h1>
     <p>NB : le clic sur les features s'obtient par l'ajout du controle GetFeatureInfo (ici : caché et activé).</p>
     <div id="geoportalMap"></div>
 {{/content}}
 
 {{#content "js"}}
     <script>
         Gp.Map.load('geoportalMap',{
-            configUrl : "{{resources}}/autoconf.js",
+            reloadConfig : false,
+            apiKey : "{{apikey}}",
+            center:{
+                x : 407444,
+                y : 5856585
+            },
             controlsOptions : {
                 "layerSwitcher" : {},
                 "getfeatureInfo" : {
@@ -36,9 +41,9 @@ <h1>Une carte affichant une couche MapBox avec un style externe</h1>
             layersOptions : {
                 'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
                 },
-                'monMapBoxOSM' : {
+                'PLAN.IGN.GEOPORTAIL' : {
                     format : "MapBox",
-                    url : "{{resources}}/MAPBOX/styles/osm.json"
+                    url : "{{resources}}/MAPBOX/styles/PLAN.IGN.GEOPORTAIL.json"
                 }
             },
             zoom : 6

diff --git a/samples-src/pages/3d/page-mapbox-bundle.html b/samples-src/pages/3d/page-mapbox-bundle.html
@@ -42,18 +42,16 @@ <h2>Carte 3D.</h2>
             projection : "EPSG:3857",
             tileMatrixSet : "PM",
             // url : "https://vectortiles.ign.fr/demonstrateur/styles/planign.json",
-            url : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/standard.json",
+            url : "{{resources}}/MAPBOX/styles/planign/standard.json",
             styles : [
                 {
                     "name" : "style 'gris'",
-                    "url" : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/gris.json",
-                    // "url" : "data/planign/gris.json"
+                    "url" : "{{resources}}/MAPBOX/styles/planign/gris.json",
                     "selected" : true
                 },
                 {
-                    "name" : "style 'muet'",
-                    "url" : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/muet.json",
-                    // "url" : "data/planign/muet.json",
+                    "name" : "style 'accentue'",
+                    "url" : "{{resources}}/MAPBOX/styles/planign/accentue.json",
                 },
             ],
             filtersSummary : "Filtres",

diff --git a/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html b/samples-src/pages/3d/page-mapbox-custom-sprite-bundle.html
@@ -41,19 +41,17 @@ <h2>Carte 3D.</h2>
             projection : "EPSG:3857",
             tileMatrixSet : "PM",
             // url : "https://vectortiles.ign.fr/demonstrateur/styles/planign.json",
-            url : "{{resources}}/MAPBOX/styles/planign.json",
+            url : "{{resources}}/MAPBOX/styles/planign/standard.json",
             sprite : "{{resources}}/MAPBOX/geojson/sprite/PlanIgnTest",
             styles : [
                 {
                     "name" : "style 'gris'",
-                    "url" : "https://vectortiles.ign.fr/demonstrateur/styles/gris.json",
-                    // "url" : "data/planign/gris.json"
+                    "url" : "{{resources}}/MAPBOX/styles/planign/gris.json",
                     "selected" : true
                 },
                 {
-                    "name" : "style 'muet'",
-                    "url" : "https://vectortiles.ign.fr/demonstrateur/styles/muet.json",
-                    // "url" : "data/planign/muet.json",
+                    "name" : "style 'accentue'",
+                    "url" : "{{resources}}/MAPBOX/styles/planign/accentue.json",
                 },
             ],
             filtersSummary : "Filtres",