diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index e564acf17..0bc7cc06f 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -1,5 +1,6 @@ + # Extension Geoportail OpenLayers, version __VERSION__ **__DATE__** @@ -11,8 +12,6 @@ * [Added] - - Ajout du menu des couleurs et de la taille des pictogramme dans l'outil de dessin - * [Changed] * [Deprecated] @@ -21,8 +20,10 @@ * [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 + - Permettre la saisie sous la tooltip sur les outils de mesures + - Correctif du style des elements en cours d'édition lors de l'export / enregistrement des croquis sur l'outil de dessin + - Desactivation des interactions à la fermeture de l'outil de dessin [#323](https://github.com/IGNF/geoportal-extensions/issues/323) + - Nettoyage des tooltips des outils de mesures * [Security] diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.12.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.12.tgz new file mode 100644 index 000000000..56970f2ad Binary files /dev/null and b/build/scripts/release/geoportal-extensions-openlayers-3.2.12.tgz differ diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json index f62567e73..e182ba82e 100644 --- a/build/scripts/release/package-openlayers.json +++ b/build/scripts/release/package-openlayers.json @@ -1,31 +1,25 @@ { - "module" : "src/OpenLayers/index.js", - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-extensions.git" - }, - "author" : "IGNF", - "description" : "French Geoportal Extensions for OpenLayers", - "dependencies" : { - "node-fetch" : "^2.6.1", - "@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", - "proj4" : "2.7.5", - "xmldom" : "^0.1.27", - "geoportal-access-lib" : "3.1.0", - "eventbusjs" : "0.2.0" - }, - "main" : "dist/GpPluginOpenLayers-src.js", + "name" : "geoportal-extensions-openlayers", + "bundleDependencies" : [], "keywords" : [ "geoportail", "plugin", "javascript", "OpenLayers" ], - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html", + "date" : "29/04/2022", + "version" : "3.2.12", + "description" : "French Geoportal Extensions for OpenLayers", + "module" : "src/OpenLayers/index.js", + "devDependencies" : {}, + "author" : "IGNF", + "main" : "dist/GpPluginOpenLayers-src.js", + "repository" : { + "url" : "https://github.com/IGNF/geoportal-extensions.git", + "type" : "git" + }, + "license" : "CECILL-B", + "scripts" : {}, "files" : [ "dist/", "src/", @@ -33,14 +27,20 @@ "README.md", "package.json" ], - "bundleDependencies" : [], - "date" : "31/03/2022", - "devDependencies" : {}, - "bugs" : {}, "peerDependencies" : {}, - "directories" : {}, - "name" : "geoportal-extensions-openlayers", - "scripts" : {}, - "version" : "3.2.11", - "license" : "CECILL-B" + "bugs" : {}, + "dependencies" : { + "@mapbox/mapbox-gl-style-spec" : "13.20.1", + "ol-mapbox-style" : "6.7.0", + "xmldom" : "^0.1.27", + "ol" : "6.9.0", + "loglevel" : "1.6.6", + "geoportal-access-lib" : "3.1.0", + "sortablejs" : "1.14.0", + "node-fetch" : "^2.6.1", + "proj4" : "2.7.5", + "eventbusjs" : "0.2.0" + }, + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html", + "directories" : {} } diff --git a/doc/CHANGELOG-openlayers.md b/doc/CHANGELOG-openlayers.md index c92ea728d..84910bcda 100644 --- a/doc/CHANGELOG-openlayers.md +++ b/doc/CHANGELOG-openlayers.md @@ -118,6 +118,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [Extension Geoportail OpenLayers, version 3.2.10](#extension-geoportail-openlayers-version-3210) * [Summary](#summary-34) * [Changelog](#changelog-31) +- [Extension Geoportail OpenLayers, version 3.2.11](#extension-geoportail-openlayers-version-3211) + * [Summary](#summary-35) + * [Changelog](#changelog-32) @@ -1290,3 +1293,30 @@ Evolution de la documentation et correction du layerswitcher * [Security] --- +# Extension Geoportail OpenLayers, version 3.2.11 + +**31/03/2022** +> Release Extension Geoportail openlayers + +## Summary + +## Changelog + +* [Added] + + - Ajout du menu des couleurs et de la taille des pictogramme dans l'outil de dessin + +* [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] + +--- diff --git a/package.json b/package.json index 995cd3613..8c0e232c0 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": "2.6.12", - "date": "31/03/2022", + "version": "2.6.13", + "date": "29/04/2022", "leafletExtName": "French Geoportal Extension for Leaflet", "leafletExtVersion": "2.2.4", "olExtName": "French Geoportal Extension for OpenLayers", - "olExtVersion": "3.2.11", + "olExtVersion": "3.2.12", "itownsExtName": "French Geoportal Extension for Itowns", "itownsExtVersion": "2.3.6", "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js", diff --git a/src/OpenLayers/Controls/Drawing.js b/src/OpenLayers/Controls/Drawing.js index 8153923e1..9067b2e70 100644 --- a/src/OpenLayers/Controls/Drawing.js +++ b/src/OpenLayers/Controls/Drawing.js @@ -373,6 +373,9 @@ var Drawing = (function (Control) { return result; } + // on invalide les features... + this.featuresCollectionSelected.clear(); + var ClassName = null; switch (this.getExportFormat()) { case "KML": @@ -717,6 +720,7 @@ var Drawing = (function (Control) { this.interactionCurrent = null; this.interactionSelectEdit = null; + this.featuresCollectionSelected = null; this.stylingOvl = null; this.popupOvl = null; @@ -1860,11 +1864,15 @@ var Drawing = (function (Control) { break; case this._addUID("drawing-tool-edit"): if (context.dtOptions["edit"].active) { + this.featuresCollectionSelected = new Collection(); context.interactionSelectEdit = new SelectInteraction({ condition : eventSingleClick, - layers : [this.layer] + layers : [this.layer], + features : this.featuresCollectionSelected + }); + context.interactionSelectEdit.on("select", (e) => { + // ... }); - context.interactionSelectEdit.setProperties({ name : "Drawing", source : context diff --git a/src/OpenLayers/Controls/Measures/Measures.js b/src/OpenLayers/Controls/Measures/Measures.js index 3cacaa487..0554718f2 100644 --- a/src/OpenLayers/Controls/Measures/Measures.js +++ b/src/OpenLayers/Controls/Measures/Measures.js @@ -278,7 +278,7 @@ var Measures = { var mapContainer = map.getTargetElement(); // au cas où il y'aurait plusieurs container de carte ! - var overlays = mapContainer.getElementsByClassName("ol-overlaycontainer-stopevent"); + var overlays = mapContainer.getElementsByClassName("ol-overlaycontainer"); for (var k = 0; k < overlays.length; k++) { var nodes = overlays[k]; var len = nodes.children.length; @@ -339,6 +339,7 @@ var Measures = { this.measureTooltip = new Overlay({ element : this.measureTooltipElement, + stopEvent : false, offset : [0, -15], positioning : "bottom-center" }); @@ -362,6 +363,7 @@ var Measures = { this.helpTooltip = new Overlay({ element : this.helpTooltipElement, + stopEvent : false, offset : [15, 0], positioning : "center-left" }); diff --git a/src/OpenLayers/Controls/Utils/Interactions.js b/src/OpenLayers/Controls/Utils/Interactions.js index fad6b62ae..0b9008ed5 100644 --- a/src/OpenLayers/Controls/Utils/Interactions.js +++ b/src/OpenLayers/Controls/Utils/Interactions.js @@ -112,6 +112,8 @@ var Interactions = { } } } + } else { + interactions[i].setActive(false); } } }