feat(myaccount): enregistrement des landmarks et actions sur les land…

…marks

.github/workflows/android-deploy.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Make envfile
         run: |
           echo "GPF_key=${{ secrets.GPF_key }}" > .env
+          echo "signalement_url=${{ secrets.SIGNALEMENT_URL }}" >> .env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3

.github/workflows/ios-deploy.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Make envfile
         run: |
           echo "GPF_key=${{ secrets.GPF_key }}" > .env
+          echo "signalement_url=${{ secrets.SIGNALEMENT_URL }}" >> .env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3

.github/workflows/web-deploy.yml

@@ -30,6 +30,7 @@ jobs:
       - name: Make envfile
         run: |
           echo "GPF_key=${{ secrets.GPF_key }}" > .env
+          echo "signalement_url=${{ secrets.SIGNALEMENT_URL }}" >> .env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3

src/css/layer-switcher.css

@@ -11,6 +11,7 @@
 }
 
 
+div[id^="landmark-container_ID_"],
 div[id^="route-container_ID_"],
 div[id^="container_ID_"] {
   display: flex;
@@ -23,6 +24,7 @@ div[id^="container_ID_"] {
   padding-bottom: 20px;
 }
 
+div[id^="landmark-cross-picto_ID_"],
 div[id^="route-cross-picto_ID_"],
 div[id^="cross-picto_ID_"] {
   position: relative;
@@ -32,13 +34,15 @@ div[id^="cross-picto_ID_"] {
   background: url("./assets/drag-and-drop-light.svg") center center no-repeat, #f4f6f8;
 }
 
+div[id^="landmark-basic-tools_ID_"],
 div[id^="route-basic-tools_ID_"],
 div[id^="basic-tools_ID_"] {
   display: flex;
   flex-direction: row;
   padding: 10px;
   max-width: 250px;
 }
+div[id^="landmark-basic-tools_ID_"],
 div[id^="route-basic-tools_ID_"] {
   align-items: center
 }
@@ -60,6 +64,7 @@ div[id^="thumbnail_ID_"] {
   padding-left: 10px;
 }
 
+span[id^="landmark-title_ID_"],
 span[id^="route-title_ID_"],
 span[id^="title_ID_"] {
   word-break: break-word;
@@ -97,6 +102,7 @@ div[id^="opacity-middle-div_ID_"] {
   padding-left: 6px;
 }
 
+label[id^="landmark-show-advanced-tools_ID_"],
 label[id^="route-show-advanced-tools_ID_"],
 label[id^="show-advanced-tools_ID_"] {
   width: 25px;
@@ -105,6 +111,7 @@ label[id^="show-advanced-tools_ID_"] {
   background-repeat: no-repeat;
   background-position: center;
 }
+div[id^="landmark-advanced-tools_ID_"],
 div[id^="route-advanced-tools_ID_"],
 div[id^="advanced-tools_ID_"] {
   margin: auto;
@@ -124,12 +131,15 @@ div[id^="advanced-tools_ID_"] {
   top: -30px;
 }
 
+div[id^="landmark-advanced-tools_ID_"],
 div[id^="route-advanced-tools_ID_"] {
   top: 25px;
   right: 35px;
   left: unset;
 }
 
+label[id^="landmark-show-advanced-tools_ID_"]:hover
+  + div[id^="landmark-advanced-tools_ID_"],
 label[id^="route-show-advanced-tools_ID_"]:hover
   + div[id^="route-advanced-tools_ID_"],
 label[id^="show-advanced-tools_ID_"]:hover
@@ -140,6 +150,7 @@ label[id^="show-advanced-tools_ID_"]:hover
   transition: max-height 0.3s ease-out;
 }
 
+div[id^="landmark-advanced-tools_ID_"]:hover,
 div[id^="route-advanced-tools_ID_"]:hover,
 div[id^="advanced-tools_ID_"]:hover {
   display: flex;
@@ -148,6 +159,7 @@ div[id^="advanced-tools_ID_"]:hover {
   transition: max-height 0.3s ease-out;
 }
 
+input[id^="landmark-visibility_ID_"],
 input[id^="route-visibility_ID_"],
 input[id^="visibility_ID_"],
 input[id^="color_ID_"] {
@@ -157,6 +169,7 @@ label[id^="color-picto_ID_"] {
   background-image: url("./assets/layer-switcher/nb-layer.svg");
 }
 
+label[id^="landmark-visibility-picto_ID_"],
 label[id^="route-visibility-picto_ID_"],
 label[id^="visibility-picto_ID_"] {
   background-image: url("./assets/layer-switcher/hide-layer.svg");
@@ -170,23 +183,28 @@ div[id^="info_ID_"] {
   background-image: url("./assets/layer-switcher/info-layer.svg");
 }
 
+div[id^="landmark-remove_ID_"],
 div[id^="route-remove_ID_"],
 div[id^="remove_ID_"] {
   background-image: url("./assets/layer-switcher/delete-layer.svg");
 }
 
+div[id^="landmark-remove_ID_"]:hover,
 div[id^="route-remove_ID_"]:hover {
   background-image: url("./assets/layer-switcher/delete-layer-confirm.svg");
 }
 
+div[id^="landmark-edit_ID_"],
 div[id^="route-edit_ID_"] {
   background-image: url("./assets/layer-switcher/edit-layer.svg");
 }
 
+div[id^="landmark-export_ID_"],
 div[id^="route-export_ID_"] {
   background-image: url("./assets/layer-switcher/export-layer.svg");
 }
 
+div[id^="landmark-share_ID_"],
 div[id^="route-share_ID_"] {
   background-image: url("./assets/layer-switcher/share-layer.svg");
 }

src/css/my-account.css

@@ -82,21 +82,25 @@
   padding: 0;
 }
 
+div[id^="landmark-container_ID_"],
 div[id^="route-container_ID_"] {
   width: 100%;
   justify-content: space-between;
   border-bottom: 1px solid #DDE1E6;
   padding: 10px 0;
 }
 
+div[id^=landmark-cross-picto_ID_],
 div[id^=route-cross-picto_ID_] {
   margin-left: 15px;
 }
 
+div[id^=landmark-basic-tools_ID_],
 div[id^=route-basic-tools_ID_] {
   width: 100%;
 }
 
+div[id^=landmark-title_ID_]
 div[id^=route-title_ID_] {
   font-size: 13px;
   font-family: "Open Sans Bold";

src/js/controls.js

@@ -121,6 +121,7 @@ const addControls = () => {
         });
         // Poi RLT
         Globals.comparePoi = new ComparePoi(map, {});
+        Globals.myaccount.addLandmarksLayers();
       });
   });
 };

src/js/event-listeners.js

@@ -83,6 +83,7 @@ function addListeners() {
     localStorage.setItem("lastMapZoom", map.getZoom());
     localStorage.setItem("lastLayersDisplayed", JSON.stringify(Globals.layersDisplayed));
     localStorage.setItem("savedRoutes", JSON.stringify(Globals.myaccount.routes));
+    localStorage.setItem("savedLandmarks", JSON.stringify(Globals.myaccount.landmarks));
   });
 
   window.addEventListener("beforeunload", () => {
@@ -91,6 +92,7 @@ function addListeners() {
     localStorage.setItem("lastMapZoom", map.getZoom());
     localStorage.setItem("lastLayersDisplayed", JSON.stringify(Globals.layersDisplayed));
     localStorage.setItem("savedRoutes", JSON.stringify(Globals.myaccount.routes));
+    localStorage.setItem("savedLandmarks", JSON.stringify(Globals.myaccount.landmarks));
   });
 
   // Screen dimentions change
@@ -130,7 +132,7 @@ function addListeners() {
         }
       }
     }
-    if (["selectOnMapDirections", "selectOnMapIsochrone", "compare"].includes(Globals.backButtonState)) {
+    if (["selectOnMapDirections", "selectOnMapIsochrone", "selectOnMapLandmark", "compare"].includes(Globals.backButtonState)) {
       Globals.currentScrollIndex = 0;
     }
     if (Globals.backButtonState === "compareLayers2") {

src/js/landmark.js

@@ -5,6 +5,7 @@ import { Toast } from "@capacitor/toast";
 // dependance : abonnement au event du module
 import Geocode from "./services/geocode";
 import Location from "./services/location";
+import Reverse from "./services/reverse";
 
 /**
  * Interface sur le contrôle point de repère
@@ -147,6 +148,34 @@ class Landmark {
     };
   }
 
+  /**
+   * listener sur la carte pour recuperer les coordonnées du point
+   * @param {*} e
+   */
+  onAddWayPoint(e) {
+    console.debug(e);
+    var coordinates = e.lngLat;
+    Reverse.compute({
+      lon : coordinates.lng,
+      lat : coordinates.lat
+    })
+      .then(() => {})
+      .catch(() => {})
+      .finally(() => {
+        var coords = Reverse.getCoordinates() || {lon : coordinates.lng, lat : coordinates.lat};
+        var address = Reverse.getAddress() || coords.lon.toFixed(6) + ", " + coords.lat.toFixed(6);
+        var strAddress = address;
+        if (typeof address !== "string") {
+          strAddress = "";
+          strAddress += (address.number !== "") ? address.number + " " : "";
+          strAddress += (address.street !== "") ? address.street + ", " : "";
+          strAddress += address.city + ", " + address.postcode;
+        }
+        this.dom.location.dataset.coordinates = "[" + coords.lon + "," + coords.lat + "]";
+        this.dom.location.value = strAddress;
+      });
+  }
+
   /**
    * listener issu du dom sur l'interface du menu 'search'
    * @param {*} e

src/js/map-buttons-listeners.js

@@ -76,6 +76,9 @@ const addListeners = () => {
         lat: Globals.map.getCenter().lat,
       });
       Globals.menu.close("selectOnMapDirections");
+    } else if (Globals.backButtonState === "selectOnMapLandmark") {
+      Globals.landmark.onAddWayPoint({lngLat: Globals.map.getCenter()});
+      Globals.menu.close("selectOnMapLandmark");
     }
   });
 };