release-ol-3.2.11

IGNF · Mar 31, 2022 · 18dfc73 · 18dfc73
2 parents 0ef52a7 + eeb882f
commit 18dfc73
Show file tree

Hide file tree

Showing 31 changed files with 767 additions and 213 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -1,4 +1,4 @@
-# DEPENDENCIES (08/12/2021)
+# DEPENDENCIES (31/03/2022)
 
 * openlayers
 
@@ -23,12 +23,12 @@ last
 * Sortable
 
 last
-└── sortablejs@1.8.4
+└── sortablejs@1.14.0
 
 * geoportal-access-lib
 
 last
-└── geoportal-access-lib@3.0.5
+└── geoportal-access-lib@3.1.0
 
 * leaflet
 

diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,7 +1,5 @@
 
 
-
-
 # Extension Geoportail OpenLayers, version __VERSION__
 
 **__DATE__**
@@ -13,22 +11,25 @@
 
 * [Added]
 
-* [Changed]
+    - Ajout du menu des couleurs et de la taille des pictogramme dans l'outil de dessin
 
-    - DOM widget d'import : "Tuiles vectorielles" au lieu de "Vecteur tuilé"
-    - utilisation du service isochrone v2, access-lib 3.1.0 (#326)
+* [Changed]
 
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
 
+    - Amélioration du rendu vecteur des formats GPX et GeoJSON
+    - Gestion du nom d'une couche importée dans le gestionnaire et dans l'outil de dessin
+
 * [Security]
 
 ---
 
 
+
 # Extension Geoportail Leaflet, version __VERSION__
 
 **__DATE__**
@@ -42,8 +43,6 @@
 
 * [Changed]
 
-    - utilisation du service isochrone v2, access-lib 3.1.0 (#326)
-
 * [Deprecated]
 
 * [Removed]

diff --git a/build/scripts/release/geoportal-extensions-itowns-2.3.6.tgz b/build/scripts/release/geoportal-extensions-itowns-2.3.6.tgz
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.2.2.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.2.2.tgz
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.2.4.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.2.4.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.10.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.10.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.11.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.11.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.8.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.8.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.9.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.9.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -1,44 +1,44 @@
 {
-   "scripts" : {},
-   "author" : "IGNF",
+   "peerDependencies" : {},
+   "name" : "geoportal-extensions-itowns",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
+   "directories" : {},
+   "repository" : {
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+   },
    "dependencies" : {
-      "sortablejs" : "1.14.0",
+      "loglevel" : "1.6.7",
       "three" : "0.135.0",
+      "node-fetch" : "^2.6.1",
       "proj4" : "2.7.5",
-      "geoportal-access-lib" : "https://raw.githubusercontent.com/IGNF/geoportal-access-lib/new-iso/geoportal-access-lib-3.0.6.tgz",
-      "xmldom" : "^0.1.27",
-      "loglevel" : "1.6.7",
       "itowns" : "2.37.0",
-      "node-fetch" : "^2.6.1"
+      "sortablejs" : "1.14.0",
+      "xmldom" : "^0.1.27",
+      "geoportal-access-lib" : "3.1.0"
    },
-   "devDependencies" : {},
-   "version" : "2.3.6",
-   "directories" : {},
-   "date" : "04/03/2022",
-   "license" : "CECILL-B",
-   "bugs" : {},
-   "name" : "geoportal-extensions-itowns",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "module" : "src/Itowns/index.js",
+   "description" : "French Geoportal Extensions for iTowns",
    "bundleDependencies" : [],
+   "scripts" : {},
    "main" : "dist/GpPluginItowns-src.js",
-   "peerDependencies" : {},
-   "description" : "French Geoportal Extensions for iTowns",
+   "date" : "23/03/2022",
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "Itowns"
    ],
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "module" : "src/Itowns/index.js"
+   "author" : "IGNF",
+   "bugs" : {},
+   "version" : "2.3.6",
+   "devDependencies" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "license" : "CECILL-B"
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
@@ -1,19 +1,32 @@
 {
-   "directories" : {},
+   "name" : "geoportal-extensions-leaflet",
    "dependencies" : {
-      "node-fetch" : "^2.6.1",
+      "proj4" : "2.7.5",
       "proj4leaflet" : "1.0.2",
-      "loglevel" : "1.6.6",
+      "leaflet-draw" : "1.0.4",
+      "node-fetch" : "^2.6.1",
       "geoportal-access-lib" : "3.1.0",
+      "loglevel" : "1.6.6",
+      "leaflet" : "1.7.1",
       "sortablejs" : "1.8.4",
-      "xmldom" : "^0.1.27",
-      "leaflet-draw" : "1.0.4",
-      "proj4" : "2.7.2",
-      "leaflet" : "1.7.1"
+      "xmldom" : "^0.1.27"
    },
-   "name" : "geoportal-extensions-leaflet",
+   "license" : "CECILL-B",
+   "directories" : {},
+   "date" : "23/03/2022",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "leaflet",
+      "publish"
+   ],
+   "module" : "src/Leaflet/index.js",
    "peerDependencies" : {},
-   "devDependencies" : {},
    "bugs" : {},
    "files" : [
       "dist/",
@@ -22,24 +35,11 @@
       "README.md",
       "package.json"
    ],
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "leaflet",
-      "publish"
-   ],
-   "module" : "src/Leaflet/index.js",
+   "devDependencies" : {},
    "scripts" : {},
-   "bundleDependencies" : [],
-   "description" : "French Geoportal Extension for Leaflet",
-   "main" : "dist/GpPluginLeaflet-src.js",
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "date" : "23/03/2022",
    "version" : "2.2.4",
-   "license" : "CECILL-B"
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "main" : "dist/GpPluginLeaflet-src.js",
+   "bundleDependencies" : [],
+   "description" : "French Geoportal Extension for Leaflet"
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,46 +1,46 @@
 {
+   "module" : "src/OpenLayers/index.js",
    "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-extensions.git"
    },
    "author" : "IGNF",
-   "date" : "23/03/2022",
-   "module" : "src/OpenLayers/index.js",
-   "bundleDependencies" : [],
-   "directories" : {},
-   "peerDependencies" : {},
+   "description" : "French Geoportal Extensions for OpenLayers",
    "dependencies" : {
-      "xmldom" : "^0.1.27",
       "node-fetch" : "^2.6.1",
-      "proj4" : "2.7.2",
+      "@mapbox/mapbox-gl-style-spec" : "13.20.1",
+      "sortablejs" : "1.14.0",
+      "loglevel" : "1.6.6",
       "ol-mapbox-style" : "6.7.0",
       "ol" : "6.9.0",
-      "loglevel" : "1.6.6",
+      "proj4" : "2.7.5",
+      "xmldom" : "^0.1.27",
       "geoportal-access-lib" : "3.1.0",
-      "eventbusjs" : "0.2.0",
-      "sortablejs" : "1.14.0",
-      "@mapbox/mapbox-gl-style-spec" : "13.20.1"
+      "eventbusjs" : "0.2.0"
    },
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "OpenLayers"
+   ],
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
+   "bundleDependencies" : [],
+   "date" : "31/03/2022",
    "devDependencies" : {},
+   "bugs" : {},
+   "peerDependencies" : {},
+   "directories" : {},
    "name" : "geoportal-extensions-openlayers",
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "OpenLayers"
-   ],
-   "description" : "French Geoportal Extensions for OpenLayers",
    "scripts" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "main" : "dist/GpPluginOpenLayers-src.js",
-   "bugs" : {},
-   "version" : "3.2.10",
+   "version" : "3.2.11",
    "license" : "CECILL-B"
 }
diff --git a/build/webpack/webpack.config.itowns.js b/build/webpack/webpack.config.itowns.js
@@ -342,8 +342,7 @@ module.exports = (env, argv) => {
             new CopyWebpackPlugin([
                 {
                     from : path.join(ROOT, "samples-src", "resources", "**/*"),
-                    to : path.join(ROOT, "samples", "resources"),
-                    context : path.join(ROOT, "samples-src", "resources")
+                    to : path.join(ROOT, "samples", "resources")
                 }
             ])
         ]

diff --git a/build/webpack/webpack.config.leaflet.js b/build/webpack/webpack.config.leaflet.js
@@ -314,8 +314,7 @@ module.exports = (env, argv) => {
             new CopyWebpackPlugin([
                 {
                     from : path.join(ROOT, "samples-src", "resources", "**/*"),
-                    to : path.join(ROOT, "samples", "resources"),
-                    context : path.join(ROOT, "samples-src", "resources")
+                    to : path.join(ROOT, "samples", "resources")
                 }
             ])
         ]

diff --git a/build/webpack/webpack.config.openlayers.js b/build/webpack/webpack.config.openlayers.js
@@ -169,11 +169,15 @@ module.exports = (env, argv) => {
             host : "localhost",
             https: true,
             port : 9001,
+            headers: {
+                'Cache-Control': 'no-store'
+            },
             hot : true,
             contentBase : path.join(__dirname),
             // publicPath : "/dist/openlayers/",
             // openPage : "/samples/index-openlayers-map.html",
             open : "google-chrome",
+            watchContentBase: true,
             watchOptions : {
                 watch : true,
                 poll : true
@@ -481,10 +485,32 @@ module.exports = (env, argv) => {
             new CopyWebpackPlugin([
                 {
                     from : path.join(ROOT, "samples-src", "resources", "**/*"),
-                    to : path.join(ROOT, "samples", "resources"),
-                    context : path.join(ROOT, "samples-src", "resources")
+                    to : path.join(ROOT, "samples", "resources")
+                    // context : path.join(ROOT, "samples-src", "resources"),
+                    // force: true
                 }
-            ])
+            ]),
+            // FIXME les ressources exemples ne sont pas prises en compte dans le mode watch !?
+            // {
+            //     apply: (compiler) => {
+            //       compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
+            //         // Debugging
+            //         console.log("########-------------->>>>> Finished Copy Compile <<<<<------------#######");
+
+            //         let source = path.join(ROOT, "samples-src", "resources");
+            //         let destination = path.join(ROOT, "samples", "resources");
+
+            //         let options = {
+            //           overwrite: true
+            //         };
+            //         fs.copy(source, destination, options, err => {
+            //           if (err) return console.error(err); {
+            //               console.log('Copy resources success!');
+            //           }
+            //         })
+            //       });
+            //     }
+            //   }
         ]
             /** AJOUT DES LICENCES */
             .concat([

diff --git a/doc/CHANGELOG-leaflet.md b/doc/CHANGELOG-leaflet.md
@@ -72,6 +72,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Extension Geoportail Leaflet, version 2.2.3](#extension-geoportail-leaflet-version-223)
   * [Summary](#summary-20)
   * [Changelog](#changelog-17)
+- [Extension Geoportail Leaflet, version 2.2.4](#extension-geoportail-leaflet-version-224)
+  * [Summary](#summary-21)
+  * [Changelog](#changelog-18)
 
 <!-- tocstop -->
 
@@ -639,3 +642,27 @@ Corrections sur l'interface d'ajout des couches WMS/WMTS
 * [Security]
 
 ---
+# Extension Geoportail Leaflet, version 2.2.4
+
+**23/03/2022**
+> Release Extension Geoportail leaflet
+
+## Summary
+
+## Changelog
+
+* [Added]
+
+* [Changed]
+
+    - utilisation du service isochrone v2, access-lib 3.1.0 (#326)
+
+* [Deprecated]
+
+* [Removed]
+
+* [Fixed]
+
+* [Security]
+
+---