@nativescript-community/ui-mapbox 6.2.27 → 6.2.28

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.28](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.27...v6.2.28) (2024-07-16)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
 ## [6.2.27](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.26...v6.2.27) (2023-12-18)
 
 **Note:** Version bump only for package @nativescript-community/ui-mapbox

package/common.d.ts

@@ -5,10 +5,10 @@ export * from './layers/layer-factory';
 export * from './layers/parser/property-parser';
 export declare const MapboxTraceCategory = "NativescriptMapbox";
 export declare enum CLogTypes {
-    log,
-    info,
-    warning,
-    error
+    log = 0,
+    info = 1,
+    warning = 2,
+    error = 3
 }
 export declare const CLog: (type: CLogTypes, ...args: any[]) => void;
 export declare enum MapStyle {
@@ -168,7 +168,12 @@ export interface SetViewportOptions {
     /**
      * Optional padding.
      */
-    padding?: number;
+    padding?: number | {
+        top?: number;
+        left?: number;
+        right?: number;
+        bottom?: number;
+    };
 }
 export interface DeleteOfflineRegionOptions {
     /**
@@ -197,8 +202,8 @@ export interface AddGeoJsonClusteredOptions {
     clusterRadius?: number;
     clusters?: MapboxCluster[];
 }
-export type LayerType = "fill" | "line" | "symbol" | "circle" | "heatmap" | "fill-extrusion" | "raster" | "hillshade" | "background" | "sky";
-export 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;

package/common.js

@@ -1,4 +1,4 @@
-import { Color, ContentView, ImageSource, Property, Trace, Utils, booleanConverter } from '@nativescript/core';
+import { ContentView, ImageSource, Property, Trace, Utils, booleanConverter } from '@nativescript/core';
 export * from './geo.utils';
 export * from './expression/expression-parser';
 export * from './layers/layer-factory';
@@ -6,10 +6,10 @@ export * from './layers/parser/property-parser';
 export const MapboxTraceCategory = 'NativescriptMapbox';
 export var CLogTypes;
 (function (CLogTypes) {
-    CLogTypes[CLogTypes["log"] = Trace.messageType.log] = "log";
-    CLogTypes[CLogTypes["info"] = Trace.messageType.info] = "info";
-    CLogTypes[CLogTypes["warning"] = Trace.messageType.warn] = "warning";
-    CLogTypes[CLogTypes["error"] = Trace.messageType.error] = "error";
+    CLogTypes[CLogTypes["log"] = 0] = "log";
+    CLogTypes[CLogTypes["info"] = 1] = "info";
+    CLogTypes[CLogTypes["warning"] = 2] = "warning";
+    CLogTypes[CLogTypes["error"] = 3] = "error";
 })(CLogTypes || (CLogTypes = {}));
 export const CLog = (type, ...args) => {
     Trace.write(args.map((a) => (a && typeof a === 'object' ? JSON.stringify(a) : a)).join(' '), MapboxTraceCategory, type);
@@ -84,15 +84,15 @@ MapboxCommon.defaults = {
         top: 0,
         bottom: 0
     },
-    zoomLevel: 0,
-    showUserLocation: false,
+    zoomLevel: 0, // 0 (a big part of the world) to 20 (street level)
+    showUserLocation: false, // true requires adding `NSLocationWhenInUseUsageDescription` or `NSLocationAlwaysUsageDescription` in the .plist
     locationComponentOptions: {},
-    hideLogo: false,
-    logoPosition: ControlPosition.BOTTOM_LEFT,
+    hideLogo: false, // required for the 'starter' plan
+    logoPosition: ControlPosition.BOTTOM_LEFT, // The default position mimics constructor of MapboxMapOptions
     hideAttribution: true,
-    attributionPosition: ControlPosition.BOTTOM_LEFT,
+    attributionPosition: ControlPosition.BOTTOM_LEFT, // The default position mimics constructor of MapboxMapOptions
     hideCompass: false,
-    compassPosition: ControlPosition.TOP_RIGHT,
+    compassPosition: ControlPosition.TOP_RIGHT, // The default position mimics constructor of MapboxMapOptions
     disableRotation: false,
     disableScroll: false,
     disableZoom: false,

package/index.android.js

@@ -1543,11 +1543,14 @@ export class Mapbox extends MapboxCommon {
                 const durationMs = options.duration ? options.duration : 10000;
                 if (options.bounds) {
                     const padding = options.padding || 0;
+                    const defaultPadding = 0;
+                    // ensure padding is an object and assign default values
+                    const { top = defaultPadding, left = defaultPadding, bottom = defaultPadding, right = defaultPadding } = typeof padding === 'object' ? padding : { top: padding, left: padding, bottom: padding, right: padding };
                     const bounds = new com.mapbox.mapboxsdk.geometry.LatLngBounds.Builder()
                         .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.north, options.bounds.east))
                         .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.south, options.bounds.west))
                         .build();
-                    this._mapboxMapInstance.animateCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, padding), durationMs, null);
+                    this._mapboxMapInstance.animateCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, left, top, right, bottom), durationMs, null);
                 }
                 else {
                     const target = options.target;
@@ -1858,12 +1861,18 @@ export class Mapbox extends MapboxCommon {
                     .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.north, options.bounds.east))
                     .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.south, options.bounds.west))
                     .build();
-                const padding = options.padding !== undefined ? options.padding : 25, animated = options.animated === undefined || options.animated, durationMs = animated ? 1000 : 0;
+                const defaultPadding = 25;
+                const padding = options.padding ?? defaultPadding;
+                const animated = options.animated === undefined || options.animated;
+                const durationMs = animated ? 1000 : 0;
+                // ensure padding is an object and assign default values
+                const { top = defaultPadding, left = defaultPadding, bottom = defaultPadding, right = defaultPadding } = typeof padding === 'object' ? padding : { top: padding, left: padding, bottom: padding, right: padding };
+                const cameraUpdate = com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, left, top, right, bottom);
                 if (animated) {
-                    this._mapboxMapInstance.easeCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, padding), durationMs);
+                    this._mapboxMapInstance.easeCamera(cameraUpdate, durationMs);
                 }
                 else {
-                    this._mapboxMapInstance.moveCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, padding));
+                    this._mapboxMapInstance.moveCamera(cameraUpdate);
                 }
                 setTimeout(() => {
                     resolve();

package/index.ios.js

@@ -1565,13 +1565,10 @@ export class Mapbox extends MapboxCommon {
                 let cam;
                 if (options.bounds) {
                     const padding = options.padding || 0;
+                    // ensure padding is an object and assign default values
+                    const { top = 0, left = 0, bottom = 0, right = 0 } = typeof padding === 'object' ? padding : { top: padding, left: padding, bottom: padding, right: padding };
                     // support defined padding
-                    const insets = {
-                        top: padding,
-                        left: padding,
-                        bottom: padding,
-                        right: padding
-                    };
+                    const insets = { top, left, bottom, right };
                     const bounds = {
                         sw: CLLocationCoordinate2DMake(options.bounds.south, options.bounds.west),
                         ne: CLLocationCoordinate2DMake(options.bounds.north, options.bounds.east)
@@ -1844,8 +1841,29 @@ export class Mapbox extends MapboxCommon {
                     ne: CLLocationCoordinate2DMake(options.bounds.north, options.bounds.east)
                 };
                 const animated = options.animated === undefined || options.animated;
-                // support defined padding
-                const padding = options.padding !== undefined ? { top: options.padding, left: options.padding, bottom: options.padding, right: options.padding } : { top: 25, left: 25, bottom: 25, right: 25 };
+                // define default padding
+                const defaultPadding = 25;
+                // check if padding is defined and whether it's an object or a single value
+                const padding = options.padding !== undefined
+                    ? typeof options.padding === 'object'
+                        ? {
+                            top: options.padding.top ?? 0,
+                            left: options.padding.left ?? 0,
+                            bottom: options.padding.bottom ?? 0,
+                            right: options.padding.right ?? 0
+                        }
+                        : {
+                            top: options.padding,
+                            left: options.padding,
+                            bottom: options.padding,
+                            right: options.padding
+                        }
+                    : {
+                        top: defaultPadding,
+                        left: defaultPadding,
+                        bottom: defaultPadding,
+                        right: defaultPadding
+                    };
                 theMap.setVisibleCoordinateBoundsEdgePaddingAnimated(bounds, padding, animated);
                 resolve();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-mapbox",
-    "version": "6.2.27",
+    "version": "6.2.28",
     "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": "fa5f56e40f5345d2a09fd7518db482b5559f94af"
+    "gitHead": "6e61158c659952d2048448fbbd7a7838b2edf20d"
 }