react-native-maps 1.21.0-alpha.7 → 1.21.0-alpha.71

package/ios/AirMaps/AIRMapManager.m

@@ -350,23 +350,8 @@ RCT_EXPORT_METHOD(fitToCoordinates:(nonnull NSNumber *)reactTag
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
             AIRMap *mapView = (AIRMap *)view;
-
-            // Create Polyline with coordinates
-            CLLocationCoordinate2D coords[coordinates.count];
-            for(int i = 0; i < coordinates.count; i++)
-            {
-                coords[i] = coordinates[i].coordinate;
-            }
-            MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordinates.count];
-
-            // Set Map viewport
-            CGFloat top = [RCTConvert CGFloat:edgePadding[@"top"]];
-            CGFloat right = [RCTConvert CGFloat:edgePadding[@"right"]];
-            CGFloat bottom = [RCTConvert CGFloat:edgePadding[@"bottom"]];
-            CGFloat left = [RCTConvert CGFloat:edgePadding[@"left"]];
-
-            [mapView setVisibleMapRect:[polyline boundingMapRect] edgePadding:UIEdgeInsetsMake(top, left, bottom, right) animated:animated];
-
+            UIEdgeInsets edgeInsets = [RCTConvert UIEdgeInsets:edgePadding];
+            [mapView fitToCoordinates: coordinates edgePadding:edgeInsets animated:animated];
         }
     }];
 }
@@ -950,6 +935,9 @@ static int kDragCenterContext;
 {
     // Don't send region did change events until map has
     // started rendering, as these won't represent the final location
+    if (animated && mapView.ignoreRegionChanges){
+        mapView.ignoreRegionChanges = false;
+    }
     if(mapView.hasStartedRendering){
         [self _regionChanged:mapView];
     }
@@ -966,6 +954,8 @@ static int kDragCenterContext;
 
     mapView.pendingCenter = mapView.region.center;
     mapView.pendingSpan = mapView.region.span;
+    // reset original state (checkout setCamera / region animated)
+    mapView.ignoreRegionChanges = NO;
 }
 
 - (void)mapViewWillStartRenderingMap:(AIRMap *)mapView
@@ -980,6 +970,7 @@ static int kDragCenterContext;
 - (void)mapViewDidFinishRenderingMap:(AIRMap *)mapView fullyRendered:(BOOL)fullyRendered
 {
     [mapView finishLoading];
+    mapView.ignoreRegionChanges = NO;
 }
 
 #pragma mark Private

package/ios/AirMaps/AIRMapMarker.h

@@ -55,6 +55,7 @@
 - (void)hideCalloutView;
 - (void)addTapGestureRecognizer;
 - (void)setUseLegacyPinView:(BOOL)value;
+- (void)animateToCoordinate:(CLLocationCoordinate2D)newCoordinate duration:(NSTimeInterval)duration;
 
 @end
 

package/ios/AirMaps/AIRMapMarker.m

@@ -14,6 +14,8 @@
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTBridge+Private.h>
 
 NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
@@ -28,6 +30,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
     BOOL _useLegacyPinView;
+    
+    CADisplayLink *_displayLink;
+    CLLocationCoordinate2D _startCoordinate;
+    CLLocationCoordinate2D _endCoordinate;
+    NSTimeInterval _animationStartTime;
+    NSTimeInterval _animationDuration;
+    BOOL _isAnimating;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -43,22 +52,22 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // Make sure we use the image size when available
     CGSize size = self.image ? self.image.size : frame.size;
     CGRect bounds = {CGPointZero, size};
-
+    
     // The MapView is basically in charge of figuring out the center position of the marker view. If the view changed in
     // height though, we need to compensate in such a way that the bottom of the marker stays at the same spot on the
     // map.
     CGFloat dy = (bounds.size.height - self.bounds.size.height) / 2;
     CGPoint center = (CGPoint){ self.center.x, self.center.y - dy };
-
+    
     // Avoid crashes due to nan coords
     if (isnan(center.x) || isnan(center.y) ||
-            isnan(bounds.origin.x) || isnan(bounds.origin.y) ||
-            isnan(bounds.size.width) || isnan(bounds.size.height)) {
+        isnan(bounds.origin.x) || isnan(bounds.origin.y) ||
+        isnan(bounds.size.width) || isnan(bounds.size.height)) {
         RCTLogError(@"Invalid layout for (%@)%@. position: %@. bounds: %@",
-                self.reactTag, self, NSStringFromCGPoint(center), NSStringFromCGRect(bounds));
+                    self.reactTag, self, NSStringFromCGPoint(center), NSStringFromCGRect(bounds));
         return;
     }
-
+    
     self.center = center;
     self.bounds = bounds;
 }
@@ -68,6 +77,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = (AIRMapCallout *)subview;
     } else {
         [super insertReactSubview:(UIView *)subview atIndex:atIndex];
+        [self addSubview:subview];
     }
 }
 - (void) setFrame:(CGRect)frame {
@@ -84,6 +94,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.calloutView = nil;
     } else {
         [super removeReactSubview:(UIView *)subview];
+        [(UIView *) subview removeFromSuperview];
     }
 }
 
@@ -91,36 +102,40 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 {
     if ([self shouldUsePinView]) {
         // In this case, we want to render a platform "default" legacy marker.
-
-
+        
+        
         if (_pinView == nil && _useLegacyPinView) {
             _pinView = [[MKPinAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_pinView];
             _pinView.annotation = self;
-
+            
             if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
                 _pinView.pinTintColor = self.pinColor;
             }
-
+            
             _pinView.draggable = self.draggable;
             _pinView.layer.zPosition = self.zIndex;
-
+            _pinView.displayPriority = self.displayPriority;
+            _pinView.zPriority = self.zIndex;
             return _pinView;
         }
-
-
-
+        
+        
+        
         if (_markerView == nil && !_useLegacyPinView) {
             _markerView = [[MKMarkerAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_markerView];
             _markerView.annotation = self;
-
-        _markerView.draggable = self.draggable;
-        _markerView.layer.zPosition = self.zIndex;
-        _markerView.markerTintColor = self.pinColor;
-        _markerView.titleVisibility = self.titleVisibility ?: MKFeatureVisibilityHidden;
-        _markerView.subtitleVisibility = self.subtitleVisibility ?: MKFeatureVisibilityHidden;
-
+            
+            _markerView.draggable = self.draggable;
+            _markerView.layer.zPosition = self.zIndex;
+            _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;
     } else {
@@ -129,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;
     }
 }
@@ -136,14 +152,14 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)fillCalloutView:(SMCalloutView *)calloutView
 {
     // Set everything necessary on the calloutView before it becomes visible.
-
+    
     // Apply the MKAnnotationView's desired calloutOffset (from the top-middle of the view)
-     if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
+    if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
         calloutView.calloutOffset = CGPointMake(-8,0);
     } else {
         calloutView.calloutOffset = self.calloutOffset;
     }
-
+    
     if (self.calloutView) {
         calloutView.title = nil;
         calloutView.subtitle = nil;
@@ -156,13 +172,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             // as a result, we use the default "masked" background view.
             calloutView.backgroundView = [SMCalloutMaskedBackgroundView new];
         }
-
+        
         // when this is set, the callout's content will be whatever react views the user has put as the callout's
         // children.
         calloutView.contentView = self.calloutView;
-
+        
     } else {
-
+        
         // if there is no calloutView, it means the user wants to use the default callout behavior with title/subtitle
         // pairs.
         calloutView.title = self.title;
@@ -176,37 +192,37 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 {
     _calloutIsOpen = YES;
     [self setZIndex:_zIndexBeforeOpen];
-
+    
     MKAnnotationView *annotationView = [self getAnnotationView];
-
+    
     [self setSelected:YES animated:NO];
     [self.map selectAnnotation:self animated:NO];
-
+    
     id event = @{
-            @"action": @"marker-select",
-            @"id": self.identifier ?: @"unknown",
-            @"coordinate": @{
-                    @"latitude": @(self.coordinate.latitude),
-                    @"longitude": @(self.coordinate.longitude)
-            }
+        @"action": @"marker-select",
+        @"id": self.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(self.coordinate.latitude),
+            @"longitude": @(self.coordinate.longitude)
+        }
     };
-
+    
     if (self.map.onMarkerSelect) self.map.onMarkerSelect(event);
     if (self.onSelect) self.onSelect(event);
-
+    
     if (![self shouldShowCalloutView]) {
         // no callout to show
         return;
     }
-
+    
     [self fillCalloutView:self.map.calloutView];
-
+    
     // This is where we present our custom callout view... MapKit's built-in callout doesn't have the flexibility
     // we need, but a lot of work was done by Nick Farina to make this identical to MapKit's built-in.
     [self.map.calloutView presentCalloutFromRect:annotationView.bounds
-                                         inView:annotationView
-                              constrainedToView:self.map
-                                       animated:YES];
+                                          inView:annotationView
+                               constrainedToView:self.map
+                                        animated:YES];
 }
 
 #pragma mark - Tap Gesture & Events.
@@ -228,12 +244,12 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)_handleTap:(UITapGestureRecognizer *)recognizer {
     AIRMapMarker *marker = self;
     if (!marker) return;
-
+    
     if (marker.selected) {
         CGPoint touchPoint = [recognizer locationInView:marker.map.calloutView];
         CGRect bubbleFrame = [self.calloutView convertRect:marker.map.calloutView.bounds toView:marker.map];
         CGPoint touchPointReal = [recognizer locationInView:self.calloutView];
-
+        
         UIView *calloutView = [marker.map.calloutView hitTest:touchPoint withEvent:nil];
         if (calloutView) {
             // the callout (or its subview) got clicked, not the marker
@@ -247,22 +263,22 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                 }
                 tmp = tmp.superview;
             }
-
+            
             id event = @{
-                         @"action": calloutSubview ? @"callout-inside-press" : @"callout-press",
-                         @"id": marker.identifier ?: @"unknown",
-                         @"point": @{
-                                 @"x": @(touchPointReal.x),
-                                 @"y": @(touchPointReal.y),
-                                 },
-                         @"frame": @{
-                             @"x": @(bubbleFrame.origin.x),
-                             @"y": @(bubbleFrame.origin.y),
-                             @"width": @(bubbleFrame.size.width),
-                             @"height": @(bubbleFrame.size.height),
-                             }
-                         };
-
+                @"action": calloutSubview ? @"callout-inside-press" : @"callout-press",
+                @"id": marker.identifier ?: @"unknown",
+                @"point": @{
+                    @"x": @(touchPointReal.x),
+                    @"y": @(touchPointReal.y),
+                },
+                @"frame": @{
+                    @"x": @(bubbleFrame.origin.x),
+                    @"y": @(bubbleFrame.origin.y),
+                    @"width": @(bubbleFrame.size.width),
+                    @"height": @(bubbleFrame.size.height),
+                }
+            };
+            
             if (calloutSubview) calloutSubview.onPress(event);
             if (marker.onCalloutPress) marker.onCalloutPress(event);
             if (marker.calloutView && marker.calloutView.onPress) marker.calloutView.onPress(event);
@@ -270,25 +286,25 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             return;
         }
     }
-
+    
     // the actual marker got clicked
     CGPoint touchPointReal = [recognizer locationInView:self.calloutView];
     id event = @{
-                 @"action": @"marker-press",
-                 @"id": marker.identifier ?: @"unknown",
-                 @"coordinate": @{
-                         @"latitude": @(marker.coordinate.latitude),
-                         @"longitude": @(marker.coordinate.longitude)
-                         },
-                 @"position": @{
-                         @"x": @(touchPointReal.x),
-                         @"y": @(touchPointReal.y),
-                         }
-                 };
-
+        @"action": @"marker-press",
+        @"id": marker.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(marker.coordinate.latitude),
+            @"longitude": @(marker.coordinate.longitude)
+        },
+        @"position": @{
+            @"x": @(touchPointReal.x),
+            @"y": @(touchPointReal.y),
+        }
+    };
+    
     if (marker.onPress) marker.onPress(event);
     if (marker.map.onMarkerPress) marker.map.onMarkerPress(event);
-
+    
     [marker.map selectAnnotation:marker animated:NO];
 }
 
@@ -298,19 +314,19 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     [self setZIndex:_zIndexBeforeOpen];
     // hide the callout view
     [self.map.calloutView dismissCalloutAnimated:YES];
-
+    
     [self setSelected:NO animated:NO];
     [self.map deselectAnnotation:self animated:NO];
-
+    
     id event = @{
-            @"action": @"marker-deselect",
-            @"id": self.identifier ?: @"unknown",
-            @"coordinate": @{
-                    @"latitude": @(self.coordinate.latitude),
-                    @"longitude": @(self.coordinate.longitude)
-            }
+        @"action": @"marker-deselect",
+        @"id": self.identifier ?: @"unknown",
+        @"coordinate": @{
+            @"latitude": @(self.coordinate.latitude),
+            @"longitude": @(self.coordinate.longitude)
+        }
     };
-
+    
     if (self.map.onMarkerDeselect) self.map.onMarkerDeselect(event);
     if (self.onDeselect) self.onDeselect(event);
 }
@@ -333,39 +349,42 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
 - (void)setOpacity:(double)opacity
 {
-  [self setAlpha:opacity];
+    [self setAlpha:opacity];
 }
 
 - (void)setImageSrc:(NSString *)imageSrc
 {
     _imageSrc = imageSrc;
-
+    
     if (_reloadImageCancellationBlock) {
         _reloadImageCancellationBlock();
         _reloadImageCancellationBlock = nil;
     }
-    _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
-                                                                            size:self.bounds.size
-                                                                           scale:RCTScreenScale()
-                                                                         clipped:YES
-                                                                      resizeMode:RCTResizeModeCenter
-                                                                   progressBlock:nil
-                                                                partialLoadBlock:nil
-                                                                 completionBlock:^(NSError *error, UIImage *image) {
-                                                                     if (error) {
-                                                                         // TODO(lmr): do something with the error?
-                                                                         NSLog(@"%@", error);
-                                                                     }
-                                                                     dispatch_async(dispatch_get_main_queue(), ^{
-                                                                         self.image = image;
-                                                                     });
-                                                                 }];
+    __weak __typeof(self) weakSelf = self;
+    
+    _reloadImageCancellationBlock = [[[RCTBridge currentBridge] moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
+                                                                                                                 size:self.bounds.size
+                                                                                                                scale:RCTScreenScale()
+                                                                                                              clipped:YES
+                                                                                                           resizeMode:RCTResizeModeCenter
+                                                                                                        progressBlock:nil
+                                                                                                     partialLoadBlock:nil
+                                                                                                      completionBlock:^(NSError *error, UIImage *image) {
+        if (error) {
+            // TODO(lmr): do something with the error?
+            NSLog(@"failed to load image: %@", error);
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            __strong __typeof(weakSelf) strongSelf = weakSelf;
+            strongSelf.image = image;
+        });
+    }];
 }
 
 - (void)setPinColor:(UIColor *)pinColor
 {
     _pinColor = pinColor;
-
+    
     if(_useLegacyPinView && [_pinView respondsToSelector:@selector(setPinTintColor:)]) {
         _pinView.pinTintColor = _pinColor;
     } else {
@@ -381,7 +400,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 }
 
 - (BOOL)isSelected {
-  return _isPreselected || [super isSelected];
+    return _isPreselected || [super isSelected];
 }
 
 - (void)dealloc {
@@ -398,4 +417,47 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     _useLegacyPinView = value;
 }
 
+- (void)animateToCoordinate:(CLLocationCoordinate2D)newCoordinate duration:(NSTimeInterval)duration {
+    if (_isAnimating) {
+        NSLog(@"Animation already in progress. Rejecting new animation request.");
+        return;
+    }
+    
+    // Mark as animating
+    _isAnimating = YES;
+    
+    // Store animation parameters
+    _startCoordinate = self.coordinate;
+    _endCoordinate = newCoordinate;
+    _animationDuration = duration;
+    _animationStartTime = [NSDate timeIntervalSinceReferenceDate];
+    
+    // Start a CADisplayLink
+    if (_displayLink) {
+        [_displayLink invalidate];
+    }
+    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updatePosition)];
+    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+}
+
+- (void)updatePosition {
+    NSTimeInterval elapsed = [NSDate timeIntervalSinceReferenceDate] - _animationStartTime;
+    CGFloat progress = MIN(elapsed / _animationDuration, 1.0);
+    
+    // Interpolate coordinates
+    CLLocationDegrees currentLatitude = _startCoordinate.latitude + progress * (_endCoordinate.latitude - _startCoordinate.latitude);
+    CLLocationDegrees currentLongitude = _startCoordinate.longitude + progress * (_endCoordinate.longitude - _startCoordinate.longitude);
+    
+    // Update annotation's coordinate
+    CLLocationCoordinate2D currentCoordinate = CLLocationCoordinate2DMake(currentLatitude, currentLongitude);
+    [self setValue:[NSValue valueWithMKCoordinate:currentCoordinate] forKey:@"coordinate"];
+    
+    // Stop the animation when complete
+    if (progress == 1.0) {
+        [_displayLink invalidate];
+        _displayLink = nil;
+        _isAnimating = NO; // Reset the animation state
+    }
+}
+
 @end

package/ios/AirMaps/Callout/SMCalloutView.m

@@ -855,4 +855,4 @@ static UIImage *blackArrowImage = nil, *whiteArrowImage = nil, *grayArrowImage =
 - (CGFloat)frameBottom { return self.frame.origin.y + self.frame.size.height; }
 - (void)setFrameBottom:(CGFloat)bottom { self.frame = (CGRect){ .origin=self.frame.origin, .size.width=self.frame.size.width, .size.height=fmaxf(bottom-self.frame.origin.y,0) }; }
 
-@end
+@end

package/ios/AirMaps/RCTConvert+AirMap.h

@@ -7,6 +7,8 @@
 #import <MapKit/MapKit.h>
 #import <React/RCTConvert.h>
 
+@class AIRMapCoordinate;
+
 @interface RCTConvert (AirMap)
 
 + (MKCoordinateSpan)MKCoordinateSpan:(id)json;
@@ -16,4 +18,6 @@
 + (MKMapType)MKMapType:(id)json;
 + (NSDictionary*) dictonaryFromString:(NSString *) str;
 + (NSArray*) arrayFromString:(NSString *) str;
++ (NSArray<NSArray<AIRMapCoordinate *> *> *)AIRMapCoordinateArrayArray:(id)json;
++ (AIRMapCoordinate*) AIRMapCoordinate:(id)json;
 @end

package/ios/AirMaps/RCTConvert+AirMap.m

@@ -27,6 +27,7 @@
   };
 }
 
+
 + (MKMapCamera*)MKMapCamera:(id)json
 {
     json = [self NSDictionary:json];
@@ -49,6 +50,7 @@
                                                 error:&jsonError];
 }
 
+
 + (MKMapCamera*)MKMapCameraWithDefaults:(id)json existingCamera:(MKMapCamera*)camera
 {
     json = [self NSDictionary:json];

package/ios/AirMaps/RNMapsAirModule.h

@@ -3,7 +3,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <RNMapsSpecs/RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsSpecs.h>
 
 NS_ASSUME_NONNULL_BEGIN