@nativescript-community/ui-mapbox 6.2.14 → 6.2.19

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

@@ -1,4 +1,4 @@
-import { ContentView, Property, Trace, booleanConverter } from '@nativescript/core';
+import { Color, ContentView, ImageSource, Property, Trace, booleanConverter } from '@nativescript/core';
 export * from './geo.utils';
 export * from './expression/expression-parser';
 export * from './layers/layer-factory';
@@ -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

@@ -1,8 +1,8 @@
 import { request } from '@nativescript-community/perms';
-import { AndroidApplication, Application, Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
+import { AndroidApplication, Application, Color, File, Http, Image, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { ExpressionParser } from './expression/expression-parser';
 import { Layer, LayerFactory } from './layers/layer-factory';
-import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
+import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './common';
 export * from './common';
 function _getLocation(loc) {
     if (loc === null) {
@@ -843,13 +843,13 @@ export class Mapbox extends MapboxCommon {
                 markerOptions.setPosition(new com.mapbox.mapboxsdk.geometry.LatLng(parseFloat(marker.lat), parseFloat(marker.lng)));
                 if (marker.icon) {
                     if (marker.icon.startsWith('res://')) {
-                        let cached = this.iconCache[marker.iconPath];
+                        let cached = this.iconCache[marker.icon];
                         if (!cached) {
                             const resourcename = marker.icon.substring(6);
                             const res = Utils.ad.getApplicationContext().getResources();
                             const identifier = res.getIdentifier(resourcename, 'drawable', Utils.ad.getApplication().getPackageName());
                             if (identifier !== 0) {
-                                cached = this.iconCache[marker.iconPath] = iconFactory.fromResource(identifier);
+                                cached = this.iconCache[marker.icon] = iconFactory.fromResource(identifier);
                             }
                         }
                         if (cached) {
@@ -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

@@ -1,5 +1,5 @@
 import { Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
-import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
+import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './common';
 import { Layer, LayerFactory } from './layers/layer-factory';
 import { ExpressionParser } from './expression/expression-parser';
 var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
@@ -42,7 +42,7 @@ var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
      * set user location marker modes
      */
     MGLMapViewDelegateImpl.prototype.changeUserLocationRenderMode = function (userLocationRenderMode) {
-        this.userLocationAnnotationView.changeUserLocationRenderMode(userLocationRenderMode);
+        // nothing to do here
     };
     /**
      * set the camera changd listener callback
@@ -234,19 +234,6 @@ var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
             }
         }
     };
-    /**
-     * override the standard location marker
-     */
-    MGLMapViewDelegateImpl.prototype.mapViewViewForAnnotation = function (mapView, annotation) {
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'MGLMapViewDelegateImpl::mapViewViewForAnnotation() top');
-        }
-        if (annotation.isKindOfClass(MGLUserLocation.class())) {
-            this.userLocationAnnotationView = CustomUserLocationAnnotationView.alloc().init();
-            return this.userLocationAnnotationView;
-        }
-        return null;
-    };
     MGLMapViewDelegateImpl.prototype.mapViewRegionIsChangingWithReason = function (mapView, reason) {
         if (Trace.isEnabled()) {
             CLog(CLogTypes.info, 'MGLMapViewDelegateImpl::mapViewRegionIsChanging()');
@@ -463,9 +450,6 @@ const _getMapStyle = (input) => {
         return MGLStyle.streetsStyleURL;
     }
 };
-function _getTrackingMode(input) {
-    return 0;
-}
 function _getLocation(loc) {
     if (loc === null) {
         return null;
@@ -661,214 +645,6 @@ export class MapboxView extends MapboxViewBase {
         NSUserDefaults.standardUserDefaults.setBoolForKey(false, 'MGLMapboxMetricsEnabled');
     }
 }
-var CustomUserLocationAnnotationView = /** @class */ (function (_super) {
-    __extends(CustomUserLocationAnnotationView, _super);
-    function CustomUserLocationAnnotationView() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * init
-     *
-     * @link https://docs.nativescript.org/core-concepts/ios-runtime/HelloWorld
-     */
-    CustomUserLocationAnnotationView.prototype.init = function () {
-        this.size = 48;
-        _super.prototype.initWithFrame.call(this, CGRectMake(0, 0, this.size, this.size));
-        this.renderModeChanged = true;
-        this.userLocationRenderMode = 'NORMAL';
-        return this;
-    };
-    /**
-     * update
-     *
-     * The note from the Objective-C sample indicates this method may be called quite
-     * often so it needs to be kept lightweight.
-     */
-    CustomUserLocationAnnotationView.prototype.update = function () {
-        if (CLLocationCoordinate2DIsValid(this.userLocation.coordinate)) {
-            // if it's the first time here, setup the layers that make up the
-            // location marker.
-            if (!this.dot) {
-                this.drawNonTrackingLocationMarker();
-            }
-            if (this.userLocationRenderMode === 'GPS') {
-                this.updateHeading();
-            }
-        }
-    };
-    /**
-     * Draw the GPS tracking arrow.
-     *
-     * @link https://docs.nativescript.org/ns-framework-modules/color
-     */
-    CustomUserLocationAnnotationView.prototype.drawTrackingLocationMarker = function () {
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'CustomerUserLocationAnnotatinView::drawTrackingLocationMarker()');
-        }
-        this.drawTrackingDot();
-        this.drawArrow();
-    }; // end of setupLayers()
-    /**
-     * draw the non-tracking marker
-     */
-    CustomUserLocationAnnotationView.prototype.drawNonTrackingLocationMarker = function () {
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'CustomerUserLocationAnnotatinView::drawNonTrackingLocationMarker()');
-        }
-        this.drawNonTrackingDot();
-        if (this.arrow) {
-            this.arrow.removeFromSuperlayer();
-            this.arrow = null;
-        }
-    };
-    /**
-     * draw the tracking dot.
-     */
-    CustomUserLocationAnnotationView.prototype.drawTrackingDot = function () {
-        this.size = 48;
-        // we need to adjust the size of the bounds of the marker. The Tracking marker
-        // is larger than the non tracking marker.
-        this.bounds = CGRectMake(0, 0, this.size, this.size);
-        var dot = CALayer.layer();
-        dot.frame = this.bounds;
-        // user corner radius to turn the layer into a circle
-        dot.cornerRadius = this.size / 2;
-        dot.backgroundColor = this.tintColor.CGColor;
-        dot.borderWidth = 4;
-        var whiteColor = new Color('#FFFFFF');
-        dot.borderColor = whiteColor.ios.CGColor;
-        if (!this.dot) {
-            this.layer.addSublayer(dot);
-        }
-        else {
-            this.layer.replaceSublayerWith(this.dot, dot);
-        }
-        // QUESTION: does GC catch this?
-        this.dot = dot;
-    };
-    /**
-     * draw the non-tracking dot.
-     */
-    CustomUserLocationAnnotationView.prototype.drawNonTrackingDot = function () {
-        this.size = 24;
-        this.bounds = CGRectMake(0, 0, this.size, this.size);
-        var dot = CALayer.layer();
-        dot.frame = this.bounds;
-        // user corner radius to turn the layer into a circle
-        dot.cornerRadius = this.size / 2;
-        dot.backgroundColor = this.tintColor.CGColor;
-        dot.borderWidth = 1;
-        var whiteColor = new Color('#FFFFFF');
-        dot.borderColor = whiteColor.ios.CGColor;
-        if (!this.dot) {
-            this.layer.addSublayer(dot);
-        }
-        else {
-            this.layer.replaceSublayerWith(this.dot, dot);
-        }
-        // QUESTION: does GC catch this?
-        this.dot = dot;
-    };
-    /**
-     * draw an arrow
-     */
-    CustomUserLocationAnnotationView.prototype.drawArrow = function () {
-        var arrow = CAShapeLayer.layer();
-        arrow.path = this.arrowPath();
-        arrow.frame = CGRectMake(0, 0, this.size / 2, this.size / 2);
-        arrow.position = CGPointMake(CGRectGetMidX(this.dot.frame), CGRectGetMidY(this.dot.frame));
-        arrow.fillColor = this.dot.borderColor;
-        if (!this.arrow) {
-            this.layer.addSublayer(arrow);
-        }
-        else {
-            this.layer.replaceSublayerWith(this.arrow, arrow);
-        }
-        // QUESTION: Does GC catch this?
-        this.arrow = arrow;
-    };
-    /**
-     * update arrow heading
-     *
-     * @link https://docs.nativescript.org/core-concepts/ios-runtime/types/C-Functions
-     */
-    CustomUserLocationAnnotationView.prototype.updateHeading = function () {
-        // just to avoid a possible race condition where the arrow isnt' drawn yet
-        if (!this.arrow) {
-            return;
-        }
-        if (typeof this.userLocation == 'undefined') {
-            return;
-        }
-        if (typeof this.userLocation.heading == 'undefined' || this.userLocation.heading === null) {
-            return;
-        }
-        if (typeof this.userLocation.heading.trueHeading == 'undefined' || this.userLocation.heading.trueHeading === null) {
-            return;
-        }
-        if (this.userLocation.heading.trueHeading > 0) {
-            this.arrow.hidden = false;
-            // get the difference between the map's current direction and the
-            // user's heading, then convert it from degrees to radians
-            //
-            // The original Objective-C example uses the inline C function MGLRadiansFromDegrees but because
-            // it's declared as inline it is not available for NativeScript. See linked article above.
-            // let rotation : number = MGLRadiansFromDegrees( this.mapView.direction - this.userLocation.heading.trueHeading );
-            var degrees = this.mapView.direction - this.userLocation.heading.trueHeading;
-            // in radians
-            var rotation = (degrees * Math.PI) / 180;
-            rotation = -rotation;
-            // if the difference would be perceptible, rotate the arrow.
-            if (fabs(rotation) > 0.01) {
-                // Disable implicit animations of this rotation, which reduces lag between updates
-                CATransaction.begin();
-                CATransaction.setDisableActions(true);
-                this.arrow.setAffineTransform(CGAffineTransformRotate(CGAffineTransformIdentity, rotation));
-                CATransaction.commit();
-            }
-        }
-        else {
-            this.arrow.hidden = true;
-        }
-    };
-    /**
-     * Calculate the vector path for an arrow
-     */
-    CustomUserLocationAnnotationView.prototype.arrowPath = function () {
-        var max = this.size / 2;
-        var pad = 3;
-        var top = CGPointMake(max * 0.5, 0);
-        var left = CGPointMake(0 + pad, max - pad);
-        var right = CGPointMake(max - pad, max - pad);
-        var center = CGPointMake(max * 0.5, max * 0.6);
-        var bezierPath = UIBezierPath.bezierPath();
-        bezierPath.moveToPoint(top);
-        bezierPath.addLineToPoint(left);
-        bezierPath.addLineToPoint(center);
-        bezierPath.addLineToPoint(right);
-        bezierPath.addLineToPoint(top);
-        bezierPath.closePath();
-        return bezierPath.CGPath;
-    };
-    /**
-     * change Render mode
-     *
-     * @param {string} renderMode
-     */
-    CustomUserLocationAnnotationView.prototype.changeUserLocationRenderMode = function (renderMode) {
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, "CustomUserLocationAnnotatinView::changeUserLocationRenderMode(): changing mode to '" + renderMode + "'");
-        }
-        this.userLocationRenderMode = renderMode;
-        if (renderMode === 'GPS') {
-            this.drawTrackingLocationMarker();
-        }
-        else {
-            this.drawNonTrackingLocationMarker();
-        }
-    };
-    return CustomUserLocationAnnotationView;
-}(MGLUserLocationAnnotationView));
 export class Mapbox extends MapboxCommon {
     constructor() {
         super(...arguments);
@@ -1333,27 +1109,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 +1141,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 +1846,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 +2102,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) {
@@ -2334,7 +2122,7 @@ export class Mapbox extends MapboxCommon {
                     return;
                 }
                 const layer = theMap.style.layerWithIdentifier(name);
-                resolve(new Layer(layer));
+                resolve(layer ? new Layer(layer) : null);
             }
             catch (ex) {
                 if (Trace.isEnabled()) {
@@ -2384,6 +2172,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.19",
     "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": "ee66b091255e4c94685c927f8ab652ad66b5a5be"
 }