@nativescript-community/ui-mapbox 6.2.31 → 7.0.0

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.0.0](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.31...v7.0.0) (2025-10-25)
+
+### Features
+
+* **android:** plugin updated to v11 (not retro compat!) ([9b98b79](https://github.com/nativescript-community/ui-mapbox/commit/9b98b79cb9a0cf2474ac6336e754370940a29d2d))
+* **ios:** updated SDK to v11+ ([fc9af79](https://github.com/nativescript-community/ui-mapbox/commit/fc9af79a296019fa8c44e4b019826b524c19af72))
+
 ## [6.2.31](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.30...v6.2.31) (2024-10-04)
 
 **Note:** Version bump only for package @nativescript-community/ui-mapbox

package/common.d.ts

@@ -37,8 +37,8 @@ export interface QuerySourceFeaturesOptions {
 export interface Feature {
     id?: any;
     type: string;
-    geometry: Object;
-    properties: Object;
+    geometry: object;
+    properties: object;
 }
 export interface AddPolygonOptions {
     /**
@@ -96,7 +96,7 @@ export interface MapboxMarker extends LatLng {
     /**
      * Set this in case you want to later pass it to 'removeMarker'.
      */
-    id?: any;
+    id?: number;
     title?: string;
     subtitle?: string;
     /**
@@ -127,6 +127,10 @@ export interface MapboxMarker extends LatLng {
     update?: (newSettings: MapboxMarker) => void;
     ios?: any;
     android?: any;
+    /**
+     * internally used to know if the marker image is already downloaded
+     */
+    downloadedIcon?: ImageSource;
 }
 export interface SetZoomLevelOptions {
     level: number;
@@ -141,6 +145,7 @@ export interface SetTiltOptions {
      * default 5000 (milliseconds)
      */
     duration: number;
+    animated?: boolean;
 }
 export interface ShowOptionsMargins {
     left?: number;
@@ -190,6 +195,10 @@ export interface MapboxCluster {
     color: string;
 }
 export interface AddGeoJsonClusteredOptions {
+    id: any;
+    url: any;
+    pointColor: string;
+    pointRadius: number;
     /**
      * A unique identifier, like: "earthquakes"
      */
@@ -259,6 +268,7 @@ export interface VectorSource extends Source {
     tileSize?: number;
 }
 export interface GeoJSONSource extends Source {
+    url: any;
     type: 'geojson';
     data?: any;
     minzoom?: number;
@@ -275,19 +285,25 @@ export interface GeoJSONSource extends Source {
 export type UserLocationCameraMode = 'NONE' | 'NONE_COMPASS' | 'NONE_GPS' | 'TRACKING' | 'TRACKING_COMPASS' | 'TRACKING_GPS' | 'TRACKING_GPS_NORTH';
 export interface TrackUserOptions {
     cameraMode: UserLocationCameraMode;
-    renderMode?: string;
+    renderMode?: 'NORMAL' | 'COMPASS' | 'GPS';
     /**
      * iOS only, as Android is always animated. Default true (because of Android).
      */
     animated?: boolean;
 }
 export interface AddExtrusionOptions {
+    id?: string;
+    source?: string;
+    sourceLayer?: string;
+    minZoom?: any;
+    color?: string;
+    opacity?: any;
 }
 export interface OfflineRegion {
     name: string;
     bounds: Bounds;
-    minZoom: number;
-    maxZoom: number;
+    minZoom?: number;
+    maxZoom?: number;
     style: MapStyle;
     metadata?: any;
     pixelRatio?: any;
@@ -305,12 +321,16 @@ export interface DownloadProgress {
     completedSize?: number;
 }
 export interface DownloadOfflineRegionOptions extends OfflineRegion {
+    styleUrl: any;
     onProgress?: (data: DownloadProgress) => void;
     /**
      * Optional, used on Android only.
      * Set this, in case no map has been show yet (and thus, no accessToken has been passed in yet).
      */
     accessToken?: string;
+    regionId?: string;
+    minZoom?: number;
+    maxZoom?: number;
 }
 export interface ListOfflineRegionsOptions {
     /**
@@ -470,10 +490,7 @@ export interface MapboxApi {
     unhide(): Promise<any>;
     destroy(nativeMap?: any): Promise<any>;
     onStart(nativeMap?: any): Promise<any>;
-    onResume(nativeMap?: any): Promise<any>;
-    onPause(nativeMap?: any): Promise<any>;
     onStop(nativeMap?: any): Promise<any>;
-    onLowMemory(nativeMap?: any): Promise<any>;
     onDestroy(nativeMap?: any): Promise<any>;
     setMapStyle(style: string | MapStyle, nativeMap?: any): Promise<any>;
     addMarkers(markers: MapboxMarker[], nativeMap?: any): Promise<any>;
@@ -487,10 +504,8 @@ export interface MapboxApi {
     getUserLocation(nativeMap?: any): Promise<UserLocation>;
     showUserLocationMarker(options: any, nativeMap?: any): void;
     hideUserLocationMarker(nativeMap?: any): void;
-    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>;
@@ -513,9 +528,9 @@ export interface MapboxApi {
     setOnMoveBeginListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnMoveEndListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnFlingListener(listener: () => void, nativeMap?: any): Promise<any>;
-    setOnCameraMoveListener(listener: (reason: any, animated?: boolean) => void, nativeMap?: any): Promise<any>;
+    setOnCameraChangeListener(listener: (reason: any, animated?: boolean) => void, nativeMap?: any): Promise<any>;
     setOnCameraMoveCancelListener(listener: () => void, nativeMap?: any): Promise<any>;
-    setOnCameraIdleListener(listener: () => void, nativeMap?: any): Promise<any>;
+    setOnMapIdleListener(listener: () => void, nativeMap?: any): Promise<any>;
     requestFineLocationPermission(): Promise<any>;
     hasFineLocationPermission(): Promise<boolean>;
     getViewport(nativeMap?: any): Promise<Viewport>;
@@ -543,8 +558,12 @@ export declare abstract class MapboxCommon implements MapboxCommonApi {
     constructor(view?: MapboxViewCommonBase);
     static defaults: Partial<ShowOptions>;
     static merge(obj1: {}, obj2: {}): any;
-    requestFineLocationPermission(): Promise<any>;
     hasFineLocationPermission(): Promise<boolean>;
+    /**
+     * Request fine locaion permission
+     *
+     */
+    requestFineLocationPermission(): Promise<import("@nativescript-community/perms").Status>;
     protected fetchImageSource(imagePath: string): Promise<ImageSource>;
 }
 /**
@@ -562,7 +581,7 @@ export interface MapboxViewApi {
     setOnScrollListener(listener: (data?: LatLng) => void): Promise<void>;
     setOnMoveBeginListener(listener: (data?: LatLng) => void): Promise<void>;
     setOnFlingListener(listener: () => void): Promise<any>;
-    setOnCameraMoveListener(listener: (reason: any, animated?: boolean) => void): Promise<any>;
+    setOnCameraChangeListener(listener: (reason: any, animated?: boolean) => void): Promise<any>;
     setOnCameraMoveCancelListener(listener: () => void): Promise<any>;
     setOnCameraIdleListener(listener: () => void): Promise<any>;
     getViewport(): Promise<Viewport>;
@@ -576,10 +595,8 @@ 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>;
@@ -599,10 +616,7 @@ export interface MapboxViewApi {
     removeImage(imageId: string, nativeMap?: any): Promise<void>;
     destroy(): Promise<any>;
     onStart(): Promise<any>;
-    onResume(): Promise<any>;
-    onPause(): Promise<any>;
     onStop(): Promise<any>;
-    onLowMemory(): Promise<any>;
     onDestroy(): Promise<any>;
     project(data: LatLng): {
         x: number;
@@ -641,7 +655,7 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
     setOnMoveBeginListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnMoveEndListener(listener: (data?: LatLng) => void, nativeMap?: any): Promise<void>;
     setOnFlingListener(listener: () => void, nativeMap?: any): Promise<any>;
-    setOnCameraMoveListener(listener: (reason: any, animated?: boolean) => void, nativeMap?: any): Promise<any>;
+    setOnCameraChangeListener(listener: (reason: any, animated?: boolean) => void, nativeMap?: any): Promise<any>;
     setOnCameraMoveCancelListener(listener: () => void, nativeMap?: any): Promise<any>;
     setOnCameraIdleListener(listener: () => void, nativeMap?: any): Promise<any>;
     getViewport(): Promise<Viewport>;
@@ -656,10 +670,8 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
     getUserLocation(): Promise<UserLocation>;
     showUserLocationMarker(options: any): void;
     hideUserLocationMarker(): void;
-    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>;
@@ -680,10 +692,7 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
     removeImage(imageId: string): Promise<void>;
     destroy(): Promise<any>;
     onStart(): Promise<any>;
-    onResume(nativeMap?: any): Promise<any>;
-    onPause(nativeMap?: any): Promise<any>;
     onStop(nativeMap?: any): Promise<any>;
-    onLowMemory(nativeMap?: any): Promise<any>;
     onDestroy(nativeMap?: any): Promise<any>;
     project(data: LatLng): {
         x: number;
@@ -693,6 +702,9 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
         x: number;
         y: number;
     }): LatLng;
+    downloadOfflineRegion(options: DownloadOfflineRegionOptions): Promise<any>;
+    listOfflineRegions(options?: ListOfflineRegionsOptions): Promise<OfflineRegion[]>;
+    deleteOfflineRegion(options: DeleteOfflineRegionOptions): Promise<any>;
 }
 /**
  * Properties definitions for the Mapbox XML tag.
@@ -730,6 +742,24 @@ export declare const delayProperty: Property<MapboxViewCommonBase, number>;
  * @link https://docs.nativescript.org/plugins/ui-plugin-custom
  */
 export declare abstract class MapboxViewBase extends MapboxViewCommonBase {
+    [zoomLevelProperty.setNative]: (value: number) => void;
+    [mapStyleProperty.setNative]: (value: string) => void;
+    [accessTokenProperty.setNative]: (value: string) => void;
+    [delayProperty.setNative]: (value: number) => void;
+    [latitudeProperty.setNative]: (value: number) => void;
+    [longitudeProperty.setNative]: (value: number) => void;
+    [showUserLocationProperty.setNative]: (value: boolean) => void;
+    [locationComponentOptionsProperty.setNative]: (value: boolean) => void;
+    [hideLogoProperty.setNative]: (value: boolean) => void;
+    [logoPositionProperty.setNative]: (value: ControlPosition) => void;
+    [hideAttributionProperty.setNative]: (value: boolean) => void;
+    [attributionPositionProperty.setNative]: (value: ControlPosition) => void;
+    [hideCompassProperty.setNative]: (value: boolean) => void;
+    [compassPositionProperty.setNative]: (value: ControlPosition) => void;
+    [disableZoomProperty.setNative]: (value: boolean) => void;
+    [disableRotationProperty.setNative]: (value: boolean) => void;
+    [disableScrollProperty.setNative]: (value: boolean) => void;
+    [disableTiltProperty.setNative]: (value: boolean) => void;
     static mapReadyEvent: string;
     static scrollEvent: string;
     static moveBeginEvent: string;

package/common.js

@@ -1,3 +1,4 @@
+import { check, request } from '@nativescript-community/perms';
 import { ContentView, ImageSource, Property, Trace, Utils, booleanConverter } from '@nativescript/core';
 export * from './geo.utils';
 export * from './expression/expression-parser';
@@ -61,9 +62,15 @@ export class MapboxCommon {
         }
         return result;
     }
-    async requestFineLocationPermission() { }
     async hasFineLocationPermission() {
-        return true;
+        return (await check('location')) === 'authorized';
+    }
+    /**
+     * Request fine locaion permission
+     *
+     */
+    async requestFineLocationPermission() {
+        return request('location');
     }
     async fetchImageSource(imagePath) {
         if (Utils.isDataURI(imagePath)) {
@@ -77,7 +84,7 @@ export class MapboxCommon {
     }
 }
 MapboxCommon.defaults = {
-    style: MapStyle.STREETS.toString(),
+    style: MapStyle.STREETS,
     margins: {
         left: 0,
         right: 0,
@@ -145,14 +152,14 @@ export class MapboxViewCommonBase extends ContentView {
     setOnFlingListener(listener, nativeMap) {
         return this.mapbox.setOnFlingListener(listener, this.getNativeMapView());
     }
-    setOnCameraMoveListener(listener, nativeMap) {
-        return this.mapbox.setOnCameraMoveListener(listener, this.getNativeMapView());
+    setOnCameraChangeListener(listener, nativeMap) {
+        return this.mapbox.setOnCameraChangeListener(listener, this.getNativeMapView());
     }
     setOnCameraMoveCancelListener(listener, nativeMap) {
         return this.mapbox.setOnCameraMoveCancelListener(listener, this.getNativeMapView());
     }
     setOnCameraIdleListener(listener, nativeMap) {
-        return this.mapbox.setOnCameraIdleListener(listener, this.getNativeMapView());
+        return this.mapbox.setOnMapIdleListener(listener, this.getNativeMapView());
     }
     getViewport() {
         return this.mapbox.getViewport(this.getNativeMapView());
@@ -190,18 +197,18 @@ export class MapboxViewCommonBase extends ContentView {
     hideUserLocationMarker() {
         this.mapbox.hideUserLocationMarker(this.getNativeMapView());
     }
-    changeUserLocationMarkerMode(renderModeString, cameraModeString) {
-        this.mapbox.changeUserLocationMarkerMode(renderModeString, cameraModeString, this.getNativeMapView());
-    }
+    // changeUserLocationMarkerMode(renderModeString, cameraModeString: UserLocationCameraMode): void {
+    //     this.mapbox.changeUserLocationMarkerMode(renderModeString, cameraModeString, this.getNativeMapView());
+    // }
     forceUserLocationUpdate(location) {
         this.mapbox.forceUserLocationUpdate(location, this.getNativeMapView());
     }
     trackUser(options) {
         return this.mapbox.trackUser(options, this.getNativeMapView());
     }
-    getUserLocationCameraMode() {
-        return this.mapbox.getUserLocationCameraMode(this.getNativeMapView());
-    }
+    // getUserLocationCameraMode(): UserLocationCameraMode {
+    //     return this.mapbox.getUserLocationCameraMode(this.getNativeMapView());
+    // }
     addSource(id, options) {
         return this.mapbox.addSource(id, options, this.getNativeMapView());
     }
@@ -257,31 +264,40 @@ export class MapboxViewCommonBase extends ContentView {
         return this.mapbox.removeImage(imageId, this.getNativeMapView());
     }
     destroy() {
-        return this.mapbox && this.mapbox.destroy(this.getNativeMapView());
+        return this.mapbox?.destroy(this.getNativeMapView());
     }
     onStart() {
-        return this.mapbox && this.mapbox.onStart(this.getNativeMapView());
-    }
-    onResume(nativeMap) {
-        return this.mapbox && this.mapbox.onResume(this.getNativeMapView());
-    }
-    onPause(nativeMap) {
-        return this.mapbox && this.mapbox.onPause(this.getNativeMapView());
-    }
+        return this.mapbox?.onStart(this.getNativeMapView());
+    }
+    // onResume(nativeMap?: any): Promise<any> {
+    //     return this.mapbox && this.mapbox.onResume(this.getNativeMapView());
+    // }
+    // onPause(nativeMap?: any): Promise<any> {
+    //     return this.mapbox && this.mapbox.onPause(this.getNativeMapView());
+    // }
     onStop(nativeMap) {
-        return this.mapbox && this.mapbox.onStop(this.getNativeMapView());
-    }
-    onLowMemory(nativeMap) {
-        return this.mapbox.onLowMemory(this.getNativeMapView());
+        return this.mapbox?.onStop(this.getNativeMapView());
     }
+    // onLowMemory(nativeMap?: any): Promise<any> {
+    //     return this.mapbox.onLowMemory(this.getNativeMapView());
+    // }
     onDestroy(nativeMap) {
-        return this.mapbox && this.mapbox.onDestroy(this.getNativeMapView());
+        return this.mapbox?.onDestroy(this.getNativeMapView());
     }
     project(data) {
-        return this.mapbox && this.mapbox.project(data);
+        return this.mapbox.project(data);
     }
     projectBack(screenCoordinate) {
-        return this.mapbox && this.mapbox.projectBack(screenCoordinate);
+        return this.mapbox.projectBack(screenCoordinate);
+    }
+    downloadOfflineRegion(options) {
+        return this.mapbox.downloadOfflineRegion(options);
+    }
+    listOfflineRegions(options) {
+        return this.mapbox.listOfflineRegions(options);
+    }
+    deleteOfflineRegion(options) {
+        return this.mapbox.deleteOfflineRegion(options);
     }
 }
 // -----------------------------------------------------------------

package/expression/expression-parser.android.d.ts

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

package/expression/expression-parser.android.js

@@ -1,16 +1,17 @@
+const Expression = com.mapbox.maps.extension.style.expressions.generated.Expression;
 export class ExpressionParser {
     static parseJson(json) {
-        const expression = com.mapbox.mapboxsdk.style.expressions.Expression.Converter.convert(JSON.stringify(json));
+        const expression = Expression.fromRaw(JSON.stringify(json));
         return expression;
     }
     static toJson(filter) {
         if (!filter) {
             return null;
         }
-        if (!(filter instanceof com.mapbox.mapboxsdk.style.expressions.Expression)) {
+        if (!(filter instanceof com.mapbox.maps.extension.style.expressions.generated.Expression)) {
             throw new Error('Filter must be a Expression.');
         }
-        return JSON.parse(filter.toString());
+        return JSON.parse(filter.toJson());
     }
 }
 //# sourceMappingURL=expression-parser.android.js.map

package/expression/expression-parser.ios.d.ts

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

package/expression/expression-parser.ios.js

@@ -1,22 +1,37 @@
+// src/ui-mapbox/expression-parser.ios.ts
+// TypeScript shim that exports ExpressionParser (TS API) while delegating to native NativeExpressionParser when available.
 export class ExpressionParser {
+    // Return native predicate object (opaque) if native parser available, otherwise return the expression JSON.
     static parseJson(json) {
-        const filterStr = NSString.stringWithString(JSON.stringify(json));
-        const filterData = filterStr.dataUsingEncoding(NSUTF8StringEncoding);
-        const filterJson = NSJSONSerialization.JSONObjectWithDataOptionsError(filterData, 1 /* NSJSONReadingOptions.MutableContainers */);
-        const predicateFilter = NSPredicate.predicateWithMGLJSONObject(filterJson);
-        return predicateFilter;
+        try {
+            if (global.NativeExpressionParser && global.NativeExpressionParser.parseJson) {
+                const res = global.NativeExpressionParser.parseJson(json);
+                if (res)
+                    return res;
+            }
+        }
+        catch (e) {
+            // ignore and fallback
+        }
+        return json;
     }
+    // Try to convert native predicate back to JSON expression. Returns array or null.
     static toJson(filter) {
-        if (!filter) {
-            return null;
+        try {
+            if (!filter)
+                return null;
+            if (Array.isArray(filter))
+                return filter;
+            if (global.NativeExpressionParser && global.NativeExpressionParser.toJson) {
+                const res = global.NativeExpressionParser.toJson(filter);
+                if (res)
+                    return res;
+            }
         }
-        if (!(filter instanceof NSPredicate)) {
-            throw new Error('Filter must be a NSPredicate.');
+        catch (e) {
+            // ignore
         }
-        const expressionObj = filter.mgl_jsonExpressionObject;
-        const data = NSJSONSerialization.dataWithJSONObjectOptionsError(expressionObj, 0);
-        const expression = NSString.alloc().initWithDataEncoding(data, NSUTF8StringEncoding);
-        return JSON.parse(expression);
+        return null;
     }
 }
 //# sourceMappingURL=expression-parser.ios.js.map