@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNMapTouchEvent.h

@@ -9,8 +9,8 @@
 @property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) CGPoint screenPoint;
 
-+ (MLRNMapTouchEvent*)makeTapEvent:(MLNMapView*)mapView withPoint:(CGPoint)point;
-+ (MLRNMapTouchEvent*)makeLongPressEvent:(MLNMapView*)mapView withPoint:(CGPoint)point;
++ (MLRNMapTouchEvent *)makeTapEvent:(MLNMapView *)mapView withPoint:(CGPoint)point;
++ (MLRNMapTouchEvent *)makeLongPressEvent:(MLNMapView *)mapView withPoint:(CGPoint)point;
 + (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation;
 + (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation;
 

package/ios/MLRN/MLRNMapTouchEvent.m

@@ -5,65 +5,66 @@
 
 @implementation MLRNMapTouchEvent
 
-- (NSDictionary*)payload
-{
-    MLNPointFeature *feature = [[MLNPointFeature alloc] init];
-    feature.coordinate = _coordinate;
-    if (_id == nil) {
-        feature.attributes = @{
-           @"screenPointX": [NSNumber numberWithDouble:_screenPoint.x],
-           @"screenPointY":[NSNumber numberWithDouble:_screenPoint.y]
-        };
-    } else {
-        feature.attributes = @{
-           @"id": _id,
-           @"screenPointX": [NSNumber numberWithDouble:_screenPoint.x],
-           @"screenPointY":[NSNumber numberWithDouble:_screenPoint.y]
-        };
-    }
-    return [feature geoJSONDictionary];
+- (NSDictionary *)payload {
+  MLNPointFeature *feature = [[MLNPointFeature alloc] init];
+  feature.coordinate = _coordinate;
+  if (_id == nil) {
+    feature.attributes = @{
+      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
+      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
+    };
+  } else {
+    feature.attributes = @{
+      @"id" : _id,
+      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
+      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
+    };
+  }
+  return [feature geoJSONDictionary];
 }
 
-+ (MLRNMapTouchEvent*)makeTapEvent:(MLNMapView*)mapView withPoint:(CGPoint)point
-{
-    return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
++ (MLRNMapTouchEvent *)makeTapEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
+  return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
 }
 
-+ (MLRNMapTouchEvent*)makeLongPressEvent:(MLNMapView*)mapView withPoint:(CGPoint)point
-{
-    return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
++ (MLRNMapTouchEvent *)makeLongPressEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
+  return [MLRNMapTouchEvent _fromPoint:point
+                           withMapView:mapView
+                          andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
 }
 
-+ (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation
-{
-    MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-    event.type = RCT_MAPBOX_ANNOTATION_TAP;
-    event.id = pointAnnotation.id;
-    event.coordinate = pointAnnotation.coordinate;
-    event.screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.frame.origin toView:nil];
-    return event;
++ (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation {
+  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
+  event.type = RCT_MAPBOX_ANNOTATION_TAP;
+  event.id = pointAnnotation.id;
+  event.coordinate = pointAnnotation.coordinate;
+  event.screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.frame.origin
+                                                       toView:nil];
+  return event;
 }
 
-+ (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation
-{
-    MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-    event.type = RCT_MAPBOX_ANNOTATION_TAP;
-    event.id = pointAnnotation.id;
-    CGPoint screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.layer.position toView:nil];
-    screenPoint.x -= (pointAnnotation.layer.bounds.size.width * pointAnnotation.layer.anchorPoint.x);
-    screenPoint.y -= (pointAnnotation.layer.bounds.size.height * pointAnnotation.layer.anchorPoint.y);
-    event.screenPoint = screenPoint;
-    event.coordinate =  [pointAnnotation.map convertPoint:pointAnnotation.layer.position toCoordinateFromView:pointAnnotation.map];
-    return event;
++ (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation {
+  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
+  event.type = RCT_MAPBOX_ANNOTATION_TAP;
+  event.id = pointAnnotation.id;
+  CGPoint screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.layer.position
+                                                         toView:nil];
+  screenPoint.x -= (pointAnnotation.layer.bounds.size.width * pointAnnotation.layer.anchorPoint.x);
+  screenPoint.y -= (pointAnnotation.layer.bounds.size.height * pointAnnotation.layer.anchorPoint.y);
+  event.screenPoint = screenPoint;
+  event.coordinate = [pointAnnotation.map convertPoint:pointAnnotation.layer.position
+                                  toCoordinateFromView:pointAnnotation.map];
+  return event;
 }
 
-+ (MLRNMapTouchEvent*)_fromPoint:(CGPoint)point withMapView:(MLNMapView *)mapView andEventType:(NSString*)eventType
-{
-    MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-    event.type = eventType;
-    event.coordinate = [mapView convertPoint:point toCoordinateFromView:mapView];
-    event.screenPoint = point;
-    return event;
++ (MLRNMapTouchEvent *)_fromPoint:(CGPoint)point
+                      withMapView:(MLNMapView *)mapView
+                     andEventType:(NSString *)eventType {
+  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
+  event.type = eventType;
+  event.coordinate = [mapView convertPoint:point toCoordinateFromView:mapView];
+  event.screenPoint = point;
+  return event;
 }
 
 @end

package/ios/MLRN/MLRNMapView.h

@@ -1,8 +1,8 @@
 #import <React/RCTComponent.h>
-#import "MLRNSource.h"
-#import "MLRNShapeSource.h"
-#import "MLRNPointAnnotation.h"
 #import "MLRNLight.h"
+#import "MLRNPointAnnotation.h"
+#import "MLRNShapeSource.h"
+#import "MLRNSource.h"
 
 @import MapLibre;
 
@@ -10,44 +10,46 @@
 @class MLRNImages;
 @class MLRNLogging;
 
-@protocol MLRNMapViewCamera<NSObject>
+@protocol MLRNMapViewCamera <NSObject>
 - (void)initialLayout;
 - (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated;
 @end
 
-typedef void (^FoundLayerBlock) (MLNStyleLayer* __nonnull layer);
-typedef void (^StyleLoadedBlock) (MLNStyle* __nonnull style);
+typedef void (^FoundLayerBlock)(MLNStyleLayer *__nonnull layer);
+typedef void (^StyleLoadedBlock)(MLNStyle *__nonnull style);
 
-@interface MLRNMapView : MLNMapView<RCTInvalidating>
+@interface MLRNMapView : MLNMapView <RCTInvalidating>
 
-@property (nonatomic, strong, nonnull) MLRNLogging* logging;
-@property (nonatomic, strong) CameraUpdateQueue *cameraUpdateQueue;
+@property (nonatomic, strong, nonnull) MLRNLogging *logging;
+@property (nonatomic, strong, nonnull) CameraUpdateQueue *cameraUpdateQueue;
 @property (nonatomic, weak) id<MLRNMapViewCamera> reactCamera;
-@property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-@property (nonatomic, strong) NSMutableArray<MLRNSource*> *sources;
-@property (nonatomic, strong) NSMutableArray<MLRNImages*> *images;
-@property (nonatomic, strong) NSMutableArray<MLRNLayer*> *layers;
-@property (nonatomic, strong) NSMutableArray<MLRNPointAnnotation*> *pointAnnotations;
-@property (nonatomic, strong) MLRNLight *light;
-@property (nonatomic, copy) NSArray<NSNumber *> *reactContentInset;
-
-@property (nonatomic, strong) NSMutableDictionary<NSString*, NSMutableArray<FoundLayerBlock>*> *layerWaiters;
-@property (nonatomic, strong) NSMutableArray<StyleLoadedBlock> *styleWaiters;
+@property (nonatomic, strong, nonnull) NSMutableArray<id<RCTComponent>> *reactSubviews;
+@property (nonatomic, strong, nonnull) NSMutableArray<MLRNSource *> *sources;
+@property (nonatomic, strong, nonnull) NSMutableArray<MLRNImages *> *images;
+@property (nonatomic, strong, nonnull) NSMutableArray<MLRNLayer *> *layers;
+@property (nonatomic, strong, nonnull) NSMutableArray<MLRNPointAnnotation *> *pointAnnotations;
+@property (nonatomic, strong, nullable) MLRNLight *light;
+@property (nonatomic, copy, nullable) NSArray<NSNumber *> *reactContentInset;
+
+@property (nonatomic, strong, nonnull)
+    NSMutableDictionary<NSString *, NSMutableArray<FoundLayerBlock> *> *layerWaiters;
+@property (nonatomic, strong, nonnull) NSMutableArray<StyleLoadedBlock> *styleWaiters;
 
 @property (nonatomic, assign) BOOL reactLocalizeLabels;
 @property (nonatomic, assign) BOOL reactScrollEnabled;
 @property (nonatomic, assign) BOOL reactPitchEnabled;
 @property (nonatomic, assign) BOOL reactRotateEnabled;
 @property (nonatomic, assign) BOOL reactAttributionEnabled;
-@property (nonatomic, strong) NSDictionary<NSString *, NSNumber *> *reactAttributionPosition;
+@property (nonatomic, strong, nullable)
+    NSDictionary<NSString *, NSNumber *> *reactAttributionPosition;
 @property (nonatomic, assign) BOOL reactLogoEnabled;
 @property (nonatomic, assign) BOOL reactCompassEnabled;
 @property (nonatomic, assign) BOOL reactZoomEnabled;
 
-@property (nonatomic, assign) NSInteger *reactCompassViewPosition;
+@property (nonatomic, assign) NSInteger reactCompassViewPosition;
 @property (nonatomic, assign) CGPoint reactCompassViewMargins;
 
-@property (nonatomic, copy) NSString *reactMapStyle;
+@property (nonatomic, copy, nullable) NSString *reactMapStyle;
 @property (nonatomic, assign) NSInteger reactPreferredFramesPerSecond;
 
 @property (nonatomic, assign) MLNCoordinateBounds maxBounds;
@@ -55,28 +57,33 @@ typedef void (^StyleLoadedBlock) (MLNStyle* __nonnull style);
 @property (nonatomic, assign) BOOL isUserInteraction;
 @property (nonatomic, assign) BOOL useNativeUserLocationAnnotationView;
 
-@property (nonatomic, copy) RCTBubblingEventBlock onPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapChange;
-
+@property (nonatomic, copy, nullable) RCTBubblingEventBlock onPress;
+@property (nonatomic, copy, nullable) RCTBubblingEventBlock onLongPress;
+@property (nonatomic, copy, nullable) RCTBubblingEventBlock onMapChange;
 
-- (void)layerAdded:(MLNStyleLayer*) layer;
+- (void)layerAdded:(nonnull MLNStyleLayer *)layer;
 
 - (CLLocationDistance)getMetersPerPixelAtLatitude:(double)latitude withZoom:(double)zoomLevel;
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel;
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel atLatitude:(CLLocationDegrees)latitude;
-- (CLLocationDistance)altitudeFromZoom:(double)zoomLevel atLatitude:(CLLocationDegrees)latitude atPitch:(CGFloat)pitch;
-- (MLRNPointAnnotation*)getRCTPointAnnotation:(MLNPointAnnotation*)mlnAnnotation;
-- (NSArray<MLRNSource *> *)getAllTouchableSources;
-- (NSArray<MLRNSource *> *)getAllShapeSources;
-- (NSArray<MLRNImages *> *)getAllImages;
-- (MLRNSource *)getTouchableSourceWithHighestZIndex:(NSArray<MLRNSource *> *)touchableSources;
-- (NSString *)takeSnap:(BOOL)writeToDisk;
+- (CLLocationDistance)altitudeFromZoom:(double)zoomLevel
+                            atLatitude:(CLLocationDegrees)latitude
+                               atPitch:(CGFloat)pitch;
+- (nonnull MLRNPointAnnotation *)getRCTPointAnnotation:(nonnull MLNPointAnnotation *)mlnAnnotation;
+- (nonnull NSArray<MLRNSource *> *)getAllTouchableSources;
+- (nonnull NSArray<MLRNSource *> *)getAllShapeSources;
+- (nonnull NSArray<MLRNImages *> *)getAllImages;
+- (nonnull MLRNSource *)getTouchableSourceWithHighestZIndex:
+    (nonnull NSArray<MLRNSource *> *)touchableSources;
+- (nonnull NSString *)takeSnap:(BOOL)writeToDisk;
 - (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated;
 
-- (void)waitForLayerWithID:(nonnull NSString*)layerID then:(void (^ _Nonnull)(MLNStyleLayer* _Nonnull layer))foundLayer;
+- (void)waitForLayerWithID:(nonnull NSString *)layerID
+                      then:(void (^_Nonnull)(MLNStyleLayer *_Nonnull layer))foundLayer;
 
-- (void)setSourceVisibility:(BOOL)visiblity sourceId:(nonnull NSString*)sourceId sourceLayerId:(nullable NSString*)sourceLayerId;
+- (void)setSourceVisibility:(BOOL)visiblity
+                   sourceId:(nonnull NSString *)sourceId
+              sourceLayerId:(nullable NSString *)sourceLayerId;
 
 - (void)notifyStyleLoaded;