@nativescript-community/ui-mapbox 6.2.28 → 6.2.30

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.30](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.29...v6.2.30) (2024-10-01)
+
+### Bug Fixes
+
+* **ios:** updated Mapbox to 6.4.2 with bitcode disabled ([6bc7eb5](https://github.com/nativescript-community/ui-mapbox/commit/6bc7eb55ef8444a9c02c787f95ef757de3e13efc))
+
+## [6.2.29](https://github.com/nativescript-community/ui-mapbox/compare/v6.2.28...v6.2.29) (2024-09-21)
+
+**Note:** Version bump only for package @nativescript-community/ui-mapbox
+
 ## [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

package/index.ios.js

@@ -1627,8 +1627,7 @@ export class Mapbox extends MapboxCommon {
                 for (let i = 0; i < theMap.gestureRecognizers.count; i++) {
                     const recognizer = theMap.gestureRecognizers.objectAtIndex(i);
                     if (recognizer instanceof UITapGestureRecognizer) {
-                        recognizer.addTargetAction(theMap['mapTapHandler'], 'tap');
-                        break;
+                        tapGestureRecognizer.requireGestureRecognizerToFail(recognizer);
                     }
                 }
                 theMap.addGestureRecognizer(tapGestureRecognizer);

package/layers/parser/property-parser.ios.js

@@ -2,6 +2,41 @@ import { Color } from '@nativescript/core';
 function toCamelCase(s) {
     return s.replace(/([-_][a-z])/gi, ($1) => $1.toUpperCase().replace('-', '').replace('_', ''));
 }
+const styleExtras = {
+    // padding
+    iconTextFitPadding: {
+        iosType: 'edgeinsets'
+    },
+    // offsets
+    iconOffset: {
+        iosType: 'vector'
+    },
+    textOffset: {
+        iosType: 'vector'
+    },
+    lineOffset: {
+        iosType: 'vector'
+    },
+    // translates
+    fillTranslate: {
+        iosType: 'vector'
+    },
+    lineTranslate: {
+        iosType: 'vector'
+    },
+    iconTranslate: {
+        iosType: 'vector'
+    },
+    textTranslate: {
+        iosType: 'vector'
+    },
+    circleTranslate: {
+        iosType: 'vector'
+    },
+    fillExtrusionTranslate: {
+        iosType: 'vector'
+    }
+};
 const keysMap = {
     'circle-pitch-scale': 'circleScaleAlignment',
     'circle-translate': 'circleTranslation',
@@ -39,24 +74,39 @@ const keysMap = {
     'raster-brightness-min': 'maximumRasterBrightness',
     'raster-brightness-max': 'minimumRasterBrightness'
 };
-function transformValue(key, value) {
-    if (key.indexOf('-color') !== -1 && !Array.isArray(value)) {
+function transformValue(key, value, _styleType) {
+    if (_styleType === 'color' || key.indexOf('-color') !== -1) {
         const color = value instanceof Color ? value : new Color(value);
         return color.ios;
     }
-    switch (key) {
-        case 'raster-resampling':
-            if (value === 'linear') {
-                return 0 /* MGLRasterResamplingMode.Linear */;
-            }
-            else if (value === 'nearest') {
-                return 1 /* MGLRasterResamplingMode.Nearest */;
-            }
-            else {
+    else if (_styleType === 'vector') {
+        const vector = CGVectorMake(value[0], value[1]);
+        return NSExpression.expressionWithMGLJSONObject(NSValue.valueWithCGVector(vector));
+    }
+    else if (_styleType === 'edgeinsets') {
+        const edgeInsets = new UIEdgeInsets({
+            top: value[0],
+            left: value[1],
+            bottom: value[2],
+            right: value[3]
+        });
+        return NSExpression.expressionWithMGLJSONObject(NSValue.valueWithUIEdgeInsets(edgeInsets));
+    }
+    else {
+        switch (key) {
+            case 'raster-resampling':
+                if (value === 'linear') {
+                    return 0 /* MGLRasterResamplingMode.Linear */;
+                }
+                else if (value === 'nearest') {
+                    return 1 /* MGLRasterResamplingMode.Nearest */;
+                }
+                else {
+                    return value;
+                }
+            default:
                 return value;
-            }
-        default:
-            return value;
+        }
     }
 }
 export class PropertyParser {
@@ -66,7 +116,7 @@ export class PropertyParser {
             Object.keys(propertiesObject).forEach((k) => {
                 const actualKey = keysMap[k] || toCamelCase(k);
                 const value = propertiesObject[k];
-                const rValue = transformValue(k, value);
+                const rValue = transformValue(k, value, styleExtras[k]?.iosType);
                 if (Array.isArray(value)) {
                     nProperties[actualKey] = NSExpression.expressionWithMGLJSONObject(rValue);
                 }

package/package.json

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

package/platforms/ios/Podfile

@@ -1,3 +1,2 @@
-platform :ios, '13.0'
-
-pod 'Mapbox-iOS-SDK', '~> 5.1.1'
+# see https://github.com/CocoaPods/CocoaPods/issues/11867 for why i use podspec
+pod 'Mapbox-iOS-SDK', :podspec => 'https://raw.githubusercontent.com/nativescript-community/mapbox-gl-native-ios/refs/heads/main/Mapbox-iOS-SDK.podspec'