diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 691b42dac..93e6856db 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,12 +57,15 @@ - 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] --- + # Extension Geoplateforme Itowns, version __VERSION__ **__DATE__** @@ -59,8 +73,6 @@ ## Summary -Corrections mineures sur le Helper et les exemples - ## Changelog * [Added] @@ -73,10 +85,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/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json index 0859b7a60..a71ba74ee 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/doc/CHANGELOG-itowns.md b/doc/CHANGELOG-itowns.md index 7744592d3..0bc614991 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] + +--- diff --git a/package.json b/package.json index 7117c9631..9b1e4d82c 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", diff --git a/src/Common/Utils.js b/src/Common/Utils.js index c64358dac..7abde2857 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/Common/Utils/SearchEngineUtils.js b/src/Common/Utils/SearchEngineUtils.js index 7c2508318..adcd13d86 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", diff --git a/src/Leaflet/CRS/EPSG2154.js b/src/Leaflet/CRS/EPSG2154.js index fd2452138..05c12594d 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; } diff --git a/src/Leaflet/Controls/SearchEngine.js b/src/Leaflet/Controls/SearchEngine.js index 8686314df..70d669f6f 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 44f5bbc44..696c099c9 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"]; @@ -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; } } diff --git a/src/OpenLayers/Layers/SourceWMTS.js b/src/OpenLayers/Layers/SourceWMTS.js index ab109f777..7edb2253b 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] }) };