@nativescript-community/ui-mapbox 7.0.0-alpha.14.3191a7b → 7.0.1

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.0.1](https://github.com/nativescript-community/ui-mapbox/compare/v7.0.0...v7.0.1) (2025-10-28)
+
+### Bug Fixes
+
+* **ios:** missing options and improvements ([3d4cedd](https://github.com/nativescript-community/ui-mapbox/commit/3d4cedd92761445ab7293668d2b22e8767f73cce))
+
+## [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

@@ -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;
     /**
@@ -195,6 +195,10 @@ export interface MapboxCluster {
     color: string;
 }
 export interface AddGeoJsonClusteredOptions {
+    id: any;
+    url: any;
+    pointColor: string;
+    pointRadius: number;
     /**
      * A unique identifier, like: "earthquakes"
      */
@@ -264,6 +268,7 @@ export interface VectorSource extends Source {
     tileSize?: number;
 }
 export interface GeoJSONSource extends Source {
+    url: any;
     type: 'geojson';
     data?: any;
     minzoom?: number;
@@ -287,6 +292,12 @@ export interface TrackUserOptions {
     animated?: boolean;
 }
 export interface AddExtrusionOptions {
+    id?: string;
+    source?: string;
+    sourceLayer?: string;
+    minZoom?: any;
+    color?: string;
+    opacity?: any;
 }
 export interface OfflineRegion {
     name: string;
@@ -310,6 +321,7 @@ export interface DownloadProgress {
     completedSize?: number;
 }
 export interface DownloadOfflineRegionOptions extends OfflineRegion {
+    styleUrl: any;
     onProgress?: (data: DownloadProgress) => void;
     /**
      * Optional, used on Android only.
@@ -546,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>;
 }
 /**

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)) {

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

package/index.android.d.ts

@@ -223,13 +223,6 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
      * an invoke any registered callbacks.
      */
     private handleLineClickEvent;
-    hasFineLocationPermission(): Promise<boolean>;
-    /**
-     * Request fine locaion permission
-     *
-     * @link https://docs.mapbox.com/android/core/overview/#permissionsmanager
-     */
-    requestFineLocationPermission(): Promise<import("@nativescript-community/perms").Result>;
     /**
      * set the map style
      *
@@ -434,11 +427,11 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
      *
      * @todo at least with simulated data, the location is only updated once hence adding support for forceLocation method.
      */
-    showUserLocationMarker(options: TrackUserOptions & {
-        accuracyColor: any;
-        accuracyRingColor: any;
-        pulsingColor: any;
-    }, nativeMap?: any): Promise<void>;
+    showUserLocationMarker(options: Partial<TrackUserOptions & {
+        accuracyColor?: any;
+        accuracyRingColor?: any;
+        pulsingColor?: any;
+    }>, nativeMap?: any): Promise<void>;
     /**
      * hide (destroy) the user location marker
      *

package/index.android.js

@@ -3,7 +3,6 @@
  *
  * @todo FIXME: The gcFix() implementation currently assumes only one map visible at a time.
  */
-import { request } from '@nativescript-community/perms';
 import { 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';
@@ -116,6 +115,9 @@ export class MapboxView extends MapboxViewBase {
      * programmatically include settings
      */
     setConfig(settings) {
+        if (Trace.isEnabled()) {
+            CLog(CLogTypes.info, 'setConfig()');
+        }
         // zoom level is not applied unless center is set
         if (settings.zoomLevel && !settings.center) {
             // Eiffel tower, Paris
@@ -221,13 +223,14 @@ export class MapboxView extends MapboxViewBase {
      * @todo FIXME: this.nativeMapView is unused and never actually set to anything.
      */
     async initMap() {
+        const accessToken = this.config?.accessToken ?? this.settings?.accessToken;
         if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, "MapboxView:initMap(): top - accessToken is '" + this.config.accessToken + "'", this.config);
+            CLog(CLogTypes.info, "MapboxView:initMap(): top - accessToken is '" + accessToken + "'", this.config);
         }
-        if (!this.config.accessToken) {
+        if (!accessToken) {
             throw new Error('missing accessToken');
         }
-        if (!this.nativeMapView && ((this.config && this.config.accessToken) || (this.settings && this.settings.accessToken))) {
+        if (!this.nativeMapView) {
             this.mapbox = new Mapbox(this);
             // the NativeScript contentview class extends from Observable to provide the notify method
             // which is the glue that joins this code with whatever callbacks are set in the Mapbox XML
@@ -937,27 +940,6 @@ export class Mapbox extends MapboxCommon {
         } // end of for loop over events.
         return false;
     }
-    hasFineLocationPermission() {
-        return new Promise((resolve, reject) => {
-            try {
-                resolve(this._fineLocationPermissionGranted());
-            }
-            catch (ex) {
-                if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'Error in mapbox.hasFineLocationPermission: ' + ex);
-                }
-                reject(ex);
-            }
-        });
-    }
-    /**
-     * Request fine locaion permission
-     *
-     * @link https://docs.mapbox.com/android/core/overview/#permissionsmanager
-     */
-    async requestFineLocationPermission() {
-        return request('location');
-    }
     /**
      * set the map style
      *
@@ -2423,7 +2405,6 @@ export class Mapbox extends MapboxCommon {
             source = this.getSource(style.source, theMap);
         }
         const layer = await LayerFactory.createLayer(style, source);
-        console.log('addLayer', layer.getNativeInstance());
         if (belowLayerId) {
             // TODO: missing extension typings
             //@ts-ignore
@@ -2596,23 +2577,14 @@ export class Mapbox extends MapboxCommon {
         if (Trace.isEnabled()) {
             CLog(CLogTypes.info, 'trackUser(): top');
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 if (!this._mapboxMapInstance) {
                     reject('No map has been loaded');
                     return;
                 }
-                this.requestFineLocationPermission()
-                    .then(() => {
-                    // if (this._locationComponent) {
-                    //     this.changeUserLocationMarkerMode(options.renderMode || 'COMPASS', options.cameraMode || 'TRACKING');
-                    // } else {
-                    this.showUserLocationMarker(options);
-                    // }
-                })
-                    .catch((err) => {
-                    console.error('Location permission denied. error:', err);
-                });
+                await this.requestFineLocationPermission();
+                this.showUserLocationMarker(options, nativeMap);
                 resolve();
             }
             catch (ex) {
@@ -2869,64 +2841,6 @@ export class Mapbox extends MapboxCommon {
                     return settings;
                 }
             }));
-            // if (typeof options.elevation != 'undefined') {
-            //     componentOptionsBuilder = componentOptionsBuilder.elevation(options.elevation);
-            // }
-            // if (typeof options.accuracyAlpha != 'undefined') {
-            //     componentOptionsBuilder = componentOptionsBuilder.accuracyAlpha(options.accuracyAlpha);
-            // }
-            // if (typeof options.foregroundTintColor != 'undefined') {
-            //     const foregroundTintColor = new java.lang.Integer(android.graphics.Color.parseColor(options.foregroundTintColor));
-            //     componentOptionsBuilder = componentOptionsBuilder.foregroundTintColor(foregroundTintColor);
-            // }
-            // if (typeof options.foregroundStaleTintColor != 'undefined') {
-            //     const foregroundStaleTintColor = new java.lang.Integer(android.graphics.Color.parseColor(options.foregroundStaleTintColor));
-            //     componentOptionsBuilder = componentOptionsBuilder.foregroundStaleTintColor(foregroundStaleTintColor);
-            // }
-            // if (typeof options.backgroundTintColor != 'undefined') {
-            //     const backgroundTintColor = new java.lang.Integer(android.graphics.Color.parseColor(options.backgroundTintColor));
-            //     componentOptionsBuilder = componentOptionsBuilder.backgroundTintColor(backgroundTintColor);
-            // }
-            // if (typeof options.bearingTintColor != 'undefined') {
-            //     const bearingTintColor = new java.lang.Integer(android.graphics.Color.parseColor(options.bearingTintColor));
-            //     componentOptionsBuilder = componentOptionsBuilder.bearingTintColor(bearingTintColor);
-            // }
-            // const componentOptions = componentOptionsBuilder.build();
-            // this._locationComponent = this._mapboxMapInstance.getLocationComponent();
-            // const activationOptionsBuilder = com.mapbox.maps.location.LocationComponentActivationOptions.builder(Utils.android.getApplicationContext(), this._mapboxMapInstance.getStyle());
-            // activationOptionsBuilder.locationComponentOptions(componentOptions);
-            // let useDefaultEngine = true;
-            // if (typeof options.useDefaultLocationEngine != 'undefined') {
-            //     useDefaultEngine = options.useDefaultLocationEngine;
-            // }
-            // activationOptionsBuilder.useDefaultLocationEngine(useDefaultEngine);
-            // const locationComponentActivationOptions = activationOptionsBuilder.build();
-            // this._locationComponent.activateLocationComponent(locationComponentActivationOptions);
-            // this._locationComponent.setLocationComponentEnabled(true);
-            // let cameraMode = this._stringToCameraMode('TRACKING');
-            // if (typeof options.cameraMode != 'undefined') {
-            //     cameraMode = this._stringToCameraMode(options.cameraMode);
-            // }
-            // this._locationComponent.setCameraMode(cameraMode);
-            // let renderMode = com.mapbox.maps.location.modes.RenderMode.COMPASS;
-            // if (typeof options.renderMode != 'undefined') {
-            //     renderMode = this._stringToRenderMode(options.renderMode);
-            // }
-            // this._locationComponent.setRenderMode(renderMode);
-            // if (Trace.isEnabled()) {
-            //     CLog(CLogTypes.info, 'showUserLocationMarker(): after renderMode');
-            // }
-            // if (typeof options.clickListener != 'undefined') {
-            //     this.onLocationClickListener = new com.mapbox.maps.location.OnLocationClickListener({
-            //         onLocationComponentClick: () => {
-            //             options.clickListener();
-            //         }
-            //     });
-            //     this._locationComponent.addOnLocationClickListener(this.onLocationClickListener);
-            // }
-            // if (typeof options.cameraTrackingChangedListener != 'undefined') {
-            //     this._locationComponent.addOnCameraTrackingChangedListener(options.cameraTrackingChangedListener);
-            // }
         }
         catch (ex) {
             if (Trace.isEnabled()) {
@@ -2982,7 +2896,7 @@ export class Mapbox extends MapboxCommon {
         return new Promise((resolve, reject) => {
             try {
                 if (Trace.isEnabled()) {
-                    CLog(CLogTypes.info, 'showUserLocationMarker()');
+                    CLog(CLogTypes.info, 'changeUserLocationMarkerMode()');
                 }
                 if (!this._mapboxMapInstance) {
                     throw new Error('No map has been loaded');