@nativescript-community/ui-mapbox 6.2.12 → 6.2.15

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 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
+
+
+
+
+
+## [6.2.13](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.12...v6.2.13) (2022-01-19)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
+
+
+
+
 ## [6.2.12](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.11...v6.2.12) (2022-01-17)
 
 **Note:** Version bump only for package @nativescript-community/ui-mapbox

package/common.d.ts

@@ -1,6 +1,6 @@
 import { Color, ContentView, ImageSource, Property } from '@nativescript/core';
 export * from './geo.utils';
-export * from './filter/filter-parser';
+export * from './expression/expression-parser';
 export * from './layers/layer-factory';
 export * from './layers/parser/property-parser';
 export declare const MapboxTraceCategory = "NativescriptMapbox";
@@ -120,11 +120,13 @@ export interface AddGeoJsonClusteredOptions {
     clusterRadius?: number;
     clusters?: MapboxCluster[];
 }
+export declare type LayerType = "fill" | "line" | "symbol" | "circle" | "heatmap" | "fill-extrusion" | "raster" | "hillshade" | "background" | "sky";
+export declare type SupportedLayerType = LayerType & ("line" | "circle" | "fill" | "symbol" | "raster");
 export interface AddLayerOptions {
     id: string;
     source: string;
     sourceLayer: string;
-    type: string;
+    type: SupportedLayerType;
     circleColor?: string | Color;
     circleOpacity?: number;
     circleRadius?: number;
@@ -167,9 +169,13 @@ export interface GeoJSONSource extends Source {
     data?: any;
     minzoom?: number;
     maxzoom?: number;
+    lineMetrics?: boolean;
     cluster?: {
         radius: any;
         maxZoom: any;
+        properties?: {
+            [property: string]: [any, any];
+        };
     };
 }
 export declare type UserLocationCameraMode = 'NONE' | 'NONE_COMPASS' | 'NONE_GPS' | 'TRACKING' | 'TRACKING_COMPASS' | 'TRACKING_GPS' | 'TRACKING_GPS_NORTH';
@@ -250,6 +256,7 @@ export interface LayerCommon {
     getNativeInstance(): any;
     setFilter(filter: any[]): void;
     getFilter(): any[];
+    type(): LayerType;
 }
 export interface MapboxCommonApi {
     requestFineLocationPermission(): Promise<any>;
@@ -285,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>;
@@ -327,6 +335,10 @@ export interface MapboxApi {
         x: number;
         y: number;
     };
+    projectBack(point: {
+        x: number;
+        y: number;
+    }): LatLng;
 }
 export declare abstract class MapboxCommon implements MapboxCommonApi {
     view?: MapboxViewCommonBase;
@@ -382,11 +394,13 @@ 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;
     forceUserLocationUpdate(location: any): void;
     addSource(id: string, options: AddSourceOptions): Promise<any>;
+    updateSource(id: string, options: UpdateSourceOptions): Promise<any>;
     removeSource(id: string, nativeMap?: any): Promise<any>;
     addLayer(style: any, belowLayerId?: string): Promise<any>;
     removeLayer(id: string): Promise<any>;
@@ -408,6 +422,14 @@ export interface MapboxViewApi {
     onStop(): Promise<any>;
     onLowMemory(): Promise<any>;
     onDestroy(): Promise<any>;
+    project(data: LatLng): {
+        x: number;
+        y: number;
+    };
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
 }
 export declare abstract class MapboxViewCommonBase extends ContentView implements MapboxViewApi {
     protected mapbox: MapboxApi;
@@ -441,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>;
@@ -470,6 +493,10 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
         x: number;
         y: number;
     };
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
 }
 export declare const mapReadyProperty: Property<MapboxViewCommonBase, string>;
 export declare const zoomLevelProperty: Property<MapboxViewCommonBase, number>;

package/common.js

@@ -1,6 +1,6 @@
 import { ContentView, Property, Trace, booleanConverter } from '@nativescript/core';
 export * from './geo.utils';
-export * from './filter/filter-parser';
+export * from './expression/expression-parser';
 export * from './layers/layer-factory';
 export * from './layers/parser/property-parser';
 export const MapboxTraceCategory = 'NativescriptMapbox';
@@ -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());
     }
@@ -236,6 +239,9 @@ export class MapboxViewCommonBase extends ContentView {
     project(data) {
         return this.mapbox && this.mapbox.project(data);
     }
+    projectBack(screenCoordinate) {
+        return this.mapbox && this.mapbox.projectBack(screenCoordinate);
+    }
 }
 export const mapReadyProperty = new Property({ name: 'mapReady' });
 mapReadyProperty.register(MapboxViewCommonBase);

package/{filter/filter-parser.android.d.ts → expression/expression-parser.android.d.ts}

@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): com.mapbox.mapboxsdk.style.expressions.Expression;
     static toJson(filter: com.mapbox.mapboxsdk.style.expressions.Expression): any[];
 }

package/{filter/filter-parser.android.js → expression/expression-parser.android.js}

@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json) {
         const expression = com.mapbox.mapboxsdk.style.expressions.Expression.Converter.convert(JSON.stringify(json));
         return expression;
@@ -13,4 +13,4 @@ export class FilterParser {
         return JSON.parse(filter.toString());
     }
 }
-//# sourceMappingURL=filter-parser.android.js.map
+//# sourceMappingURL=expression-parser.android.js.map

package/{filter/filter-parser.d.ts → expression/expression-parser.d.ts}

@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): any;
     static toJson(filter: any): any[];
 }

package/{filter/filter-parser.ios.d.ts → expression/expression-parser.ios.d.ts}

@@ -1,4 +1,4 @@
-export declare class FilterParser {
+export declare class ExpressionParser {
     static parseJson(json: any[]): NSPredicate;
     static toJson(filter: NSPredicate): any[];
 }

package/{filter/filter-parser.ios.js → expression/expression-parser.ios.js}

@@ -1,4 +1,4 @@
-export class FilterParser {
+export class ExpressionParser {
     static parseJson(json) {
         const filterStr = NSString.stringWithString(JSON.stringify(json));
         const filterData = filterStr.dataUsingEncoding(NSUTF8StringEncoding);
@@ -19,4 +19,4 @@ export class FilterParser {
         return JSON.parse(expression);
     }
 }
-//# sourceMappingURL=filter-parser.ios.js.map
+//# sourceMappingURL=expression-parser.ios.js.map

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;
@@ -138,4 +139,9 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     };
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
 }

package/index.android.js

@@ -1,6 +1,6 @@
 import { request } from '@nativescript-community/perms';
 import { AndroidApplication, Application, Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
-import { FilterParser } from './filter/filter-parser';
+import { ExpressionParser } from './expression/expression-parser';
 import { Layer, LayerFactory } from './layers/layer-factory';
 import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 export * from './common';
@@ -1085,7 +1085,7 @@ export class Mapbox extends MapboxCommon {
                 const mapboxPoint = new com.mapbox.mapboxsdk.geometry.LatLng(options.point.lat, options.point.lng);
                 const screenLocation = this._mapboxMapInstance.getProjection().toScreenLocation(mapboxPoint);
                 if (this._mapboxMapInstance.queryRenderedFeatures) {
-                    const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                    const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                     const features = this._mapboxMapInstance.queryRenderedFeatures(screenLocation, queryFilter, options.layers);
                     const result = [];
                     for (let i = 0; i < features.size(); i++) {
@@ -1117,7 +1117,7 @@ export class Mapbox extends MapboxCommon {
                     throw new Error(`Source with id "${sourceId}" not found.`);
                 }
                 let features;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 if (source instanceof com.mapbox.mapboxsdk.style.sources.GeoJsonSource) {
                     features = source.querySourceFeatures(queryFilter);
                 }
@@ -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']);
@@ -1850,11 +1851,24 @@ export class Mapbox extends MapboxCommon {
                         if (options.maxzoom) {
                             geojsonOptions.withMaxZoom(options.maxzoom);
                         }
+                        if (options.lineMetrics !== undefined) {
+                            geojsonOptions.withLineMetrics(options.lineMetrics);
+                        }
                         if (options.cluster) {
                             geojsonOptions
                                 .withCluster(true)
                                 .withClusterMaxZoom(options.cluster.maxZoom || 13)
                                 .withClusterRadius(options.cluster.radius || 40);
+                            if (options.cluster.properties) {
+                                for (const property of Object.keys(options.cluster.properties)) {
+                                    const propertyValues = options.cluster.properties[property];
+                                    let operator = propertyValues[0];
+                                    if (!Array.isArray(operator)) {
+                                        operator = [operator];
+                                    }
+                                    geojsonOptions.withClusterProperty(property, ExpressionParser.parseJson(operator), ExpressionParser.parseJson(propertyValues[1]));
+                                }
+                            }
                         }
                         const geoJsonSource = new com.mapbox.mapboxsdk.style.sources.GeoJsonSource(id, geojsonOptions);
                         if (options.data) {
@@ -1961,7 +1975,7 @@ export class Mapbox extends MapboxCommon {
             if (!lineSource) {
                 throw new Error(`no source found with id: ${sId}`);
             }
-            const lineFeatures = lineSource.querySourceFeatures(FilterParser.parseJson(['==', '$type', 'LineString']));
+            const lineFeatures = lineSource.querySourceFeatures(ExpressionParser.parseJson(['==', '$type', 'LineString']));
             if (lineFeatures.size() === 0) {
                 throw new Error('no line string feature found');
             }
@@ -2174,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) {
@@ -2480,5 +2514,22 @@ export class Mapbox extends MapboxCommon {
         const screenLocation = this._mapboxMapInstance.getProjection().toScreenLocation(mapboxPoint);
         return { x: Utils.layout.toDeviceIndependentPixels(screenLocation.x), y: Utils.layout.toDeviceIndependentPixels(screenLocation.y) };
     }
+    projectBack(screenCoordinate) {
+        const pointf = new android.graphics.PointF(screenCoordinate.x, screenCoordinate.y);
+        const coordinate = this._mapboxMapInstance.getProjection().fromScreenLocation(pointf);
+        return {
+            lat: coordinate.getLatitude(),
+            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.d.ts

@@ -97,4 +97,5 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     };
-}
+    projectBack(screenCoordinate: { x: number, y: number }): LatLng;
+}

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>;
@@ -95,4 +96,9 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     };
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
+    getUserLocationCameraMode(nativeMap?: any): UserLocationCameraMode;
 }

package/index.ios.js

@@ -1,7 +1,7 @@
 import { Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 import { Layer, LayerFactory } from './layers/layer-factory';
-import { FilterParser } from './filter/filter-parser';
+import { ExpressionParser } from './expression/expression-parser';
 var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
     __extends(MGLMapViewDelegateImpl, _super);
     function MGLMapViewDelegateImpl() {
@@ -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 {
@@ -1436,7 +1444,7 @@ export class Mapbox extends MapboxCommon {
                 }
                 const { x, y } = theMap.convertCoordinateToPointToView({ latitude: options.point.lat, longitude: options.point.lng }, theMap);
                 const queryLayerIds = options.layers ? NSSet.setWithArray(Utils.ios.collections.jsArrayToNSArray(options.layers)) : null;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 const features = theMap.visibleFeaturesAtPointInStyleLayersWithIdentifiersPredicate({ x, y }, queryLayerIds, queryFilter);
                 const result = [];
                 for (let i = 0; i < features.count; i++) {
@@ -1466,7 +1474,7 @@ export class Mapbox extends MapboxCommon {
                     throw new Error(`Source with id "${sourceId}" not found.`);
                 }
                 let features;
-                const queryFilter = options.filter ? FilterParser.parseJson(options.filter) : null;
+                const queryFilter = options.filter ? ExpressionParser.parseJson(options.filter) : null;
                 if (source instanceof MGLShapeSource) {
                     features = source.featuresMatchingPredicate(queryFilter);
                 }
@@ -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']);
@@ -2139,10 +2148,25 @@ export class Mapbox extends MapboxCommon {
                         if (options.maxzoom !== undefined) {
                             sourceOptions[MGLShapeSourceOptionMaximumZoomLevel] = options.maxzoom;
                         }
+                        if (options.lineMetrics !== undefined) {
+                            sourceOptions[MGLShapeSourceOptionLineDistanceMetrics] = options.lineMetrics;
+                        }
                         if (options.cluster) {
                             sourceOptions[MGLShapeSourceOptionClustered] = true;
                             sourceOptions[MGLShapeSourceOptionClusterRadius] = options.cluster.radius || 40;
                             sourceOptions[MGLShapeSourceOptionMaximumZoomLevelForClustering] = options.cluster.maxZoom || 13;
+                            if (options.cluster.properties) {
+                                const clusterProperties = {};
+                                for (const property of Object.keys(options.cluster.properties)) {
+                                    let [operator, operand] = options.cluster.properties[property];
+                                    if (!Array.isArray(operator)) {
+                                        operator = [operator];
+                                    }
+                                    const expressions = Utils.ios.collections.jsArrayToNSArray([ExpressionParser.parseJson(operator), ExpressionParser.parseJson(operand)]);
+                                    clusterProperties[property] = expressions;
+                                }
+                                sourceOptions[MGLShapeSourceOptionClusterProperties] = clusterProperties;
+                            }
                         }
                         source = MGLShapeSource.alloc().initWithIdentifierShapeOptions(id, geoJsonShape, sourceOptions);
                         break;
@@ -2269,7 +2293,7 @@ export class Mapbox extends MapboxCommon {
             throw new Error(`no source found with id: ${sId}`);
         }
         try {
-            const lineFeatures = lineSource.featuresMatchingPredicate(FilterParser.parseJson(['==', '$type', 'LineString']));
+            const lineFeatures = lineSource.featuresMatchingPredicate(ExpressionParser.parseJson(['==', '$type', 'LineString']));
             if (lineFeatures.count === 0) {
                 throw new Error('no line string feature found');
             }
@@ -2299,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) {
@@ -2357,6 +2381,25 @@ export class Mapbox extends MapboxCommon {
         const { x, y } = theMap.convertCoordinateToPointToView({ latitude: data.lat, longitude: data.lng }, theMap);
         return { x, y };
     }
+    projectBack(screenCoordinate) {
+        const theMap = this._mapboxViewInstance;
+        const cgPoint = {
+            x: screenCoordinate.x,
+            y: screenCoordinate.y
+        };
+        const coordinate = theMap.convertPointToCoordinateFromView(cgPoint, theMap);
+        return {
+            lat: coordinate.latitude,
+            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/layers/layer-factory.android.d.ts

@@ -1,4 +1,4 @@
-import { LayerCommon } from '../common';
+import { LayerCommon, LayerType } from "../common";
 export declare class Layer implements LayerCommon {
     id: string;
     private instance;
@@ -11,6 +11,7 @@ export declare class Layer implements LayerCommon {
     getFilter(): any[];
     setProperty(name: string, value: any): void;
     getProperty(name: string): any;
+    type(): LayerType;
 }
 export declare class LayerFactory {
     static createLayer(style: any, source: any): Promise<LayerCommon>;

package/layers/layer-factory.android.js

@@ -1,4 +1,4 @@
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 export class Layer {
     constructor(instance) {
@@ -18,10 +18,10 @@ export class Layer {
         return this.instance;
     }
     setFilter(filter) {
-        this.instance.setFilter(FilterParser.parseJson(filter));
+        this.instance.setFilter(ExpressionParser.parseJson(filter));
     }
     getFilter() {
-        return FilterParser.toJson(this.instance.getFilter());
+        return ExpressionParser.toJson(this.instance.getFilter());
     }
     setProperty(name, value) {
         const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });
@@ -30,6 +30,36 @@ export class Layer {
     getProperty(name) {
         return PropertyParser.propertyValueFromLayer(this.instance, name);
     }
+    type() {
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.FillLayer) {
+            return "fill";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.LineLayer) {
+            return "line";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.SymbolLayer) {
+            return "symbol";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.CircleLayer) {
+            return "circle";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.HeatmapLayer) {
+            return "heatmap";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer) {
+            return "fill-extrusion";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.RasterLayer) {
+            return "raster";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.HillshadeLayer) {
+            return "hillshade";
+        }
+        if (this.instance instanceof com.mapbox.mapboxsdk.style.layers.BackgroundLayer) {
+            return "background";
+        }
+        return null;
+    }
 }
 export class LayerFactory {
     static async createLayer(style, source) {

package/layers/layer-factory.d.ts

@@ -1,4 +1,4 @@
-import { LayerCommon } from '../common';
+import { LayerCommon, LayerType } from "../common"
 
 declare class LayerFactory {
     static createLayer(style, source): Promise<LayerCommon>;
@@ -16,4 +16,5 @@ export declare class Layer implements LayerCommon {
     getFilter(): any[];
     setProperty(name: string, value: any): void;
     getProperty(name: string): any;
-}
+    type(): LayerType;
+}

package/layers/layer-factory.ios.d.ts

@@ -1,4 +1,4 @@
-import { LayerCommon } from '../common';
+import { LayerCommon, LayerType } from "../common";
 export declare class LayerFactory {
     static createLayer(style: any, source: any): Promise<LayerCommon>;
     private static parseProperties;
@@ -6,7 +6,8 @@ export declare class LayerFactory {
 export declare class Layer implements LayerCommon {
     id: string;
     private instance;
-    constructor(instance: any);
+    constructor(instance: MGLStyleLayer);
+    type(): LayerType;
     visibility(): boolean;
     show(): void;
     hide(): void;

package/layers/layer-factory.ios.js

@@ -1,4 +1,4 @@
-import { FilterParser } from '../filter/filter-parser';
+import { ExpressionParser } from '../expression/expression-parser';
 import { PropertyParser } from './parser/property-parser';
 export class LayerFactory {
     static async createLayer(style, source) {
@@ -49,6 +49,36 @@ export class Layer {
         this.instance = instance;
         this.id = instance.identifier;
     }
+    type() {
+        if (this.instance instanceof MGLFillStyleLayer) {
+            return "fill";
+        }
+        if (this.instance instanceof MGLLineStyleLayer) {
+            return "line";
+        }
+        if (this.instance instanceof MGLSymbolStyleLayer) {
+            return "symbol";
+        }
+        if (this.instance instanceof MGLCircleStyleLayer) {
+            return "circle";
+        }
+        if (this.instance instanceof MGLHeatmapStyleLayer) {
+            return "heatmap";
+        }
+        if (this.instance instanceof MGLFillExtrusionStyleLayer) {
+            return "fill-extrusion";
+        }
+        if (this.instance instanceof MGLRasterStyleLayer) {
+            return "raster";
+        }
+        if (this.instance instanceof MGLHillshadeStyleLayer) {
+            return "hillshade";
+        }
+        if (this.instance instanceof MGLBackgroundStyleLayer) {
+            return "background";
+        }
+        return null;
+    }
     visibility() {
         return this.instance.visible;
     }
@@ -63,14 +93,14 @@ export class Layer {
     }
     setFilter(filter) {
         if (this.instance instanceof MGLVectorStyleLayer) {
-            this.instance.predicate = FilterParser.parseJson(filter);
+            this.instance.predicate = ExpressionParser.parseJson(filter);
         }
         else {
             throw new Error('Set filter only support for vector layer.');
         }
     }
     getFilter() {
-        return FilterParser.toJson(this.instance.predicate);
+        return ExpressionParser.toJson(this.instance.predicate);
     }
     setProperty(name, value) {
         const properties = PropertyParser.parsePropertiesForLayer({ [name]: value });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-mapbox",
-    "version": "6.2.12",
+    "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": "44fe8fec4a1d5ddfcd529919346f238afecabc94"
+    "gitHead": "0fcc83da4bd587591485042c0cec891041d9049a"
 }

package/typings/Mapbox.ios.d.ts

@@ -2661,6 +2661,8 @@ declare var MGLShapeSourceOptionClusterRadius: string;
 
 declare var MGLShapeSourceOptionClustered: string;
 
+declare var MGLShapeSourceOptionClusterProperties: string;
+
 declare var MGLShapeSourceOptionLineDistanceMetrics: string;
 
 declare var MGLShapeSourceOptionMaximumZoomLevel: string;