@nativescript-community/ui-mapbox 6.2.14 → 6.2.15

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.15](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.14...v6.2.15) (2022-03-03)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
+
+
+
+
 ## [6.2.14](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.13...v6.2.14) (2022-02-09)
 
 **Note:** Version bump only for package @nativescript-community/ui-mapbox

package/common.d.ts

@@ -292,6 +292,7 @@ export interface MapboxApi {
     changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode, nativeMap?: any): void;
     forceUserLocationUpdate(location: any, nativeMap?: any): void;
     trackUser(options: TrackUserOptions, nativeMap?: any): Promise<void>;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
     addSource(id: string, options: AddSourceOptions, nativeMapView?: any): Promise<any>;
     updateSource(id: string, options: UpdateSourceOptions, nativeMapView?: any): Promise<any>;
     removeSource(id: string, nativeMap?: any): Promise<any>;
@@ -393,6 +394,7 @@ export interface MapboxViewApi {
     setTilt(options: SetTiltOptions): Promise<any>;
     getUserLocation(): Promise<UserLocation>;
     trackUser(options: TrackUserOptions): Promise<any>;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
     showUserLocationMarker(options: any): void;
     hideUserLocationMarker(options: any): void;
     changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode): void;
@@ -461,6 +463,7 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
     changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode): void;
     forceUserLocationUpdate(location: any): void;
     trackUser(options: TrackUserOptions): Promise<any>;
+    getUserLocationCameraMode(): UserLocationCameraMode;
     addSource(id: string, options: AddSourceOptions): Promise<any>;
     updateSource(id: string, options: UpdateSourceOptions): Promise<any>;
     removeSource(id: string): Promise<any>;

package/common.js

@@ -158,6 +158,9 @@ export class MapboxViewCommonBase extends ContentView {
     trackUser(options) {
         return this.mapbox.trackUser(options, this.getNativeMapView());
     }
+    getUserLocationCameraMode() {
+        return this.mapbox.getUserLocationCameraMode(this.getNativeMapView());
+    }
     addSource(id, options) {
         return this.mapbox.addSource(id, options, this.getNativeMapView());
     }

package/index.android.d.ts

@@ -109,7 +109,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     deleteOfflineRegion(options: DeleteOfflineRegionOptions): Promise<void>;
     _getOfflineManager(): any;
     addExtrusion(options: AddExtrusionOptions, nativeMap?: any): Promise<void>;
-    updateSource(id: string, options: UpdateSourceOptions, nativeMap?: any): Promise<unknown>;
+    updateSource(id: string, options: UpdateSourceOptions, nativeMap?: any): Promise<void>;
     addSource(id: string, options: AddSourceOptions, nativeMap?: any): Promise<void>;
     removeSource(id: string, nativeMap?: any): Promise<void>;
     addLayer(style: any, belowLayerId?: string, nativeMap?: any): Promise<void>;
@@ -122,6 +122,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     _getMapboxMapOptions(settings: any): com.mapbox.mapboxsdk.maps.MapboxMapOptions;
     _stringToCameraMode(mode: UserLocationCameraMode): any;
     _stringToRenderMode(mode: any): any;
+    _convertCameraMode(mode: any): UserLocationCameraMode;
     _fineLocationPermissionGranted(): boolean;
     _getRegionName(offlineRegion: com.mapbox.mapboxsdk.offline.OfflineRegion): string;
     _getRegionMetadata(offlineRegion: com.mapbox.mapboxsdk.offline.OfflineRegion): any;
@@ -142,4 +143,5 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     }): LatLng;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
 }

package/index.android.js

@@ -1786,6 +1786,7 @@ export class Mapbox extends MapboxCommon {
                     case 'geojson':
                         const geoJsonString = JSON.stringify(options.data);
                         source.setGeoJson(geoJsonString);
+                        resolve();
                         break;
                     default:
                         reject('Invalid source type: ' + options['type']);
@@ -2187,6 +2188,26 @@ export class Mapbox extends MapboxCommon {
         }
         return renderMode;
     }
+    _convertCameraMode(mode) {
+        const modeRef = com.mapbox.mapboxsdk.location.modes.CameraMode;
+        switch (mode) {
+            case modeRef.NONE:
+                return "NONE";
+            case modeRef.NONE_COMPASS:
+                return "NONE_COMPASS";
+            case modeRef.NONE_GPS:
+                return "NONE_GPS";
+            case modeRef.TRACKING:
+                return "TRACKING";
+            case modeRef.TRACKING_COMPASS:
+                return "TRACKING_COMPASS";
+            case modeRef.TRACKING_GPS:
+                return "TRACKING_GPS";
+            case modeRef.TRACKING_GPS_NORTH:
+                return "TRACKING_GPS_NORTH";
+        }
+        return "NONE";
+    }
     _fineLocationPermissionGranted() {
         let hasPermission = android.os.Build.VERSION.SDK_INT < 23;
         if (!hasPermission) {
@@ -2501,5 +2522,14 @@ export class Mapbox extends MapboxCommon {
             lng: coordinate.getLongitude()
         };
     }
+    getUserLocationCameraMode(nativeMap) {
+        if (!this._mapboxMapInstance) {
+            return "NONE";
+        }
+        if (!this._locationComponent) {
+            return "NONE";
+        }
+        return this._convertCameraMode(this._locationComponent.getCameraMode());
+    }
 }
 //# sourceMappingURL=index.android.js.map

package/index.ios.d.ts

@@ -53,6 +53,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     getUserLocation(nativeMap?: any): Promise<UserLocation>;
     _stringToCameraMode(mode: UserLocationCameraMode): any;
     _stringToRenderMode(mode: any): any;
+    _convertCameraMode(mode: MGLUserTrackingMode): UserLocationCameraMode;
     showUserLocationMarker(options: any, nativeMap?: any): Promise<void>;
     hideUserLocationMarker(nativeMap?: any): Promise<void>;
     changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode, nativeMap?: any): Promise<void>;
@@ -81,7 +82,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     listOfflineRegions(options?: ListOfflineRegionsOptions): Promise<OfflineRegion[]>;
     deleteOfflineRegion(options: DeleteOfflineRegionOptions): Promise<void>;
     addExtrusion(options: AddExtrusionOptions, nativeMap?: any): Promise<void>;
-    updateSource(id: string, options: UpdateSourceOptions, nativeMap?: any): Promise<unknown>;
+    updateSource(id: string, options: UpdateSourceOptions, nativeMap?: any): Promise<void>;
     addSource(id: string, options: AddSourceOptions, nativeMap?: any): Promise<void>;
     removeSource(id: string, nativeMap?: any): Promise<void>;
     addLayer(style: any, belowLayerId?: string, nativeMapView?: any): Promise<void>;
@@ -99,4 +100,5 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     }): LatLng;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
 }

package/index.ios.js

@@ -463,9 +463,6 @@ const _getMapStyle = (input) => {
         return MGLStyle.streetsStyleURL;
     }
 };
-function _getTrackingMode(input) {
-    return 0;
-}
 function _getLocation(loc) {
     if (loc === null) {
         return null;
@@ -1333,27 +1330,26 @@ export class Mapbox extends MapboxCommon {
     }
     _stringToCameraMode(mode) {
         switch (mode) {
-            case 'NONE':
+            case "NONE":
                 return 0;
-            case 'NONE_COMPASS':
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, '_stringToCameraMode(): NONE_COMPASS unsupported on iOS');
-                }
+            case "NONE_COMPASS":
+                console.log("MapboxView::_stringToCameraMode(): NONE_COMPASS unsupported on iOS");
                 return 0;
-            case 'NONE_GPS':
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, '_stringToCameraMode(): NONE_GPS unsupported on iOS');
-                }
+            case "NONE_GPS":
+                console.log("MapboxView::_stringToCameraMode(): NONE_GPS unsupported on iOS");
                 return 0;
-            case 'TRACKING':
+            case "TRACKING":
                 return 1;
-            case 'TRACKING_COMPASS':
+            case "TRACKING_COMPASS":
                 return 2;
-            case 'TRACKING_GPS':
+            case "TRACKING_GPS":
                 return 1;
-            case 'TRACKING_GPS_NORTH':
+            case "TRACKING_GPS_NORTH":
                 return 3;
+            default:
+                console.log(`_stringToCameraMode: invalid cameraMode: ${mode}`);
         }
+        return 0;
     }
     _stringToRenderMode(mode) {
         let renderMode;
@@ -1366,6 +1362,18 @@ export class Mapbox extends MapboxCommon {
                 return 'GPS';
         }
     }
+    _convertCameraMode(mode) {
+        switch (mode) {
+            case 0:
+                return "NONE";
+            case 1:
+                return "TRACKING";
+            case 2:
+                return "TRACKING_COMPASS";
+            case 3:
+                return "TRACKING_GPS_NORTH";
+        }
+    }
     showUserLocationMarker(options, nativeMap) {
         return new Promise((resolve, reject) => {
             try {
@@ -2059,6 +2067,7 @@ export class Mapbox extends MapboxCommon {
                         const nsData = content.dataUsingEncoding(NSUTF8StringEncoding);
                         const geoJsonShape = MGLShape.shapeWithDataEncodingError(nsData, NSUTF8StringEncoding);
                         source.shape = geoJsonShape;
+                        resolve();
                         break;
                     default:
                         reject('Invalid source type: ' + options['type']);
@@ -2314,7 +2323,7 @@ export class Mapbox extends MapboxCommon {
                     reject('The map is not currently showing the user location');
                     return;
                 }
-                theMap.setUserTrackingModeAnimated(_getTrackingMode(options.cameraMode), options.animated !== false);
+                theMap.setUserTrackingModeAnimated(this._stringToCameraMode(options.cameraMode), options.animated !== false);
                 resolve();
             }
             catch (ex) {
@@ -2384,6 +2393,13 @@ export class Mapbox extends MapboxCommon {
             lng: coordinate.longitude
         };
     }
+    getUserLocationCameraMode(nativeMap) {
+        let theMap = nativeMap || this._mapboxViewInstance;
+        if (!theMap) {
+            return "NONE";
+        }
+        return this._convertCameraMode(theMap.userTrackingMode);
+    }
 }
 const _addObserver = (eventName, callback) => NSNotificationCenter.defaultCenter.addObserverForNameObjectQueueUsingBlock(eventName, null, NSOperationQueue.mainQueue, callback);
 function _downloadImage(marker) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-mapbox",
-    "version": "6.2.14",
+    "version": "6.2.15",
     "description": "Interactive, thoroughly customizable maps powered by vector tiles and OpenGL.",
     "main": "index",
     "typings": "index.d.ts",
@@ -54,5 +54,5 @@
     "dependencies": {
         "@nativescript-community/perms": "^2.2.0"
     },
-    "gitHead": "f3399295d88474fe637cacc301445c977a91540d"
+    "gitHead": "0fcc83da4bd587591485042c0cec891041d9049a"
 }