@sumaris-net/ngx-components 2.4.64 → 2.4.65

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -21630,13 +21630,44 @@ class JobUtils {
 class IPosition {
 }
 class GeolocationUtils {
+    static isNotNilAndValid(position, opts) {
+        if (!position || isNil(position.latitude) || isNil(position.longitude))
+            return false;
+        // Invalid lat/lon
+        if (position.latitude < -90 || position.latitude > 90
+            || position.longitude < -180 || position.longitude > 180) {
+            // /!\ Log in console, because should never occur
+            if (opts?.debug)
+                console.warn('Invalid lat/long position:  ', position);
+            return false;
+        }
+        // OK: valid
+        return true;
+    }
+    static isNilOrInvalid(position, opts) {
+        return !GeolocationUtils.isNotNilAndValid(position, opts);
+    }
+    static computeDistanceInMiles(position1, position2) {
+        // Invalid position(s): skip
+        if (GeolocationUtils.isNilOrInvalid(position1, { debug: true })
+            || GeolocationUtils.isNilOrInvalid(position2, { debug: true }))
+            return;
+        const latitude1Rad = Math.PI * position1.latitude / 180;
+        const longitude1Rad = Math.PI * position1.longitude / 180;
+        const latitude2Rad = Math.PI * position2.latitude / 180;
+        const longitude2Rad = Math.PI * position2.longitude / 180;
+        let distance = 2 * 6371 * Math.asin(Math.sqrt(Math.pow(Math.sin((latitude1Rad - latitude2Rad) / 2), 2)
+            + Math.cos(latitude1Rad) * Math.cos(latitude2Rad) * Math.pow(Math.sin((longitude2Rad - longitude1Rad) / 2), 2)));
+        distance = Math.round((((distance / 1.852) + Number.EPSILON) * 100)) / 100;
+        return distance;
+    }
     /**
      * Get the position by geo loc sensor
      */
     static async getCurrentPosition(platform, options) {
         // Use Capacitor plugin
         try {
-            console.info(`[position-utils] Get current geo position, using Capacitor...(timeout: ${options?.timeout})`);
+            console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);
             const pos = await Geolocation.getCurrentPosition(options);
             return {
                 latitude: pos.coords.latitude,
@@ -21644,13 +21675,19 @@ class GeolocationUtils {
             };
         }
         catch (err) {
-            console.error('[position-utils] Cannot get current geo position, using Capacitor:', err);
-            // Stop if capacitor (cannot use browser geolocation, because of browser security limitation)
-            if (platform.is('capacitor'))
+            // If capacitor : throw error (cannot fallback to browser geolocation, because of browser security limitation)
+            if (platform.is('capacitor')) {
+                console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''} (code=${err?.code || 'null'})`);
+                const permissions = await Geolocation.checkPermissions();
+                const permissionStatus = permissions?.coarseLocation || permissions?.location;
+                if (permissionStatus === 'denied') {
+                    throw { ...err, code: GeolocationPositionError.PERMISSION_DENIED };
+                }
                 throw err;
+            }
         }
         // Or fallback to navigator
-        console.info('[position-utils] Get current geo position, using browser...');
+        console.info('[geolocation-utils] Get current geo location, using browser...');
         return new Promise((resolve, reject) => {
             navigator.geolocation.getCurrentPosition((res) => {
                 resolve({
@@ -21660,7 +21697,7 @@ class GeolocationUtils {
             }, (err) => {
                 let message = err?.message || err;
                 message = typeof message === 'string' ? message : JSON.stringify(message);
-                console.error('[position-utils] Cannot get current geo position, using browser:' + message);
+                console.error('[geolocation-utils] Cannot get current geo location, using browser:' + message);
                 reject(err);
             }, options);
         });