feat(position): gestion de localisation désactivée ou refusée (JMG_02)

android/app/capacitor.build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation project(':capacitor-share')
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
+    implementation project(':capacitor-native-settings')
 
 }
 

android/capacitor.settings.gradle

@@ -28,3 +28,6 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
 
 include ':capacitor-toast'
 project(':capacitor-toast').projectDir = new File('../node_modules/@capacitor/toast/android')
+
+include ':capacitor-native-settings'
+project(':capacitor-native-settings').projectDir = new File('../node_modules/capacitor-native-settings/android')

ios/App/Podfile

@@ -20,6 +20,7 @@ def capacitor_pods
   pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
   pod 'CapacitorToast', :path => '../../node_modules/@capacitor/toast'
+  pod 'CapacitorNativeSettings', :path => '../../node_modules/capacitor-native-settings'
 end
 
 target 'App' do

package.json

@@ -27,7 +27,7 @@
     "@aashu-dubey/capacitor-statusbar-safe-area": "^2.1.1",
     "@agorapulse/capacitor-mediastore": "^0.2.0",
     "@capacitor/android": "5.6.0",
-    "@capacitor/app": "^5.0.6",
+    "@capacitor/app": "^5.0.7",
     "@capacitor/core": "5.6.0",
     "@capacitor/filesystem": "^5.2.0",
     "@capacitor/geolocation": "5.0.6",
@@ -41,6 +41,7 @@
     "@maplibre/maplibre-gl-directions": "^0.6.1",
     "@turf/buffer": "^6.5.0",
     "@turf/union": "^6.5.0",
+    "capacitor-native-settings": "^5.0.1",
     "chart.js": "^4.4.1",
     "maplibre-gl": "^3.6.2",
     "proj4": "^2.10.0"

src/css/app.scss

@@ -20,4 +20,5 @@
 @use 'comparePoi.css';
 @use 'signalement.css';
 @use 'landmark.css';
+@use 'location.css';
 @use 'media-queries.css';

src/css/location.css

@@ -0,0 +1,21 @@
+.btnOpenParameters {
+  appearance: unset; /* for ios */
+  display: block;
+  margin: auto;
+  border: none;
+  border-radius: 70px;
+  background-color: #26a581;
+  padding: 14px 28px;
+  font-family: "Open Sans";
+  font-weight: 600;
+  font-size: 9px;
+  color: white;
+  cursor: pointer;
+  text-align: center;
+  letter-spacing: 0;
+  line-height: normal;
+  white-space: nowrap;
+  width: 100%;
+  margin-top: 26px;
+  box-sizing: border-box;
+}

src/css/position.css

@@ -167,7 +167,7 @@
  */
 
 #interactivityPopup,
-#positionPopup,
+#locationPopup,
 #routeDrawHelpPopup {
   position: relative;
 }
@@ -184,14 +184,14 @@
 
 .routeDrawHelpPopup>.maplibregl-popup-content,
 .interactivityPopup>.maplibregl-popup-content,
-.positionPopup>.maplibregl-popup-content {
+.locationPopup>.maplibregl-popup-content {
   color: #3F4A55;
   border-radius: 15px;
 }
 
 .routeDrawHelpPopup>.maplibregl-popup-tip,
 .interactivityPopup>.maplibregl-popup-tip,
-.positionPopup>.maplibregl-popup-tip {
+.locationPopup>.maplibregl-popup-tip {
   display: none;
 }
 

src/js/event-listeners.js

@@ -6,6 +6,7 @@ import RecentSearch from "./search-recent";
 import State from "./state";
 import { SafeAreaController } from "@aashu-dubey/capacitor-statusbar-safe-area";
 import { ScreenOrientation } from "@capacitor/screen-orientation";
+import { App } from "@capacitor/app";
 
 /**
  * Ecouteurs generiques
@@ -77,24 +78,19 @@ function addListeners() {
   // Action du backbutton
   document.addEventListener("backbutton", State.onBackKeyDown, false);
 
-  // Sauvegarde de l'état de l'application
-  document.addEventListener("pause", () => {
+  const saveState = () => {
     localStorage.setItem("lastMapLat", map.getCenter().lat);
     localStorage.setItem("lastMapLng", map.getCenter().lng);
     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", () => {
-    localStorage.setItem("lastMapLat", map.getCenter().lat);
-    localStorage.setItem("lastMapLng", map.getCenter().lng);
-    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));
-  });
+  // Sauvegarde de l'état de l'application
+  App.addListener("pause", saveState);
+  document.addEventListener("pause", saveState);
+  window.addEventListener("beforeunload", saveState);
 
   const handleresize = () => {
     SafeAreaController.addSafeAreaVariables().then( () => {

src/js/map-interactivity/interactivity-indicator.js

@@ -172,9 +172,9 @@ class InteractivityIndicator {
   }
 
   /**
-     * affiche la popup explicative
-     * @public
-     */
+   * affiche la popup explicative
+   * @public
+   */
   showPopup() {
     // on supprime la popup
     if (this.popup) {

src/js/position.js

@@ -23,7 +23,6 @@ class Position {
   constructor(map, options) {
     this.options = options || {
       target: null,
-      tracking : false, // suivi de la position
       // callback
       openPositionCbk: null,
       closePositionCbk: null,
@@ -36,9 +35,6 @@ class Position {
     // carte
     this.map = map;
 
-    // tracking
-    this.tracking = this.options.tracking;
-
     // target
     this.target = this.options.target;
 
@@ -283,7 +279,7 @@ Altitude : ${altitude} m
     this.clear();
     let position;
     if (lngLat === false) {
-      position = await Location.getLocation(this.tracking);
+      position = await Location.getLocation();
     } else {
       position = {
         coordinates: {

src/js/search.js

@@ -127,7 +127,7 @@ class Search {
         }, 250);
       }
       // on realise une geolocalisation
-      Location.getLocation(true)
+      Location.getLocation()
         .then((result) => {
           Location.moveTo(result.coordinates, Globals.map.getZoom(), true, true);
         }, true);