Merge remote-tracking branch 'origin/develop'

IGNF · Mar 31, 2020 · bb2f048 · bb2f048
2 parents dd37d60 + 2f9ac70
commit bb2f048
Show file tree

Hide file tree

Showing 21 changed files with 86,057 additions and 108 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -28,7 +28,7 @@ last
 * geoportal-access-lib
 
 last
-└── [email protected].5
+└── [email protected].6
 
 * leaflet
 
@@ -43,7 +43,7 @@ last
 
 * "itowns"
 
-└── "itowns@2.15.3"
+└── "itowns@2.19.0"
 
 * loglevel
 

diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,31 +1,46 @@
 **TODO : PREPARATION POUR PROCHAINE LIVRAISON**
 
-# Extension Geoportail OpenLayers, version 3.0.7
+# Extension Geoportail OpenLayers, version 3.0.8
 
-**02/03/2020**
+**31/03/2020**
 > Release Extension Geoportail OpenLayers
 
 ## Summary
 
-* fix sur le retrait d'un widget de la carte
+* correctif sur les widgets
+* correctif sur l'éditeur de styles (mapbox)
+* fix sur les versions des dépendances (mapbox)
 
 ## Changelog
 
 * [Added]
 
+    - gestion des icônes dans l’éditeur MapBox ([\#261](https://github.com/IGNF/geoportal-extensions/pull/261))
+
 * [Changed]
 
+    - mise à jour du plugin de minification : "terser-webpack-plugin" ([\#261](https://github.com/IGNF/geoportal-extensions/pull/261))
+
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
 
-    - fix sur le retrait du widget "mouseposition" de la carte
-    - Control LocationSelector OL : inversion affichage lon/lat
+    - widget "mouseposition" :
+      - fix sur le retrait de la carte
+      - correctif sur l'inversion affichage lon/lat
+
+    - fix sur la gestion des evenements du widget "drawing"
+
+    - utilisation de la version "13.11.0" de la dépendance "@mapbox/mapbox-gl-style-spec" ([\#261](https://github.com/IGNF/geoportal-extensions/pull/261))
 
 * [Security]
 
+**BREAKING CHANGES**
+
+> compilation du projet avec une version nodejs > 8.9.0
+
 ---
 
 # Extension Geoportail Itowns, version 2.2.8
@@ -41,6 +56,8 @@
 
 * [Changed]
 
+    - choix fixé des versions des dépendances dans le package.json
+
 * [Deprecated]
 
 * [Removed]
@@ -69,6 +86,8 @@
 
 * [Changed]
 
+    - choix fixé des versions des dépendances dans le package.json
+
 * [Deprecated]
 
 * [Removed]

diff --git a/build/scripts/release/geoportal-extensions-itowns-2.2.7.tgz b/build/scripts/release/geoportal-extensions-itowns-2.2.7.tgz
diff --git a/build/scripts/release/geoportal-extensions-itowns-2.2.8.tgz b/build/scripts/release/geoportal-extensions-itowns-2.2.8.tgz
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.1.5.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.1.5.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.7.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.7.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.8.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.8.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -1,45 +1,45 @@
 {
-   "date" : "06/03/2020",
+   "description" : "French Geoportal Extensions for iTowns",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "bugs" : {},
    "bundleDependencies" : [],
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "Itowns"
-   ],
-   "scripts" : {},
-   "name" : "geoportal-extensions-itowns",
+   "date" : "26/03/2020",
    "author" : "IGNF",
-   "bugs" : {},
+   "directories" : {},
+   "scripts" : {},
+   "version" : "2.2.8",
+   "repository" : {
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+   },
+   "peerDependencies" : {},
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "main" : "dist/GpPluginItowns-src.js",
-   "directories" : {},
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
-   },
    "license" : "CECILL-B",
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "Itowns"
+   ],
+   "main" : "dist/GpPluginItowns-src.js",
    "dependencies" : {
-      "three.meshline" : "~1.2.0",
-      "loglevel" : "~1.6.1",
-      "itowns" : "2.19.0",
-      "sortablejs" : "1.8.4",
-      "proj4" : "2.5.0",
+      "three" : "0.113.2",
       "xmldom" : "^0.1.27",
-      "three" : "^0.113.2",
       "request" : "^2.83.0",
-      "geoportal-access-lib" : "^2.1.6"
+      "three.meshline" : "1.2.0",
+      "sortablejs" : "1.8.4",
+      "proj4" : "2.5.0",
+      "itowns" : "2.19.0",
+      "loglevel" : "1.6.1",
+      "geoportal-access-lib" : "2.1.6"
    },
-   "description" : "French Geoportal Extensions for iTowns",
-   "devDependencies" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
-   "version" : "2.2.7",
    "module" : "src/Itowns/index.js",
-   "peerDependencies" : {}
+   "name" : "geoportal-extensions-itowns",
+   "devDependencies" : {}
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
@@ -1,44 +1,44 @@
 {
-   "description" : "French Geoportal Extension for Leaflet",
-   "module" : "src/Leaflet/index.js",
+   "main" : "dist/GpPluginLeaflet-src.js",
+   "name" : "geoportal-extensions-leaflet",
+   "dependencies" : {
+      "leaflet" : "1.5.1",
+      "geoportal-access-lib" : "2.1.6",
+      "sortablejs" : "1.8.4",
+      "leaflet-draw" : "1.0.4",
+      "proj4" : "2.6.0",
+      "proj4leaflet" : "1.0.2",
+      "loglevel" : "1.6.1"
+   },
+   "devDependencies" : {},
+   "bundleDependencies" : [],
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "devDependencies" : {},
-   "name" : "geoportal-extensions-leaflet",
-   "dependencies" : {
-      "leaflet" : "1.5.1",
-      "loglevel" : "~1.6.1",
-      "sortablejs" : "1.8.4",
-      "leaflet-draw" : "1.0.4",
-      "geoportal-access-lib" : "^2.1.6",
-      "proj4" : "2.5.0",
-      "proj4leaflet" : "~1.0.2"
-   },
-   "date" : "05/12/2019",
-   "directories" : {},
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "leaflet",
       "publish"
    ],
-   "bugs" : {},
+   "author" : "IGNF",
+   "module" : "src/Leaflet/index.js",
+   "date" : "26/03/2020",
    "peerDependencies" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "version" : "2.1.5",
+   "directories" : {},
+   "description" : "French Geoportal Extension for Leaflet",
+   "bugs" : {},
+   "license" : "CECILL-B",
    "repository" : {
       "url" : "https://github.com/IGNF/geoportal-extensions.git",
       "type" : "git"
    },
-   "main" : "dist/GpPluginLeaflet-src.js",
    "scripts" : {},
-   "bundleDependencies" : [],
-   "author" : "IGNF",
-   "version" : "2.1.5",
-   "license" : "CECILL-B"
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html"
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,45 +1,46 @@
 {
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "bugs" : {},
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "author" : "IGNF",
-   "name" : "geoportal-extensions-openlayers",
    "peerDependencies" : {},
+   "devDependencies" : {},
+   "main" : "dist/GpPluginOpenLayers-src.js",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "module" : "src/OpenLayers/index.js",
-   "devDependencies" : {},
+   "author" : "IGNF",
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "OpenLayers"
    ],
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "directories" : {},
+   "bundleDependencies" : [],
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "scripts" : {},
    "dependencies" : {
-      "loglevel" : "~1.6.1",
       "sortablejs" : "1.8.4",
-      "proj4" : "2.5.0",
-      "ol-mapbox-style" : "^4.2.1",
-      "geoportal-access-lib" : "^2.1.6",
+      "request" : "^2.83.0",
+      "eventbusjs" : "0.2.0",
+      "proj4" : "2.6.0",
+      "geoportal-access-lib" : "2.1.6",
+      "loglevel" : "1.6.1",
       "xmldom" : "^0.1.27",
       "ol" : "^5.3.0",
-      "request" : "^2.83.0",
-      "eventbusjs" : "^0.2.0"
+      "@mapbox/mapbox-gl-style-spec" : "13.11.0",
+      "ol-mapbox-style" : "^4.3.0"
    },
+   "bugs" : {},
+   "date" : "31/03/2020",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
    "license" : "CECILL-B",
-   "version" : "3.0.7",
-   "bundleDependencies" : [],
-   "scripts" : {},
-   "date" : "24/01/2020",
-   "main" : "dist/GpPluginOpenLayers-src.js"
+   "directories" : {},
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
+   "name" : "geoportal-extensions-openlayers",
+   "module" : "src/OpenLayers/index.js",
+   "version" : "3.0.8"
 }
diff --git a/build/webpack/webpack.config.itowns.js b/build/webpack/webpack.config.itowns.js
@@ -141,6 +141,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME avec les banner !

diff --git a/build/webpack/webpack.config.leaflet.js b/build/webpack/webpack.config.leaflet.js
@@ -120,6 +120,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME avec les banner !

diff --git a/build/webpack/webpack.config.openlayers.js b/build/webpack/webpack.config.openlayers.js
@@ -175,6 +175,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME avec les banner !
@@ -407,7 +408,7 @@ module.exports = (env, argv) => {
                     context : [
                         path.join(ROOT, "samples-src", "config.json"),
                         {
-                            mode : (devMode) ? "-src" : suffix,
+                            mode : suffix,
                             version : pkg.dependencies["ol"] === 'latest' ? pkg.dependencies["ol"] : 'v' + pkg.dependencies["ol"].match(/(\d+\.\d+\.\d+)/)[0]
                         }
                     ]

diff --git a/build/webpack/webpack.config.openlayers.modules.js b/build/webpack/webpack.config.openlayers.modules.js
@@ -182,6 +182,7 @@ module.exports = (env, argv) => {
             /** MINIFICATION */
             minimizer: [
                 new TerserJsWebPackPlugin({
+                    extractComments: false,
                     terserOptions: {
                         output: {
                             // FIXME avec les banner !

diff --git a/package.json b/package.json
@@ -2,11 +2,11 @@
   "name": "geoportal-extensions",
   "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries",
   "version": "2.2.11",
-  "date": "26/03/2020",
+  "date": "31/03/2020",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.1.5",
   "olExtName": "French Geoportal Extension for OpenLayers",
-  "olExtVersion": "3.0.7",
+  "olExtVersion": "3.0.8",
   "itownsExtName": "French Geoportal Extension for Itowns",
   "itownsExtVersion": "2.2.8",
   "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js",
@@ -73,13 +73,13 @@
   "dependencies": {
     "eventbusjs": "^0.2.0",
     "geoportal-access-lib": "^2.1.6",
-    "handlebars": "^4.7.2",
     "itowns": "2.19.0",
     "leaflet": "1.5.1",
     "leaflet-draw": "1.0.4",
     "loglevel": "~1.6.1",
     "ol": "^5.3.0",
-    "ol-mapbox-style": "^4.2.1",
+    "ol-mapbox-style": "^4.3.0",
+    "@mapbox/mapbox-gl-style-spec": "13.11.0",
     "proj4": "^2.5.0",
     "proj4leaflet": "~1.0.2",
     "sortablejs": "1.8.4",
@@ -107,6 +107,7 @@
     "exports-loader": "^0.7.0",
     "expose-loader": "^0.7.5",
     "fs-extra": "^8.0.1",
+    "handlebars": "^4.7.2",
     "handlebars-layouts": "^3.1.4",
     "html-webpack-plugin": "^3.1.0",
     "istanbul-instrumenter-loader": "^3.0.1",
@@ -126,7 +127,7 @@
     "speed-measure-webpack-plugin": "^1.3.0",
     "string-template": "^1.0.0",
     "style-loader": "^0.23.1",
-    "terser-webpack-plugin": "^1.2.3",
+    "terser-webpack-plugin": "^2.0.0",
     "uglify-es": "github:mishoo/UglifyJS2#harmony",
     "uglifyjs-webpack-plugin": "^2.1.2",
     "url-loader": "^1.1.2",

diff --git a/samples-src/pages/openlayers/Drawing/pages-ol-drawing-bundle-all-options.html b/samples-src/pages/openlayers/Drawing/pages-ol-drawing-bundle-all-options.html
@@ -115,7 +115,7 @@ <h2>Ajout des outils de dessin avec options</h2>
 
                       if (feature) {
 
-                          var coord = evt.coordinates;
+                          var coord = evt.coordinate;
                           var props = feature.getProperties();
                           // Offset the popup so it points at the middle of the marker not the tip
                           popup.setOffset([0, -22]);