@sumaris-net/ngx-components 2.4.63 → 2.4.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/src/app/shared/geolocation/geolocation.utils.mjs +45 -7
- package/fesm2015/sumaris-net.ngx-components.mjs +43 -6
- package/fesm2015/sumaris-net.ngx-components.mjs.map +1 -1
- package/fesm2020/sumaris-net.ngx-components.mjs +43 -6
- package/fesm2020/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +2 -2
- package/src/app/shared/geolocation/geolocation.utils.d.ts +9 -1
|
@@ -1,14 +1,46 @@
|
|
|
1
1
|
import { Geolocation } from '@capacitor/geolocation';
|
|
2
|
+
import { isNil } from '../functions';
|
|
2
3
|
export class IPosition {
|
|
3
4
|
}
|
|
4
5
|
export class GeolocationUtils {
|
|
6
|
+
static isNotNilAndValid(position, opts) {
|
|
7
|
+
if (!position || isNil(position.latitude) || isNil(position.longitude))
|
|
8
|
+
return false;
|
|
9
|
+
// Invalid lat/lon
|
|
10
|
+
if (position.latitude < -90 || position.latitude > 90
|
|
11
|
+
|| position.longitude < -180 || position.longitude > 180) {
|
|
12
|
+
// /!\ Log in console, because should never occur
|
|
13
|
+
if (opts?.debug)
|
|
14
|
+
console.warn('Invalid lat/long position: ', position);
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
// OK: valid
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
static isNilOrInvalid(position, opts) {
|
|
21
|
+
return !GeolocationUtils.isNotNilAndValid(position, opts);
|
|
22
|
+
}
|
|
23
|
+
static computeDistanceInMiles(position1, position2) {
|
|
24
|
+
// Invalid position(s): skip
|
|
25
|
+
if (GeolocationUtils.isNilOrInvalid(position1, { debug: true })
|
|
26
|
+
|| GeolocationUtils.isNilOrInvalid(position2, { debug: true }))
|
|
27
|
+
return;
|
|
28
|
+
const latitude1Rad = Math.PI * position1.latitude / 180;
|
|
29
|
+
const longitude1Rad = Math.PI * position1.longitude / 180;
|
|
30
|
+
const latitude2Rad = Math.PI * position2.latitude / 180;
|
|
31
|
+
const longitude2Rad = Math.PI * position2.longitude / 180;
|
|
32
|
+
let distance = 2 * 6371 * Math.asin(Math.sqrt(Math.pow(Math.sin((latitude1Rad - latitude2Rad) / 2), 2)
|
|
33
|
+
+ Math.cos(latitude1Rad) * Math.cos(latitude2Rad) * Math.pow(Math.sin((longitude2Rad - longitude1Rad) / 2), 2)));
|
|
34
|
+
distance = Math.round((((distance / 1.852) + Number.EPSILON) * 100)) / 100;
|
|
35
|
+
return distance;
|
|
36
|
+
}
|
|
5
37
|
/**
|
|
6
38
|
* Get the position by geo loc sensor
|
|
7
39
|
*/
|
|
8
40
|
static async getCurrentPosition(platform, options) {
|
|
9
41
|
// Use Capacitor plugin
|
|
10
42
|
try {
|
|
11
|
-
console.info(`[
|
|
43
|
+
console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);
|
|
12
44
|
const pos = await Geolocation.getCurrentPosition(options);
|
|
13
45
|
return {
|
|
14
46
|
latitude: pos.coords.latitude,
|
|
@@ -16,13 +48,19 @@ export class GeolocationUtils {
|
|
|
16
48
|
};
|
|
17
49
|
}
|
|
18
50
|
catch (err) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
51
|
+
// If capacitor : throw error (cannot fallback to browser geolocation, because of browser security limitation)
|
|
52
|
+
if (platform.is('capacitor')) {
|
|
53
|
+
console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''} (code=${err?.code || 'null'})`);
|
|
54
|
+
const permissions = await Geolocation.checkPermissions();
|
|
55
|
+
const permissionStatus = permissions?.coarseLocation || permissions?.location;
|
|
56
|
+
if (permissionStatus === 'denied') {
|
|
57
|
+
throw { ...err, code: GeolocationPositionError.PERMISSION_DENIED };
|
|
58
|
+
}
|
|
22
59
|
throw err;
|
|
60
|
+
}
|
|
23
61
|
}
|
|
24
62
|
// Or fallback to navigator
|
|
25
|
-
console.info('[
|
|
63
|
+
console.info('[geolocation-utils] Get current geo location, using browser...');
|
|
26
64
|
return new Promise((resolve, reject) => {
|
|
27
65
|
navigator.geolocation.getCurrentPosition((res) => {
|
|
28
66
|
resolve({
|
|
@@ -32,10 +70,10 @@ export class GeolocationUtils {
|
|
|
32
70
|
}, (err) => {
|
|
33
71
|
let message = err?.message || err;
|
|
34
72
|
message = typeof message === 'string' ? message : JSON.stringify(message);
|
|
35
|
-
console.error('[
|
|
73
|
+
console.error('[geolocation-utils] Cannot get current geo location, using browser:' + message);
|
|
36
74
|
reject(err);
|
|
37
75
|
}, options);
|
|
38
76
|
});
|
|
39
77
|
}
|
|
40
78
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"geolocation.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/geolocation/geolocation.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Geolocation, Position } from '@capacitor/geolocation';\nimport {PlatformService} from '../../core/services/platform.service';\nimport {Platform} from '@ionic/angular';\nimport {isNil} from '../functions';\n\nexport class IPosition {\n  latitude: number;\n  longitude: number;\n}\n\nexport abstract class GeolocationUtils {\n\n  static isNotNilAndValid(position: IPosition, opts?: {debug?: boolean}) {\n\n    if (!position || isNil(position.latitude) || isNil(position.longitude)) return false;\n\n    // Invalid lat/lon\n    if (position.latitude < -90 || position.latitude > 90\n      || position.longitude < -180 || position.longitude > 180) {\n\n      // /!\\ Log in console, because should never occur\n      if (opts?.debug) console.warn('Invalid lat/long position:  ', position);\n      return false;\n    }\n\n    // OK: valid\n    return true;\n  }\n\n  static isNilOrInvalid(position: IPosition, opts?: {debug?: boolean}) {\n    return !GeolocationUtils.isNotNilAndValid(position, opts);\n  }\n\n  static computeDistanceInMiles(position1: IPosition, position2: IPosition): number {\n    // Invalid position(s): skip\n    if (GeolocationUtils.isNilOrInvalid(position1, {debug: true})\n      || GeolocationUtils.isNilOrInvalid(position2, {debug: true})) return;\n\n    const latitude1Rad = Math.PI * position1.latitude / 180;\n    const longitude1Rad = Math.PI * position1.longitude / 180;\n    const latitude2Rad = Math.PI * position2.latitude / 180;\n    const longitude2Rad = Math.PI * position2.longitude / 180;\n\n    let distance = 2 * 6371 * Math.asin(\n      Math.sqrt(\n        Math.pow(Math.sin((latitude1Rad - latitude2Rad) / 2), 2)\n        + Math.cos(latitude1Rad) * Math.cos(latitude2Rad) * Math.pow(Math.sin((longitude2Rad - longitude1Rad) / 2), 2)\n      ));\n    distance = Math.round((((distance / 1.852) + Number.EPSILON) * 100)) / 100;\n    return distance;\n  }\n\n  /**\n   * Get the position by geo loc sensor\n   */\n  static async getCurrentPosition(platform: PlatformService|Platform, options?: PositionOptions): Promise<IPosition> {\n\n    // Use Capacitor plugin\n    try {\n      console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);\n      const pos: Position = await Geolocation.getCurrentPosition(options);\n      return <IPosition>{\n        latitude: pos.coords.latitude,\n        longitude: pos.coords.longitude\n      };\n    } catch (err) {\n      // If capacitor : throw error (cannot fallback to browser geolocation, because of browser security limitation)\n      if (platform.is('capacitor')) {\n        console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''} (code=${err?.code || 'null'})`);\n        const permissions = await Geolocation.checkPermissions();\n        const permissionStatus = permissions?.coarseLocation || permissions?.location;\n        if (permissionStatus === 'denied') {\n          throw {...err, code: GeolocationPositionError.PERMISSION_DENIED};\n        }\n        throw err;\n      }\n    }\n\n    // Or fallback to navigator\n    console.info('[geolocation-utils] Get current geo location, using browser...')\n    return new Promise<IPosition>((resolve, reject) => {\n      navigator.geolocation.getCurrentPosition((res) => {\n          resolve(<IPosition>{\n            latitude: res.coords.latitude,\n            longitude: res.coords.longitude\n          });\n        },\n        (err) => {\n          let message = err?.message || err;\n          message = typeof message === 'string' ? message : JSON.stringify(message);\n          console.error('[geolocation-utils] Cannot get current geo location, using browser:' + message);\n          reject(err);\n        },\n        options\n      );\n    });\n  }\n\n}\n"]}
|
|
@@ -21994,6 +21994,37 @@ class JobUtils {
|
|
|
21994
21994
|
class IPosition {
|
|
21995
21995
|
}
|
|
21996
21996
|
class GeolocationUtils {
|
|
21997
|
+
static isNotNilAndValid(position, opts) {
|
|
21998
|
+
if (!position || isNil(position.latitude) || isNil(position.longitude))
|
|
21999
|
+
return false;
|
|
22000
|
+
// Invalid lat/lon
|
|
22001
|
+
if (position.latitude < -90 || position.latitude > 90
|
|
22002
|
+
|| position.longitude < -180 || position.longitude > 180) {
|
|
22003
|
+
// /!\ Log in console, because should never occur
|
|
22004
|
+
if (opts === null || opts === void 0 ? void 0 : opts.debug)
|
|
22005
|
+
console.warn('Invalid lat/long position: ', position);
|
|
22006
|
+
return false;
|
|
22007
|
+
}
|
|
22008
|
+
// OK: valid
|
|
22009
|
+
return true;
|
|
22010
|
+
}
|
|
22011
|
+
static isNilOrInvalid(position, opts) {
|
|
22012
|
+
return !GeolocationUtils.isNotNilAndValid(position, opts);
|
|
22013
|
+
}
|
|
22014
|
+
static computeDistanceInMiles(position1, position2) {
|
|
22015
|
+
// Invalid position(s): skip
|
|
22016
|
+
if (GeolocationUtils.isNilOrInvalid(position1, { debug: true })
|
|
22017
|
+
|| GeolocationUtils.isNilOrInvalid(position2, { debug: true }))
|
|
22018
|
+
return;
|
|
22019
|
+
const latitude1Rad = Math.PI * position1.latitude / 180;
|
|
22020
|
+
const longitude1Rad = Math.PI * position1.longitude / 180;
|
|
22021
|
+
const latitude2Rad = Math.PI * position2.latitude / 180;
|
|
22022
|
+
const longitude2Rad = Math.PI * position2.longitude / 180;
|
|
22023
|
+
let distance = 2 * 6371 * Math.asin(Math.sqrt(Math.pow(Math.sin((latitude1Rad - latitude2Rad) / 2), 2)
|
|
22024
|
+
+ Math.cos(latitude1Rad) * Math.cos(latitude2Rad) * Math.pow(Math.sin((longitude2Rad - longitude1Rad) / 2), 2)));
|
|
22025
|
+
distance = Math.round((((distance / 1.852) + Number.EPSILON) * 100)) / 100;
|
|
22026
|
+
return distance;
|
|
22027
|
+
}
|
|
21997
22028
|
/**
|
|
21998
22029
|
* Get the position by geo loc sensor
|
|
21999
22030
|
*/
|
|
@@ -22001,7 +22032,7 @@ class GeolocationUtils {
|
|
|
22001
22032
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22002
22033
|
// Use Capacitor plugin
|
|
22003
22034
|
try {
|
|
22004
|
-
console.info(`[
|
|
22035
|
+
console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options === null || options === void 0 ? void 0 : options.timeout})`);
|
|
22005
22036
|
const pos = yield Geolocation.getCurrentPosition(options);
|
|
22006
22037
|
return {
|
|
22007
22038
|
latitude: pos.coords.latitude,
|
|
@@ -22009,13 +22040,19 @@ class GeolocationUtils {
|
|
|
22009
22040
|
};
|
|
22010
22041
|
}
|
|
22011
22042
|
catch (err) {
|
|
22012
|
-
|
|
22013
|
-
|
|
22014
|
-
|
|
22043
|
+
// If capacitor : throw error (cannot fallback to browser geolocation, because of browser security limitation)
|
|
22044
|
+
if (platform.is('capacitor')) {
|
|
22045
|
+
console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${(err === null || err === void 0 ? void 0 : err.message) || ''} (code=${(err === null || err === void 0 ? void 0 : err.code) || 'null'})`);
|
|
22046
|
+
const permissions = yield Geolocation.checkPermissions();
|
|
22047
|
+
const permissionStatus = (permissions === null || permissions === void 0 ? void 0 : permissions.coarseLocation) || (permissions === null || permissions === void 0 ? void 0 : permissions.location);
|
|
22048
|
+
if (permissionStatus === 'denied') {
|
|
22049
|
+
throw Object.assign(Object.assign({}, err), { code: GeolocationPositionError.PERMISSION_DENIED });
|
|
22050
|
+
}
|
|
22015
22051
|
throw err;
|
|
22052
|
+
}
|
|
22016
22053
|
}
|
|
22017
22054
|
// Or fallback to navigator
|
|
22018
|
-
console.info('[
|
|
22055
|
+
console.info('[geolocation-utils] Get current geo location, using browser...');
|
|
22019
22056
|
return new Promise((resolve, reject) => {
|
|
22020
22057
|
navigator.geolocation.getCurrentPosition((res) => {
|
|
22021
22058
|
resolve({
|
|
@@ -22025,7 +22062,7 @@ class GeolocationUtils {
|
|
|
22025
22062
|
}, (err) => {
|
|
22026
22063
|
let message = (err === null || err === void 0 ? void 0 : err.message) || err;
|
|
22027
22064
|
message = typeof message === 'string' ? message : JSON.stringify(message);
|
|
22028
|
-
console.error('[
|
|
22065
|
+
console.error('[geolocation-utils] Cannot get current geo location, using browser:' + message);
|
|
22029
22066
|
reject(err);
|
|
22030
22067
|
}, options);
|
|
22031
22068
|
});
|