release-3.1.8

IGNF · Jun 22, 2021 · ca4d29a · ca4d29a
2 parents b2acec7 + 9d4ccc5
commit ca4d29a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,26 +1,27 @@
-# SDK Geoportail 2D/3D, version 3.1.7
+# SDK Geoportail 2D/3D, version 3.1.8
 
-**11/05/2021 : version 3.1.7**
+**22/06/2021 : version 3.1.8**
 > Release SDK Geoportail 2D/3D
 
 ## Summary
 
-* Upgrade extension geoportail pour OpenLayers
+* Upgrade extensions geoportail pour OpenLayers et pour iTowns, et travaux sur le profil alti
 
 ## Changelog
 
 * [Added]
 
 * [Changed]
 
-    - mise à jour ext-gp-ol-3.0.16
+    - mise à jour ext-gp-ol-3.0.18 (#81)
+    - mise à jour ext-gp-itowns-2.3.3 et iTowns 2.33 (#79)
 
 * [Removed]
 
 * [Fixed]
 
-    - correctifs sur le chargement des couches vecteur tuilé (6e2d1af37d5df4c6f4e163f2d2b2a4e6113299ba et a70ee8f2e7b4623c75c5d3566da4e82d6d46f276)
-    - correctif sur la visibilité par défaut des couches vecteur tuilé en 3D (5fdee4a8ededa28e4f129e2f298c4deb8201bff2)
+    - fix de la saisie main levee du profil alti (#80)
+    - fix chargement des labels vecteur tuilé après switch 2D->3D (#79) 
 
 * [Deprecated]
 

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.1.7",
-    "date": "11/05/2021",
-    "SDK2DVersion": "3.1.7",
-    "SDK3DVersion": "3.1.7",
+    "version": "3.1.8",
+    "date": "22/06/2021",
+    "SDK2DVersion": "3.1.8",
+    "SDK3DVersion": "3.1.8",
     "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",
@@ -71,12 +71,12 @@
         "exports-loader": "^0.7.0",
         "expose-loader": "^0.7.5",
         "fs-extra": "^9.0.0",
-        "geoportal-extensions-itowns": "2.3.2",
-        "geoportal-extensions-openlayers": "3.0.16",
+        "geoportal-extensions-itowns": "2.3.3",
+        "geoportal-extensions-openlayers": "3.0.18",
         "handlebars": "^4.7.5",
         "handlebars-layouts": "^3.1.4",
         "html-webpack-plugin": "^4.0.4",
-        "itowns": "2.30.0",
+        "itowns": "2.33.0",
         "jsdoc-webpack-plugin": "^0.3.0",
         "loglevel": "1.6.6",
         "mini-css-extract-plugin": "^0.9.0",
@@ -87,7 +87,7 @@
         "ol-mapbox-style": "4.2.1",
         "optimize-css-assets-webpack-plugin": "^5.0.1",
         "path": "^0.12.7",
-        "proj4": "2.7.0",
+        "proj4": "2.7.2",
         "replace-bundle-webpack-plugin": "^1.0.0",
         "requirejs": "^2.3.6",
         "responsive-loader": "^1.2.0",
@@ -96,7 +96,7 @@
         "string-template": "^1.0.0",
         "style-loader": "^1.1.3",
         "terser-webpack-plugin": "^2.0.0",
-        "three": "0.124.0",
+        "three": "0.127.0",
         "three.meshline": "1.2.0",
         "uglify-es": "github:mishoo/UglifyJS2#harmony",
         "uglifyjs-webpack-plugin": "^2.1.2",

diff --git a/samples-src/pages/3d/page-mapbox-bundle.html b/samples-src/pages/3d/page-mapbox-bundle.html
@@ -42,17 +42,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 : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/standard.json",
             styles : [
                 {
                     "name" : "style 'gris'",
-                    "url" : "https://vectortiles.ign.fr/demonstrateur/styles/gris.json",
+                    "url" : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/gris.json",
                     // "url" : "data/planign/gris.json"
                     "selected" : true
                 },
                 {
                     "name" : "style 'muet'",
-                    "url" : "https://vectortiles.ign.fr/demonstrateur/styles/muet.json",
+                    "url" : "https://wxs.ign.fr/static/vectorTiles/styles/PLAN.IGN/muet.json",
                     // "url" : "data/planign/muet.json",
                 },
             ],

diff --git a/src/Itowns/ItMapLayers.js b/src/Itowns/ItMapLayers.js
@@ -946,18 +946,15 @@ ItMap.prototype._addMapBoxLayer = function (layerObj) {
         vectorTileSourceOpts.sprite = layerOpts.sprite;
     }
 
+    // affichage des labels associés à la couche à true par défaut
+    if (!layerOpts.showLabels) {
+        layerOpts.showLabels = true;
+    }
+
     // set default layerOptions for visibility and opacity if none specified
     layerOpts = this._setDefaultOpacityOptions(layerOpts);
     layerOpts = this._setDefaultVisibilityOptions(layerOpts);
 
-    // overloads the showLabels option to false if the layer is not visible
-    if (layerOpts.visibility === false) {
-        layerOpts.showLabels = false;
-    } else {
-        // vector tile layers labels handling
-        layerOpts.showLabels = true;
-    }
-
     var vectorTileSource = new VectorTilesSource(vectorTileSourceOpts);
 
     var vectorTileLayer = {};
@@ -968,7 +965,7 @@ ItMap.prototype._addMapBoxLayer = function (layerObj) {
             return false;
         },
         noTextureParentOutsideLimit : true,
-        labelEnabled : layerOpts.showLabels,
+        addLabelLayer : layerOpts.showLabels,
         source : vectorTileSource
     });
 

diff --git a/src/Map.js b/src/Map.js
@@ -366,7 +366,7 @@ var autoPanOptions = {
  *
  * | property | Type | Description |
  * | - | - | - |
- * | showLabels | Boolean | False by default. If true, the labels associated to the mapbox layer will be displayed |
+ * | showLabels | Boolean | True by default. If true, the labels associated to the mapbox layer will be displayed |
  * | sprite | String | Url to the sprites file. By default, automatically extracted from the style file. |
  *
  * ### KML, GPX, GeoJSON and MapBox specific properties