@maplibre/maplibre-react-native 10.0.0-beta.8 → 10.0.0

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineImpl.java

@@ -0,0 +1,151 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.location.Location;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.Priority;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+
+import org.maplibre.android.location.engine.LocationEngineCallback;
+import org.maplibre.android.location.engine.LocationEngineImpl;
+import org.maplibre.android.location.engine.LocationEngineRequest;
+import org.maplibre.android.location.engine.LocationEngineResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Wraps implementation of Fused Location Provider
+ */
+public class GoogleLocationEngineImpl implements LocationEngineImpl<LocationCallback> {
+    private final FusedLocationProviderClient fusedLocationProviderClient;
+
+    @VisibleForTesting
+    GoogleLocationEngineImpl(FusedLocationProviderClient fusedLocationProviderClient) {
+        this.fusedLocationProviderClient = fusedLocationProviderClient;
+    }
+
+    public GoogleLocationEngineImpl(@NonNull Context context) {
+        this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context);
+    }
+
+    @NonNull
+    @Override
+    public LocationCallback createListener(LocationEngineCallback<LocationEngineResult> callback) {
+        return new GoogleLocationEngineCallbackTransport(callback);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void getLastLocation(@NonNull LocationEngineCallback<LocationEngineResult> callback)
+            throws SecurityException {
+        GoogleLastLocationEngineCallbackTransport transport =
+                new GoogleLastLocationEngineCallbackTransport(callback);
+        fusedLocationProviderClient.getLastLocation().addOnSuccessListener(transport).addOnFailureListener(transport);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull LocationCallback listener,
+                                       @Nullable Looper looper) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), listener, looper);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull PendingIntent pendingIntent) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), pendingIntent);
+    }
+
+    @Override
+    public void removeLocationUpdates(@NonNull LocationCallback listener) {
+        if (listener != null) {
+            fusedLocationProviderClient.removeLocationUpdates(listener);
+        }
+    }
+
+    @Override
+    public void removeLocationUpdates(PendingIntent pendingIntent) {
+        if (pendingIntent != null) {
+            fusedLocationProviderClient.removeLocationUpdates(pendingIntent);
+        }
+    }
+
+    private static LocationRequest toGMSLocationRequest(LocationEngineRequest request) {
+        LocationRequest.Builder builder = new LocationRequest.Builder(request.getInterval());
+        builder.setMinUpdateIntervalMillis(request.getFastestInterval());
+        builder.setMinUpdateDistanceMeters(request.getDisplacement());
+        builder.setMaxUpdateDelayMillis(request.getMaxWaitTime());
+        builder.setPriority(toGMSLocationPriority(request.getPriority()));
+        return builder.build();
+    }
+
+    private static int toGMSLocationPriority(int enginePriority) {
+        switch (enginePriority) {
+            case LocationEngineRequest.PRIORITY_HIGH_ACCURACY:
+                return Priority.PRIORITY_HIGH_ACCURACY;
+            case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY:
+                return Priority.PRIORITY_BALANCED_POWER_ACCURACY;
+            case LocationEngineRequest.PRIORITY_LOW_POWER:
+                return Priority.PRIORITY_LOW_POWER;
+            case LocationEngineRequest.PRIORITY_NO_POWER:
+            default:
+                return Priority.PRIORITY_PASSIVE;
+        }
+    }
+
+    private static final class GoogleLocationEngineCallbackTransport extends LocationCallback {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onLocationResult(LocationResult locationResult) {
+            super.onLocationResult(locationResult);
+            List<Location> locations = locationResult.getLocations();
+            if (!locations.isEmpty()) {
+                callback.onSuccess(LocationEngineResult.create(locations));
+            } else {
+                callback.onFailure(new Exception("Unavailable location"));
+            }
+        }
+    }
+
+    @VisibleForTesting
+    static final class GoogleLastLocationEngineCallbackTransport
+            implements OnSuccessListener<Location>, OnFailureListener {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLastLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onSuccess(Location location) {
+            callback.onSuccess(location != null ? LocationEngineResult.create(location) :
+                    LocationEngineResult.create(Collections.<Location>emptyList()));
+        }
+
+        @Override
+        public void onFailure(@NonNull Exception e) {
+            callback.onFailure(e);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineProvider.java

@@ -0,0 +1,24 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineProxy;
+
+public class GoogleLocationEngineProvider implements LocationEngineProvidable {
+    private static final String LOG_TAG = "GoogleLocationEngineProvider";
+
+    public LocationEngine getLocationEngine(Context context) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            LocationEngine locationEngine = new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext()));
+            Log.d(LOG_TAG, "GoogleLocationEngine will be used.");
+            return locationEngine;
+        } else {
+            return new DefaultLocationEngineProvider().getLocationEngine(context);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -0,0 +1,12 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public class LocationEngineProvider implements LocationEngineProvidable {
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        return new GoogleLocationEngineProvider().getLocationEngine(context);
+    }
+}

package/app.plugin.js

@@ -1 +1 @@
-module.exports = require("./plugin/build/withMapLibre");
+module.exports = require("./lib/commonjs/plugin/withMapLibre");

package/ios/MLRN/MLRNCamera.m

@@ -179,11 +179,6 @@
         return;
     }
     
-    if (_map.userTrackingMode != [self _userTrackingMode]) {
-        _map.showsUserLocation = [self _userTrackingMode] != MLNUserTrackingModeNone;
-        _map.userTrackingMode = [self _userTrackingMode];
-    }
-    
     MLNMapCamera *camera = _map.camera;
     if (_followPitch != nil && [_followPitch floatValue] >= 0.0) {
         camera.pitch = [_followPitch floatValue];
@@ -202,8 +197,12 @@
     if (_followZoomLevel != nil && [_followZoomLevel doubleValue] >= 0.0) {
         camera.altitude = [_map altitudeFromZoom:[_followZoomLevel doubleValue]];
     }
-    
-    [_map setCamera:camera animated:YES];
+
+    [_map setCamera:camera animated:NO];
+
+    if (_map.userTrackingMode != [self _userTrackingMode]) {
+      [_map setUserTrackingMode:[self _userTrackingMode] animated:NO completionHandler:nil];
+    }
 }
 
 - (NSUInteger)_userTrackingMode

package/ios/MLRN/MLRNMapView.h

@@ -47,7 +47,7 @@ typedef void (^StyleLoadedBlock) (MLNStyle* __nonnull style);
 @property (nonatomic, assign) NSInteger *reactCompassViewPosition;
 @property (nonatomic, assign) CGPoint reactCompassViewMargins;
 
-@property (nonatomic, copy) NSString *reactStyleURL;
+@property (nonatomic, copy) NSString *reactMapStyle;
 @property (nonatomic, assign) NSInteger reactPreferredFramesPerSecond;
 
 @property (nonatomic, assign) MLNCoordinateBounds maxBounds;

package/ios/MLRN/MLRNMapView.m

@@ -374,11 +374,11 @@ static double const M2PI = M_PI * 2;
     self.contentInset = UIEdgeInsetsMake(top, left, bottom, right);
 }
 
-- (void)setReactStyleURL:(NSString *)reactStyleURL
+- (void)setReactMapStyle:(NSString *)reactMapStyle
 {
-    _reactStyleURL = reactStyleURL;
+    _reactMapStyle = reactMapStyle;
     [self _removeAllSourcesFromMap];
-    self.styleURL = [self _getStyleURLFromKey:_reactStyleURL];
+    self.styleURL = [self _getStyleURLFromKey:_reactMapStyle];
 }
 
 - (void)setReactPreferredFramesPerSecond:(NSInteger)reactPreferredFramesPerSecond
@@ -500,13 +500,13 @@ static double const M2PI = M_PI * 2;
     return nil;
 }
 
-- (NSURL*)_getStyleURLFromKey:(NSString *)styleURL
+- (NSURL*)_getStyleURLFromKey:(NSString *)mapStyle
 {
-    NSURL *url = [NSURL URLWithString:styleURL];
+    NSURL *url = [NSURL URLWithString:mapStyle];
     if (url) {
         return url;
-    } else if (RCTJSONParse(styleURL, nil)) {
-        return [MLRNUtils styleURLFromStyleJSON:styleURL];
+    } else if (RCTJSONParse(mapStyle, nil)) {
+        return [MLRNUtils styleURLFromStyleJSON:mapStyle];
     }
     return url;
 }

package/ios/MLRN/MLRNMapViewManager.m

@@ -80,7 +80,7 @@ RCT_REMAP_VIEW_PROPERTY(compassViewPosition, reactCompassViewPosition, NSInteger
 RCT_REMAP_VIEW_PROPERTY(compassViewMargins, reactCompassViewMargins, CGPoint)
 
 RCT_REMAP_VIEW_PROPERTY(contentInset, reactContentInset, NSArray)
-RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
+RCT_REMAP_VIEW_PROPERTY(mapStyle, reactMapStyle, NSString)
 RCT_REMAP_VIEW_PROPERTY(preferredFramesPerSecond, reactPreferredFramesPerSecond, NSInteger)
 
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)

package/ios/MLRN/MLRNModule.m

@@ -19,10 +19,6 @@ RCT_EXPORT_MODULE();
 {
     // style urls
     NSMutableDictionary *styleURLS = [[NSMutableDictionary alloc] init];
-
-    for (MLNDefaultStyle* style in [MLNStyle predefinedStyles]) {
-      [styleURLS setObject:[style.url absoluteString] forKey:style.name];
-    }
     [styleURLS setObject:[[MLNStyle defaultStyleURL] absoluteString] forKey:@"Default"];
 
     // event types
@@ -71,120 +67,6 @@ RCT_EXPORT_MODULE();
     NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
     [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
 
-    // line layer constants
-    NSMutableDictionary *lineJoin = [[NSMutableDictionary alloc] init];
-    [lineJoin setObject:@(MLNLineJoinBevel) forKey:@"Bevel"];
-    [lineJoin setObject:@(MLNLineJoinRound) forKey:@"Round"];
-    [lineJoin setObject:@(MLNLineJoinMiter) forKey:@"Miter"];
-
-    NSMutableDictionary *lineCap = [[NSMutableDictionary alloc] init];
-    [lineCap setObject:@(MLNLineCapButt) forKey:@"Butt"];
-    [lineCap setObject:@(MLNLineCapRound) forKey:@"Round"];
-    [lineCap setObject:@(MLNLineCapSquare) forKey:@"Square"];
-
-    NSMutableDictionary *lineTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorMap) forKey:@"Map"];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // circle layer constants
-    NSMutableDictionary *circlePitchScale = [[NSMutableDictionary alloc] init];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentMap) forKey:@"Map"];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circlePitchAlignment = [[NSMutableDictionary alloc] init];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentMap) forKey:@"Map"];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circleTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorMap) forKey:@"Map"];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill extrusion layer constants
-    NSMutableDictionary *fillExtrusionTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorMap) forKey:@"Map"];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill layer constants
-    NSMutableDictionary *fillTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorMap) forKey:@"Map"];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // symbol layer constants
-    NSMutableDictionary *iconRotationAlignment = [[NSMutableDictionary alloc] init];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentAuto) forKey:@"Auto"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentMap) forKey:@"Map"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconTextFit = [[NSMutableDictionary alloc] init];
-    [iconTextFit setObject:@(MLNIconTextFitNone) forKey:@"None"];
-    [iconTextFit setObject:@(MLNIconTextFitWidth) forKey:@"Width"];
-    [iconTextFit setObject:@(MLNIconTextFitHeight) forKey:@"Height"];
-    [iconTextFit setObject:@(MLNIconTextFitBoth) forKey:@"Both"];
-
-    NSMutableDictionary *iconAnchor = [[NSMutableDictionary alloc] init];
-    [iconAnchor setObject:@(MLNIconAnchorCenter) forKey:@"Center"];
-    [iconAnchor setObject:@(MLNIconAnchorTop) forKey:@"Top"];
-    [iconAnchor setObject:@(MLNIconAnchorBottom) forKey:@"Bottom"];
-    [iconAnchor setObject:@(MLNIconAnchorLeft) forKey:@"Left"];
-    [iconAnchor setObject:@(MLNIconAnchorRight) forKey:@"Right"];
-    [iconAnchor setObject:@(MLNIconAnchorTopLeft) forKey:@"TopLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorTopRight) forKey:@"TopRight"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomLeft) forKey:@"BottomLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *iconTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorMap) forKey:@"Map"];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconPitchAlignment = [[NSMutableDictionary alloc] init];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentAuto) forKey:@"Auto"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentMap) forKey:@"Map"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *symbolPlacement = [[NSMutableDictionary alloc] init];
-    [symbolPlacement setObject:@(MLNSymbolPlacementLine) forKey:@"Line"];
-    [symbolPlacement setObject:@(MLNSymbolPlacementPoint) forKey:@"Point"];
-
-    NSMutableDictionary *textAnchor = [[NSMutableDictionary alloc] init];
-    [textAnchor setObject:@(MLNTextAnchorCenter) forKey:@"Center"];
-    [textAnchor setObject:@(MLNTextAnchorLeft) forKey:@"Left"];
-    [textAnchor setObject:@(MLNTextAnchorRight) forKey:@"Right"];
-    [textAnchor setObject:@(MLNTextAnchorTop) forKey:@"Top"];
-    [textAnchor setObject:@(MLNTextAnchorBottom) forKey:@"Bottom"];
-    [textAnchor setObject:@(MLNTextAnchorTopLeft) forKey:@"TopLeft"];
-    [textAnchor setObject:@(MLNTextAnchorTopRight) forKey:@"TopRight"];
-    [textAnchor setObject:@(MLNTextAnchorBottomLeft) forKey:@"BottomLeft"];
-    [textAnchor setObject:@(MLNTextAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *textJustify = [[NSMutableDictionary alloc] init];
-    [textJustify setObject:@(MLNTextJustificationCenter) forKey:@"Center"];
-    [textJustify setObject:@(MLNTextJustificationLeft) forKey:@"Left"];
-    [textJustify setObject:@(MLNTextJustificationRight) forKey:@"Right"];
-
-    NSMutableDictionary *textPitchAlignment = [[NSMutableDictionary alloc] init];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentAuto) forKey:@"Auto"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentMap) forKey:@"Map"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textRotationAlignment = [[NSMutableDictionary alloc] init];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentAuto) forKey:@"Auto"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentMap) forKey:@"Map"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textTransform = [[NSMutableDictionary alloc] init];
-    [textTransform setObject:@(MLNTextTransformNone) forKey:@"None"];
-    [textTransform setObject:@(MLNTextTransformLowercase) forKey:@"Lowercase"];
-    [textTransform setObject:@(MLNTextTransformUppercase) forKey:@"Uppercase"];
-
-    NSMutableDictionary *textTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorMap) forKey:@"Map"];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // light constants
-    NSMutableDictionary *lightAnchor = [[NSMutableDictionary alloc] init];
-    [lightAnchor setObject:@(MLNLightAnchorMap) forKey:@"Map"];
-    [lightAnchor setObject:@(MLNLightAnchorViewport) forKey:@"Viewport"];
-
     // offline module callback names
     NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
     [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
@@ -202,33 +84,16 @@ RCT_EXPORT_MODULE();
          @"UserLocationVerticalAlignment": userLocationVerticalAlignment,
          @"CameraModes": cameraModes,
          @"StyleSource": styleSourceConsts,
-         @"LineJoin": lineJoin,
-         @"LineCap": lineCap,
-         @"LineTranslateAnchor": lineTranslateAnchor,
-         @"CirclePitchScale": circlePitchScale,
-         @"CircleTranslateAnchor": circleTranslateAnchor,
-         @"CirclePitchAlignment": circlePitchAlignment,
-         @"FillExtrusionTranslateAnchor": fillExtrusionTranslateAnchor,
-         @"FillTranslateAnchor": fillTranslateAnchor,
-         @"IconRotationAlignment": iconRotationAlignment,
-         @"IconTextFit": iconTextFit,
-         @"IconTranslateAnchor": iconTranslateAnchor,
-         @"IconAnchor": iconAnchor,
-         @"IconPitchAlignment": iconPitchAlignment,
-         @"SymbolPlacement": symbolPlacement,
-         @"TextAnchor": textAnchor,
-         @"TextJustify": textJustify,
-         @"TextPitchAlignment": textPitchAlignment,
-         @"TextRotationAlignment": textRotationAlignment,
-         @"TextTransform": textTransform,
-         @"TextTranslateAnchor": textTranslateAnchor,
-         @"LightAnchor": lightAnchor,
          @"OfflineCallbackName": offlineModuleCallbackNames,
          @"OfflinePackDownloadState": offlinePackDownloadState,
          @"LocationCallbackName": locationModuleEvents
     };
 }
 
+/**
+* @deprecated This will be removed in the next major version.
+* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+*/
 RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken)
 {
     if (accessToken.length > 0) {
@@ -246,6 +111,10 @@ RCT_EXPORT_METHOD(removeCustomHeader:(NSString *)headerName)
     [MLRNCustomHeaders.sharedInstance removeHeader:headerName];
 }
 
+/**
+* @deprecated This will be removed in the next major version.
+* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+*/
 RCT_EXPORT_METHOD(getAccessToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString* accessToken = MLNSettings.apiKey;

package/ios/MLRN/MLRNStyle.m

@@ -24,10 +24,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"fillSortKey"]) {
@@ -88,10 +84,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"lineCap"]) {
@@ -176,10 +168,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"symbolPlacement"]) {
@@ -348,10 +336,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"circleSortKey"]) {
@@ -411,10 +395,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -450,10 +430,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -516,10 +492,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -567,10 +539,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -610,10 +578,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -660,10 +624,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"anchor"]) {

package/lib/commonjs/MLRNModule.js

@@ -3,15 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = exports.CameraModes = void 0;
+exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.CameraModes = void 0;
 var _reactNative = require("react-native");
 const MLRNModule = Object.create(_reactNative.NativeModules.MLRNModule);
 const {
   CameraModes,
-  StyleURL,
   OfflinePackDownloadState,
-  LineJoin,
   StyleSource,
+  StyleURL,
   setAccessToken,
   getAccessToken,
   addCustomHeader,
@@ -23,9 +22,8 @@ exports.removeCustomHeader = removeCustomHeader;
 exports.addCustomHeader = addCustomHeader;
 exports.getAccessToken = getAccessToken;
 exports.setAccessToken = setAccessToken;
+exports.StyleURL = StyleURL;
 exports.StyleSource = StyleSource;
-exports.LineJoin = LineJoin;
 exports.OfflinePackDownloadState = OfflinePackDownloadState;
-exports.StyleURL = StyleURL;
 exports.CameraModes = CameraModes;
 //# sourceMappingURL=MLRNModule.js.map

package/lib/commonjs/MLRNModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","CameraModes","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","setAccessToken","getAccessToken","addCustomHeader","removeCustomHeader","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAsCA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,WAAW;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EAEXC,cAAc;EACdC,cAAc;EAEdC,eAAe;EACfC,kBAAkB;EAElBC;AACF,CAAC,GAAGb,UAAU;AAACc,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,kBAAA,GAAAA,kBAAA;AAAAE,OAAA,CAAAH,eAAA,GAAAA,eAAA;AAAAG,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,WAAA,GAAAA,WAAA;AAAAM,OAAA,CAAAP,QAAA,GAAAA,QAAA;AAAAO,OAAA,CAAAR,wBAAA,GAAAA,wBAAA;AAAAQ,OAAA,CAAAT,QAAA,GAAAA,QAAA;AAAAS,OAAA,CAAAV,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","CameraModes","OfflinePackDownloadState","StyleSource","StyleURL","setAccessToken","getAccessToken","addCustomHeader","removeCustomHeader","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AA4CA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,WAAW;EACXC,wBAAwB;EACxBC,WAAW;EACXC,QAAQ;EAERC,cAAc;EACdC,cAAc;EAEdC,eAAe;EACfC,kBAAkB;EAElBC;AACF,CAAC,GAAGZ,UAAU;AAACa,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,kBAAA,GAAAA,kBAAA;AAAAE,OAAA,CAAAH,eAAA,GAAAA,eAAA;AAAAG,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,QAAA,GAAAA,QAAA;AAAAM,OAAA,CAAAP,WAAA,GAAAA,WAAA;AAAAO,OAAA,CAAAR,wBAAA,GAAAA,wBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA","ignoreList":[]}