@maplibre/maplibre-react-native 11.0.0-beta.2 → 11.0.0-beta.20

package/ios/components/images/MLRNImages.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge.h>
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 
@@ -8,8 +7,6 @@
 
 @interface MLRNImages : UIView
 
-@property (nonatomic, weak) RCTBridge *bridge;
-
 @property (nonatomic, strong) MLRNMapView *_Nullable map;
 @property (nonatomic, strong, nonnull) NSMutableArray<id<RCTComponent>> *reactSubviews;
 

package/ios/components/images/MLRNImages.m

@@ -2,6 +2,7 @@
 #import <React/UIView+React.h>
 #import "MLRNEvent.h"
 #import "MLRNEventTypes.h"
+#import "MLRNImageLoader.h"
 #import "MLRNMapView.h"
 #import "MLRNUtils.h"
 
@@ -169,12 +170,11 @@ static UIImage *_placeHolderImage;
 
   if (missingImages.count > 0) {
     // forceUpdate to ensure the placeholder images are updated
-    [MLRNUtils fetchImages:_bridge
-                     style:self.map.style
-                   objects:missingImages
-               forceUpdate:true
-                  callback:^{
-                  }];
+    [MLRNImageLoader fetchImages:self.map.style
+                         objects:missingImages
+                     forceUpdate:true
+                        callback:^{
+                        }];
   }
 }
 

package/ios/components/images/MLRNImagesComponentView.mm

@@ -7,7 +7,6 @@
 
 #import "RCTFabricComponentsPlugins.h"
 
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import "MLRNFollyConvert.h"
 #import "MLRNImages.h"
@@ -37,8 +36,6 @@ using namespace facebook::react;
 - (void)prepareView {
   _view = [[MLRNImages alloc] init];
 
-  _view.bridge = [RCTBridge currentBridge];
-
   // Capture weak self reference to prevent retain cycle
   __weak __typeof__(self) weakSelf = self;
 

package/ios/components/images/MLRNImagesModule.h

@@ -0,0 +1,6 @@
+#import <MapLibreReactNativeSpec/MapLibreReactNativeSpec.h>
+
+#import <React/RCTInitializing.h>
+
+@interface MLRNImagesModule : NSObject <NativeImagesModuleSpec, RCTInitializing>
+@end

package/ios/components/images/MLRNImagesModule.mm

@@ -0,0 +1,23 @@
+#import "MLRNImagesModule.h"
+#import "MLRNImageLoader.h"
+
+#import <MapLibreReactNativeSpec/MapLibreReactNativeSpec.h>
+
+@implementation MLRNImagesModule
+
+@synthesize moduleRegistry = _moduleRegistry;
+
++ (NSString *)moduleName {
+  return @"MLRNImagesModule";
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeImagesModuleSpecJSI>(params);
+}
+
+- (void)initialize {
+  [MLRNImageLoader sharedInstance].imageLoader = [_moduleRegistry moduleForName:"ImageLoader"];
+}
+
+@end

package/ios/components/layer/MLRNLayer.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge.h>
 #import <UIKit/UIKit.h>
 
 @class MLRNMapView;
@@ -7,8 +6,6 @@
 
 @interface MLRNLayer : UIView
 
-@property (nonatomic, weak, nullable) RCTBridge *bridge;
-
 @property (nonatomic, strong, nullable) MLNStyleLayer *styleLayer;
 @property (nonatomic, strong, nullable) MLNStyle *style;
 @property (nonatomic, weak, nullable) MLRNMapView *map;

package/ios/components/layer/MLRNLayer.m

@@ -211,7 +211,6 @@
 
 - (void)addStyles {
   MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
-  style.bridge = self.bridge;
 
   BOOL (^isValid)(void) = ^{
     return [self isAddedToMap];

package/ios/components/layer/MLRNLayerComponentView.mm

@@ -8,7 +8,6 @@
 #import "RCTFabricComponentsPlugins.h"
 
 #import <MapLibre/MapLibre.h>
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import "MLRNLayer.h"
 #import "MLRNPropConvert.h"
@@ -27,8 +26,6 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const MLRNLayerProps>();
-    _props = defaultProps;
     [self prepareView];
   }
 
@@ -36,8 +33,10 @@ using namespace facebook::react;
 }
 
 - (void)prepareView {
+  static const auto defaultProps = std::make_shared<const MLRNLayerProps>();
+  _props = defaultProps;
+
   _view = [[MLRNLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 
@@ -45,6 +44,11 @@ using namespace facebook::react;
   return _view;
 }
 
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -64,22 +68,19 @@ using namespace facebook::react;
   }
 
   if (oldViewProps.source != newViewProps.source) {
-    _view.sourceID = newViewProps.source.empty() ? nil : RCTNSStringFromString(newViewProps.source);
+    _view.sourceID = RCTNSStringFromStringNilIfEmpty(newViewProps.source);
   }
 
   if (oldViewProps.sourceLayer != newViewProps.sourceLayer) {
-    _view.sourceLayerID =
-        newViewProps.sourceLayer.empty() ? nil : RCTNSStringFromString(newViewProps.sourceLayer);
+    _view.sourceLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.sourceLayer);
   }
 
   if (oldViewProps.afterId != newViewProps.afterId) {
-    _view.aboveLayerID =
-        newViewProps.afterId.empty() ? nil : RCTNSStringFromString(newViewProps.afterId);
+    _view.aboveLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.afterId);
   }
 
   if (oldViewProps.beforeId != newViewProps.beforeId) {
-    _view.belowLayerID =
-        newViewProps.beforeId.empty() ? nil : RCTNSStringFromString(newViewProps.beforeId);
+    _view.belowLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.beforeId);
   }
 
   if (oldViewProps.layerIndex != newViewProps.layerIndex) {

package/ios/components/layer/style/MLRNStyle.h

@@ -1,7 +1,6 @@
 // DO NOT MODIFY
-// This file is auto-generated from scripts/templates/MLRNStyle.h.ejs
+// This file is auto-generated from scripts/src/templates/MLRNStyle.h.ejs
 
-#import <React/RCTBridge.h>
 #import "MLRNStyle.h"
 #import "MLRNStyleValue.h"
 
@@ -9,7 +8,6 @@
 
 @interface MLRNStyle : NSObject
 
-@property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) MLNStyle *style;
 
 - (id)initWithMLNStyle:(MLNStyle *)mlnStyle;

package/ios/components/layer/style/MLRNStyle.m

@@ -1,7 +1,8 @@
 // DO NOT MODIFY
-// This file is auto-generated from scripts/templates/MLRNStyle.m.ejs
+// This file is auto-generated from scripts/src/templates/MLRNStyle.m.ejs
 
 #import "MLRNStyle.h"
+#import "MLRNImageLoader.h"
 #import "MLRNUtils.h"
 
 @implementation MLRNStyle
@@ -54,20 +55,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setFillPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setFillPattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"fillPatternTransition"]) {
       [self setFillPatternTransition:layer withReactStyleValue:styleValue];
@@ -139,20 +139,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setLinePattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setLinePattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"linePatternTransition"]) {
       [self setLinePatternTransition:layer withReactStyleValue:styleValue];
@@ -204,20 +203,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setIconImage:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setIconImage:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"iconRotate"]) {
       [self setIconRotate:layer withReactStyleValue:styleValue];
@@ -459,20 +457,20 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setFillExtrusionPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setFillExtrusionPattern:layer
+                                             withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"fillExtrusionPatternTransition"]) {
       [self setFillExtrusionPatternTransition:layer withReactStyleValue:styleValue];
@@ -598,20 +596,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setBackgroundPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setBackgroundPattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"backgroundPatternTransition"]) {
       [self setBackgroundPatternTransition:layer withReactStyleValue:styleValue];

package/ios/components/map-view/MLRNMapView.h

@@ -1,4 +1,5 @@
 #import <React/RCTComponent.h>
+#import <React/RCTInvalidating.h>
 
 #import <MapLibre/MapLibre.h>
 
@@ -57,10 +58,14 @@ typedef void (^StyleLoadedBlock)(MLNStyle *__nonnull style);
 @property (nonatomic, strong, nullable) NSDictionary<NSString *, NSNumber *> *reactCompassPosition;
 @property (nonatomic, assign) BOOL reactCompassHiddenFacingNorth;
 
+@property (nonatomic, assign) BOOL reactScaleBarEnabled;
+@property (nonatomic, strong, nullable) NSDictionary<NSString *, NSNumber *> *reactScaleBarPosition;
+
 @property (nonatomic, assign) MLNCoordinateBounds maxBounds;
 
 @property (nonatomic, assign) BOOL isUserInteraction;
 @property (nonatomic, assign) BOOL useNativeUserLocationAnnotationView;
+@property (nonatomic, assign) BOOL annotationSelected;
 
 @property (nonatomic, copy, nullable) RCTBubblingEventBlock reactOnPress;
 @property (nonatomic, copy, nullable) RCTBubblingEventBlock reactOnLongPress;

package/ios/components/map-view/MLRNMapView.m

@@ -13,6 +13,7 @@
 
 @implementation MLRNMapView {
   BOOL _pendingInitialLayout;
+  CGPoint _lastTapPoint;
 }
 
 static double const DEG2RAD = M_PI / 180;
@@ -26,6 +27,8 @@ static double const M2PI = M_PI * 2;
     self.delegate = self;
 
     _pendingInitialLayout = YES;
+    _lastTapPoint = CGPointZero;
+    _annotationSelected = NO;
     _cameraUpdateQueue = [[CameraUpdateQueue alloc] init];
     _sources = [[NSMutableArray alloc] init];
     _images = [[NSMutableArray alloc] init];
@@ -251,10 +254,17 @@ static double const M2PI = M_PI * 2;
 
 // MARK: - UIGestureRecognizers
 
-- (void)didTapMap:(UITapGestureRecognizer *)recognizer {
-  MLRNMapView *mapView = (MLRNMapView *)recognizer.view;
-  CGPoint screenPoint = [recognizer locationInView:mapView];
-  NSArray<MLRNSource *> *touchableSources = [mapView getAllTouchableSources];
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+  [super touchesBegan:touches withEvent:event];
+  _annotationSelected = NO;
+  UITouch *touch = touches.anyObject;
+  if (touch != nil) {
+    _lastTapPoint = [touch locationInView:self];
+  }
+}
+
+- (void)handleTapAtPoint:(CGPoint)screenPoint {
+  NSArray<MLRNSource *> *touchableSources = [self getAllTouchableSources];
 
   NSMutableDictionary<NSString *, NSArray<id<MLNFeature>> *> *hits =
       [[NSMutableDictionary alloc] init];
@@ -270,7 +280,7 @@ static double const M2PI = M_PI * 2;
         CGRectMake(left, top, [hitbox[@"width"] floatValue], [hitbox[@"height"] floatValue]);
 
     NSArray<id<MLNFeature>> *features =
-        [mapView visibleFeaturesInRect:hitboxRect
+        [self visibleFeaturesInRect:hitboxRect
             inStyleLayersWithIdentifiers:[NSSet setWithArray:[touchableSource getLayerIDs]]
                                predicate:nil];
 
@@ -281,12 +291,11 @@ static double const M2PI = M_PI * 2;
   }
 
   if (hits.count > 0) {
-    MLRNSource *source = [mapView getTouchableSourceWithHighestZIndex:hitTouchableSources];
+    MLRNSource *source = [self getTouchableSourceWithHighestZIndex:hitTouchableSources];
     if (source != nil && source.hasPressListener) {
       NSArray *geoJSONDicts = [MLRNUtils featuresToJSON:hits[source.id]];
 
-      CLLocationCoordinate2D coordinate = [mapView convertPoint:screenPoint
-                                           toCoordinateFromView:mapView];
+      CLLocationCoordinate2D coordinate = [self convertPoint:screenPoint toCoordinateFromView:self];
 
       source.onPress(@{
         @"lngLat" : @[
@@ -303,13 +312,17 @@ static double const M2PI = M_PI * 2;
     }
   }
 
-  if (mapView.reactOnPress != nil) {
-    MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeTapEvent:mapView withPoint:screenPoint];
-
+  if (self.reactOnPress != nil) {
+    MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeTapEvent:self withPoint:screenPoint];
     self.reactOnPress(event.toJSON);
   }
 }
 
+- (void)didTapMap:(UITapGestureRecognizer *)recognizer {
+  CGPoint screenPoint = [recognizer locationInView:self];
+  [self handleTapAtPoint:screenPoint];
+}
+
 - (void)didLongPressMap:(UILongPressGestureRecognizer *)recognizer {
   MLRNMapView *mapView = (MLRNMapView *)recognizer.view;
 
@@ -459,6 +472,35 @@ static double const M2PI = M_PI * 2;
       _reactCompassHiddenFacingNorth ? MLNOrnamentVisibilityAdaptive : MLNOrnamentVisibilityVisible;
 }
 
+- (void)setReactScaleBarEnabled:(BOOL)reactScaleBarEnabled {
+  _reactScaleBarEnabled = reactScaleBarEnabled;
+  [self _applyScaleBar];
+}
+
+- (void)_applyScaleBar {
+  // Scale bar needs the style to be loaded to calculate its dimensions
+  if (self.style == nil) {
+    return;
+  }
+  self.showsScale = _reactScaleBarEnabled;
+}
+
+- (void)setReactScaleBarPosition:(NSDictionary<NSString *, NSNumber *> *)position {
+  __weak typeof(self) weakSelf = self;
+  [self setOrnamentPosition:position
+      defaultPosition:MLNOrnamentPositionTopLeft
+      setPosition:^(MLNOrnamentPosition ornamentPosition) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        [strongSelf setScaleBarPosition:ornamentPosition];
+      }
+      setMargins:^(CGPoint point) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        [strongSelf setScaleBarMargins:point];
+      }];
+}
+
 - (void)setReactShowUserLocation:(BOOL)reactShowUserLocation {
   self.showsUserLocation = reactShowUserLocation;
 }
@@ -613,8 +655,8 @@ static double const M2PI = M_PI * 2;
   if ([annotation isKindOfClass:[MLRNPointAnnotation class]]) {
     MLRNPointAnnotation *rctAnnotation = (MLRNPointAnnotation *)annotation;
 
-    if (rctAnnotation.reactOnSelected != nil) {
-      rctAnnotation.reactOnSelected([rctAnnotation makeEventPayload]);
+    if (rctAnnotation.reactOnSelect != nil) {
+      rctAnnotation.reactOnSelect([rctAnnotation makeEventPayload]);
     }
   }
 }
@@ -623,10 +665,16 @@ static double const M2PI = M_PI * 2;
   if ([annotation isKindOfClass:[MLRNPointAnnotation class]]) {
     MLRNPointAnnotation *rctAnnotation = (MLRNPointAnnotation *)annotation;
 
-    if (rctAnnotation.reactOnDeselected != nil) {
-      rctAnnotation.reactOnDeselected([rctAnnotation makeEventPayload]);
+    if (rctAnnotation.reactOnDeselect != nil) {
+      rctAnnotation.reactOnDeselect([rctAnnotation makeEventPayload]);
     }
   }
+
+  if (_annotationSelected) {
+    _annotationSelected = NO;
+  } else {
+    [self handleTapAtPoint:_lastTapPoint];
+  }
 }
 
 - (BOOL)mapView:(MLNMapView *)mapView annotationCanShowCallout:(id<MLNAnnotation>)annotation {
@@ -734,6 +782,7 @@ static double const M2PI = M_PI * 2;
   }
 
   [reactMapView _applyLight];
+  [reactMapView _applyScaleBar];
   [reactMapView notifyStyleLoaded];
 
   self.reactOnDidFinishLoadingStyle(nil);

package/ios/components/map-view/MLRNMapViewComponentView.mm

@@ -288,9 +288,7 @@ ViewState createViewState(NSDictionary *dict) {
   const auto &newViewProps = *std::static_pointer_cast<MLRNMapViewProps const>(props);
 
   if (oldViewProps.mapStyle != newViewProps.mapStyle) {
-    NSString *mapStyle = [NSString stringWithCString:newViewProps.mapStyle.c_str()
-                                            encoding:NSUTF8StringEncoding];
-    [_view setReactMapStyle:mapStyle];
+    [_view setReactMapStyle:RCTNSStringFromString(newViewProps.mapStyle)];
   }
 
   if (oldViewProps.light != newViewProps.light) {
@@ -396,6 +394,24 @@ ViewState createViewState(NSDictionary *dict) {
     [_view setReactCompassHiddenFacingNorth:newViewProps.compassHiddenFacingNorth];
   }
 
+  if (oldViewProps.scaleBar != newViewProps.scaleBar) {
+    [_view setReactScaleBarEnabled:newViewProps.scaleBar];
+  }
+
+  if (oldViewProps.scaleBarPosition.top != newViewProps.scaleBarPosition.top ||
+      oldViewProps.scaleBarPosition.right != newViewProps.scaleBarPosition.right ||
+      oldViewProps.scaleBarPosition.bottom != newViewProps.scaleBarPosition.bottom ||
+      oldViewProps.scaleBarPosition.left != newViewProps.scaleBarPosition.left) {
+    NSDictionary *scaleBarPosition = @{
+      @"top" : @(newViewProps.scaleBarPosition.top),
+      @"right" : @(newViewProps.scaleBarPosition.right),
+      @"bottom" : @(newViewProps.scaleBarPosition.bottom),
+      @"left" : @(newViewProps.scaleBarPosition.left)
+    };
+
+    [_view setReactScaleBarPosition:scaleBarPosition];
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
 

package/ios/components/map-view/MLRNMapViewModule.mm

@@ -106,7 +106,7 @@
         resolve:(RCTPromiseResolveBlock)resolve
          reject:(RCTPromiseRejectBlock)reject {
   CLLocationCoordinate2D coordinate =
-      CLLocationCoordinate2DMake([lngLat[0] doubleValue], [lngLat[1] doubleValue]);
+      CLLocationCoordinate2DMake([lngLat[1] doubleValue], [lngLat[0] doubleValue]);
 
   [self withMapView:reactTag
               block:^(MLRNMapView *view) {

package/ios/components/sources/geojson-source/MLRNGeoJSONSource.h

@@ -1,12 +1,9 @@
-#import <React/RCTBridge.h>
 #import "MLRNSource.h"
 
 #import <MapLibre/MapLibre.h>
 
 @interface MLRNGeoJSONSource : MLRNSource
 
-@property (nonatomic, weak) RCTBridge *bridge;
-
 @property (nonatomic, copy, nullable) NSString *url;
 @property (nonatomic, copy, nullable) NSString *shape;
 

package/ios/components/sources/image-source/MLRNImageSourceComponentView.mm

@@ -57,7 +57,7 @@ using namespace facebook::react;
   }
 
   if (oldViewProps.url != newViewProps.url) {
-    _view.url = newViewProps.url.empty() ? nil : RCTNSStringFromString(newViewProps.url);
+    _view.url = RCTNSStringFromStringNilIfEmpty(newViewProps.url);
   }
 
   if (oldViewProps.coordinates != newViewProps.coordinates) {

package/ios/components/sources/tile-sources/raster-source/MLRNRasterSourceComponentView.mm

@@ -57,7 +57,7 @@ using namespace facebook::react;
   }
 
   if (oldViewProps.url != newViewProps.url) {
-    _view.url = newViewProps.url.empty() ? nil : RCTNSStringFromString(newViewProps.url);
+    _view.url = RCTNSStringFromStringNilIfEmpty(newViewProps.url);
   }
 
   if (oldViewProps.tiles != newViewProps.tiles) {
@@ -91,8 +91,7 @@ using namespace facebook::react;
   }
 
   if (oldViewProps.attribution != newViewProps.attribution) {
-    _view.attribution =
-        newViewProps.attribution.empty() ? nil : RCTNSStringFromString(newViewProps.attribution);
+    _view.attribution = RCTNSStringFromStringNilIfEmpty(newViewProps.attribution);
   }
 
   if (oldViewProps.tileSize != newViewProps.tileSize) {