@nativescript-community/ui-mapbox 6.2.21 → 6.2.22

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.22](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.21...v6.2.22) (2023-11-29)
+
+### Bug Fixes
+
+* **android:** trying to handle all sdk versions ([bbfa0aa](https://github.com/nativescript-community/ui-mapbox/commit/bbfa0aa5c16750bbcd3c331be18b9a6bf35f4d49))
+
 ## [6.2.21](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.20...v6.2.21) (2023-11-17)
 
 ### Bug Fixes

package/README.md

@@ -38,6 +38,7 @@
 ## Table of Contents
 
 * [Prerequisites](#prerequisites)
+	* [Android](#android)
 * [Installation](#installation)
 * [Configuration](#configuration)
 * [Issues](#issues)
@@ -110,6 +111,31 @@
 You either need your own tile server such as the one provided by [openmaptiles.org](https://openmaptiles.org) or a Mapbox API access token (they have a 🆓 Starter plan!), so [sign up with Mapbox](https://www.mapbox.com/signup/).
 Once you've registered go to your Account > Apps > New token. The 'Default Secret Token' is what you'll need.
 
+### Android
+
+Mapbox now requires (version > 8.6.6) an api key to download the sdk
+
+If you want to use newer version than the default 8.6.6 you need to add this to your `app.gradle`
+```gradle
+allprojects {
+  repositories {
+       maven {
+        url 'https://api.mapbox.com/downloads/v2/releases/maven'
+        authentication {
+            basic(BasicAuthentication)
+        }
+        credentials {
+            // Do not change the username below.
+            // This should always be `mapbox` (not your username). 
+            username = 'mapbox'
+            // Use the secret token you stored in gradle.properties as the password
+            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+        }
+    }
+  }
+}
+```
+
 
 [](#installation)
 

package/blueprint.md

@@ -10,6 +10,31 @@
 You either need your own tile server such as the one provided by [openmaptiles.org](https://openmaptiles.org) or a Mapbox API access token (they have a 🆓 Starter plan!), so [sign up with Mapbox](https://www.mapbox.com/signup/).
 Once you've registered go to your Account > Apps > New token. The 'Default Secret Token' is what you'll need.
 
+### Android
+
+Mapbox now requires (version > 8.6.6) an api key to download the sdk
+
+If you want to use newer version than the default 8.6.6 you need to add this to your `app.gradle`
+```gradle
+allprojects {
+  repositories {
+       maven {
+        url 'https://api.mapbox.com/downloads/v2/releases/maven'
+        authentication {
+            basic(BasicAuthentication)
+        }
+        credentials {
+            // Do not change the username below.
+            // This should always be `mapbox` (not your username). 
+            username = 'mapbox'
+            // Use the secret token you stored in gradle.properties as the password
+            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+        }
+    }
+  }
+}
+```
+
 ## Installation
 Run the following command from the root of your project:
 

package/common.d.ts

@@ -197,8 +197,8 @@ 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 type LayerType = "fill" | "line" | "symbol" | "circle" | "heatmap" | "fill-extrusion" | "raster" | "hillshade" | "background" | "sky";
+export type SupportedLayerType = LayerType & ("line" | "circle" | "fill" | "symbol" | "raster");
 export interface AddLayerOptions {
     id: string;
     source: string;
@@ -229,9 +229,9 @@ export interface AddLayerOptions {
     lineOpacity?: number;
     lineWidth?: number;
 }
-export declare type UserTrackingMode = 'NONE' | 'FOLLOW' | 'FOLLOW_WITH_HEADING' | 'FOLLOW_WITH_COURSE';
-export declare type AddSourceOptions = VectorSource | GeoJSONSource | RasterSource;
-export declare type UpdateSourceOptions = VectorSource | GeoJSONSource | RasterSource;
+export type UserTrackingMode = 'NONE' | 'FOLLOW' | 'FOLLOW_WITH_HEADING' | 'FOLLOW_WITH_COURSE';
+export type AddSourceOptions = VectorSource | GeoJSONSource | RasterSource;
+export type UpdateSourceOptions = VectorSource | GeoJSONSource | RasterSource;
 export interface Source {
     type: 'vector' | 'raster' | 'geojson';
     scheme?: 'xyz' | 'tms';
@@ -267,7 +267,7 @@ export interface GeoJSONSource extends Source {
         };
     };
 }
-export declare type UserLocationCameraMode = 'NONE' | 'NONE_COMPASS' | 'NONE_GPS' | 'TRACKING' | 'TRACKING_COMPASS' | 'TRACKING_GPS' | 'TRACKING_GPS_NORTH';
+export type UserLocationCameraMode = 'NONE' | 'NONE_COMPASS' | 'NONE_GPS' | 'TRACKING' | 'TRACKING_COMPASS' | 'TRACKING_GPS' | 'TRACKING_GPS_NORTH';
 export interface TrackUserOptions {
     cameraMode: UserLocationCameraMode;
     renderMode?: string;

package/index.android.js

@@ -10,6 +10,29 @@ import { Layer, LayerFactory } from './layers/layer-factory';
 import { CLog, CLogTypes, MapStyle, MapboxCommon, MapboxTraceCategory, MapboxViewBase, telemetryProperty } from './common';
 // Export the enums for devs not using TS
 export * from './common';
+let libraryLoadedOverloaded = false;
+function overrideLibraryLoader() {
+    try {
+        if (true && !libraryLoadedOverloaded) {
+            var LibraryLoader = /** @class */ (function (_super) {
+    __extends(LibraryLoader, _super);
+    function LibraryLoader() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    LibraryLoader.prototype.load = function (name) {
+        java.lang.System.loadLibrary(name);
+    };
+    return LibraryLoader;
+}(com.mapbox.mapboxsdk.LibraryLoader));
+            com.mapbox.mapboxsdk.LibraryLoader.setLibraryLoader(new LibraryLoader());
+            libraryLoadedOverloaded = true;
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
+overrideLibraryLoader();
 function _getLocation(loc) {
     if (loc === null) {
         return null;
@@ -218,7 +241,6 @@ export class MapboxView extends MapboxViewBase {
                     if (this.telemetry === false) {
                         try {
                             com.mapbox.mapboxsdk.Mapbox.getTelemetry().setUserTelemetryRequestState(false);
-                            console.error('telemtry disabled!');
                         }
                         catch (err) {
                             console.error('telemtry', err);
@@ -1105,7 +1127,7 @@ export class Mapbox extends MapboxCommon {
                             markerOptions.setIcon(cached);
                         }
                         else {
-                            console.log(`No icon found for this device density for icon ' ${marker.icon}'. Falling back to the default icon.`);
+                            console.warn(`No icon found for this device density for icon ' ${marker.icon}'. Falling back to the default icon.`);
                         }
                     }
                     else if (marker.icon.startsWith('http')) {
@@ -1133,7 +1155,7 @@ export class Mapbox extends MapboxCommon {
                         markerOptions.setIcon(cached);
                     }
                     else {
-                        console.log(`Marker icon not found, using the default instead. Requested path: '" + ${marker.iconPath}'.`);
+                        console.warn(`Marker icon not found, using the default instead. Requested path: '" + ${marker.iconPath}'.`);
                     }
                 }
                 marker.android = this._mapboxMapInstance.addMarker(markerOptions);
@@ -1917,7 +1939,7 @@ export class Mapbox extends MapboxCommon {
                                 reject(`${error.getMessage()}, reason: ${error.getReason()}`);
                             },
                             mapboxTileCountLimitExceeded: (limit) => {
-                                console.log(`dl mapboxTileCountLimitExceeded: ${limit}`);
+                                console.warn(`dl mapboxTileCountLimitExceeded: ${limit}`);
                             }
                         }));
                     }
@@ -2567,21 +2589,21 @@ export class Mapbox extends MapboxCommon {
         const modeRef = com.mapbox.mapboxsdk.location.modes.CameraMode;
         switch (mode) {
             case modeRef.NONE:
-                return "NONE";
+                return 'NONE';
             case modeRef.NONE_COMPASS:
-                return "NONE_COMPASS";
+                return 'NONE_COMPASS';
             case modeRef.NONE_GPS:
-                return "NONE_GPS";
+                return 'NONE_GPS';
             case modeRef.TRACKING:
-                return "TRACKING";
+                return 'TRACKING';
             case modeRef.TRACKING_COMPASS:
-                return "TRACKING_COMPASS";
+                return 'TRACKING_COMPASS';
             case modeRef.TRACKING_GPS:
-                return "TRACKING_GPS";
+                return 'TRACKING_GPS';
             case modeRef.TRACKING_GPS_NORTH:
-                return "TRACKING_GPS_NORTH";
+                return 'TRACKING_GPS_NORTH';
         }
-        return "NONE";
+        return 'NONE';
     }
     _fineLocationPermissionGranted() {
         let hasPermission = android.os.Build.VERSION.SDK_INT < 23; // Android M. (6.0)
@@ -2918,7 +2940,7 @@ export class Mapbox extends MapboxCommon {
                 this._markerIconDownloadCache[marker.icon] = marker.iconDownloaded;
                 resolve(marker);
             }, (e) => {
-                console.log(`Download failed for ' ${marker.icon}' with error: ${e}`);
+                console.error(`Download failed for ' ${marker.icon}' with error: ${e}`);
                 resolve(marker);
             });
         });
@@ -2955,10 +2977,10 @@ export class Mapbox extends MapboxCommon {
     }
     getUserLocationCameraMode(nativeMap) {
         if (!this._mapboxMapInstance) {
-            return "NONE";
+            return 'NONE';
         }
         if (!this._locationComponent) {
-            return "NONE";
+            return 'NONE';
         }
         return this._convertCameraMode(this._locationComponent.getCameraMode());
     }

package/package.json

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

package/platforms/android/include.gradle

@@ -5,35 +5,39 @@ 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 mapboxTelemetryVersion =  project.hasProperty("mapboxTelemetryVersion") ? project.mapboxTelemetryVersion : "6.1.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"
-	def mapboxGesturesVersion =  project.hasProperty("mapboxGesturesVersion") ? project.mapboxGesturesVersion : "0.7.0"
+	// def mapboxGesturesVersion =  project.hasProperty("mapboxGesturesVersion") ? project.mapboxGesturesVersion : "0.7.0"
 	def okHttpVersion =  project.hasProperty("okHttpVersion") ? project.okHttpVersion : "4.9.0"
     implementation ("com.mapbox.mapboxsdk:mapbox-android-sdk:$mapboxVersion") {
-        transitive=false
+        // transitive=false
     }
-
-    implementation ("com.mapbox.mapboxsdk:mapbox-android-telemetry:$mapboxTelemetryVersion") {
-        transitive=false
+    if (project.hasProperty("mapboxTelemetryVersion")) {
+	    def mapboxTelemetryVersion =  project.hasProperty("mapboxTelemetryVersion") ? project.mapboxTelemetryVersion : "6.1.0"
+        implementation ("com.mapbox.mapboxsdk:mapbox-android-telemetry:$mapboxTelemetryVersion") 
     }
+    // implementation ("com.mapbox.mapboxsdk:mapbox-android-telemetry:$mapboxTelemetryVersion") {
+    //     transitive=false
+    // }
     implementation ("com.mapbox.mapboxsdk:mapbox-sdk-geojson:$mapboxServicesVersion"){
-        transitive=false
-    }
-    implementation ("com.mapbox.mapboxsdk:mapbox-android-gestures:$mapboxGesturesVersion"){
-        transitive=false
-    }
-    implementation ("com.mapbox.mapboxsdk:mapbox-sdk-services:$mapboxServicesVersion"){
-        transitive=false
-    }
-    implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-$mapboxPluginsVersion:$mapboxAnnotationPluginVersion"){
-        transitive=false
+        // transitive=false
     }
+    // implementation ("com.mapbox.mapboxsdk:mapbox-android-gestures:$mapboxGesturesVersion"){
+    //     transitive=false
+    // }
+    // implementation ("com.mapbox.mapboxsdk:mapbox-sdk-services:$mapboxServicesVersion"){
+    //     transitive=false
+    // }
+
+    implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-$mapboxPluginsVersion:$mapboxAnnotationPluginVersion")
+    // implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-$mapboxPluginsVersion:$mapboxAnnotationPluginVersion"){
+    // }
 
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
 
-    println 'com.mapbox.mapboxsdk:mapbox-android-sdk:$mapboxVersion'
+    println "com.mapbox.mapboxsdk:mapbox-android-sdk:$mapboxVersion"
 
 }