Consider geolocation errors for MMapGeolocationControl

mappable-world · Nov 22, 2024 · 2a29125 · 2a29125
1 parent 6d90a47
commit 2a29125
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/src/controls/MMapGeolocationControl/index.ts b/src/controls/MMapGeolocationControl/index.ts
@@ -9,8 +9,10 @@ import './index.css';
  * MMapGeolocationControl props
  */
 type MMapGeolocationControlProps = {
-    /** Geolocation request callback */
+    /** Geolocation request success callback */
     onGeolocatePosition?: (position: LngLat) => void;
+    /** Geolocation request error callback */
+    onGeolocateError?: () => void;
     /** Data source id for geolocation placemark */
     source?: string;
     /** Easing function for map location animation */
@@ -19,19 +21,30 @@ type MMapGeolocationControlProps = {
     duration?: number;
     /** Map zoom after geolocate position */
     zoom?: number;
+    /** Options for {@link mappable.geolocation.getPosition} */
+    positionOptions?: PositionOptions;
 };
 
-const defaultProps = Object.freeze({duration: 500});
+const defaultProps = Object.freeze({
+    duration: 500,
+    positionOptions: {
+        enableHighAccuracy: true,
+        timeout: 5000,
+        maximumAge: 60000
+    }
+});
 
 type DefaultProps = typeof defaultProps;
 
 const MMapGeolocationControlVuefyOptions: CustomVuefyOptions<MMapGeolocationControl> = {
     props: {
         onGeolocatePosition: Function as TVue.PropType<MMapGeolocationControlProps['onGeolocatePosition']>,
+        onGeolocateError: Function as TVue.PropType<MMapGeolocationControlProps['onGeolocateError']>,
         source: String,
         easing: [String, Object, Function] as TVue.PropType<EasingFunctionDescription>,
         duration: {type: Number, default: defaultProps.duration},
-        zoom: {type: Number}
+        zoom: {type: Number},
+        positionOptions: {type: Object, default: defaultProps.positionOptions}
     }
 };
 
@@ -83,9 +96,7 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
     private _updatePosition(pos: LngLat): void {
         this._position = pos;
 
-        if (this._props.onGeolocatePosition) {
-            this._props.onGeolocatePosition(this._position);
-        }
+        this._props.onGeolocatePosition?.(this._position);
 
         const map = this.root;
         map?.update({
@@ -106,10 +117,15 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
         this._setLoading(true);
 
         mappable.geolocation
-            .getPosition({enableHighAccuracy: true, maximumAge: 60000})
+            .getPosition(this._props.positionOptions)
             .then((position: {coords: LngLat; accuracy: number}) => {
-                this._setLoading(false);
                 this._updatePosition(position.coords);
+            })
+            .catch(() => {
+                this._props.onGeolocateError?.();
+            })
+            .finally(() => {
+                this._setLoading(false);
             });
     }