release-ol-3.0.18

IGNF · Jun 22, 2021 · 7e363a7 · 7e363a7
2 parents d4b8457 + da172a4
commit 7e363a7
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 130 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -13,7 +13,7 @@ last
 * proj4
 
 last
-└── proj4@2.5.0
+└── proj4@2.7.0
 
 * proj4leaflet
 
@@ -28,22 +28,22 @@ last
 * geoportal-access-lib
 
 last
-└── geoportal-access-lib@2.1.6
+└── geoportal-access-lib@2.1.8
 
 * leaflet
 
-└── leaflet@1.5.1
+└── leaflet@1.7.1
 
 > upgrade to 1.4.0
 
 * leaflet-draw
 
 last
-└── leaflet-draw@1.0.2
+└── leaflet-draw@1.0.4
 
 * "itowns"
 
-└── "itowns@2.19.0"
+└── "itowns@2.33.0"
 
 * loglevel
 

diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ## Summary
 
+Ajout de la gestion de projections geocentriques
+
 ## Changelog
 
 * [Added]
@@ -19,22 +21,24 @@
 * [Removed]
 
 * [Fixed]
+
+    - Gestion des projections geocentriques (ex. EPSG:4978) (#303)
+    - Correction sur le DOM du profil-alti (#302)
 
 * [Security]
 
 ---
 
 
 
+
 # Extension Geoportail Leaflet, version __VERSION__
 
 **__DATE__**
 > Release Extension Geoportail leaflet
 
 ## Summary
 
-Reparation du profil altimétrique
-
 ## Changelog
 
 * [Added]
@@ -47,8 +51,6 @@ Reparation du profil altimétrique
 
 * [Fixed]
 
-    - Correction et réparation du profil altimétrique de Leaflet (#297)
-
 * [Security]
 
 ---

diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.17.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.17.tgz
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,46 +1,46 @@
 {
+   "keywords" : [
+      "geoportail",
+      "plugin",
+      "javascript",
+      "OpenLayers"
+   ],
    "module" : "src/OpenLayers/index.js",
-   "license" : "CECILL-B",
+   "peerDependencies" : {},
+   "version" : "3.0.17",
+   "bundleDependencies" : [],
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "bugs" : {},
+   "date" : "16/06/2021",
+   "devDependencies" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
+   "author" : "IGNF",
+   "dependencies" : {
+      "sortablejs" : "1.8.4",
+      "node-fetch" : "^2.6.1",
+      "ol" : "5.3.0",
+      "@mapbox/mapbox-gl-style-spec" : "13.11.0",
+      "geoportal-access-lib" : "2.1.8",
+      "ol-mapbox-style" : "4.2.1",
+      "eventbusjs" : "0.2.0",
+      "loglevel" : "1.6.6",
+      "proj4" : "2.7.0",
+      "xmldom" : "^0.1.27"
+   },
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "bugs" : {},
-   "scripts" : {},
-   "date" : "11/05/2021",
-   "bundleDependencies" : [],
-   "dependencies" : {
-      "loglevel" : "1.6.6",
-      "ol-mapbox-style" : "4.2.1",
-      "@mapbox/mapbox-gl-style-spec" : "13.11.0",
-      "eventbusjs" : "0.2.0",
-      "geoportal-access-lib" : "2.1.8",
-      "node-fetch" : "^2.6.1",
-      "xmldom" : "^0.1.27",
-      "proj4" : "2.7.0",
-      "ol" : "5.3.0",
-      "sortablejs" : "1.8.4"
-   },
    "name" : "geoportal-extensions-openlayers",
-   "keywords" : [
-      "geoportail",
-      "plugin",
-      "javascript",
-      "OpenLayers"
-   ],
+   "scripts" : {},
+   "directories" : {},
+   "license" : "CECILL-B",
+   "main" : "dist/GpPluginOpenLayers-src.js",
    "repository" : {
       "type" : "git",
       "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "peerDependencies" : {},
-   "version" : "3.0.16",
-   "devDependencies" : {},
-   "main" : "dist/GpPluginOpenLayers-src.js",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "directories" : {},
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "author" : "IGNF"
+   }
 }
diff --git a/doc/CHANGELOG-leaflet.md b/doc/CHANGELOG-leaflet.md
@@ -57,6 +57,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Extension Geoportail Leaflet, version 2.1.9](#extension-geoportail-leaflet-version-219)
   * [Summary](#summary-15)
   * [Changelog](#changelog-12)
+- [Extension Geoportail Leaflet, version 2.1.10](#extension-geoportail-leaflet-version-2110)
+  * [Summary](#summary-16)
+  * [Changelog](#changelog-13)
 
 <!-- tocstop -->
 
@@ -494,3 +497,29 @@ Nouveau widget de profil altimétrique par défaut, et correctif mineur
 * [Security]
 
 ---
+# Extension Geoportail Leaflet, version 2.1.10
+
+**16/06/2021**
+> Release Extension Geoportail leaflet
+
+## Summary
+
+Reparation du profil altimétrique
+
+## Changelog
+
+* [Added]
+
+* [Changed]
+
+* [Deprecated]
+
+* [Removed]
+
+* [Fixed]
+
+    - Correction et réparation du profil altimétrique de Leaflet (#297)
+
+* [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.3.6",
-  "date": "16/06/2021",
+  "version": "2.3.7",
+  "date": "22/06/2021",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.1.10",
   "olExtName": "French Geoportal Extension for OpenLayers",
-  "olExtVersion": "3.0.17",
+  "olExtVersion": "3.0.18",
   "itownsExtName": "French Geoportal Extension for Itowns",
   "itownsExtVersion": "2.3.3",
   "main": "dist/leaflet/GpPluginLeaflet.js, dist/openlayers/GpPluginOpenLayers.js, dist/itowns/GpPluginItowns.js",

diff --git a/samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-projection.html b/samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-projection.html
@@ -78,7 +78,7 @@ <h2>Ajout du Widget d'affichage des coordonnées de la Souris</h2>
                         {
                             crs : "EPSG:4978",
                             label : "WGS84 (geocent)",
-                            type : "Geographical"
+                            type : "Metric"
                         }
                     ]
                 });

diff --git a/src/Common/CSS/GPelevationPath.css b/src/Common/CSS/GPelevationPath.css
@@ -90,12 +90,12 @@ div[id^=GPelevationPathPanelInfo] {
 
 .altiPathValue {
   font-weight: 700;
-  color: #5E5E5E;
+  fill: #5E5E5E;
 }
 
 .altiPathCoords {
   font-style: italic;
-  color: #5E5E5E;
+  fill: #5E5E5E;
 }
 
 .tooltipInit {

diff --git a/src/Common/Controls/ProfileElevationPathDOM.js b/src/Common/Controls/ProfileElevationPathDOM.js
@@ -479,31 +479,36 @@ var ProfileElevationPathDOM = {
         dynamicsG.appendChild(focusLineY);
 
         // Tooltip
-        const tooltipDiv = document.createElement("div");
-        const altiSpan = document.createElement("span");
-        const br = document.createElement("br");
-        const slopeSpan = document.createElement("span");
-        const br2 = document.createElement("br");
-        const coordsSpan = document.createElement("span");
+        const tooltipDiv = document.createElementNS("http://www.w3.org/2000/svg", "text");
+        const altiSpan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+        const slopeSpan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+        const coordsSpan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
 
         tooltipDiv.setAttribute("style", "text-align:center; max-width:220px; font-size:10px; color:#000000; font-family:Verdana; z-index:50;");
         tooltipDiv.style.pointerEvents = "none";
         tooltipDiv.style.position = "fixed";
         // tooltipDiv.classList.add("tooltipInit");
         // IE...
         tooltipDiv.setAttribute("class", "tooltipInit");
+        tooltipDiv.setAttribute("text-anchor", "middle");
 
         widgetDiv.appendChild(tooltipDiv);
 
         altiSpan.setAttribute("class", "altiPathValue");
+        altiSpan.setAttribute("x", "0");
+        altiSpan.setAttribute("dy", "-.7em");
+
         slopeSpan.setAttribute("class", "altiPathValue");
+        slopeSpan.setAttribute("x", "0");
+        slopeSpan.setAttribute("dy", "1em");
+
         coordsSpan.setAttribute("class", "altiPathCoords");
+        coordsSpan.setAttribute("x", "0");
+        coordsSpan.setAttribute("dy", "1em");
 
         tooltipDiv.appendChild(altiSpan);
-        tooltipDiv.appendChild(br);
         if (_displayProfileOptions.currentSlope) {
             tooltipDiv.appendChild(slopeSpan);
-            tooltipDiv.appendChild(br2);
         }
         tooltipDiv.appendChild(coordsSpan);
 
@@ -530,6 +535,7 @@ var ProfileElevationPathDOM = {
 
         tooltipG.appendChild(tooltipBubbleShadow);
         tooltipG.appendChild(tooltipBubble);
+        tooltipG.appendChild(tooltipDiv);
 
         // tooltipG.classList.add("tooltipInit");
         // IE... deprecated
@@ -619,27 +625,21 @@ var ProfileElevationPathDOM = {
                 this._getTextWidth(altiSpanTxt, altiSpan)
             );
 
-            let tooltipDivLeft = elevationSvg.getBoundingClientRect().left + window.pageXOffset + focusX;
-            const tooltipDivTop = elevationSvg.getBoundingClientRect().top + window.pageYOffset + focusY - 19;
-
             let toolTipBubbleD;
             if (d.dist > (dist * factor) / 2) {
                 toolTipBubbleD = `M -0.5 -0.5 l -6 6 l 0 16 l -${tooltipTextWidth + 10} 0 l 0 -44 l ${tooltipTextWidth + 10} 0 l 0 16 l 6 6`;
-                tooltipDivLeft -= (tooltipTextWidth + 12);
+                tooltipDiv.setAttribute("transform", `translate(${-(tooltipTextWidth / 2 + 12)},0)`); // IE11 !
             } else if (d.dist <= (dist * factor) / 2) {
                 toolTipBubbleD = `M -0.5 -0.5 l 6 6 l 0 16 l ${tooltipTextWidth + 10} 0 l 0 -44 l -${tooltipTextWidth + 10} 0 l 0 16 l -6 6`;
                 // Largeur de la fleche de la bulle du tooltip
-                tooltipDivLeft += 12;
+                tooltipDiv.setAttribute("transform", `translate(${(tooltipTextWidth / 2 + 12)},0)`); // IE11 !
             }
 
             tooltipBubble.setAttribute("d", toolTipBubbleD);
             tooltipBubbleShadow.setAttribute("d", toolTipBubbleD);
 
             tooltipG.setAttribute("transform", `translate(${focusX},${focusY})`); // IE11 !
             tooltipG.style.transform = `translate(${focusX}px,${focusY}px)`;
-
-            tooltipDiv.style.left = `${tooltipDivLeft}px`;
-            tooltipDiv.style.top = `${tooltipDivTop}px`;
         }.bind(this));
 
         dynamicsG.appendChild(pathRectangle);