From 8098d52ce044a6d9de5280630b93616b99db4e3d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 16 May 2024 12:56:29 +0000 Subject: [PATCH 1/9] update CHANGELOG for Itowns --- DRAFT_CHANGELOG.md | 7 +------ doc/CHANGELOG-itowns.md | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 691b42da..1ae56e95 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -52,6 +52,7 @@ --- + # Extension Geoplateforme Itowns, version __VERSION__ **__DATE__** @@ -59,8 +60,6 @@ ## Summary -Corrections mineures sur le Helper et les exemples - ## Changelog * [Added] @@ -73,10 +72,6 @@ Corrections mineures sur le Helper et les exemples * [Fixed] - - corrige couche json itowns, mauvaise url (77c6eb1b75c68a348c215c0fb0f2ee86cc80bd52) - - Correction du logger par définiton de la variable process (e0e3b9b5ad3e1f8c92086891564f04f792e24280) - - mise à jour bibliothèque d'accès en version 3.4.2 - * [Security] --- diff --git a/doc/CHANGELOG-itowns.md b/doc/CHANGELOG-itowns.md index 7744592d..0bc61499 100644 --- a/doc/CHANGELOG-itowns.md +++ b/doc/CHANGELOG-itowns.md @@ -111,6 +111,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [Extension Geoplateforme Itowns, version 2.5.0-beta4](#extension-geoplateforme-itowns-version-250-beta4) * [Summary](#summary-33) * [Changelog](#changelog-32) +- [Extension Geoplateforme Itowns, version 2.5.1](#extension-geoplateforme-itowns-version-251) + * [Summary](#summary-34) + * [Changelog](#changelog-33) @@ -1026,3 +1029,31 @@ Ajout possible de couches à accès restreint via une fichier de configuration c * [Security] --- +# Extension Geoplateforme Itowns, version 2.5.1 + +**16/05/2024** +> Release Extension Geoplateforme itowns + +## Summary + +Corrections mineures sur le Helper et les exemples + +## Changelog + +* [Added] + +* [Changed] + +* [Deprecated] + +* [Removed] + +* [Fixed] + + - corrige couche json itowns, mauvaise url (77c6eb1b75c68a348c215c0fb0f2ee86cc80bd52) + - Correction du logger par définiton de la variable process (e0e3b9b5ad3e1f8c92086891564f04f792e24280) + - mise à jour bibliothèque d'accès en version 3.4.2 + +* [Security] + +--- From b29a2a35bdb57346913b4c91997ce48ba514d371 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 16 May 2024 19:27:25 +0200 Subject: [PATCH 2/9] =?UTF-8?q?fix(Controls):=20Param=C3=A9trage=20des=20r?= =?UTF-8?q?essources=20de=20la=20recherche=20avanc=C3=A9e=20corrig=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fonction mergeParams avec test d'existece trop sévère corrigé - nom des ressources à utilisé pas bob sous openlayer (poi,address au lieu de PositionOfInterest, StreetAddress) --- src/Common/Utils.js | 2 +- src/OpenLayers/Controls/SearchEngine.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/Utils.js b/src/Common/Utils.js index c64358da..6b088dba 100644 --- a/src/Common/Utils.js +++ b/src/Common/Utils.js @@ -70,7 +70,7 @@ var Utils = { * @param {Boolean} replace - replace destination value by source if exists or not (true by default) */ mergeParams : function (dest, source, replace) { - if (!dest || !source) { + if (typeof dest === 'undefined' || typeof source === 'undefined' ) { return; } if (typeof replace === "undefined") { diff --git a/src/OpenLayers/Controls/SearchEngine.js b/src/OpenLayers/Controls/SearchEngine.js index 44f5bbc4..89ddbb0b 100644 --- a/src/OpenLayers/Controls/SearchEngine.js +++ b/src/OpenLayers/Controls/SearchEngine.js @@ -206,7 +206,7 @@ var SearchEngine = (function (Control) { collapsed : true, zoomTo : "", resources : { - geocode : "", + geocode : [], autocomplete : [] }, displayAdvancedSearch : true, @@ -227,7 +227,7 @@ var SearchEngine = (function (Control) { // merge with user options Utils.mergeParams(this.options, options); if (this.options.resources.geocode === "") { - this.options.resources.geocode = "address,poi"; + this.options.resources.geocode = ["PositionOfInterest", "StreetAddress"]; } if (this.options.resources.autocomplete.length === 0) { this.options.resources.autocomplete = ["PositionOfInterest", "StreetAddress"]; From 223bf42db74d4ccc05f56d0338235f39ca820d4a Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 16 May 2024 19:30:54 +0200 Subject: [PATCH 3/9] style(eslint): fix eslint errors --- src/Common/Utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/Utils.js b/src/Common/Utils.js index 6b088dba..7abde285 100644 --- a/src/Common/Utils.js +++ b/src/Common/Utils.js @@ -70,7 +70,7 @@ var Utils = { * @param {Boolean} replace - replace destination value by source if exists or not (true by default) */ mergeParams : function (dest, source, replace) { - if (typeof dest === 'undefined' || typeof source === 'undefined' ) { + if (typeof dest === "undefined" || typeof source === "undefined") { return; } if (typeof replace === "undefined") { From c88357aefd41528330c31b4793a1c46a724fb8d8 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Tue, 28 May 2024 16:22:05 +0200 Subject: [PATCH 4/9] fix(Controls): filtre section toujours en majuscule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Le service est case Sensitive, on passe le paramètre section entré côté client en majuscules --- src/Leaflet/Controls/SearchEngine.js | 4 ++++ src/OpenLayers/Controls/SearchEngine.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/Leaflet/Controls/SearchEngine.js b/src/Leaflet/Controls/SearchEngine.js index 8686314d..70d669f6 100644 --- a/src/Leaflet/Controls/SearchEngine.js +++ b/src/Leaflet/Controls/SearchEngine.js @@ -1237,6 +1237,10 @@ var SearchEngine = L.Control.extend(/** @lends L.geoportalControl.SearchEngine.p for (var i = 0; i < data.length; i++) { var filter = data[i]; if (filter.value) { + // On passe la section en majuscule car le service est caseSensitive + if (filter.key === "section") { + filter.value = filter.value.toUpperCase(); + } _filterOptions[filter.key] = filter.value; } } diff --git a/src/OpenLayers/Controls/SearchEngine.js b/src/OpenLayers/Controls/SearchEngine.js index 89ddbb0b..696c099c 100644 --- a/src/OpenLayers/Controls/SearchEngine.js +++ b/src/OpenLayers/Controls/SearchEngine.js @@ -1463,6 +1463,9 @@ var SearchEngine = (function (Control) { for (var i = 0; i < data.length; i++) { var filter = data[i]; if (filter.value) { + if (filter.key === "section") { + filter.value = filter.value.toUpperCase(); + } _filterOptions[filter.key] = filter.value; } } From 44da8e717ace958ecce912dd79d777b2b9e78dd0 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Tue, 28 May 2024 19:00:52 +0200 Subject: [PATCH 5/9] fix(common:Search): retrait du champ "nom commune" du cadastralParcel Le champ n'est plus requetable avec le nouveau service (voir https://geoservices.ign.fr/documentation/services/services-geoplateforme/geocodage#70974) --- src/Common/Utils/SearchEngineUtils.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Common/Utils/SearchEngineUtils.js b/src/Common/Utils/SearchEngineUtils.js index 7c250831..adcd13d8 100644 --- a/src/Common/Utils/SearchEngineUtils.js +++ b/src/Common/Utils/SearchEngineUtils.js @@ -67,10 +67,6 @@ var SearchEngineUtils = { name : "municipalitycode", title : "Code commune (INSEE)", description : "Code INSEE de la commune : 3 chiffres (ex: 067)" - }, { - name : "city", - title : "Nom commune", - description : "Nom de la commune" }, { name : "oldmunicipalitycode", title : "Commune absorbée", From 054f2e2c0f2102d3ee4c31a3549e6e9467ac3a3c Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 29 May 2024 16:26:39 +0200 Subject: [PATCH 6/9] fix(ll:CRS): corrige nom du CRS -> LAMB93_5cm --- src/Leaflet/CRS/EPSG2154.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Leaflet/CRS/EPSG2154.js b/src/Leaflet/CRS/EPSG2154.js index fd245213..05c12594 100644 --- a/src/Leaflet/CRS/EPSG2154.js +++ b/src/Leaflet/CRS/EPSG2154.js @@ -60,7 +60,7 @@ var EPSG2154 = { var resolutions = []; // resolutions issues de la configuration if (Config.isConfigLoaded()) { - var o = Config.configuration.getTMSConf("LAMB93"); + var o = Config.configuration.getTMSConf("LAMB93_5cm"); resolutions = o.nativeResolutions; } From ff1ca9fbff0aba98629cd307b6b40e54b7b3386a Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 5 Jun 2024 14:28:28 +0200 Subject: [PATCH 7/9] fix(ol:Layers): correction tileMatrices[0] introduit par Maj des pyramides --- src/OpenLayers/Layers/SourceWMTS.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenLayers/Layers/SourceWMTS.js b/src/OpenLayers/Layers/SourceWMTS.js index ab109f77..7edb2253 100644 --- a/src/OpenLayers/Layers/SourceWMTS.js +++ b/src/OpenLayers/Layers/SourceWMTS.js @@ -95,7 +95,7 @@ var SourceWMTS = (function (WMTSExtended) { tileGrid : new WMTSTileGrid({ resolutions : wmtsParams.nativeResolutions, matrixIds : wmtsParams.matrixIds, - origin : [wmtsParams.tileMatrices[0].topLeftCorner.x, wmtsParams.tileMatrices[0].topLeftCorner.y] + origin : [Object.values(wmtsParams.tileMatrices)[0].topLeftCorner.x, Object.values(wmtsParams.tileMatrices)[0].topLeftCorner.y] }) }; From e0a6c09e0db7db45338a486edaa2b74c244f9aac Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 5 Jun 2024 18:05:02 +0200 Subject: [PATCH 8/9] =?UTF-8?q?update(changelog):=20mise=20=C3=A0=20jour?= =?UTF-8?q?=20du=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DRAFT_CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 1ae56e95..93e6856d 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -8,18 +8,25 @@ ## Summary +Correction HOTFIX sur l'affichage de couches définies sur des niveaux de zooms restreints, et amélioration du SearchEngine. + ## Changelog * [Added] * [Changed] + - recherche avancée améliorée sur la ressource parcelle cadastrale (#379) + * [Deprecated] * [Removed] * [Fixed] + - correction du paramétrage des ressources à utiliser avec le SearchEngine (#377) + - correction de la lecture de la définition des tileMatrices liées aux nouveaux TMS_LINK (ff1ca9fbff0aba98629cd307b6b40e54b7b3386a) + * [Security] --- @@ -31,12 +38,16 @@ ## Summary +Corrections multiples principalement sur le searchEngine + ## Changelog * [Added] * [Changed] + - recherche avancée améliorée sur la ressource parcelle cadastrale (#379) + * [Deprecated] * [Removed] @@ -46,7 +57,9 @@ - widget itineraire utilise ressource bdtopo-valhalla dans le cas d'un itinéraire pieton en mode fastest (92439bc421cc5f6ee1f10e069f2aa468e2b971b6) - Correction du logger par définiton de la variable process (e0e3b9b5ad3e1f8c92086891564f04f792e24280) - recherche avancée : correction du test sur le param query - + - correction du paramétrage des ressources à utiliser avec le SearchEngine (#377) + - corrige l'affichage de couches en lambert93 (#380) + * [Security] --- From 889ecfa2a5d0ebbe9e2e5a28484c3c69ad8e9516 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 5 Jun 2024 18:15:12 +0200 Subject: [PATCH 9/9] update(package): release ol-3.4.4 --- build/scripts/release/package-openlayers.json | 4 ++-- package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json index 0859b7a6..a71ba74e 100644 --- a/build/scripts/release/package-openlayers.json +++ b/build/scripts/release/package-openlayers.json @@ -6,10 +6,10 @@ "javascript", "OpenLayers" ], - "version" : "3.4.3", + "version" : "3.4.4", "types" : "src/OpenLayers/index.d.ts", "license" : "CECILL-B", - "date" : "14/05/2024", + "date" : "05/06/2024", "dependencies" : { "loglevel" : "1.6.6", "@mapbox/mapbox-gl-style-spec" : "13.20.1", diff --git a/package.json b/package.json index 7117c963..9b1e4d82 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "geoportal-extensions", "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries", - "version": "3.0.3", - "date": "16/05/2024", + "version": "3.0.4", + "date": "05/06/2024", "leafletExtName": "French Geoportal Extension for Leaflet", "leafletExtVersion": "2.4.0", "olExtName": "French Geoportal Extension for OpenLayers", - "olExtVersion": "3.4.3", + "olExtVersion": "3.4.4", "itownsExtName": "French Geoportal Extension for Itowns", "itownsExtVersion": "2.5.1", "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js",