From 65225d791ec8dc03cbf171181f4d5d2a77879732 Mon Sep 17 00:00:00 2001
From: azarz <amaury.zarzelli@gmail.com>
Date: Thu, 14 Dec 2023 19:13:31 +0100
Subject: [PATCH] feat(route-draw): enhancements

---
 deploiement-appli-mobile.md                 |  82 ++++++++++++++++++++
 src/html/img/layers/PLAN.IGN.INTERACTIF.jpg | Bin 5083 -> 20032 bytes
 src/js/data-layer/base-layer-config.json    |   7 +-
 src/js/data-layer/layers-config.json        |   9 ++-
 src/js/elevation-line-control.js            |   9 ++-
 src/js/globals.js                           |   2 +-
 src/js/index.js                             |   3 -
 src/js/interactivity.js                     |  36 +++++++--
 src/js/layer-catalogue.js                   |   1 +
 src/js/layer-switcher.js                    |   1 -
 src/js/map-listeners.js                     |   2 +-
 src/js/nav.js                               |  14 ++--
 src/js/route-draw/route-draw-dom.js         |  15 ++--
 src/js/route-draw/route-draw-styles.js      |   4 +-
 src/js/route-draw/route-draw.js             |  72 ++++++++++++++---
 www/data/poi-osm-style.json                 |   4 +-
 16 files changed, 213 insertions(+), 48 deletions(-)
 create mode 100644 deploiement-appli-mobile.md

diff --git a/deploiement-appli-mobile.md b/deploiement-appli-mobile.md
new file mode 100644
index 00000000..6f951ecd
--- /dev/null
+++ b/deploiement-appli-mobile.md
@@ -0,0 +1,82 @@
+# Application mobile Géoportail - procédure de déploiement
+
+## Prérequis
+
+- [node](https://nodejs.org/en/)
+- [Cordova](https://cordova.apache.org/#getstarted)
+
+## Capacitor
+- `npm run build`
+- `npx cap sync`
+- `cd android && ./gradlew assembleRelease`
+- `zipalign 4 ./android/app/build/outputs/apk/release/app-release-signed.apk ./android/app/build/outputs/apk/release/app-release-aligned.apk`
+- `apksigner sign --ks /<chemin_vers>/ign.keystore --v1-signing-enabled true --v2-signing-enabled true ./android/app/build/outputs/apk/release/app-release-aligned.apk`
+
+- Génération des assets : https://github.com/ionic-team/capacitor-assets
+
+## Android
+
+### Prérequis spécifiques
+- Avoir le keystore ign.keystore sur la machine
+- `zipalign` (`apt install zipalign`)
+- [Installer les dépendances de Cordova pour Android (JDK, Android SDK, etc)](https://cordova.apache.org/docs/en/latest/guide/platforms/android/#installing-the-requirements)
+
+### Étapes
+
+Voici les étapes à réaliser pour déployer la dernière version du code de l'application Android du dépôt de l'UL :
+
+#### Construction du binaire
+- `git clone https://gitlab.ul.geoportail.rie.gouv.fr/ign/appli-mobile-geoportail`
+- `cd appli-mobile-geoportail`
+- `git checkout android`
+- `cordova platform add android`
+- `npm install`
+- `cordova build android --release --prod -- --packageType apk`
+- `jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore /<chemin_vers>/ign.keystore ./platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk geoportail_mobile` (passphrase : G3oportail)
+- `zipalign 4 ./platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk ./platforms/android/app/build/outputs/apk/release/app-release.apk`
+- `apksigner sign --ks /<chemin_vers>/ign.keystore --v1-signing-enabled true --v2-signing-enabled true ./platforms/android/app/build/outputs/apk/release/app-release.apk`
+
+Le fichier `app-release.apk` ainsi créé est signé et est prête à être déposé sur la Google Play Console.
+
+#### Déploiement en bêta
+
+- Accéder à la [Google Play Console](https://play.google.com/console/developers/4728683733784898454/app-list) et sélectionner l'application Géoportail (le nom varie, mais a toujours en sous-titre fr.ign.geoportail)
+
+- Sur le panneau situé à gauche, dans la section `Publier`, dans la sous-section `Tests`, sélectionner (par exemple) `Test ouvert`.
+
+- Cliquer sur `Créer une release` en haut à droite.
+
+- Dans la section `Apps bundles et APK`, cliquer sur `Importer` et sélectionner le fichier créé précédemment : `app-release.apk`.
+
+- Remplir les informations, enregistrer puis examiner la release.
+
+- Pour promouvoir la release, dans l'écran récapitulatif des tests ouverts, sous la section `Releases`, cliquer sur `Promouvoir la release`
+
+## iOS
+
+### Prérequis spécifiques
+- N'est possible que sur Mac
+- [Installer les dépendances de Cordova pour iOS](https://cordova.apache.org/docs/en/latest/guide/platforms/ios/#installing-the-requirements)
+- Avoir dans le trouseau d'accès un certificat de publication App Store
+
+### Étapes
+
+#### Construction et téléversement du binaire
+- `git clone https://gitlab.ul.geoportail.rie.gouv.fr/ign/appli-mobile-geoportail`
+- `cd appli-mobile-geoportail`
+- `git checkout ios`
+- `cordova platform add ios`
+- `cordova build ios `
+
+- Un fichier `Géoportail.xcodeproj` a été créé dans le dossier `./platforms/ios`. L'ouvrir avec XCode.
+- Dans XCode, dans l'onglet Certificats et signatures, entrer le certificat de publication App Store.
+- Dans le menu général (barre tout en haut de l'écran) : `Product > Destination > Any iOS device (arm64)`
+- Dans le menu général (barre tout en haut de l'écran) : `Product > Archive`
+
+- Une nouvelle fenêtre s'ouvre après la construction du binaire (quelques minutes). Cliquer sur `Distribute App`.
+- Appuyer sur Next et OK 6 fois, jusqu'à ce que l'application soit téléversée.
+
+#### Déploiement en bêta
+- Accéder à [App Store Connect](https://appstoreconnect.apple.com/apps/748345888/testflight/ios) et sélectionner l'application mobile Géoportail.
+- Dans la section `TestFlight`, le dernier binaire doit appparaître. Sinon, attendre quelques minutes.
+- Cliquer sur la version du build à tester, entrer les informations et les groupes de testeurs, puis lancer la vérification manuelle.
diff --git a/src/html/img/layers/PLAN.IGN.INTERACTIF.jpg b/src/html/img/layers/PLAN.IGN.INTERACTIF.jpg
index 04ea820d64240be2e47a14ce44eb22861e4dff42..285d3c6e73d927d27eee2205c833b4809e0434fc 100644
GIT binary patch
literal 20032
zcmaI6WmH|wvNpPKhakaSgS&fhcb5PQcU!nyaCdiicXxMp4epRYfXlnTz4y7_80X&l
zF=uzrdb+B*s(W<x?2pxtJpi_tn}sO=ASFcufCc;yeOv%gML|F-cK{dw^0QeH0QlI0
zpf`7Rw&!7Fv~^-IG`2G`VF23MFuEDqGcq$UF#`Am-Rup4RwmBGMkZz!w)~{m9X+JP
z7RLOf8tigRa`qx7<`$A3jwUJ|@~S`&D<HQqsh|KcpBs;xjlGSDvmvpYjkT>4j~hSf
zzdGmnEdSHYNJ{)K7H2DdQsIB35^KsS5{uY5nh>)yaL@yp*;t4<xfz%_n7CQk=!jXE
zm^m4lI2oB)>6w^$m^gS?xrzTxq@U6pjZJx!MaBOu>$ApB`fsCLU0oSmSsCmc%@~=v
zxw#pcSQuGY=s!8=o!o7m4c+K%oyh*vgQ$rU(9y!)*}~42_@5pPjqE_q{G^|n{vQ);
z?B(SC+wuQ8S~fQS*!3@NCue1o|54+A<#tkaw>M!_HgU28IRZ^S*~$I`{v5mie?k8+
zerm%bY6k?_nAkc?iSm<vwlEl581sm8a<g)Bi?Xw`GJj`g784fc;^Giz=M>{+XXEA+
z=V1L0R?61N+0Yhf@*k|l|6tkvf3Z9wjwXiAc8;occGmy#o}#&(vz?Q<ojtLL$UolV
zBG$05HMVng`e$(et*eQng^P)?xTBp7@xMlg$Krp{fR%-rm5cqmC^I{g@V~TYVqz0z
z7Zzm|=M-k);$$QJH`e%nvHagyvHwpj<EJu=|G4)5<?8=5ea6o}#s3EGXXU@4Z({oy
z?~b2={c#0A{#UpHjC(&P5ZK2CAP4~dUxN57K|p>!At0e3{~;)7sDBYOGz<(Z3=A|J
z96UT69OC~?U=R=xP>@h?(9m#52yh5UD9E3Lg7Pn>f4>m_PwoH4{kQhf3qXYh*a9{o
zz)%6;s9+GNU>}2kcEG1*5MW?n|6Kr}pdn$vz#(7(a9{v%2mr+Yd;vf}fkQ$Az+hm%
z{9_IP5(*pw8Uh*|9s=+QfJB7?kf1>`3!`JeD3Kbne0A{uu1p3SXT+LU=NLeaITwG^
zmtWs6q5@2yC}6`v{RaaD2?GTM1Nko*V5r~#2uKoUVKgWuLkH3u|F}FBbm+Rix$nw*
zMveg(xAFP)WUOENRoGzm$uZ|Y)&Yp0IB--5RDdAh&7g)p%O$=2k@w0o9fGjF{h+$J
zTD;FkcR<JF&}p1GRxL4*2G?<K%D(XmRlm7l9KX4B6?y@=tHo^HWh(ttce$aa_L1rs
z8^;lWiR^S~ut_9o&A--90v0*Ry0ehPg7|ir_$Hh{h&t}_iuBv}k;+q+c&Q0VxL#f0
z0RC?<sF^(|7+S8rW{{$0EciY7UGMH-Q8APksSSr+Lo%0Dg_K4md~MBf9q}>t2Otqh
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
XpEvtXzqT#@rlTkJc~k2bc1Qo&9d{ne

literal 5083
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
R!|NKt!nsj@?VIc6{{j;ncYOc=

diff --git a/src/js/data-layer/base-layer-config.json b/src/js/data-layer/base-layer-config.json
index 89a2286c..bee544fd 100644
--- a/src/js/data-layer/base-layer-config.json
+++ b/src/js/data-layer/base-layer-config.json
@@ -1,15 +1,16 @@
 {
     "base-layers": [
-      "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2$GEOPORTAIL:OGC:WMTS",
+      "PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS",
       "ORTHOIMAGERY.ORTHOPHOTOS$GEOPORTAIL:OGC:WMTS",
       "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN25TOUR.CV$GEOPORTAIL:OGC:WMTS",
-      "GEOGRAPHICALGRIDSYSTEMS.MAPS$GEOPORTAIL:OGC:WMTS",
-      "PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS"
+      "GEOGRAPHICALGRIDSYSTEMS.MAPS$GEOPORTAIL:OGC:WMTS"
     ],
     "rlt-layers": [
+      "ORTHOIMAGERY.ORTHOPHOTOS$GEOPORTAIL:OGC:WMTS",
       "ORTHOIMAGERY.ORTHOPHOTOS2006-2010$GEOPORTAIL:OGC:WMTS",
       "ORTHOIMAGERY.ORTHOPHOTOS2000-2005$GEOPORTAIL:OGC:WMTS",
       "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965$GEOPORTAIL:OGC:WMTS",
+      "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2$GEOPORTAIL:OGC:WMTS",
       "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950$GEOPORTAIL:OGC:WMTS",
       "GEOGRAPHICALGRIDSYSTEMS.ETATMAJOR40$GEOPORTAIL:OGC:WMTS",
       "GEOGRAPHICALGRIDSYSTEMS.CASSINI$GEOPORTAIL:OGC:WMTS"
diff --git a/src/js/data-layer/layers-config.json b/src/js/data-layer/layers-config.json
index 3357e00a..6fbe2c1e 100644
--- a/src/js/data-layer/layers-config.json
+++ b/src/js/data-layer/layers-config.json
@@ -2,7 +2,9 @@
   "generalOptions": {
     "apiKeys": {
       "appign": [
-        "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2$GEOPORTAIL:OGC:WMTS",
+        "OSM.POI$GEOPORTAIL:GPP:TMS",
+
+        "PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS",
         "ORTHOIMAGERY.ORTHOPHOTOS$GEOPORTAIL:OGC:WMTS",
         "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN25TOUR.CV$GEOPORTAIL:OGC:WMTS",
         "GEOGRAPHICALGRIDSYSTEMS.MAPS$GEOPORTAIL:OGC:WMTS",
@@ -33,6 +35,7 @@
         "ORTHOIMAGERY.ORTHOPHOTOS2006-2010$GEOPORTAIL:OGC:WMTS",
         "ORTHOIMAGERY.ORTHOPHOTOS2000-2005$GEOPORTAIL:OGC:WMTS",
         "ORTHOIMAGERY.ORTHOPHOTOS.1950-1965$GEOPORTAIL:OGC:WMTS",
+        "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2$GEOPORTAIL:OGC:WMTS",
         "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950$GEOPORTAIL:OGC:WMTS",
         "GEOGRAPHICALGRIDSYSTEMS.ETATMAJOR40$GEOPORTAIL:OGC:WMTS",
         "GEOGRAPHICALGRIDSYSTEMS.CASSINI$GEOPORTAIL:OGC:WMTS"
@@ -4253,8 +4256,8 @@
         }
       },
       "name": "PLAN.IGN.INTERACTIF",
-      "title": "Plan IGN interactif",
-      "description": "BDUni tuilée avec la BDtopo",
+      "title": "Plan IGN",
+      "description": "Plan IGN vectoriel, interactif : au clic, affichez les informations de légende et les données issues de la BD Topo.",
       "formats": [
         {
           "current": true,
diff --git a/src/js/elevation-line-control.js b/src/js/elevation-line-control.js
index 2f12bf66..2810854d 100644
--- a/src/js/elevation-line-control.js
+++ b/src/js/elevation-line-control.js
@@ -18,6 +18,8 @@ ChartJS.register(
 import maplibregl from 'maplibre-gl';
 import ElevationLine from "./services/elevation-line";
 
+import { Toast } from '@capacitor/toast';
+
 /**
  * Interface sur le contrôle profil altimétrique
  * @module ElevationLineControl
@@ -124,7 +126,12 @@ class ElevationLineControl {
     try {
       responseElevation = await ElevationLine.compute(this.coordinates);
     } catch(err) {
-      responseElevation = {elevations: []}
+      Toast.show({
+        text: "Erreur lors du calcul de profil altimétrique",
+        duration: "short",
+        position: "bottom"
+      });
+      responseElevation = {elevations: [{lon: 0, lat:0, z:0}]}
     }
     let lastLngLat = null;
     let lastZ = null;
diff --git a/src/js/globals.js b/src/js/globals.js
index d0628d7b..2396801f 100644
--- a/src/js/globals.js
+++ b/src/js/globals.js
@@ -7,7 +7,7 @@ let mapRLT = null;
  */
 let layersDisplayed;
 if (!localStorage.getItem("lastLayersDisplayed")) {
-  layersDisplayed = ["ORTHOIMAGERY.ORTHOPHOTOS$GEOPORTAIL:OGC:WMTS"];
+  layersDisplayed = ["PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS"];
 } else {
   layersDisplayed = JSON.parse(localStorage.getItem("lastLayersDisplayed"));
 }
diff --git a/src/js/index.js b/src/js/index.js
index c3e28a8e..d4879041 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -108,20 +108,17 @@ function app() {
     var source = LayersConfig.baseLayerSources[layer];
     if (source.type !== "vector") {
       map.addSource(layer, source);
-      mapRLT.addSource(layer, source);
     }
   }
   for (let layer in LayersConfig.rltLayerSources) {
     var source = LayersConfig.rltLayerSources[layer];
     if (source.type !== "vector") {
-      map.addSource(layer, source);
       mapRLT.addSource(layer, source);
     }
   }
   for (let layer in LayersConfig.thematicLayerSources) {
     var source = LayersConfig.thematicLayerSources[layer];
     if (source.type !== "vector") {
-      map.addSource(layer, source);
     }
   }
 
diff --git a/src/js/interactivity.js b/src/js/interactivity.js
index 9f4d8378..951d489b 100644
--- a/src/js/interactivity.js
+++ b/src/js/interactivity.js
@@ -18,7 +18,8 @@ class Interactivity {
         id: "PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS"
       };
 
-      this.activated = null;
+      this.shown = null;
+      this.hardDisabled = false;
 
       this.map = map;
       this.id = this.options.id || "PLAN.IGN.INTERACTIF$GEOPORTAIL:GPP:TMS"; // PII
@@ -29,6 +30,8 @@ class Interactivity {
       this.thematic = false; // couche thematic chargée ?
       this.position = false; // couche en position max ?
 
+      this.piiMinZoom = 14; // zoom mini pour l'interactivité
+
       this.popup = null;
 
       return this;
@@ -37,7 +40,7 @@ class Interactivity {
     /**
      * Ecouteurs sur :
      * - gestion des ajout / suppression / position des couches
-     * - si zooms > 14 actif pour la couche PII
+     * - si zooms > piiMinZoom actif pour la couche PII
      * - la couche au dessus est elle un baseLayer ?
      */
     #listen() {
@@ -47,7 +50,10 @@ class Interactivity {
       Globals.manager.addEventListener("movelayer", this.onGetLastLayer);
 
       this.map.on("zoom", (e) => {
-        if (this.pii && this.position && Math.round(e.target.getZoom()) > 10) {
+        if (this.hardDisabled) {
+          return;
+        }
+        if (this.pii && this.position && Math.round(e.target.getZoom()) > this.piiMinZoom) {
           this.active();
         } else {
           (this.thematic && this.position) ? this.active() : this.disable();
@@ -69,7 +75,7 @@ class Interactivity {
       if (layer[0] === this.id) {
         this.pii = true;
         this.position = true;
-        if (Math.round(this.map.getZoom())>14) {
+        if (Math.round(this.map.getZoom()) > this.piiMinZoom) {
           this.active();
         } else {
           this.disable();
@@ -89,18 +95,36 @@ class Interactivity {
      * Active l'indicateur d'activité
      */
     active () {
-      this.activated = true;
+      this.hardDisabled = false;
+      this.shown = true;
       DOM.$interactivityBtn.style.removeProperty("display");
     }
 
     /**
      * Desactive l'indicateur d'activité
+     * @param {boolean} hard l'interactivité reste désactivée tant qu'active() n'est pas appelée
      */
     disable () {
-        this.activated = false;
+        this.shown = false;
         DOM.$interactivityBtn.style.display = "none";
     }
 
+    /**
+     * Desactive l'indicateur d'activité jusqu'à nouvel ordre
+     */
+    hardDisable() {
+        this.hardDisabled = true;
+        this.disable();
+    }
+
+    /**
+     * Réactive l'indicateur après désactivation forcée
+     */
+    enable() {
+      this.hardDisabled = false;
+      this.map.fire("zoom");
+    }
+
     /**
      * affiche la popup explicative
      * @public
diff --git a/src/js/layer-catalogue.js b/src/js/layer-catalogue.js
index 90a8cd1e..6421da48 100644
--- a/src/js/layer-catalogue.js
+++ b/src/js/layer-catalogue.js
@@ -191,6 +191,7 @@ class LayerCatalogue extends EventTarget {
     document.querySelectorAll(".baseLayer").forEach((el) => {
       el.addEventListener('click', (e) => {
         if (el.classList.contains("selectedLayer") || el.classList.contains("comparedLayer")) {
+          this.removeLayer(el.id);
         } else {
           this.addLayer(el.id);
         }
diff --git a/src/js/layer-switcher.js b/src/js/layer-switcher.js
index 52f9ea97..32a12dcc 100644
--- a/src/js/layer-switcher.js
+++ b/src/js/layer-switcher.js
@@ -612,7 +612,6 @@ class LayerSwitcher extends EventTarget {
      * @public
      */
     addLayer(id) {
-      console.log("addLayer")
       var props = LayersConfig.getLayerProps(id);
       this.index++;
       this.layers[id] = {
diff --git a/src/js/map-listeners.js b/src/js/map-listeners.js
index 8e0ed9c8..a26d79e7 100644
--- a/src/js/map-listeners.js
+++ b/src/js/map-listeners.js
@@ -68,7 +68,7 @@ const addListeners = () => {
   // FIXME le mecanisme de GFI est à revoir afin de pouvoir requêter toutes les couches
   // ou la plus au dessus de la pile.
   map.on("click", (ev) => {
-    if (!Globals.interactivity.activated) {
+    if (!Globals.interactivity.shown) {
       return;
     }
     let features = map.queryRenderedFeatures(ev.point);
diff --git a/src/js/nav.js b/src/js/nav.js
index cfee602b..87aadc67 100644
--- a/src/js/nav.js
+++ b/src/js/nav.js
@@ -126,7 +126,7 @@ class MenuNavigation {
 
                 DOM.$tabContainer.style.backgroundColor = "white";
                 DOM.$sideBySideBtn.classList.add('d-none');
-                Globals.interactivity.disable();
+                Globals.interactivity.hardDisable();
                 Globals.routeDraw.activate();
                 Globals.currentScrollIndex = 1;
                 break;
@@ -168,7 +168,7 @@ class MenuNavigation {
                 DOM.$sideBySideBtn.classList.add('d-none');
                 DOM.$backTopLeftBtn.classList.remove('d-none');
                 Globals.isochrone.interactive(true);
-                Globals.interactivity.disable();
+                Globals.interactivity.hardDisable();
                 Globals.currentScrollIndex = 1;
                 break;
             case "parameterScreen":
@@ -183,6 +183,7 @@ class MenuNavigation {
                 break;
             case "directionsResults":
                 DOM.$tabContainer.style.backgroundColor = "white";
+                Globals.interactivity.enable();
                 DOM.$tabContainer.style.removeProperty("height");
                 Globals.currentScrollIndex = 2;
                 break;
@@ -212,7 +213,7 @@ class MenuNavigation {
                 DOM.$backTopLeftBtn.classList.remove('d-none');
                 DOM.$sideBySideBtn.classList.add('d-none');
                 Globals.directions.interactive(true);
-                Globals.interactivity.disable();
+                Globals.interactivity.hardDisable();
                 Globals.currentScrollIndex = 2;
                 break;
             default:
@@ -265,7 +266,7 @@ class MenuNavigation {
                 DOM.$sideBySideBtn.classList.remove('d-none');
                 DOM.$tabContainer.style.removeProperty("background-color");
                 Globals.routeDraw.clear();
-                Globals.interactivity.active();
+                Globals.interactivity.enable();
                 break;
             case "poi":
                 DOM.$search.style.display = "flex";
@@ -302,7 +303,7 @@ class MenuNavigation {
                 DOM.$sideBySideBtn.classList.remove('d-none');
                 Globals.isochrone.clear();
                 Globals.isochrone.interactive(false);
-                Globals.interactivity.active();
+                Globals.interactivity.enable();
                 break;
             case "search":
                 DOM.$rech.blur();
@@ -339,6 +340,7 @@ class MenuNavigation {
                 Globals.currentScrollIndex = 1;
             case "directionsResults":
                 DOM.$tabContainer.style.removeProperty("background-color");
+                Globals.interactivity.hardDisable();
                 isSpecific = true;
                 isFinished = true;
                 break;
@@ -359,7 +361,7 @@ class MenuNavigation {
                 DOM.$sideBySideBtn.classList.remove('d-none');
                 Globals.directions.clear();
                 Globals.directions.interactive(false);
-                Globals.interactivity.active();
+                Globals.interactivity.enable();
                 break;
             default:
                 break;
diff --git a/src/js/route-draw/route-draw-dom.js b/src/js/route-draw/route-draw-dom.js
index 80fc2c45..6e03af23 100644
--- a/src/js/route-draw/route-draw-dom.js
+++ b/src/js/route-draw/route-draw-dom.js
@@ -226,7 +226,9 @@ let RouteDrawDOM = {
         let totalSeconds = 0;
         this.dom.detailsList.innerHTML = "";
         if (data.steps.length > 0) {
-            for (let i = 0; i < data.points.length; i++) {
+            // Code facilement adaptable si on veut afficher toutes les étapes (ADDSTEPS)
+            // ADDSTEPS:  i += data.points.length - 1 --> i++
+            for (let i = 0; i < data.points.length; i += data.points.length - 1) {
                 const waypoint = data.points[i];
                 var waypointDiv = document.createElement("div");
                 waypointDiv.classList.add("routeDrawWaypointDiv");
@@ -254,18 +256,15 @@ let RouteDrawDOM = {
                 waypointLabelDurationTextSpan.innerText = waypointLabelDurationText;
 
                 if (i > 0) {
-                    const step = data.steps[i - 1];
-
+                    // ADDSTEPS: const step = data.steps[i - 1];
                     // Ajout de la div du step
                     var stepDiv = document.createElement("div");
                     stepDiv.classList.add("routeDrawStepDiv");
-                    stepDiv.innerText = utils.convertDistance(step.properties.distance) +
+                    stepDiv.innerText = utils.convertDistance(data.distance) + // ADDSTEPS: data.distance -> step.porperties.distance
                         " / " +
-                        utils.convertSecondsToTime(step.properties.duration);
+                        utils.convertSecondsToTime(data.duration); // ADDSTEPS: data.duration -> step.porperties.duration
                     this.dom.detailsList.appendChild(stepDiv);
-
-                    totalSeconds += step.properties.duration;
-
+                    totalSeconds += data.duration; // ADDSTEPS: data.duration -> step.porperties.duration
                     waypointLabelDurationTextSpan.innerText = utils.convertSecondsToTime(totalSeconds);
                 }
                 waypointLabel.appendChild(waypointLabelDurationTextSpan);
diff --git a/src/js/route-draw/route-draw-styles.js b/src/js/route-draw/route-draw-styles.js
index 6ecf50b1..186cf442 100644
--- a/src/js/route-draw/route-draw-styles.js
+++ b/src/js/route-draw/route-draw-styles.js
@@ -10,7 +10,7 @@ const layers = {
     },
     paint: {
       "line-color": "#26a581",
-      "line-opacity": 0.55,
+      "line-opacity": ["case", ["boolean", ["get", "invisible"], false], 0, 0.55],
       "line-width": [
         "interpolate",
         ["exponential", 1.5],
@@ -34,7 +34,7 @@ const layers = {
     },
     paint: {
       "line-color": "#26a581",
-      "line-opacity": 0.85,
+      "line-opacity": ["case", ["boolean", ["get", "invisible"], false], 0, 0.85],
       "line-width": [
         "interpolate",
         ["exponential", 1.5],
diff --git a/src/js/route-draw/route-draw.js b/src/js/route-draw/route-draw.js
index 4c736df1..1a7b11ac 100644
--- a/src/js/route-draw/route-draw.js
+++ b/src/js/route-draw/route-draw.js
@@ -7,6 +7,7 @@ import Reverse from "../services/reverse";
 
 import MapLibreGL from "maplibre-gl";
 
+
 /**
  * Interface sur le tracé d'itinéraire
  * @module RouteDraw
@@ -73,7 +74,8 @@ class RouteDraw {
 
         // fonction d'event avec bind
         this.handleAddWayPoint = this.#onAddWayPoint.bind(this);
-        this.handleTouchStart = this.#onTouchStart.bind(this);
+        this.handleTouchStartPoint = this.#onTouchStartPoint.bind(this);
+        this.handleTouchStartLine = this.#onTouchStartLine.bind(this);
         this.handleTouchMove = this.#onTouchMove.bind(this);
         this.handleTouchEnd = this.#onTouchEnd.bind(this);
         this.handleDeletePoint = this.#onDeleteWayPoint.bind(this);
@@ -152,7 +154,8 @@ class RouteDraw {
      */
     #listeners() {
         this.map.on("click", this.handleAddWayPoint);
-        this.map.on("touchstart", "route-draw-point", this.handleTouchStart);
+        this.map.on("touchstart", "route-draw-point", this.handleTouchStartPoint);
+        this.map.on("touchstart", "route-draw-line", this.handleTouchStartLine);
         DOM.$routeDrawCancel.addEventListener("click", this.handleCancelChange);
         DOM.$routeDrawRestore.addEventListener("click", this.handleRestoreChange);
     }
@@ -162,17 +165,68 @@ class RouteDraw {
      */
     #deactivate() {
         this.map.off("click", this.handleAddWayPoint);
-        this.map.off("touchstart", "route-draw-point", this.handleTouchStart);
+        this.map.off("touchstart", "route-draw-point", this.handleTouchStartPoint);
+        this.map.off("touchstart", "route-draw-line", this.handleTouchStartLine);
         DOM.$routeDrawCancel.removeEventListener("click", this.handleCancelChange);
         DOM.$routeDrawRestore.removeEventListener("click", this.handleRestoreChange);
     }
 
+    /**
+     * ecouteur lors du déplacement d'un nouveau waypoint depuis une ligne sur la carte - début
+     * @param {*} e
+     * @returns
+     */
+    #onTouchStartLine(e) {
+        // TODO gestion d'erreurs
+        // TODO patience
+        e.preventDefault();
+        if (this.map.queryRenderedFeatures(e.point, {
+            layers: ["route-draw-point"],
+        })[0]) {
+            return;
+        }
+        const feature = this.map.queryRenderedFeatures(e.point, {
+            layers: ["route-draw-line"],
+        })[0];
+        console.warn(feature);
+        this.movedPointIndex = this.data.steps.findIndex((step) => {
+            return step.properties?.id === feature?.properties?.id;
+        }) + 1;
+        var coordinates = e.lngLat;
+        const newPoint = {
+            type: "Feature",
+            geometry: {
+                type: "Point",
+                coordinates: [coordinates.lng, coordinates.lat]
+            },
+            properties: {
+                name: "",
+                id: this.nextPointId,
+            }
+        }
+        this.nextPointId++;
+        if (this.movedPointIndex < this.data.steps.length) {
+            const newStep = JSON.parse(JSON.stringify(this.data.steps[this.movedPointIndex]));
+            newStep.properties.id = this.nextStepId;
+            newStep.properties.invisible = true;
+            this.nextStepId++;
+            this.data.steps.splice(this.movedPointIndex, 0, newStep);
+        }
+        this.data.points.splice(this.movedPointIndex, 0, newPoint);
+        this.movedPoint = this.data.points[this.movedPointIndex];
+        this.movedPoint.properties.highlight = true;
+        this.#updateSources();
+
+        this.map.on('touchmove', this.handleTouchMove);
+        this.map.once('touchend', this.handleTouchEnd);
+    }
+
     /**
      * ecouteur lors du déplacement d'un waypoint sur la carte - début
      * @param {*} e
      * @returns
      */
-    #onTouchStart(e) {
+    #onTouchStartPoint(e) {
         // TODO gestion d'erreurs
         // TODO patience
         e.preventDefault();
@@ -220,7 +274,7 @@ class RouteDraw {
         if (index > 0) {
             promises.push(this.#computeStep(index - 1));
         }
-        if (index < this.data.steps.length) {
+        if (index < this.data.points.length - 1) {
             promises.push(this.#computeStep(index));
         }
         Promise.all(promises).then( () => {
@@ -349,7 +403,6 @@ class RouteDraw {
      * @param {MapLibreGL.LngLat}
      */
     async #computePointName(coordinates){
-        let bResponse = false;
         try {
             await Reverse.compute({
                 lon : coordinates.lng,
@@ -456,9 +509,6 @@ class RouteDraw {
         try {
             await this.#updateElevation();
         } catch(err) {
-            // TODO "Erreur lors de l'ajout du point"
-            this.map.on("click", this.handleAddWayPoint);
-            return;
         }
         this.data.steps[index].properties.dplus = this.elevation.dplus - lastDPlus;
         this.data.steps[index].properties.dminus = this.elevation.dminus - lastDMinus;
@@ -581,12 +631,12 @@ class RouteDraw {
             this.delete = false;
             DOM.$routeDrawDelete.classList.add("inactive");
             this.map.off("click", "route-draw-point", this.handleDeletePoint);
-            this.map.on("touchstart", "route-draw-point", this.handleTouchStart);
+            this.map.on("touchstart", "route-draw-point", this.handleTouchStartPoint);
             this.map.on("click", this.handleAddWayPoint);
             return;
         }
         this.delete = true;
-        this.map.off("touchstart", "route-draw-point", this.handleTouchStart);
+        this.map.off("touchstart", "route-draw-point", this.handleTouchStartPoint);
         this.map.off("click", this.handleAddWayPoint);
         this.map.on("click", "route-draw-point", this.handleDeletePoint);
         DOM.$routeDrawDelete.classList.remove("inactive");
diff --git a/www/data/poi-osm-style.json b/www/data/poi-osm-style.json
index 8515c6c8..ca999deb 100644
--- a/www/data/poi-osm-style.json
+++ b/www/data/poi-osm-style.json
@@ -23,8 +23,8 @@
             "type": "symbol",
             "source": "poi_osm",
             "source-layer": "point_interet",
-            "minzoom": 15,
-            "maxzoom": 17,
+            "minzoom": 16,
+            "maxzoom": 18,
             "layout": {
                 "visibility": "visible",
                 "icon-image": "{symbo}_17"