Merge branch 'release-itowns-2.3.2'

IGNF · Mar 30, 2021 · d4fbc99 · d4fbc99
2 parents 383fc30 + 753809e
commit d4fbc99
Show file tree

Hide file tree

Showing 58 changed files with 578 additions and 371 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build project ...
+name: Build
 
 on:
   pull_request:

diff --git a/.github/workflows/release-itowns.yml b/.github/workflows/release-itowns.yml
@@ -251,8 +251,8 @@ jobs:
       - name: Reset draft changelog
         run: |
           sed -i -e '/# Extension Geoportail Itowns/{:a; N; /---/!ba; r .github/CHANGELOG_TEMPLATE.md' -e 'd;}' DRAFT_CHANGELOG.md
-          sed -e 's/__UP_LIBRARY__/Itowns/' DRAFT_CHANGELOG.md
-          sed -e 's/__LO_LIBRARY__/itowns/' DRAFT_CHANGELOG.md
+          sed -i '0,/__UP_LIBRARY__/s/__UP_LIBRARY__/Itowns/' DRAFT_CHANGELOG.md
+          sed -i '0,/__LO_LIBRARY__/s/__LO_LIBRARY__/itowns/' DRAFT_CHANGELOG.md
 
       - name: Archive changelog
         run: |

diff --git a/.github/workflows/release-leaflet.yml b/.github/workflows/release-leaflet.yml
@@ -251,8 +251,8 @@ jobs:
       - name: Reset draft changelog
         run: |
           sed -i -e '/# Extension Geoportail Leaflet/{:a; N; /---/!ba; r .github/CHANGELOG_TEMPLATE.md' -e 'd;}' DRAFT_CHANGELOG.md
-          sed -e 's/__UP_LIBRARY__/Leaflet/' DRAFT_CHANGELOG.md
-          sed -e 's/__LO_LIBRARY__/leaflet/' DRAFT_CHANGELOG.md
+          sed -i '0,/__UP_LIBRARY__/s/__UP_LIBRARY__/Leaflet/' DRAFT_CHANGELOG.md
+          sed -i '0,/__LO_LIBRARY__/s/__LO_LIBRARY__/leaflet/' DRAFT_CHANGELOG.md
 
       - name: Archive changelog
         run: |

diff --git a/.github/workflows/release-ol.yml b/.github/workflows/release-ol.yml
@@ -252,9 +252,9 @@ jobs:
       # cf. http://fahdshariff.blogspot.com/2012/12/sed-mutli-line-replacement-between-two.html
       - name: Reset draft changelog
         run: |
-          sed -i -e '/# Extension Geoportail OpenLayers/{:a; N; /---/!ba; r .github/CHANGELOG_TEMPLATE.md' -e 'd;}' DRAFT_CHANGELOG.md
-          sed -e 's/__UP_LIBRARY__/OpenLayers/' DRAFT_CHANGELOG.md
-          sed -e 's/__LO_LIBRARY__/openlayers/' DRAFT_CHANGELOG.md
+          sed -i '/# Extension Geoportail OpenLayers/{:a; N; /---/!ba; r .github/CHANGELOG_TEMPLATE.md' -e 'd;}' DRAFT_CHANGELOG.md
+          sed -i '0,/__UP_LIBRARY__/s/__UP_LIBRARY__/OpenLayers/' DRAFT_CHANGELOG.md
+          sed -i '0,/__LO_LIBRARY__/s/__LO_LIBRARY__/openlayers/' DRAFT_CHANGELOG.md
 
       - name: Archive changelog
         run: |

diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,8 +1,8 @@
 
-# Extension Geoportail __UP_LIBRARY__, version __VERSION__
+# Extension Geoportail OpenLayers, version __VERSION__
 
 **__DATE__**
-> Release Extension Geoportail __LO_LIBRARY__
+> Release Extension Geoportail openLayers
 
 ## Summary
 
@@ -12,21 +12,26 @@
 
 * [Changed]
 
+    - mise à jour de la jsDoc (95cff8206ef2e0fcfb7fee5989d2d74d236b9f9f)
+
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
 
+    - corrections des erreurs à partir de DeepScan (#288)
+    - corrections syntaxiques eslint (da275a284a07ddd8e32753eda57ad4ef283d34fb et 306506a2255b2f05558ddcb05210dce39135c804)
+
 * [Security]
 
 ---
 
 
-# Extension Geoportail __UP_LIBRARY__, version __VERSION__
+# Extension Geoportail Leaflet, version __VERSION__
 
 **__DATE__**
-> Release Extension Geoportail __LO_LIBRARY__
+> Release Extension Geoportail leaflet
 
 ## Summary
 
@@ -42,35 +47,40 @@
 
 * [Fixed]
 
+    - corrections des erreurs à partir de DeepScan (#288)
+    - corrections syntaxiques eslint (da275a284a07ddd8e32753eda57ad4ef283d34fb et 306506a2255b2f05558ddcb05210dce39135c804)
+
 * [Security]
 
 ---
 
 
-# Extension Geoportail Leaflet, version __VERSION__
+
+# Extension Geoportail Itowns, version __VERSION__
 
 **__DATE__**
-> Release Extension Geoportail Leaflet
+> Release Extension Geoportail itowns
 
 ## Summary
 
-Nouveau widget de profil altimétrique par défaut, et correctif mineur
-
 ## Changelog
 
 * [Added]
 
 * [Changed]
 
-        - nouvel affichage du profil altimétrique par défaut (DISPLAY_PROFILE_BY_DEFAULT)
+    - mise à jour d'iTowns en version 2.30 (#292)
 
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
 
-        - correctif sur l'export de la version en mode module
+    - corrections des erreurs à partir de DeepScan (#288)
+    - corrections syntaxiques eslint (da275a284a07ddd8e32753eda57ad4ef283d34fb et 306506a2255b2f05558ddcb05210dce39135c804)
+    - correction de la synchronisation des couches vecteur tuilé avec leurs labels (#290)
+
 
 * [Security]
 

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Extensions Géoportail
 
-[![CeCILL License](https://img.shields.io/badge/licence-CeCILL--B-blue.svg)](https://raw.githubusercontent.com/IGNF/geoportal-extensions/master/LICENCE.md) [![Build Status](https://img.shields.io/travis/IGNF/geoportal-extensions/master.svg)](https://travis-ci.org/IGNF/geoportal-extensions)
+[![Build](https://github.com/IGNF/geoportal-extensions/actions/workflows/build.yml/badge.svg)](https://github.com/IGNF/geoportal-extensions/actions/workflows/build.yml)
+[![CeCILL License](https://img.shields.io/badge/licence-CeCILL--B-blue.svg)](https://raw.githubusercontent.com/IGNF/geoportal-extensions/master/LICENCE.md)
+[![DeepScan grade](https://deepscan.io/api/teams/12425/projects/15469/branches/309621/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=12425&pid=15469&bid=309621)
 
 Ce projet a pour but de fournir des extensions facilitant l'accès aux ressources de la plateforme Géoportail pour les bibliothèques cartographiques Leaflet, OpenLayers (versions 3 et supérieures) et iTowns.
 

diff --git a/build/scripts/release/geoportal-extensions-itowns-2.3.0.tgz b/build/scripts/release/geoportal-extensions-itowns-2.3.0.tgz
diff --git a/build/scripts/release/geoportal-extensions-itowns-2.3.1.tgz b/build/scripts/release/geoportal-extensions-itowns-2.3.1.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.13.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.13.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.14.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.14.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -1,44 +1,44 @@
 {
-   "main" : "dist/GpPluginItowns-src.js",
-   "scripts" : {},
-   "module" : "src/Itowns/index.js",
-   "dependencies" : {
-      "proj4" : "2.6.2",
-      "itowns" : "2.27.0",
-      "xmldom" : "^0.1.27",
-      "geoportal-access-lib" : "2.1.6",
-      "request" : "^2.83.0",
-      "three" : "0.121.1",
-      "loglevel" : "1.6.6",
-      "sortablejs" : "1.8.4"
-   },
-   "author" : "IGNF",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
-   "bugs" : {},
+   "directories" : {},
+   "name" : "geoportal-extensions-itowns",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "license" : "CECILL-B",
-   "version" : "2.3.0",
+   "bugs" : {},
    "repository" : {
       "url" : "https://github.com/IGNF/geoportal-extensions.git",
       "type" : "git"
    },
-   "description" : "French Geoportal Extensions for iTowns",
+   "module" : "src/Itowns/index.js",
+   "dependencies" : {
+      "three" : "0.124.0",
+      "loglevel" : "1.6.6",
+      "sortablejs" : "1.8.4",
+      "itowns" : "2.30.0",
+      "geoportal-access-lib" : "2.1.6",
+      "xmldom" : "^0.1.27",
+      "request" : "^2.83.0",
+      "proj4" : "2.7.0"
+   },
+   "date" : "12/02/2021",
+   "main" : "dist/GpPluginItowns-src.js",
+   "peerDependencies" : {},
+   "scripts" : {},
    "bundleDependencies" : [],
-   "directories" : {},
+   "version" : "2.3.1",
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "Itowns"
    ],
    "devDependencies" : {},
-   "peerDependencies" : {},
-   "date" : "09/12/2020",
-   "name" : "geoportal-extensions-itowns"
+   "description" : "French Geoportal Extensions for iTowns",
+   "author" : "IGNF",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "license" : "CECILL-B"
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,46 +1,46 @@
 {
-   "devDependencies" : {},
-   "name" : "geoportal-extensions-openlayers",
-   "peerDependencies" : {},
-   "module" : "src/OpenLayers/index.js",
-   "directories" : {},
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "version" : "3.0.13",
+   "dependencies" : {
+      "proj4" : "2.6.0",
+      "geoportal-access-lib" : "2.1.6",
+      "xmldom" : "^0.1.27",
+      "sortablejs" : "1.8.4",
+      "request" : "^2.83.0",
+      "ol" : "5.3.0",
+      "@mapbox/mapbox-gl-style-spec" : "13.11.0",
+      "loglevel" : "1.6.6",
+      "eventbusjs" : "0.2.0",
+      "ol-mapbox-style" : "4.2.1"
+   },
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "OpenLayers"
    ],
+   "scripts" : {},
+   "name" : "geoportal-extensions-openlayers",
+   "author" : "IGNF",
+   "bugs" : {},
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
+   "date" : "12/02/2021",
+   "module" : "src/OpenLayers/index.js",
    "license" : "CECILL-B",
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "directories" : {},
    "repository" : {
       "type" : "git",
       "url" : "https://github.com/IGNF/geoportal-extensions.git"
    },
-   "dependencies" : {
-      "ol" : "5.3.0",
-      "sortablejs" : "1.8.4",
-      "@mapbox/mapbox-gl-style-spec" : "13.11.0",
-      "proj4" : "2.6.0",
-      "loglevel" : "1.6.6",
-      "xmldom" : "^0.1.27",
-      "eventbusjs" : "0.2.0",
-      "geoportal-access-lib" : "2.1.6",
-      "request" : "^2.83.0",
-      "ol-mapbox-style" : "4.2.1"
-   },
    "bundleDependencies" : [],
-   "main" : "dist/GpPluginOpenLayers-src.js",
-   "scripts" : {},
-   "bugs" : {},
+   "peerDependencies" : {},
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "author" : "IGNF",
-   "date" : "09/12/2020"
+   "devDependencies" : {},
+   "version" : "3.0.14"
 }
diff --git a/doc/CHANGELOG-leaflet.md b/doc/CHANGELOG-leaflet.md
@@ -51,6 +51,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Extension Geoportail Leaflet, version 2.1.7](#extension-geoportail-leaflet-version-217)
   * [Summary](#summary-13)
   * [Changelog](#changelog-10)
+- [Extension Geoportail Leaflet, version 2.1.8](#extension-geoportail-leaflet-version-218)
+  * [Summary](#summary-14)
+  * [Changelog](#changelog-11)
 
 <!-- tocstop -->
 
@@ -418,3 +421,31 @@ Mise à jour de Leaflet en version 1.7.1
 * [Security]
 
 ---
+# Extension Geoportail Leaflet, version 2.1.8
+
+**12/02/2021**
+> Release Extension Geoportail Leaflet
+
+## Summary
+
+Nouveau widget de profil altimétrique par défaut, et correctif mineur
+
+## Changelog
+
+* [Added]
+
+* [Changed]
+
+        - nouvel affichage du profil altimétrique par défaut (DISPLAY_PROFILE_BY_DEFAULT)
+
+* [Deprecated]
+
+* [Removed]
+
+* [Fixed]
+
+        - correctif sur l'export de la version en mode module
+
+* [Security]
+
+---
diff --git a/doc/README-itowns.md b/doc/README-itowns.md
@@ -317,7 +317,7 @@ Gp.Services.getConfig(...)
 
 ### Versions d'iTowns supportées
 
-La dernière version de l'extension Géoportail pour iTowns peut s'utiliser avec la **version 2.15.3** d'iTowns. [Cliquer ici](https://github.com/iTowns/itowns/releases/) pour télécharger directement la version 2.15.3 de la librairie iTowns. [Cliquer ici](https://www.npmjs.com/package/itowns?activeTab=readme) pour accéder à la page du package npm iTowns.
+La dernière version de l'extension Géoportail pour iTowns peut s'utiliser avec la **version 2.27.0** d'iTowns. [Cliquer ici](https://github.com/iTowns/itowns/releases/) pour télécharger directement la version 2.27.0 de la librairie iTowns. [Cliquer ici](https://www.npmjs.com/package/itowns?activeTab=readme) pour accéder à la page du package npm iTowns.
 
 
 ### Navigateurs supportés

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "geoportal-extensions",
   "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries",
-  "version": "2.3.2",
-  "date": "12/02/2021",
+  "version": "2.3.3",
+  "date": "30/03/2021",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.1.8",
   "olExtName": "French Geoportal Extension for OpenLayers",
   "olExtVersion": "3.0.14",
   "itownsExtName": "French Geoportal Extension for Itowns",
-  "itownsExtVersion": "2.3.1",
+  "itownsExtVersion": "2.3.2",
   "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js",
   "module": "src/Leaflet/index.js, src/OpenLayers/index.js, src/Itowns/index.js",
   "directories": {},
@@ -67,17 +67,17 @@
     "@mapbox/mapbox-gl-style-spec": "13.11.0",
     "eventbusjs": "0.2.0",
     "geoportal-access-lib": "2.1.7",
-    "itowns": "2.27.0",
+    "itowns": "2.30.0",
     "leaflet": "1.7.1",
     "leaflet-draw": "1.0.4",
     "loglevel": "^1.6.7",
     "markdown-toc": "^1.2.0",
     "ol": "5.3.0",
     "ol-mapbox-style": "4.2.1",
-    "proj4": "^2.6.2",
+    "proj4": "2.7.0",
     "proj4leaflet": "1.0.2",
     "sortablejs": "1.8.4",
-    "three": "^0.121.1",
+    "three": "0.124.0",
     "whatwg-fetch": "3.0.0"
   },
   "devDependencies": {

diff --git a/src/Common/Controls/MousePositionDOM.js b/src/Common/Controls/MousePositionDOM.js
@@ -831,7 +831,7 @@ var MousePositionDOM = {
      */
     GPdisplayCoords : function (coordinate) {
         // Compute coords in case of cursor position (desktop)
-        if (coordinate && coordinate != null) {
+        if (coordinate) {
             var labelLon = document.getElementById(this._addUID("GPmousePositionLonLabel"));
             var labelLat = document.getElementById(this._addUID("GPmousePositionLatLabel"));
 
@@ -911,7 +911,7 @@ var MousePositionDOM = {
         var minThreshold = noDataValue - noDataValueTolerance;
 
         // Compute coords in case of cursor position (desktop)
-        if (coordinate && coordinate != null) {
+        if (coordinate) {
             // If no altitude panel, don't call altitude request
             if (document.getElementById(this._addUID("GPmousePositionAltitude"))) {
                 altitudeTimeout = setTimeout(function () {