react-native-maps 1.21.0-alpha.32 → 1.21.0-alpha.33

package/ios/AirMaps/AIRMap.m

@@ -51,7 +51,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     BOOL _initialRegionSet;
     BOOL _initialCameraSet;
     BOOL _initialized;
-    
+
     // Array to manually track RN subviews
     //
     // AIRMap implicitly creates subviews that aren't regular RN children
@@ -69,7 +69,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if ((self = [super init])) {
         _hasStartedRendering = NO;
         _reactSubviews = [NSMutableArray new];
-        
+
         // Find Apple link label
         for (UIView *subview in self.subviews) {
             if ([NSStringFromClass(subview.class) isEqualToString:@"MKAttributionLabel"]) {
@@ -79,12 +79,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 break;
             }
         }
-        
+
         // 3rd-party callout view for MapKit that has more options than the built-in. It's painstakingly built to
         // be identical to the built-in callout view (which has a private API)
         self.calloutView = [SMCalloutView platformCalloutView];
         self.calloutView.delegate = self;
-        
+
         self.minZoom = 0;
         self.maxZoom = AIRMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
@@ -212,11 +212,13 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         coords[i] = coordinates[i].coordinate;
     }
     MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordinates.count];
-    
+
     // Set Map viewport
-    
+
     [self setVisibleMapRect:[polyline boundingMapRect] edgePadding:edgeInsets animated:animated];
 }
+
+
 - (CGRect) frameForMarker:(AIRMapMarker*) mrkAnn {
     MKAnnotationView* mrkView = [self viewForAnnotation: mrkAnn];
     CGRect mrkFrame = mrkView.frame;
@@ -251,16 +253,16 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 // Allow touches to be sent to our calloutview.
 // See this for some discussion of why we need to override this: https://github.com/nfarina/calloutview/pull/9
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
-    
+
     CGPoint touchPoint = [self.calloutView convertPoint:point fromView:self];
     UIView *touchedView = [self.calloutView hitTest:touchPoint withEvent:event];
-    
+
     if (touchedView) {
         UIWindow* win = [[[UIApplication sharedApplication] windows] firstObject];
         AIRMapCalloutSubview* calloutSubview = nil;
         AIRMapCallout* callout = nil;
         AIRMapMarker* marker = nil;
-        
+
         UIView* tmp = touchedView;
         while (tmp && tmp != win && tmp != self.calloutView) {
             if ([tmp respondsToSelector:@selector(onPress)]) {
@@ -272,7 +274,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
             }
             tmp = tmp.superview;
         }
-        
+
         if (callout) {
             marker = [self markerForCallout:callout];
             if (marker) {
@@ -282,36 +284,36 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 }
             }
         }
-        
+
         return calloutSubview ? calloutSubview : touchedView;
     }
-    
+
     return [super hitTest:point withEvent:event];
 }
 
 #pragma mark SMCalloutViewDelegate
 
 - (NSTimeInterval)calloutView:(SMCalloutView *)calloutView delayForRepositionWithSize:(CGSize)offset {
-    
+
     // When the callout is being asked to present in a way where it or its target will be partially offscreen, it asks us
     // if we'd like to reposition our surface first so the callout is completely visible. Here we scroll the map into view,
     // but it takes some math because we have to deal in lon/lat instead of the given offset in pixels.
-    
+
     CLLocationCoordinate2D coordinate = self.region.center;
-    
+
     // where's the center coordinate in terms of our view?
     CGPoint center = [self convertCoordinate:coordinate toPointToView:self];
-    
+
     // move it by the requested offset
     center.x -= offset.width;
     center.y -= offset.height;
-    
+
     // and translate it back into map coordinates
     coordinate = [self convertPoint:center toCoordinateFromView:self];
-    
+
     // move the map!
     [self setCenterCoordinate:coordinate animated:YES];
-    
+
     // tell the callout to wait for a while while we scroll (we assume the scroll delay for MKMapView matches UIScrollView)
     return kSMCalloutViewRepositionDelayForUIScrollView;
 }
@@ -321,10 +323,10 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (NSArray *)getMapBoundaries
 {
     MKMapRect mapRect = self.visibleMapRect;
-    
+
     CLLocationCoordinate2D northEast = MKCoordinateForMapPoint(MKMapPointMake(MKMapRectGetMaxX(mapRect), mapRect.origin.y));
     CLLocationCoordinate2D southWest = MKCoordinateForMapPoint(MKMapPointMake(mapRect.origin.x, MKMapRectGetMaxY(mapRect)));
-    
+
     return @[
         @[
             [NSNumber numberWithDouble:northEast.longitude],
@@ -339,7 +341,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
 {
     CGPoint touchPoint = [self convertCoordinate:location toPointToView:self];
-    
+
     return @{
         @"x": @(touchPoint.x),
         @"y": @(touchPoint.y),
@@ -352,7 +354,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         @"latitude": @(coordinate.latitude),
         @"longitude": @(coordinate.longitude),
     };
-    
+
 }
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
@@ -394,9 +396,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)takeSnapshotWithConfig:(NSDictionary *)config
                        success:(RCTPromiseResolveBlock)success error:(RCTPromiseRejectBlock)error
 {
-    
+
     MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
-    
+
     options.mapType = self.mapType;
     NSNumber *width = config[@"width"];
     NSNumber *height = config[@"height"];
@@ -414,12 +416,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                               ([width floatValue] == 0) ? self.bounds.size.width : [width floatValue],
                               ([height floatValue] == 0) ? self.bounds.size.height : [height floatValue]
                               );
-    
+
     options.scale = [[UIScreen mainScreen] scale];
-    
-    
+
+
     MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
-    
+
     [self takeMapSnapshot:snapshotter
                    format:format
                   quality:[quality floatValue]
@@ -437,7 +439,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
     NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
     NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
-    
+
     [snapshotter startWithQueue:dispatch_get_main_queue()
               completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
         if (error) {
@@ -445,30 +447,30 @@ const NSInteger AIRMapMaxZoomLevel = 20;
             return;
         }
         MKAnnotationView *pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:nil];
-        
+
         UIImage *image = snapshot.image;
         UIGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
         {
             [image drawAtPoint:CGPointMake(0.0f, 0.0f)];
-            
+
             CGRect rect = CGRectMake(0.0f, 0.0f, image.size.width, image.size.height);
-            
+
             for (id <AIRMapSnapshot> overlay in self.overlays) {
                 if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
                     [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
                 }
             }
 
-            
+
             for (id <MKAnnotation> annotation in self.annotations) {
                 CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                
+
                 MKAnnotationView* anView = [self viewForAnnotation: annotation];
-                
+
                 if (anView){
                     pin = anView;
                 }
-                
+
                 if (CGRectContainsPoint(rect, point)) {
                     point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
                     point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
@@ -490,7 +492,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
             else if([format isEqualToString:@"jpg"]) {
                 data = UIImageJPEGRepresentation(compositeImage, quality);
             }
-            
+
             if ([result isEqualToString:@"file"]) {
                 [data writeToFile:filePath atomically:YES];
                 success(filePath);
@@ -558,7 +560,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if (!CLLocationCoordinate2DIsValid(region.center)) {
         return;
     }
-    
+
     // If new span values are nil, use old values instead
     if (!region.span.latitudeDelta) {
         region.span.latitudeDelta = self.region.span.latitudeDelta;
@@ -566,7 +568,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     if (!region.span.longitudeDelta) {
         region.span.longitudeDelta = self.region.span.longitudeDelta;
     }
-    
+
     // Animate/move to new position
     [super setRegion:region animated:animated];
 }
@@ -637,25 +639,25 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void)setCameraZoomRange:(NSDictionary *)cameraZoomRange {
     if (@available(iOS 13.0, *)) {
-        
+
         if (cameraZoomRange == nil) {
             cameraZoomRange = @{};
         }
-        
+
         NSNumber *minValue = cameraZoomRange[@"minCenterCoordinateDistance"];
         NSNumber *maxValue = cameraZoomRange[@"maxCenterCoordinateDistance"];
-        
+
         if (minValue == nil && maxValue == nil) {
             self.legacyZoomConstraintsEnabled = YES;
-            
+
             MKMapCameraZoomRange *defaultZoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:MKMapCameraZoomDefault maxCenterCoordinateDistance:MKMapCameraZoomDefault];
             [super setCameraZoomRange:defaultZoomRange animated:NO];
-            
+
             return;
         }
-        
+
         MKMapCameraZoomRange *zoomRange = nil;
-        
+
         if (minValue != nil && maxValue != nil) {
             zoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:[minValue doubleValue] maxCenterCoordinateDistance:[maxValue doubleValue]];
         } else if (minValue != nil) {
@@ -663,9 +665,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         } else if (maxValue != nil) {
             zoomRange = [[MKMapCameraZoomRange alloc] initWithMaxCenterCoordinateDistance:[maxValue doubleValue]];
         }
-        
+
         BOOL animated = [cameraZoomRange[@"animated"] boolValue];
-        
+
         self.legacyZoomConstraintsEnabled = NO;
         [super setCameraZoomRange:zoomRange animated:animated];
     }
@@ -716,7 +718,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         else {
             self.cacheImageView.image = nil;
             self.cacheImageView.hidden = YES;
-            
+
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 self.cacheImageView.image = nil;
                 self.cacheImageView.hidden = YES;
@@ -724,12 +726,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
                 [self.layer renderInContext:UIGraphicsGetCurrentContext()];
                 UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
                 UIGraphicsEndImageContext();
-                
+
                 self.cacheImageView.image = image;
                 self.cacheImageView.hidden = NO;
             });
         }
-        
+
         [self updateScrollEnabled];
         [self updateZoomEnabled];
         [self updateLegalLabelInsets];
@@ -859,22 +861,22 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 // based on https://medium.com/@dmytrobabych/getting-actual-rotation-and-zoom-level-for-mapkit-mkmapview-e7f03f430aa9
 - (CGFloat)getZoomLevel {
     CGFloat cameraAngle = self.camera.heading;
-    
+
     if (cameraAngle > 270) {
         cameraAngle = 360 - cameraAngle;
     } else if (cameraAngle > 90) {
         cameraAngle = fabs(cameraAngle - 180);
     }
-    
+
     CGFloat angleRad = M_PI * cameraAngle / 180; // map rotation in radians
     CGFloat width = self.frame.size.width;
     CGFloat height = self.frame.size.height;
     CGFloat heightOffset = 20; // the offset (status bar height) which is taken by MapKit into consideration to calculate visible area height
-    
+
     // calculating Longitude span corresponding to normal (non-rotated) width
     CGFloat spanStraight = width * self.region.span.longitudeDelta / (width * cos(angleRad) + (height - heightOffset) * sin(angleRad));
     int normalizingFactor = 512;
-    
+
     return log2(360 * ((width / normalizingFactor) / spanStraight));
 }
 

package/ios/AirMaps/AIRMapMarker.m

@@ -115,7 +115,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             
             _pinView.draggable = self.draggable;
             _pinView.layer.zPosition = self.zIndex;
-            
+            _pinView.displayPriority = self.displayPriority;
+            _pinView.zPriority = self.zIndex;
             return _pinView;
         }
         
@@ -131,6 +132,9 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             _markerView.markerTintColor = self.pinColor;
             _markerView.titleVisibility = self.titleVisibility ?: MKFeatureVisibilityHidden;
             _markerView.subtitleVisibility = self.subtitleVisibility ?: MKFeatureVisibilityHidden;
+            _markerView.displayPriority = self.displayPriority;
+            _markerView.zPriority = self.zIndex;
+
             
         }
         return _markerView ?: _pinView;
@@ -140,6 +144,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         // In either case, we want to return the AIRMapMarker since it is both an MKAnnotation and an
         // MKAnnotationView all at the same time.
         self.layer.zPosition = self.zIndex;
+        self.zPriority = self.zIndex;
         return self;
     }
 }

package/ios/AirMaps/RNMapsMapView.mm

@@ -496,6 +496,7 @@ newViewProps.name.right);           \
     REMAP_MAPVIEW_PROP(userLocationCalloutEnabled)
     REMAP_MAPVIEW_PROP(zoomEnabled)
 
+
     REMAP_MAPVIEW_POINT_PROP(compassOffset)
 
     if (![_view ignoreRegionChanges]){

package/ios/AirMaps/RNMapsMarkerView.mm

@@ -390,6 +390,21 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
                 
         }
     }
+    
+    if (newViewProps.displayPriority != oldViewProps.displayPriority){
+        switch (newViewProps.displayPriority) {
+            case RNMapsMarkerDisplayPriority::Required:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityRequired];
+                break;
+            case RNMapsMarkerDisplayPriority::High:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityDefaultHigh];
+                break;
+            case RNMapsMarkerDisplayPriority::Low:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityDefaultLow];
+                break;
+                
+        }
+    }
 
     
     [super updateProps:props oldProps:oldProps];

package/lib/MapMarker.d.ts

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Animated, ViewProps, ImageURISource, ImageRequireSource } from 'react-native';
 import { MapManagerCommand, NativeComponent, ProviderContext, UIManagerCommand } from './decorateMapComponent';
 import { MapMarkerNativeComponentType } from './MapMarkerNativeComponent';
+import type { AppleMarkerPriority } from './specs/NativeComponentMarker';
 import { CalloutPressEvent, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point } from './sharedTypes';
 import { Modify } from './sharedTypesInternal';
 type AppleMarkerVisibility = 'hidden' | 'adaptive' | 'visible';
@@ -261,6 +262,17 @@ export type MapMarkerProps = ViewProps & {
      * @platform Android: Supported
      */
     zIndex?: number;
+    /**
+     Constants that indicates the display priority for annotations.
+     @default required
+     @platform iOS: Apple Maps only.
+     @platform Android: Not supported
+  
+      Required: A constant indicating that the item is required.
+      High: A constant indicating that the item’s display priority is high.
+      Low: A constant indicating that the item’s display priority is Low.
+     */
+    displayPriority?: AppleMarkerPriority;
     /**
      * Visibility of the title text rendered beneath Marker balloon
      * @platform iOS: Apple Maps only

package/lib/specs/NativeComponentMarker.d.ts

@@ -40,6 +40,7 @@ export type CalloutPressEventHandler = BubblingEventHandler<Readonly<{
     };
 }>>;
 type AppleMarkerVisibility = 'hidden' | 'adaptive' | 'visible';
+export type AppleMarkerPriority = 'required' | 'high' | 'low';
 export type Point = Readonly<{
     x: Double;
     y: Double;
@@ -91,6 +92,17 @@ export interface MarkerFabricNativeProps extends ViewProps {
      * @platform Android: Not supported. See the `calloutAnchor` prop
      */
     calloutOffset?: Point;
+    /**
+       Constants that indicates the display priority for annotations.
+       @default required
+       @platform iOS: Apple Maps only.
+       @platform Android: Not supported
+  
+        Required: A constant indicating that the item is required.
+        High: A constant indicating that the item’s display priority is high.
+        Low: A constant indicating that the item’s display priority is Low.
+       */
+    displayPriority?: WithDefault<AppleMarkerPriority, 'required'>;
     /**
      * The coordinate for the marker.
      *

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.32",
+  "version": "1.21.0-alpha.33",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",