release-ol-3.2.16

IGNF · Oct 4, 2022 · 08d0ce7 · 08d0ce7
2 parents f5831e0 + bdffa07
commit 08d0ce7
Show file tree

Hide file tree

Showing 26 changed files with 735 additions and 975 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -4,29 +4,30 @@
 
 
 
+
 # Extension Geoportail OpenLayers, version __VERSION__
 
 **__DATE__**
 > Release Extension Geoportail openlayers
 
 ## Summary
 
-Correction sur la gestion des projections pour les imports WMS
+Utilisation du Geocodage v2
 
 ## Changelog
 
 * [Added]
 
 * [Changed]
 
+    - mise à jour  pour utilisation du service de Geocodage v2 (#279)
+
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
 
-    - Pour une couche WMS issue d'un import, on prend en priorité la projection de la carte si elle est gérée par le serveur WMS (#338) 
-
 * [Security]
 
 ---

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-itowns-2.3.7.tgz b/build/scripts/release/geoportal-extensions-itowns-2.3.7.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.13.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.13.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.15.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.15.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -1,44 +1,44 @@
 {
-   "author" : "IGNF",
-   "bugs" : {},
-   "dependencies" : {
-      "proj4" : "2.7.5",
-      "loglevel" : "1.6.6",
-      "sortablejs" : "1.14.0",
-      "three" : "0.137.5",
-      "geoportal-access-lib" : "3.1.0",
-      "xmldom" : "^0.1.27",
-      "itowns" : "2.38.2",
-      "node-fetch" : "^2.6.1"
-   },
-   "peerDependencies" : {},
+   "description" : "French Geoportal Extensions for iTowns",
    "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
    },
    "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
-   "bundleDependencies" : [],
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "Itowns"
-   ],
-   "devDependencies" : {},
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "main" : "dist/GpPluginItowns-src.js",
-   "description" : "French Geoportal Extensions for iTowns",
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "Itowns"
+   ],
+   "bugs" : {},
+   "scripts" : {},
+   "version" : "2.3.7",
+   "author" : "IGNF",
+   "date" : "01/08/2022",
    "license" : "CECILL-B",
-   "directories" : {},
+   "name" : "geoportal-extensions-itowns",
+   "dependencies" : {
+      "loglevel" : "1.6.7",
+      "proj4" : "2.7.5",
+      "three" : "0.137.5",
+      "geoportal-access-lib" : "https://raw.githubusercontent.com/IGNF/geoportal-access-lib/feature-new_geocode/geoportal-access-lib-3.1.0.tgz",
+      "itowns" : "2.38.2",
+      "sortablejs" : "1.14.0",
+      "xmldom" : "^0.1.27",
+      "node-fetch" : "^2.6.1"
+   },
+   "peerDependencies" : {},
    "module" : "src/Itowns/index.js",
-   "scripts" : {},
-   "version" : "2.3.6",
-   "date" : "11/05/2022",
-   "name" : "geoportal-extensions-itowns"
+   "bundleDependencies" : [],
+   "directories" : {},
+   "main" : "dist/GpPluginItowns-src.js",
+   "devDependencies" : {}
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
@@ -1,45 +1,45 @@
 {
-   "main" : "dist/GpPluginLeaflet-src.js",
    "license" : "CECILL-B",
-   "version" : "2.2.4",
-   "bugs" : {},
-   "scripts" : {},
-   "module" : "src/Leaflet/index.js",
+   "bundleDependencies" : [],
+   "description" : "French Geoportal Extension for Leaflet",
    "peerDependencies" : {},
    "dependencies" : {
       "proj4" : "2.7.5",
-      "leaflet" : "1.7.1",
-      "sortablejs" : "1.8.4",
       "leaflet-draw" : "1.0.4",
-      "proj4leaflet" : "1.0.2",
-      "node-fetch" : "^2.6.1",
       "loglevel" : "1.6.6",
-      "geoportal-access-lib" : "3.1.0",
-      "xmldom" : "^0.1.27"
+      "sortablejs" : "1.8.4",
+      "geoportal-access-lib" : "https://raw.githubusercontent.com/IGNF/geoportal-access-lib/feature-new_geocode/geoportal-access-lib-3.1.0.tgz",
+      "xmldom" : "^0.1.27",
+      "leaflet" : "1.7.1",
+      "proj4leaflet" : "1.0.2",
+      "node-fetch" : "^2.6.1"
+   },
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
    },
+   "bugs" : {},
+   "name" : "geoportal-extensions-leaflet",
+   "module" : "src/Leaflet/index.js",
+   "date" : "01/08/2022",
+   "scripts" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "devDependencies" : {},
+   "version" : "2.2.4",
+   "main" : "dist/GpPluginLeaflet-src.js",
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "leaflet",
       "publish"
    ],
-   "directories" : {},
-   "bundleDependencies" : [],
-   "devDependencies" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "date" : "11/05/2022",
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "description" : "French Geoportal Extension for Leaflet",
-   "name" : "geoportal-extensions-leaflet"
+   "directories" : {}
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,46 +1,46 @@
 {
-   "name" : "geoportal-extensions-openlayers",
-   "version" : "3.2.13",
-   "author" : "IGNF",
+   "peerDependencies" : {},
+   "directories" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
+   "module" : "src/OpenLayers/index.js",
+   "date" : "27/09/2022",
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "devDependencies" : {},
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "license" : "CECILL-B",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "module" : "src/OpenLayers/index.js",
-   "main" : "dist/GpPluginOpenLayers-src.js",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "bundleDependencies" : [],
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "scripts" : {},
-   "directories" : {},
-   "devDependencies" : {},
+   "version" : "3.2.15",
+   "name" : "geoportal-extensions-openlayers",
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "OpenLayers"
+   ],
    "bugs" : {},
-   "license" : "CECILL-B",
-   "peerDependencies" : {},
    "dependencies" : {
+      "@mapbox/mapbox-gl-style-spec" : "13.20.1",
+      "sortablejs" : "1.14.0",
+      "loglevel" : "1.6.6",
+      "proj4" : "2.7.5",
       "eventbusjs" : "0.2.0",
       "node-fetch" : "^2.6.1",
-      "ol-mapbox-style" : "6.7.0",
-      "proj4" : "2.7.5",
-      "loglevel" : "1.6.6",
-      "@mapbox/mapbox-gl-style-spec" : "13.20.1",
+      "ol" : "6.9.0",
       "xmldom" : "^0.1.27",
-      "geoportal-access-lib" : "3.1.0",
-      "sortablejs" : "1.14.0",
-      "ol" : "6.9.0"
+      "geoportal-access-lib" : "https://raw.githubusercontent.com/IGNF/geoportal-access-lib/feature-new_geocode/geoportal-access-lib-3.1.0.tgz",
+      "ol-mapbox-style" : "6.7.0"
    },
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "date" : "11/05/2022",
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "OpenLayers"
-   ]
+   "author" : "IGNF",
+   "scripts" : {},
+   "bundleDependencies" : []
 }
diff --git a/doc/CHANGELOG-openlayers.md b/doc/CHANGELOG-openlayers.md
@@ -130,6 +130,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Extension Geoportail OpenLayers, version 3.2.14](#extension-geoportail-openlayers-version-3214)
   * [Summary](#summary-38)
   * [Changelog](#changelog-35)
+- [Extension Geoportail OpenLayers, version 3.2.15](#extension-geoportail-openlayers-version-3215)
+  * [Summary](#summary-39)
+  * [Changelog](#changelog-36)
 
 <!-- tocstop -->
 
@@ -1416,3 +1419,29 @@ Correctifs sur l'editeur de styles MapBox et le controle d'import des données M
 * [Security]
 
 ---
+# Extension Geoportail OpenLayers, version 3.2.15
+
+**27/09/2022**
+> Release Extension Geoportail openlayers
+
+## Summary
+
+Correction sur la gestion des projections pour les imports WMS
+
+## Changelog
+
+* [Added]
+
+* [Changed]
+
+* [Deprecated]
+
+* [Removed]
+
+* [Fixed]
+
+    - Pour une couche WMS issue d'un import, on prend en priorité la projection de la carte si elle est gérée par le serveur WMS (#338) 
+
+* [Security]
+
+---
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "geoportal-extensions",
   "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries",
-  "version": "2.6.16",
-  "date": "27/09/2022",
+  "version": "2.7.0",
+  "date": "04/10/2022",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.2.4",
   "olExtName": "French Geoportal Extension for OpenLayers",
-  "olExtVersion": "3.2.15",
+  "olExtVersion": "3.2.16",
   "itownsExtName": "French Geoportal Extension for Itowns",
   "itownsExtVersion": "2.3.7",
   "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js",
@@ -66,7 +66,7 @@
   "dependencies": {
     "@mapbox/mapbox-gl-style-spec": "13.20.1",
     "eventbusjs": "0.2.0",
-    "geoportal-access-lib": "3.1.0",
+    "geoportal-access-lib": "3.2.0",
     "itowns": "2.38.2",
     "leaflet": "1.7.1",
     "leaflet-draw": "1.0.4",

diff --git a/src/Common/Controls/LocationSelectorDOM.js b/src/Common/Controls/LocationSelectorDOM.js
@@ -1,5 +1,6 @@
 import ID from "../Utils/SelectorID";
 import Logger from "../../Common/Utils/LoggerByDefault";
+import GeocodeUtils from "../Utils/GeocodeUtils";
 
 var logger = Logger.getLogger("LocationSelectorDOM");
 
@@ -446,7 +447,7 @@ var LocationSelectorDOM = {
         var div = document.createElement("div");
         div.id = this._addUID("AutoCompletedLocation_" + n);
         div.className = "GPautoCompleteProposal";
-        div.innerHTML = location.fullText;
+        div.innerHTML = GeocodeUtils.getSuggestedLocationFreeform(location);
 
         container.appendChild(div);
     },

diff --git a/src/Common/Controls/ReverseGeocodingDOM.js b/src/Common/Controls/ReverseGeocodingDOM.js
@@ -356,12 +356,6 @@ var ReverseGeocodingDOM = {
                     CPOption.text = "Parcelles cadastrales";
                     select.appendChild(CPOption);
                     break;
-                case "Administratif":
-                    var adminOption = document.createElement("option");
-                    adminOption.value = "Administratif";
-                    adminOption.text = "Unités administratives";
-                    select.appendChild(adminOption);
-                    break;
                 default:
                     break;
             }

diff --git a/src/Common/Controls/RouteDOM.js b/src/Common/Controls/RouteDOM.js
@@ -1,5 +1,6 @@
 import ID from "../Utils/SelectorID";
 import Logger from "../../Common/Utils/LoggerByDefault";
+import GeocodeUtils from "../../Common/Utils/GeocodeUtils";
 
 var logger = Logger.getLogger("RouteDOM");
 
@@ -821,7 +822,7 @@ var RouteDOM = {
         var div = document.createElement("div");
         div.id = "AutoCompletedLocation" + id;
         div.className = "GPautoCompleteProposal";
-        div.innerHTML = location.fullText;
+        div.innerHTML = GeocodeUtils.getSuggestedLocationFreeform(location);
 
         container.appendChild(div);
     },