@nativescript-community/ui-mapbox 6.2.10 → 6.2.14

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/{mapbox.android.d.ts → index.android.d.ts}

@@ -1,6 +1,6 @@
 import { ImageSource } from '@nativescript/core';
-import { AddExtrusionOptions, AddGeoJsonClusteredOptions, AddPolygonOptions, AddPolylineOptions, AddSourceOptions, AnimateCameraOptions, DeleteOfflineRegionOptions, DownloadOfflineRegionOptions, Feature, LatLng, LayerCommon, ListOfflineRegionsOptions, MapStyle, MapboxApi, MapboxCommon, MapboxMarker, MapboxTraceCategory, MapboxViewBase, OfflineRegion, QueryRenderedFeaturesOptions, QuerySourceFeaturesOptions, SetCenterOptions, SetTiltOptions, SetViewportOptions, SetZoomLevelOptions, ShowOptions, TrackUserOptions, UpdateSourceOptions, UserLocation, UserLocationCameraMode, Viewport } from './mapbox.common';
-export { MapboxTraceCategory, MapStyle };
+import { AddExtrusionOptions, AddGeoJsonClusteredOptions, AddPolygonOptions, AddPolylineOptions, AddSourceOptions, AnimateCameraOptions, DeleteOfflineRegionOptions, DownloadOfflineRegionOptions, Feature, LatLng, LayerCommon, ListOfflineRegionsOptions, MapStyle, MapboxApi, MapboxCommon, MapboxMarker, MapboxViewBase, OfflineRegion, QueryRenderedFeaturesOptions, QuerySourceFeaturesOptions, SetCenterOptions, SetTiltOptions, SetViewportOptions, SetZoomLevelOptions, ShowOptions, TrackUserOptions, UpdateSourceOptions, UserLocation, UserLocationCameraMode, Viewport } from './common';
+export * from './common';
 export declare function setLogLevel(level: 'none' | 'info' | 'debug' | 'error' | 'fault' | 'verbose'): void;
 export declare class MapboxView extends MapboxViewBase {
     private nativeMapView;
@@ -96,6 +96,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     setOnMapClickListener(listener: (data: LatLng) => boolean, nativeMap?: MapboxView): Promise<void>;
     setOnMapLongClickListener(listener: (data: LatLng) => boolean, nativeMap?: any): Promise<void>;
     setOnMoveBeginListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnMoveEndListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnScrollListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnFlingListener(listener: () => void, nativeMap?: any): Promise<void>;
     setOnCameraMoveListener(listener: (reason: any, animated?: any) => void, nativeMap?: any): Promise<void>;
@@ -103,7 +104,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     setOnCameraIdleListener(listener: () => void, nativeMap?: any): Promise<void>;
     getViewport(nativeMap?: any): Promise<Viewport>;
     setViewport(options: SetViewportOptions, nativeMap?: any): Promise<void>;
-    downloadOfflineRegion(options: DownloadOfflineRegionOptions): Promise<void>;
+    downloadOfflineRegion(options: DownloadOfflineRegionOptions): Promise<any>;
     listOfflineRegions(options?: ListOfflineRegionsOptions): Promise<OfflineRegion[]>;
     deleteOfflineRegion(options: DeleteOfflineRegionOptions): Promise<void>;
     _getOfflineManager(): any;
@@ -123,6 +124,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     _stringToRenderMode(mode: any): any;
     _fineLocationPermissionGranted(): boolean;
     _getRegionName(offlineRegion: com.mapbox.mapboxsdk.offline.OfflineRegion): string;
+    _getRegionMetadata(offlineRegion: com.mapbox.mapboxsdk.offline.OfflineRegion): any;
     showUserLocationMarker(options: any, nativeMap?: any): Promise<void>;
     hideUserLocationMarker(nativeMap?: any): Promise<void>;
     changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode, nativeMap?: any): Promise<void>;
@@ -136,15 +138,8 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     };
-}
-export declare class Layer implements LayerCommon {
-    id: string;
-    private instance;
-    constructor(instance: any);
-    visibility(): boolean;
-    show(): void;
-    hide(): void;
-    getNativeInstance(): any;
-    setFilter(filter: any[]): void;
-    getFilter(): any[];
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
 }

package/{mapbox.android.js → index.android.js}

@@ -1,11 +1,9 @@
 import { request } from '@nativescript-community/perms';
-import { AndroidApplication, Application, Color, File, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
-import { getImage } from '@nativescript/core/http';
-import { FilterParser } from './filter/filter-parser.android';
-import { layout } from '@nativescript/core/utils';
-import { LayerFactory } from './layers/layer-factory';
-import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './mapbox.common';
-export { MapboxTraceCategory, MapStyle };
+import { AndroidApplication, Application, Color, File, Http, 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';
+export * from './common';
 function _getLocation(loc) {
     if (loc === null) {
         return null;
@@ -186,6 +184,18 @@ export class MapboxView extends MapboxViewBase {
                         map: this,
                         android: this.nativeMapView
                     });
+                },
+                onMoveEndEvent: (event) => {
+                    if (Trace.isEnabled()) {
+                        CLog(CLogTypes.info, 'initMap(): onMoveEndEvent event');
+                    }
+                    this.notify({
+                        eventName: MapboxViewBase.moveEndEvent,
+                        object: this,
+                        event,
+                        map: this,
+                        android: this.nativeMapView
+                    });
                 }
             };
             if (Trace.isEnabled()) {
@@ -208,7 +218,9 @@ export class MapboxView extends MapboxViewBase {
         }
     }
     [telemetryProperty.setNative](value) {
-        com.mapbox.mapboxsdk.Mapbox.getTelemetry().setUserTelemetryRequestState(value);
+        if (com.mapbox.mapboxsdk.Mapbox.getTelemetry()) {
+            com.mapbox.mapboxsdk.Mapbox.getTelemetry().setUserTelemetryRequestState(value);
+        }
     }
 }
 export class Mapbox extends MapboxCommon {
@@ -294,7 +306,7 @@ export class Mapbox extends MapboxCommon {
                                 if (settings.showUserLocation) {
                                     this.requestFineLocationPermission()
                                         .then(() => {
-                                        this.showUserLocationMarker({});
+                                        this.showUserLocationMarker(settings.locationComponentOptions);
                                         if (settings.onLocationPermissionGranted) {
                                             settings.onLocationPermissionGranted(this._mapboxMapInstance);
                                         }
@@ -552,6 +564,22 @@ export class Mapbox extends MapboxCommon {
                 settings.onMoveBeginEvent(point);
             }
         }, mapboxNativeViewInstance);
+        this.setOnMoveEndListener((point) => {
+            if (Trace.isEnabled()) {
+                CLog(CLogTypes.info, 'Mapbox:initEventHandlerShim(): moveEnd:', point);
+            }
+            if (typeof settings.onMoveEndEvent != 'undefined') {
+                settings.onMoveEndEvent(point);
+            }
+        }, mapboxNativeViewInstance);
+        this.setOnScrollListener((point) => {
+            if (Trace.isEnabled()) {
+                CLog(CLogTypes.info, 'Mapbox:initEventHandlerShim(): move:', point);
+            }
+            if (typeof settings.onScrollEvent != 'undefined') {
+                settings.onScrollEvent(point);
+            }
+        }, mapboxNativeViewInstance);
     }
     onMapEvent(eventName, id, callback, nativeMapView) {
         if (typeof this.eventCallbacks[eventName] == 'undefined') {
@@ -1057,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++) {
@@ -1089,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);
                 }
@@ -1344,6 +1372,38 @@ export class Mapbox extends MapboxCommon {
             }
         });
     }
+    setOnMoveEndListener(listener, nativeMap) {
+        return new Promise((resolve, reject) => {
+            try {
+                if (!this._mapboxMapInstance) {
+                    reject('No map has been loaded');
+                    return;
+                }
+                if (Trace.isEnabled()) {
+                    CLog(CLogTypes.info, 'setOnMoveEndListener():');
+                }
+                this.onMoveListener = new com.mapbox.mapboxsdk.maps.MapboxMap.OnMoveListener({
+                    onMoveBegin: (detector) => { },
+                    onMove: (detector) => { },
+                    onMoveEnd: (detector) => {
+                        const coordinate = this._mapboxMapInstance.getCameraPosition().target;
+                        return listener({
+                            lat: coordinate.getLatitude(),
+                            lng: coordinate.getLongitude()
+                        });
+                    }
+                });
+                this._mapboxMapInstance.addOnMoveListener(this.onMoveListener);
+                resolve();
+            }
+            catch (ex) {
+                if (Trace.isEnabled()) {
+                    CLog(CLogTypes.info, 'Error in mapbox.setOnMoveEndListener: ' + ex);
+                }
+                reject(ex);
+            }
+        });
+    }
     setOnScrollListener(listener, nativeMap) {
         return new Promise((resolve, reject) => {
             try {
@@ -1526,8 +1586,8 @@ export class Mapbox extends MapboxCommon {
                     .build();
                 const retinaFactor = Utils.layout.getDisplayDensity();
                 const offlineRegionDefinition = new com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition(styleURL, bounds, options.minZoom, options.maxZoom, retinaFactor);
-                const info = '{name:"' + options.name + '"}';
-                const infoStr = new java.lang.String(info);
+                const info = Object.assign({ name: options.name }, options.metadata);
+                const infoStr = new java.lang.String(JSON.stringify(info));
                 const encodedMetadata = infoStr.getBytes();
                 if (!this._accessToken && !options.accessToken) {
                     reject("First show a map, or pass in an 'accessToken' param");
@@ -1557,7 +1617,7 @@ export class Mapbox extends MapboxCommon {
                                     });
                                 }
                                 if (status.isComplete()) {
-                                    resolve();
+                                    resolve(status);
                                 }
                                 else if (status.isRequiredResourceCountPrecise()) {
                                 }
@@ -1603,7 +1663,9 @@ export class Mapbox extends MapboxCommon {
                                 const name = this._getRegionName(offlineRegion);
                                 const offlineRegionDefinition = offlineRegion.getDefinition();
                                 const bounds = offlineRegionDefinition.getBounds();
+                                const metadata = this._getRegionMetadata(offlineRegion);
                                 regions.push({
+                                    id: offlineRegion.getID(),
                                     name,
                                     style: offlineRegionDefinition.getStyleURL(),
                                     minZoom: offlineRegionDefinition.getMinZoom(),
@@ -1613,7 +1675,10 @@ export class Mapbox extends MapboxCommon {
                                         east: bounds.getLonEast(),
                                         south: bounds.getLatSouth(),
                                         west: bounds.getLonWest()
-                                    }
+                                    },
+                                    metadata,
+                                    pixelRatio: offlineRegionDefinition.getPixelRatio(),
+                                    type: offlineRegionDefinition.getType()
                                 });
                             }
                         }
@@ -1632,8 +1697,8 @@ export class Mapbox extends MapboxCommon {
     deleteOfflineRegion(options) {
         return new Promise((resolve, reject) => {
             try {
-                if (!options || !options.name) {
-                    reject("Pass in the 'name' param");
+                if (!options || (!options.id && !options.name)) {
+                    reject("Pass in the 'id' or 'name' param");
                     return;
                 }
                 this._getOfflineManager().listOfflineRegions(new com.mapbox.mapboxsdk.offline.OfflineManager.ListOfflineRegionsCallback({
@@ -1646,8 +1711,8 @@ export class Mapbox extends MapboxCommon {
                         if (offlineRegions !== null) {
                             for (let i = 0; i < offlineRegions.length; i++) {
                                 const offlineRegion = offlineRegions[i];
-                                const name = this._getRegionName(offlineRegion);
-                                if (name === options.name) {
+                                const regionId = options.id ? offlineRegion.getID() : this._getRegionName(offlineRegion);
+                                if (regionId === (options.id || options.name)) {
                                     found = true;
                                     offlineRegion.delete(new com.mapbox.mapboxsdk.offline.OfflineRegion.OfflineRegionDeleteCallback({
                                         onError: (error) => {
@@ -1668,7 +1733,7 @@ export class Mapbox extends MapboxCommon {
             }
             catch (ex) {
                 if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'Error in mapbox.listOfflineRegions: ' + ex);
+                    CLog(CLogTypes.info, 'Error in mapbox.deleteOfflineRegion: ' + ex);
                 }
                 reject(ex);
             }
@@ -1785,11 +1850,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) {
@@ -1896,7 +1974,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');
             }
@@ -1984,9 +2062,14 @@ export class Mapbox extends MapboxCommon {
                 }
                 this.requestFineLocationPermission()
                     .then(() => {
-                    this.showUserLocationMarker({
-                        useDefaultLocationEngine: true
-                    });
+                    if (this._locationComponent) {
+                        this.changeUserLocationMarkerMode(options.renderMode || 'COMPASS', options.cameraMode || 'TRACKING');
+                    }
+                    else {
+                        this.showUserLocationMarker({
+                            useDefaultLocationEngine: true
+                        });
+                    }
                 })
                     .catch((err) => {
                     console.error('Location permission denied. error:', err);
@@ -2081,11 +2164,11 @@ export class Mapbox extends MapboxCommon {
                 return modeRef.NONE_GPS;
             case 'TRACKING':
                 return modeRef.TRACKING;
-            case 'TRACK_COMPASS':
+            case 'TRACKING_COMPASS':
                 return modeRef.TRACKING_COMPASS;
             case 'TRACKING_GPS':
                 return modeRef.TRACKING_GPS;
-            case 'TRACK_GPS_NORTH':
+            case 'TRACKING_GPS_NORTH':
                 return modeRef.TRACKING_GPS_NORTH;
         }
     }
@@ -2115,7 +2198,18 @@ export class Mapbox extends MapboxCommon {
         const metadata = offlineRegion.getMetadata();
         const jsonStr = new java.lang.String(metadata, 'UTF-8');
         const jsonObj = new org.json.JSONObject(jsonStr);
-        return jsonObj.getString('name');
+        try {
+            return jsonObj.getString('name');
+        }
+        catch (error) {
+            return '';
+        }
+    }
+    _getRegionMetadata(offlineRegion) {
+        const metadata = offlineRegion.getMetadata();
+        const jsonStr = new java.lang.String(metadata, 'UTF-8');
+        const jsonObj = new org.json.JSONObject(jsonStr);
+        return JSON.parse(jsonObj.toString());
     }
     showUserLocationMarker(options, nativeMap) {
         return new Promise((resolve, reject) => {
@@ -2241,23 +2335,32 @@ export class Mapbox extends MapboxCommon {
                     reject('No location component has been loaded');
                     return;
                 }
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'changeUserLocationMarkerMode(): current render mode is:', this._locationComponent.getRenderMode());
-                }
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, "Mapbox::changeUserLocationMarkerMode(): changing renderMode to '" + renderModeString + "' cameraMode '" + cameraModeString + "'");
+                if (cameraModeString) {
+                    const cameraMode = this._stringToCameraMode(cameraModeString);
+                    if (Trace.isEnabled()) {
+                        CLog(CLogTypes.info, `Mapbox::changeUserLocationMarkerMode(): current camera mode is: ${this._locationComponent.getCameraMode()}`);
+                        CLog(CLogTypes.info, `Mapbox::changeUserLocationMarkerMode(): changing camera mode to: ${cameraMode}`);
+                    }
+                    this._locationComponent.setCameraMode(cameraMode);
+                    if (Trace.isEnabled()) {
+                        CLog(CLogTypes.info, `Mapbox::changeUserLocationMarkerMode(): new camera mode is: ${this._locationComponent.getCameraMode()}`);
+                    }
                 }
-                const cameraMode = this._stringToCameraMode(cameraModeString);
-                const renderMode = this._stringToRenderMode(renderModeString);
-                this._locationComponent.setCameraMode(cameraMode);
-                this._locationComponent.setRenderMode(renderMode);
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'changeUserLocationMarkerMode(): new render mode is:', this._locationComponent.getRenderMode());
+                if (renderModeString) {
+                    const renderMode = this._stringToRenderMode(renderModeString);
+                    if (Trace.isEnabled()) {
+                        CLog(CLogTypes.info, `Mapbox::changeUserLocationMarkerMode(): current render mode is: ${this._locationComponent.getRenderMode()}`);
+                        CLog(CLogTypes.info, `Mapbox::changeUserLocationMarkerMode(): changing render mode to: '${renderMode}'`);
+                    }
+                    this._locationComponent.setRenderMode(renderMode);
+                    if (Trace.isEnabled()) {
+                        CLog(CLogTypes.info, 'changeUserLocationMarkerMode(): new render mode is:', this._locationComponent.getRenderMode());
+                    }
                 }
             }
             catch (ex) {
                 if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'Error in mapbox.showUserLocationMarker: ' + ex);
+                    CLog(CLogTypes.info, 'Error in mapbox.changeUserLocationMarkerMode: ' + ex);
                 }
                 reject(ex);
             }
@@ -2358,7 +2461,7 @@ export class Mapbox extends MapboxCommon {
                 resolve(marker);
                 return;
             }
-            getImage(marker.icon).then((output) => {
+            Http.getImage(marker.icon).then((output) => {
                 marker.iconDownloaded = output.android;
                 this._markerIconDownloadCache[marker.icon] = marker.iconDownloaded;
                 resolve(marker);
@@ -2388,31 +2491,15 @@ export class Mapbox extends MapboxCommon {
     project(data) {
         const mapboxPoint = new com.mapbox.mapboxsdk.geometry.LatLng(data.lat, data.lng);
         const screenLocation = this._mapboxMapInstance.getProjection().toScreenLocation(mapboxPoint);
-        return { x: layout.toDeviceIndependentPixels(screenLocation.x), y: layout.toDeviceIndependentPixels(screenLocation.y) };
-    }
-}
-export class Layer {
-    constructor(instance) {
-        this.instance = instance;
-        this.id = instance.getId();
+        return { x: Utils.layout.toDeviceIndependentPixels(screenLocation.x), y: Utils.layout.toDeviceIndependentPixels(screenLocation.y) };
     }
-    visibility() {
-        return this.instance.getVisibility().getValue() === 'visible' ? true : false;
-    }
-    show() {
-        this.instance.setProperties([new com.mapbox.mapboxsdk.style.layers.PropertyValue('visibility', 'visible')]);
-    }
-    hide() {
-        this.instance.setProperties([new com.mapbox.mapboxsdk.style.layers.PropertyValue('visibility', 'none')]);
-    }
-    getNativeInstance() {
-        return this.instance;
-    }
-    setFilter(filter) {
-        this.instance.setFilter(FilterParser.parseJson(filter));
-    }
-    getFilter() {
-        return FilterParser.toJson(this.instance.getFilter());
+    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()
+        };
     }
 }
-//# sourceMappingURL=mapbox.android.js.map
+//# sourceMappingURL=index.android.js.map

package/index.d.ts

@@ -1,8 +1,101 @@
-/**
- * iOS and Android apis should match.
- * It doesn't matter if you export `.ios` or `.android`, either one but only one.
- */
-export * from './mapbox.ios';
+import { ImageSource } from '@nativescript/core';
+import { AddExtrusionOptions, AddGeoJsonClusteredOptions, AddPolygonOptions, AddPolylineOptions, AddSourceOptions, AnimateCameraOptions, DeleteOfflineRegionOptions, DownloadOfflineRegionOptions, Feature, LatLng, LayerCommon, ListOfflineRegionsOptions, MapboxApi, MapboxCommon, MapboxMarker, MapboxViewBase, MapStyle, OfflineRegion, QueryRenderedFeaturesOptions, QuerySourceFeaturesOptions, SetCenterOptions, SetTiltOptions, SetViewportOptions, SetZoomLevelOptions, ShowOptions, TrackUserOptions, UpdateSourceOptions, UserLocation, UserLocationCameraMode, Viewport } from './common';
 
 // Export any shared classes, constants, etc.
-export * from './mapbox.common';
+export * from './common';
+
+export declare function setLogLevel(level: 'none' | 'info' | 'debug' | 'error' | 'fault' | 'verbose'): void;
+export declare class MapboxView extends MapboxViewBase {
+    private nativeMapView;
+    private delegate;
+    private settings;
+    private initialized;
+    private initCountHack;
+    setConfig(settings: any): void;
+    getNativeMapView(): any;
+    createNativeView(): Object;
+    onLoaded(): void;
+    initNativeView(): void;
+    disposeNativeView(): Promise<void>;
+    getMapboxApi(): any;
+    initMap(): void;
+    onLayout(left: number, top: number, right: number, bottom: number): void;
+}
+export declare class Mapbox extends MapboxCommon implements MapboxApi {
+    private _mapboxViewInstance;
+    private eventCallbacks;
+    private userLocationRenderMode;
+    setMapboxViewInstance(mapboxViewInstance: any): void;
+    initEventHandlerShim(settings: any, mapboxNativeViewInstance: any): void;
+    onMapEvent(eventName: any, id: any, callback: any, nativeMapView?: any): void;
+    offMapEvent(eventName: any, id: any, nativeMapView?: any): void;
+    private checkForClickEvent;
+    private _addMarkers;
+    show(options: ShowOptions): Promise<any>;
+    hide(): Promise<void>;
+    unhide(): Promise<void>;
+    destroy(nativeMap?: any): Promise<void>;
+    onStart(nativeMap?: any): Promise<void>;
+    onResume(nativeMap?: any): Promise<void>;
+    onPause(nativeMap?: any): Promise<void>;
+    onStop(nativeMap?: any): Promise<void>;
+    onLowMemory(nativeMap?: any): Promise<void>;
+    onDestroy(nativeMap?: any): Promise<void>;
+    setMapStyle(style: string | MapStyle, nativeMap?: any): Promise<void>;
+    getImage(imageId: string, nativeMap?: any): Promise<ImageSource>;
+    addImage(imageId: string, image: string, nativeMap?: any): Promise<void>;
+    removeImage(imageId: string, nativeMap?: any): Promise<void>;
+    addMarkers(markers: MapboxMarker[], nativeMap?: any): Promise<void>;
+    removeMarkers(ids?: any, nativeMap?: any): Promise<void>;
+    setCenter(options: SetCenterOptions, nativeMap?: any): Promise<void>;
+    getCenter(nativeMap?: any): Promise<LatLng>;
+    setZoomLevel(options: SetZoomLevelOptions, nativeMap?: any): Promise<void>;
+    getZoomLevel(nativeMap?: any): Promise<number>;
+    setTilt(options: SetTiltOptions, nativeMap?: any): Promise<void>;
+    getTilt(nativeMap?: any): Promise<number>;
+    getUserLocation(nativeMap?: any): Promise<UserLocation>;
+    _stringToCameraMode(mode: UserLocationCameraMode): any;
+    _stringToRenderMode(mode: any): any;
+    showUserLocationMarker(options: any, nativeMap?: any): Promise<void>;
+    hideUserLocationMarker(nativeMap?: any): Promise<void>;
+    changeUserLocationMarkerMode(renderModeString: any, cameraModeString: UserLocationCameraMode, nativeMap?: any): Promise<void>;
+    forceUserLocationUpdate(location: any, nativeMap?: any): void;
+    queryRenderedFeatures(options: QueryRenderedFeaturesOptions, nativeMap?: any): Promise<Feature[]>;
+    querySourceFeatures(sourceId: string, options?: QuerySourceFeaturesOptions, nativeMap?: any): Promise<Feature[]>;
+    addPolygon(options: AddPolygonOptions, nativeMap?: any): Promise<void>;
+    addPolyline(options: AddPolylineOptions, nativeMap?: any): Promise<void>;
+    private removePolyById;
+    private removePolys;
+    removePolygons(ids?: any[], nativeMap?: any): Promise<void>;
+    removePolylines(ids?: any[], nativeMap?: any): Promise<void>;
+    animateCamera(options: AnimateCameraOptions, nativeMap?: any): Promise<void>;
+    setOnMapClickListener(listener: (data: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnMapLongClickListener(listener: (data: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnScrollListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnMoveBeginListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnFlingListener(listener: () => void, nativeMap?: any): Promise<void>;
+    setOnCameraMoveListener(listener: (reason: any, animated?: any) => void, nativeMap?: any): Promise<void>;
+    setOnCameraMoveCancelListener(listener: () => void, nativeMap?: any): Promise<void>;
+    setOnCameraIdleListener(listener: () => void, nativeMap?: any): Promise<void>;
+    getViewport(nativeMap?: any): Promise<Viewport>;
+    setViewport(options: SetViewportOptions, nativeMap?: any): Promise<void>;
+    downloadOfflineRegion(options: DownloadOfflineRegionOptions): Promise<void>;
+    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>;
+    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>;
+    removeLayer(id: string, nativeMapViewInstance?: any): Promise<void>;
+    addLinePoint(id: string, lnglat: any, sourceId?: string, nativeMapView?: any): Promise<void>;
+    addGeoJsonClustered(options: AddGeoJsonClusteredOptions, nativeMapViewInstance?: any): Promise<void>;
+    trackUser(options: TrackUserOptions, nativeMap?: any): Promise<void>;
+    getLayer(name: string, nativeMap?: any): Promise<LayerCommon>;
+    getLayers(nativeMap?: any): Promise<LayerCommon[]>;
+    project(data: LatLng): {
+        x: number;
+        y: number;
+    };
+    projectBack(screenCoordinate: { x: number, y: number }): LatLng;
+}

package/{mapbox.ios.d.ts → index.ios.d.ts}

@@ -1,6 +1,6 @@
 import { ImageSource } from '@nativescript/core';
-import { AddExtrusionOptions, AddGeoJsonClusteredOptions, AddPolygonOptions, AddPolylineOptions, AddSourceOptions, AnimateCameraOptions, DeleteOfflineRegionOptions, DownloadOfflineRegionOptions, Feature, LatLng, LayerCommon, ListOfflineRegionsOptions, MapStyle, MapboxApi, MapboxCommon, MapboxMarker, MapboxTraceCategory, MapboxViewBase, OfflineRegion, QueryRenderedFeaturesOptions, QuerySourceFeaturesOptions, SetCenterOptions, SetTiltOptions, SetViewportOptions, SetZoomLevelOptions, ShowOptions, TrackUserOptions, UpdateSourceOptions, UserLocation, UserLocationCameraMode, Viewport } from './mapbox.common';
-export { MapboxTraceCategory, MapStyle };
+import { AddExtrusionOptions, AddGeoJsonClusteredOptions, AddPolygonOptions, AddPolylineOptions, AddSourceOptions, AnimateCameraOptions, DeleteOfflineRegionOptions, DownloadOfflineRegionOptions, Feature, LatLng, LayerCommon, ListOfflineRegionsOptions, MapStyle, MapboxApi, MapboxCommon, MapboxMarker, MapboxViewBase, OfflineRegion, QueryRenderedFeaturesOptions, QuerySourceFeaturesOptions, SetCenterOptions, SetTiltOptions, SetViewportOptions, SetZoomLevelOptions, ShowOptions, TrackUserOptions, UpdateSourceOptions, UserLocation, UserLocationCameraMode, Viewport } from './common';
+export * from './common';
 export declare function setLogLevel(level: 'none' | 'info' | 'debug' | 'error' | 'fault' | 'verbose'): void;
 export declare class MapboxView extends MapboxViewBase {
     private nativeMapView;
@@ -18,23 +18,6 @@ export declare class MapboxView extends MapboxViewBase {
     initMap(): void;
     onLayout(left: number, top: number, right: number, bottom: number): void;
 }
-export declare class CustomUserLocationAnnotationView extends MGLUserLocationAnnotationView implements MGLUserLocationAnnotationView {
-    size: number;
-    dot: CALayer;
-    arrow: CAShapeLayer;
-    private userLocationRenderMode;
-    private renderModeChanged;
-    init(): this;
-    update(): void;
-    drawTrackingLocationMarker(): void;
-    drawNonTrackingLocationMarker(): void;
-    drawTrackingDot(): void;
-    drawNonTrackingDot(): void;
-    drawArrow(): void;
-    updateHeading(): void;
-    arrowPath(): any;
-    changeUserLocationRenderMode(renderMode: any): void;
-}
 export declare class Mapbox extends MapboxCommon implements MapboxApi {
     private _mapboxViewInstance;
     private eventCallbacks;
@@ -87,6 +70,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     setOnMapLongClickListener(listener: (data: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnScrollListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnMoveBeginListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
+    setOnMoveEndListener(listener: () => void, nativeMap?: any): Promise<void>;
     setOnFlingListener(listener: () => void, nativeMap?: any): Promise<void>;
     setOnCameraMoveListener(listener: (reason: any, animated?: any) => void, nativeMap?: any): Promise<void>;
     setOnCameraMoveCancelListener(listener: () => void, nativeMap?: any): Promise<void>;
@@ -111,15 +95,8 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
         x: number;
         y: number;
     };
-}
-export declare class Layer implements LayerCommon {
-    id: string;
-    private instance;
-    constructor(instance: any);
-    visibility(): boolean;
-    show(): void;
-    hide(): void;
-    getNativeInstance(): any;
-    setFilter(filter: any[]): void;
-    getFilter(): any[];
+    projectBack(screenCoordinate: {
+        x: number;
+        y: number;
+    }): LatLng;
 }