fix telephone and DL speed

IGNF · Feb 10, 2025 · f239b4a · f239b4a
1 parent 8828554
commit f239b4a
Show file tree

Hide file tree

Showing 12 changed files with 182 additions and 119 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "lodash": "^4.17.21",
     "maplibre-gl": "^4.3.2",
     "npm": "^10.5.0",
+    "p-limit": "^6.2.0",
     "proj4": "^2.10.0"
   },
   "devDependencies": {

diff --git a/src/js/layer-manager/layer-switcher.js b/src/js/layer-manager/layer-switcher.js
@@ -620,6 +620,10 @@ class LayerSwitcher extends EventTarget {
           }
           this.map.setSprite(data_1.sprite);
           this.map.setGlyphs(data_1.glyphs);
+          // Fallback for offline glyphs
+          if (!Globals.online) {
+            this.map.setGlyphs("data/fallback_glyphs/{fontstack}/{range}.pbf");
+          }
           const data_2 = data_1;
           LayersGroup.addGroup(id, data_2.layers, layerIdBefore);
           this.layers[id].style = data_2.layers; // sauvegarde !

diff --git a/src/js/map-interactivity/interactivity-indicator.js b/src/js/map-interactivity/interactivity-indicator.js
@@ -78,6 +78,9 @@ class InteractivityIndicator {
     if (this.hardDisabled) {
       return;
     }
+    if (!Globals.online) {
+      return;
+    }
     if (this.pii && this.position && Math.floor(e.target.getZoom()) >= this.piiMinZoom) {
       this.active();
     } else {

diff --git a/src/js/my-account/my-account-dom.js b/src/js/my-account/my-account-dom.js
@@ -117,18 +117,18 @@ let MyAccountDOM = {
     <div class="tabs-wrap">
       <div class="tabs-menu-btn" tabindex="10" title="Sélectionner un onglet"></div>
       <div class="tabs-wrap-tabs">
-      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-routes-tab"/>
+      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-routes-tab" checked="checked"/>
       <label class="tabs-label" for="myaccount-routes-tab">Itinéraires <span id="myaccount-routes-number">0</span></label>
-      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-offline-maps-tab" checked="checked"/>
+      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-offline-maps-tab"/>
       <label class="tabs-label" for="myaccount-offline-maps-tab">Cartes téléchargées <span id="myaccount-offline-maps-number">0</span></label>
-        <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-landmarks-tab"/>
-        <label class="tabs-label" for="myaccount-landmarks-tab">Points de repère <span id="myaccount-landmarks-number">0</span></label>
-        <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-compare-landmarks-tab"/>
-        <label class="tabs-label" for="myaccount-compare-landmarks-tab">Repères Comparer <span id="myaccount-compare-landmarks-number">0</span></label>
-      </div>
+      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-landmarks-tab"/>
+      <label class="tabs-label" for="myaccount-landmarks-tab">Points de repère <span id="myaccount-landmarks-number">0</span></label>
+      <input class="tabs-input" name="myaccount-tabs" type="radio" id="myaccount-compare-landmarks-tab"/>
+      <label class="tabs-label" for="myaccount-compare-landmarks-tab">Repères Comparer <span id="myaccount-compare-landmarks-number">0</span></label>
+    </div>
       <div class="tabs-wrap-content">
-        <div class="tabs-content" id="myaccount-offline-maps"><div id="myAccountDownloadMapBtn">Télécharger une carte</div></div>
-        <div class="tabs-content" id="myaccount-routes"><div id="myAccountImportBtnRoutes">Importer</div></div>
+      <div class="tabs-content" id="myaccount-routes"><div id="myAccountImportBtnRoutes">Importer</div></div>
+      <div class="tabs-content" id="myaccount-offline-maps"><div id="myAccountDownloadMapBtn">Télécharger une carte</div></div>
         <div class="tabs-content" id="myaccount-landmarks"><div id="myAccountImportBtnLandmarks">Importer</div></div>
         <div class="tabs-content" id="myaccount-compare-landmarks"></div>
       </div>
@@ -660,14 +660,20 @@ let MyAccountDOM = {
         }
         if (value === "delete") {
           this.deleteOfflineMap(offlineMapId);
+          Toast.show({
+            text: "Suppression en cours...",
+            duration: "short",
+            position: "bottom"
+          });
         }
       });
     });
 
     // Au clic sur la carte : zoomer sur l'emprise
+
     container.querySelector(`#offline-map-basic-tools_ID_${offlineMapId}`).addEventListener("click", () => {
       this.hide();
-      this.map.fitBounds([[offlineMap.boundinBox.minLng, offlineMap.boundinBox.minLat], [offlineMap.boundinBox.maxLng, offlineMap.boundinBox.maxLat]]);
+      this.map.fitBounds([[offlineMap.boundingBox.minLng, offlineMap.boundingBox.minLat], [offlineMap.boundingBox.maxLng, offlineMap.boundingBox.maxLat]]);
     });
 
     if (!container) {

diff --git a/src/js/my-account/my-account.js b/src/js/my-account/my-account.js
@@ -214,16 +214,16 @@ class MyAccount {
         title: "",
         passive: true,
         options: [
-          {
-            text: "Cartes téléchargées",
-            value: "offline-maps",
-            class: "actionSheetTabOptionOfflineMaps",
-          },
           {
             text: "Itinéraires",
             value: "routes",
             class: "actionSheetTabOptionRoutes",
           },
+          {
+            text: "Cartes téléchargées",
+            value: "offline-maps",
+            class: "actionSheetTabOptionOfflineMaps",
+          },
           {
             text: "Points de repère",
             value: "landmarks",
@@ -525,7 +525,7 @@ class MyAccount {
    */
   downloadMap() {
     // Place le plan IGN au dessus de la pile des couches
-    const planIgnLayerBtn = document.getElementById("PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS");
+    const planIgnLayerBtn = document.getElementById("PLAN.IGN.INTERACTIF$TMS");
     do {
       planIgnLayerBtn.click();
     } while (!planIgnLayerBtn.classList.contains("selectedLayer"));