@maplibre/maplibre-react-native 11.0.0-beta.9 → 11.0.0

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,11 @@ static double const M2PI = M_PI * 2;
     self.delegate = self;
 
     _pendingInitialLayout = YES;
+    _lastTapPoint = CGPointZero;
+    _annotationSelected = NO;
+    _reactTouchZoomEnabled = YES;
+    _reactDoubleTapZoomEnabled = YES;
+    _reactDoubleTapHoldZoomEnabled = YES;
     _cameraUpdateQueue = [[CameraUpdateQueue alloc] init];
     _sources = [[NSMutableArray alloc] init];
     _images = [[NSMutableArray alloc] init];
@@ -37,13 +43,8 @@ static double const M2PI = M_PI * 2;
     _logging = [[MLRNLogging alloc] init];
 
     // Setup map gesture recognizers
-    UITapGestureRecognizer *doubleTap = [[UITapGestureRecognizer alloc] initWithTarget:self
-                                                                                action:nil];
-    doubleTap.numberOfTapsRequired = 2;
-
     UITapGestureRecognizer *tap =
         [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapMap:)];
-    [tap requireGestureRecognizerToFail:doubleTap];
 
     UILongPressGestureRecognizer *longPress =
         [[UILongPressGestureRecognizer alloc] initWithTarget:self
@@ -58,7 +59,6 @@ static double const M2PI = M_PI * 2;
       }
     }
 
-    [self addGestureRecognizer:doubleTap];
     [self addGestureRecognizer:tap];
     [self addGestureRecognizer:longPress];
   }
@@ -251,10 +251,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 +277,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 +288,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 +309,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;
 
@@ -375,9 +385,45 @@ static double const M2PI = M_PI * 2;
   self.scrollEnabled = _reactScrollEnabled;
 }
 
-- (void)setReactZoomEnabled:(BOOL)reactZoomEnabled {
-  _reactZoomEnabled = reactZoomEnabled;
-  self.zoomEnabled = _reactZoomEnabled;
+- (void)setReactTouchZoomEnabled:(BOOL)reactTouchZoomEnabled {
+  _reactTouchZoomEnabled = reactTouchZoomEnabled;
+  [self _applyZoomSettings];
+}
+
+- (void)setReactDoubleTapZoomEnabled:(BOOL)reactDoubleTapZoomEnabled {
+  _reactDoubleTapZoomEnabled = reactDoubleTapZoomEnabled;
+  [self _applyZoomSettings];
+}
+
+- (void)setReactDoubleTapHoldZoomEnabled:(BOOL)reactDoubleTapHoldZoomEnabled {
+  _reactDoubleTapHoldZoomEnabled = reactDoubleTapHoldZoomEnabled;
+  [self _applyZoomSettings];
+}
+
+- (void)_applyZoomSettings {
+  self.zoomEnabled =
+      _reactTouchZoomEnabled || _reactDoubleTapZoomEnabled || _reactDoubleTapHoldZoomEnabled;
+
+  if (self.zoomEnabled) {
+    for (UIGestureRecognizer *gestureRecognizer in self.gestureRecognizers) {
+      if ([gestureRecognizer isKindOfClass:[UIPinchGestureRecognizer class]]) {
+        gestureRecognizer.enabled = _reactTouchZoomEnabled;
+      } else if ([gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]) {
+        UITapGestureRecognizer *tapGestureRecognizer = (UITapGestureRecognizer *)gestureRecognizer;
+
+        if (tapGestureRecognizer.numberOfTapsRequired == 2) {
+          gestureRecognizer.enabled = _reactDoubleTapZoomEnabled;
+        }
+      } else if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) {
+        UILongPressGestureRecognizer *longPressGestureRecognizer =
+            (UILongPressGestureRecognizer *)gestureRecognizer;
+
+        if (longPressGestureRecognizer.minimumPressDuration == 0) {
+          gestureRecognizer.enabled = _reactDoubleTapHoldZoomEnabled;
+        }
+      }
+    }
+  }
 }
 
 - (void)setReactRotateEnabled:(BOOL)reactRotateEnabled {
@@ -459,6 +505,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 +688,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 +698,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 +815,7 @@ static double const M2PI = M_PI * 2;
   }
 
   [reactMapView _applyLight];
+  [reactMapView _applyScaleBar];
   [reactMapView notifyStyleLoaded];
 
   self.reactOnDidFinishLoadingStyle(nil);

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

@@ -320,8 +320,16 @@ ViewState createViewState(NSDictionary *dict) {
     [_view setReactScrollEnabled:newViewProps.dragPan];
   }
 
-  if (oldViewProps.touchAndDoubleTapZoom != newViewProps.touchAndDoubleTapZoom) {
-    [_view setReactZoomEnabled:newViewProps.touchAndDoubleTapZoom];
+  if (oldViewProps.touchZoom != newViewProps.touchZoom) {
+    [_view setReactTouchZoomEnabled:newViewProps.touchZoom];
+  }
+
+  if (oldViewProps.doubleTapZoom != newViewProps.doubleTapZoom) {
+    [_view setReactDoubleTapZoomEnabled:newViewProps.doubleTapZoom];
+  }
+
+  if (oldViewProps.doubleTapHoldZoom != newViewProps.doubleTapHoldZoom) {
+    [_view setReactDoubleTapHoldZoomEnabled:newViewProps.doubleTapHoldZoom];
   }
 
   if (oldViewProps.touchRotate != newViewProps.touchRotate) {
@@ -394,6 +402,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/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/modules/logging/MLRNLogging.h

@@ -20,4 +20,8 @@
 
 - (void)setLogLevel:(nonnull NSString*)logLevel;
 
+- (void)forwardLog:(nonnull NSString*)level
+               tag:(nonnull NSString*)tag
+           message:(nonnull NSString*)message;
+
 @end

package/ios/modules/logging/MLRNLogging.m

@@ -66,6 +66,14 @@
   }
 }
 
+- (void)forwardLog:(nonnull NSString *)level
+               tag:(nonnull NSString *)tag
+           message:(nonnull NSString *)message {
+  if (self.delegate) {
+    [self.delegate logging:self didReceiveLogWithLevel:level filePath:tag line:0 message:message];
+  }
+}
+
 - (void)setLogLevel:(nonnull NSString *)logLevel {
   MLNLoggingLevel mlnLogLevel = MLNLoggingLevelNone;
   if ([logLevel isEqualToString:@"none"]) {

package/ios/modules/network/MLRNNetworkModule.mm

@@ -1,7 +1,5 @@
 #import "MLRNNetworkModule.h"
 
-#import "MLRNNetworkHTTPHeaders.h"
-
 @implementation MLRNNetworkModule
 
 + (NSString *)moduleName {
@@ -13,14 +11,6 @@
   return std::make_shared<facebook::react::NativeNetworkModuleSpecJSI>(params);
 }
 
-- (void)addRequestHeader:(NSString *)name value:(NSString *)value match:(NSString *_Nullable)match {
-  [MLRNNetworkHTTPHeaders.sharedInstance addRequestHeader:name value:value match:match];
-}
-
-- (void)removeRequestHeader:(NSString *)name {
-  [MLRNNetworkHTTPHeaders.sharedInstance removeRequestHeader:name];
-}
-
 - (void)setConnected:(BOOL)connected {
   // Android only
 }

package/ios/modules/offline/MLRNOfflineModule.h

@@ -2,7 +2,6 @@
 
 #import <React/RCTInitializing.h>
 
-@interface MLRNOfflineModule
-    : NativeOfflineModuleSpecBase <NativeOfflineModuleSpec, RCTInitializing>
+@interface MLRNOfflineModule : NativeOfflineModuleSpecBase <NativeOfflineModuleSpec>
 
 @end

package/ios/modules/offline/MLRNOfflineModule.mm

@@ -12,6 +12,7 @@ static const NSInteger MLRN_MIGRATION_VERSION = 1;
   double lastPackTimestamp;
   double eventThrottle;
   NSMutableArray<RCTPromiseResolveBlock> *packRequestQueue;
+  BOOL _migrationCompleted;
 }
 
 + (NSString *)moduleName {
@@ -23,15 +24,12 @@ static const NSInteger MLRN_MIGRATION_VERSION = 1;
   return std::make_shared<facebook::react::NativeOfflineModuleSpecJSI>(params);
 }
 
-- (void)initialize {
-  [self runMigrations];
-}
-
 - (instancetype)init {
   if (self = [super init]) {
     packRequestQueue = [NSMutableArray new];
     eventThrottle = 300;
     lastPackState = -1;
+    _migrationCompleted = NO;
 
     NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
     [defaultCenter addObserver:self
@@ -70,15 +68,17 @@ static const NSInteger MLRN_MIGRATION_VERSION = 1;
     return;
   }
 
-  if (packRequestQueue.count == 0) {
-    return;
-  }
-
   NSArray<MLNOfflinePack *> *packs = [[MLNOfflineStorage sharedOfflineStorage] packs];
   if (packs == nil) {
     return;
   }
 
+  if (!_migrationCompleted) {
+    _migrationCompleted = YES;
+    [self runMigrations];
+    packs = [[MLNOfflineStorage sharedOfflineStorage] packs] ?: packs;
+  }
+
   while (packRequestQueue.count > 0) {
     RCTPromiseResolveBlock resolve = [packRequestQueue objectAtIndex:0];
     resolve([self _convertPacksToJson:packs]);
@@ -652,7 +652,7 @@ static const NSInteger MLRN_MIGRATION_VERSION = 1;
   return @{
     @"id" : contextDictionary[@"id"] ?: @"",
     @"bounds" : bounds,
-    @"metadata" : contextDictionary[@"metadata"]
+    @"metadata" : contextDictionary[@"metadata"] ?: @"{}"
   };
 }
 

package/ios/modules/transform-request/MLRNTransformRequest.h

@@ -0,0 +1,38 @@
+#import <Foundation/Foundation.h>
+#import <MapLibre/MLNNetworkConfiguration.h>
+
+@interface MLRNTransformRequest : NSObject <MLNNetworkConfigurationDelegate>
+
++ (MLRNTransformRequest *_Nonnull)sharedInstance;
+
+@property (nonatomic, copy, nullable) void (^logCallback)
+    (NSString *_Nonnull level, NSString *_Nonnull tag, NSString *_Nonnull message);
+
+- (void)addUrlTransform:(nonnull NSString *)transformId
+                  match:(nullable NSString *)match
+                   find:(nonnull NSString *)find
+                replace:(nonnull NSString *)replace;
+
+- (void)removeUrlTransform:(nonnull NSString *)transformId;
+
+- (void)clearUrlTransforms;
+
+- (void)addUrlSearchParam:(nonnull NSString *)transformId
+                    match:(nullable NSString *)match
+                     name:(nonnull NSString *)name
+                    value:(nonnull NSString *)value;
+
+- (void)removeUrlSearchParam:(nonnull NSString *)transformId;
+
+- (void)clearUrlSearchParams;
+
+- (void)addHeader:(nonnull NSString *)transformId
+            match:(nullable NSString *)match
+             name:(nonnull NSString *)name
+            value:(nonnull NSString *)value;
+
+- (void)removeHeader:(nonnull NSString *)transformId;
+
+- (void)clearHeaders;
+
+@end