@nativescript-community/ui-mapbox 6.2.22 → 6.2.25

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.25](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.24...v6.2.25) (2023-12-07)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
+## [6.2.24](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.23...v6.2.24) (2023-12-07)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
+## [6.2.23](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.22...v6.2.23) (2023-11-29)
+
+### Bug Fixes
+
+* **android:** build fix ([76ea2c0](https://github.com/nativescript-community/ui-mapbox/commit/76ea2c08c247dfecdfb1d08f1d2ae3f4ce43bc84))
+
 ## [6.2.22](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.21...v6.2.22) (2023-11-29)
 
 ### Bug Fixes

package/common.d.ts

@@ -496,7 +496,7 @@ export interface MapboxApi {
     getLayer(name: string, nativeMap?: any): Promise<LayerCommon>;
     getLayers(nativeMap?: any): Promise<LayerCommon[]>;
     getImage(imageId: string, nativeMap?: any): Promise<ImageSource>;
-    addImage(imageId: string, image: string, nativeMap?: any): Promise<void>;
+    addImage(imageId: string, imagePath: string, nativeMap?: any): Promise<void>;
     removeImage(imageId: string, nativeMap?: any): Promise<void>;
     project(data: LatLng): {
         x: number;
@@ -534,6 +534,7 @@ export declare abstract class MapboxCommon implements MapboxCommonApi {
     static merge(obj1: {}, obj2: {}): any;
     requestFineLocationPermission(): Promise<any>;
     hasFineLocationPermission(): Promise<boolean>;
+    protected fetchImageSource(imagePath: string): Promise<ImageSource>;
 }
 /**
  * Interface definition for a View of a mapbox map.
@@ -583,7 +584,7 @@ export interface MapboxViewApi {
     getLayer(name: string, nativeMap?: any): Promise<LayerCommon>;
     getLayers(nativeMap?: any): Promise<LayerCommon[]>;
     getImage(imageId: string, nativeMap?: any): Promise<ImageSource>;
-    addImage(imageId: string, image: string, nativeMap?: any): Promise<void>;
+    addImage(imageId: string, imagePath: string, nativeMap?: any): Promise<void>;
     removeImage(imageId: string, nativeMap?: any): Promise<void>;
     destroy(): Promise<any>;
     onStart(): Promise<any>;
@@ -664,7 +665,7 @@ export declare abstract class MapboxViewCommonBase extends ContentView implement
     getLayer(name: string, nativeMap?: any): Promise<LayerCommon>;
     getLayers(nativeMap?: any): Promise<LayerCommon[]>;
     getImage(imageId: string): Promise<ImageSource>;
-    addImage(imageId: string, image: string): Promise<void>;
+    addImage(imageId: string, imagePath: string): Promise<void>;
     removeImage(imageId: string): Promise<void>;
     destroy(): Promise<any>;
     onStart(): Promise<any>;

package/common.js

@@ -1,4 +1,4 @@
-import { Color, ContentView, ImageSource, Property, Trace, booleanConverter } from '@nativescript/core';
+import { Color, ContentView, ImageSource, Property, Trace, Utils, booleanConverter } from '@nativescript/core';
 export * from './geo.utils';
 export * from './expression/expression-parser';
 export * from './layers/layer-factory';
@@ -57,6 +57,16 @@ export class MapboxCommon {
     async hasFineLocationPermission() {
         return true;
     }
+    async fetchImageSource(imagePath) {
+        if (Utils.isDataURI(imagePath)) {
+            const [, base64] = imagePath.split(';base64,');
+            return ImageSource.fromBase64Sync(base64);
+        }
+        if (Utils.isFileOrResourcePath(imagePath)) {
+            return ImageSource.fromFileOrResourceSync(imagePath);
+        }
+        return ImageSource.fromUrl(imagePath);
+    }
 }
 MapboxCommon.defaults = {
     style: MapStyle.STREETS.toString(),
@@ -230,8 +240,8 @@ export class MapboxViewCommonBase extends ContentView {
     getImage(imageId) {
         return this.mapbox.getImage(imageId, this.getNativeMapView());
     }
-    addImage(imageId, image) {
-        return this.mapbox.addImage(imageId, image, this.getNativeMapView());
+    addImage(imageId, imagePath) {
+        return this.mapbox.addImage(imageId, imagePath, this.getNativeMapView());
     }
     removeImage(imageId) {
         return this.mapbox.removeImage(imageId, this.getNativeMapView());

package/index.android.d.ts

@@ -249,7 +249,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
      */
     setMapStyle(style: string | MapStyle, nativeMapViewInstance?: any): Promise<void>;
     getImage(imageId: string, nativeMap?: any): Promise<ImageSource>;
-    addImage(imageId: string, image: string, nativeMap?: any): Promise<void>;
+    addImage(imageId: string, imagePath: 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>;

package/index.android.js

@@ -4,10 +4,10 @@
  * @todo FIXME: The gcFix() implementation currently assumes only one map visible at a time.
  */
 import { request } from '@nativescript-community/perms';
-import { AndroidApplication, Application, Color, File, Http, Image, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
+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, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './common';
+import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 // Export the enums for devs not using TS
 export * from './common';
 let libraryLoadedOverloaded = false;
@@ -987,19 +987,16 @@ export class Mapbox extends MapboxCommon {
             }
         });
     }
-    async addImage(imageId, image, nativeMap) {
-        return new Promise((resolve, reject) => {
+    async addImage(imageId, imagePath, nativeMap) {
+        return new Promise(async (resolve, reject) => {
             const theMap = nativeMap || this._mapboxMapInstance;
             if (!theMap) {
                 reject('No map has been loaded');
                 return;
             }
-            if (!image.startsWith('res://')) {
-                image = path.join(knownFolders.currentApp().path, image.replace('~/', ''));
-            }
-            const img = ImageSource.fromFileOrResourceSync(image);
             try {
-                theMap.getStyle().addImage(imageId, img.android);
+                const imageSource = await this.fetchImageSource(imagePath);
+                theMap.getStyle().addImage(imageId, imageSource.android);
                 resolve();
             }
             catch (ex) {

package/index.d.ts

@@ -43,7 +43,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
     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>;
+    addImage(imageId: string, imagePath: 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>;

package/index.ios.d.ts

@@ -111,7 +111,7 @@ export declare class Mapbox extends MapboxCommon implements MapboxApi {
      */
     setMapStyle(style: string | MapStyle, nativeMap?: any): Promise<void>;
     getImage(imageId: string, nativeMap?: any): Promise<ImageSource>;
-    addImage(imageId: string, image: string, nativeMap?: any): Promise<void>;
+    addImage(imageId: string, imagePath: 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>;

package/index.ios.js

@@ -1,5 +1,5 @@
 import { Color, File, Http, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
-import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './common';
+import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxViewBase, telemetryProperty } from './common';
 import { Layer, LayerFactory } from './layers/layer-factory';
 import { ExpressionParser } from './expression/expression-parser';
 var MGLMapViewDelegateImpl = /** @class */ (function (_super) {
@@ -998,20 +998,16 @@ export class Mapbox extends MapboxCommon {
             }
         });
     }
-    async addImage(imageId, image, nativeMap) {
-        return new Promise((resolve, reject) => {
+    async addImage(imageId, imagePath, nativeMap) {
+        return new Promise(async (resolve, reject) => {
             const theMap = nativeMap || this._mapboxViewInstance;
             if (!theMap) {
                 reject('No map has been loaded');
                 return;
             }
-            if (!image.startsWith('res://')) {
-                const appPath = knownFolders.currentApp().path;
-                image = appPath + '/' + image.replace('~/', '');
-            }
-            const img = ImageSource.fromFileOrResourceSync(image);
             try {
-                theMap.style.setImageForName(img.ios, imageId);
+                const imageSource = await this.fetchImageSource(imagePath);
+                theMap.style.setImageForName(imageSource.ios, imageId);
                 resolve();
             }
             catch (ex) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-mapbox",
-    "version": "6.2.22",
+    "version": "6.2.25",
     "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.3.0"
     },
-    "gitHead": "970a3622c251a6b45b63711c7239f7965e2bc049"
+    "gitHead": "d30b7e286b25bbf34a2593d14932be196f5a025b"
 }

package/platforms/android/include.gradle

@@ -5,7 +5,7 @@ repositories {
 // see https://www.mapbox.com/android-sdk/
 dependencies {
 	def mapboxVersion =  project.hasProperty("mapboxVersion") ? project.mapboxVersion : "8.6.6"
-	// def mapboxServicesVersion =  project.hasProperty("mapboxServicesVersion") ? project.mapboxServicesVersion : "5.6.0"
+	def mapboxServicesVersion =  project.hasProperty("mapboxServicesVersion") ? project.mapboxServicesVersion : "5.6.0"
 	// def mapboxTelemetryVersion =  project.hasProperty("mapboxTelemetryVersion") ? project.mapboxTelemetryVersion : "6.1.0"
 	def mapboxPluginsVersion =  project.hasProperty("mapboxPluginsVersion") ? project.mapboxPluginsVersion : "v9"
 	def mapboxAnnotationPluginVersion =  project.hasProperty("mapboxAnnotationPluginVersion") ? project.mapboxAnnotationPluginVersion : "0.9.0"