Merge pull request #7373 from zoran995/3601-my-location-error

fix process error types when obtaining user location

Author: na9da

CHANGES.md

@@ -3,6 +3,7 @@
 #### next release (8.7.12)
 
 - support URL parameters in a GetLegendGraphic request for a layer without a style configured
+- Enhanced error processing for obtaining user location
 - [The next improvement]
 
 #### 8.7.11 - 2024-12-18

lib/ReactViews/Map/MapNavigation/Items/MyLocation.ts

@@ -154,7 +154,7 @@ export class MyLocation extends MapNavigationItemController {
     });
   }
 
-  handleLocationError(err: any) {
+  handleLocationError(err: GeolocationPositionError) {
     const t = i18next.t.bind(i18next);
     let message = err.message;
     if (message && message.indexOf("Only secure origins are allowed") === 0) {
@@ -163,12 +163,19 @@ export class MyLocation extends MapNavigationItemController {
       const uri = new URI(window.location);
       const secureUrl = uri.protocol("https").toString();
       message = t("location.originError", { secureUrl: secureUrl });
+    } else if (err.code === err.PERMISSION_DENIED) {
+      message = t("location.permissionDenied");
+    } else if (err.code === err.POSITION_UNAVAILABLE) {
+      message = t("location.positionUnavailable");
+    } else if (err.code === err.TIMEOUT) {
+      message = t("location.timeout");
     }
     this.terria.raiseErrorToUser(
       new TerriaError({
         sender: this,
         title: t("location.errorGettingLocation"),
-        message: message
+        message: message,
+        showDetails: false
       })
     );
   }

wwwroot/languages/en/translation.json

@@ -63,7 +63,10 @@
     "myLocation": "My Location",
     "location": "Location",
     "originError": "Your browser can only provide your location when using HTTPS. You may be able to use {{secureUrl}} instead.",
-    "centreMap": "Centre map at your current location"
+    "centreMap": "Centre map at your current location",
+    "permissionDenied": "Permission denied to get your location. Please check your browser settings.",
+    "positionUnavailable": "Your location information is unavailable.",
+    "timeout": "Obtaining your location information took to long. Please try again later."
   },
   "splitterTool": {
     "errorTitle": "Failed to compare catalog item.",