react-native-maps 1.21.0-alpha.2 → 1.21.0-alpha.21

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 {
@@ -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];
     }
 }
 
@@ -344,7 +355,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         _reloadImageCancellationBlock();
         _reloadImageCancellationBlock = nil;
     }
-    _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
+    
+    _reloadImageCancellationBlock = [[[RCTBridge currentBridge] moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
                                                                             size:self.bounds.size
                                                                            scale:RCTScreenScale()
                                                                          clipped:YES
@@ -352,9 +364,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                                                                    progressBlock:nil
                                                                 partialLoadBlock:nil
                                                                  completionBlock:^(NSError *error, UIImage *image) {
+        NSLog(@"image load completed");
                                                                      if (error) {
                                                                          // TODO(lmr): do something with the error?
-                                                                         NSLog(@"%@", error);
+                                                                         NSLog(@"failed to load image: %@", error);
                                                                      }
                                                                      dispatch_async(dispatch_get_main_queue(), ^{
                                                                          self.image = image;
@@ -398,4 +411,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/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

@@ -1,5 +1,6 @@
 //  RCTNativeLocalStorage.h
 //  TurboModuleExample
+#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
 #import <RNMapsSpecs/RNMapsSpecs.h>
@@ -11,3 +12,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif

package/ios/AirMaps/RNMapsAirModule.mm

@@ -20,15 +20,15 @@
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
 
 - (void)executeWithMapView:(double)tag
-                   success:(void (^)(AIRMap *mapView))success
+                   success:(void (^)(id<RNMapsAirModuleDelegate> mapView))success
                    reject:(RCTPromiseRejectBlock)reject {
     dispatch_async(dispatch_get_main_queue(), ^{
         id view = [_viewRegistry_DEPRECATED viewForReactTag:[NSNumber numberWithDouble:tag]];
-        if (![view isKindOfClass:[RNMapsMapView class]]) {
-            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMapsMapView, got: %@", view], NULL);
+        if ([view conformsToProtocol:@protocol(RNMapsHostVewDelegate)]) {
+            id<RNMapsAirModuleDelegate> mapViewDelegate = [view mapView];
+            success(mapViewDelegate);
         } else {
-            AIRMap *mapView = [view mapView];
-            success(mapView);
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMapsMapView, got: %@", view], NULL);
         }
     });
 }
@@ -36,17 +36,8 @@
 - (void)getCamera:(double)tag
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-            MKMapCamera *camera = [mapView camera];
-            resolve(@{
-                      @"center": @{
-                              @"latitude": @(camera.centerCoordinate.latitude),
-                              @"longitude": @(camera.centerCoordinate.longitude),
-                      },
-                      @"pitch": @(camera.pitch),
-                      @"heading": @(camera.heading),
-                      @"altitude": @(camera.altitude),
-            });
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getCamera]);
     } reject:reject];
 
 }
@@ -56,7 +47,7 @@
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
         resolve([mapView getMarkersFramesWithOnlyVisible:onlyVisible]);
     } reject:reject];
 }
@@ -64,7 +55,7 @@
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
         resolve([mapView getMapBoundaries]);
     } reject:reject];
 }
@@ -73,42 +64,11 @@
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
-
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-          
-        MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
-       
-        options.mapType = mapView.mapType;
-        NSNumber *width = config[@"width"];
-        NSNumber *height = config[@"height"];
-        NSNumber *quality = config[@"quality"];
-        NSString*format =config[@"format"];
-        NSString*result =config[@"result"];
-        MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
-       
-     
-        options.region = (region.center.latitude && region.center.longitude) ? region : mapView.region;
-        options.size = CGSizeMake(
-          ([width floatValue] == 0) ? mapView.bounds.size.width : [width floatValue],
-          ([height floatValue] == 0) ? mapView.bounds.size.height : [height floatValue]
-        );
-        
-        options.scale = [[UIScreen mainScreen] scale];
-
-
-        MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
-
-        [self takeMapSnapshot:mapView
-            snapshotter:snapshotter
-            format:format
-            quality:[quality floatValue]
-            result:result
-            callback:resolve];
-        
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        [mapView takeSnapshotWithConfig:config callback:resolve];
     } reject:reject];
-    
-   
 }
+
 - (void)getAddressFromCoordinates:(double)tag
                        coordinate:(JS::NativeAirMapsModule::LatLng &)coordinate
                           resolve:(RCTPromiseResolveBlock)resolve
@@ -117,32 +77,30 @@
     double latitude = coordinate.latitude();
     double longitude = coordinate.longitude();
     
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-        CLLocation *location = [[CLLocation alloc] initWithLatitude:latitude
+  
+    CLLocation *location = [[CLLocation alloc] initWithLatitude:latitude
                                                           longitude:longitude];
-        CLGeocoder *geoCoder = [[CLGeocoder alloc] init];
-        [geoCoder reverseGeocodeLocation:location
+    CLGeocoder *geoCoder = [[CLGeocoder alloc] init];
+    [geoCoder reverseGeocodeLocation:location
                        completionHandler:^(NSArray *placemarks, NSError *error) {
-            if (error == nil && [placemarks count] > 0){
-                CLPlacemark *placemark = placemarks[0];
-                resolve(@{
-                    @"name" : [NSString stringWithFormat:@"%@", placemark.name],
-                    @"thoroughfare" : [NSString stringWithFormat:@"%@", placemark.thoroughfare],
-                    @"subThoroughfare" : [NSString stringWithFormat:@"%@", placemark.subThoroughfare],
-                    @"locality" : [NSString stringWithFormat:@"%@", placemark.locality],
-                    @"subLocality" : [NSString stringWithFormat:@"%@", placemark.subLocality],
-                    @"administrativeArea" : [NSString stringWithFormat:@"%@", placemark.administrativeArea],
-                    @"subAdministrativeArea" : [NSString stringWithFormat:@"%@", placemark.subAdministrativeArea],
-                    @"postalCode" : [NSString stringWithFormat:@"%@", placemark.postalCode],
-                    @"countryCode" : [NSString stringWithFormat:@"%@", placemark.ISOcountryCode],
-                    @"country" : [NSString stringWithFormat:@"%@", placemark.country],
-                });
-            } else {
-                reject(@"Invalid argument", [NSString stringWithFormat:@"Can not get address location"], NULL);
-            }
-        }];
-        
-    } reject:reject];
+        if (error == nil && [placemarks count] > 0){
+            CLPlacemark *placemark = placemarks[0];
+            resolve(@{
+                @"name" : [NSString stringWithFormat:@"%@", placemark.name],
+                @"thoroughfare" : [NSString stringWithFormat:@"%@", placemark.thoroughfare],
+                @"subThoroughfare" : [NSString stringWithFormat:@"%@", placemark.subThoroughfare],
+                @"locality" : [NSString stringWithFormat:@"%@", placemark.locality],
+                @"subLocality" : [NSString stringWithFormat:@"%@", placemark.subLocality],
+                @"administrativeArea" : [NSString stringWithFormat:@"%@", placemark.administrativeArea],
+                @"subAdministrativeArea" : [NSString stringWithFormat:@"%@", placemark.subAdministrativeArea],
+                @"postalCode" : [NSString stringWithFormat:@"%@", placemark.postalCode],
+                @"countryCode" : [NSString stringWithFormat:@"%@", placemark.ISOcountryCode],
+                @"country" : [NSString stringWithFormat:@"%@", placemark.country],
+            });
+        } else {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Can not get address location"], NULL);
+        }
+    }];
 }
 
 - (void)getPointForCoordinate:(double)tag
@@ -153,16 +111,10 @@
     double latitude = coordinate.latitude();
     double longitude = coordinate.longitude();
     
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    CLLocationCoordinate2D location = CLLocationCoordinate2DMake(latitude,longitude);
     
-        CGPoint touchPoint = [mapView convertCoordinate:
-                              CLLocationCoordinate2DMake(latitude,longitude)
-                                          toPointToView:mapView];
-
-        resolve(@{
-                  @"x": @(touchPoint.x),
-                  @"y": @(touchPoint.y),
-                  });
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getPointForCoordinates:location]);
         
     } reject:reject];
     
@@ -174,20 +126,10 @@
 {
     double x = point.x();
     double y = point.y();
-    
-    [self executeWithMapView:tag success:^(AIRMap *mapView) {
-    
-       
-        CLLocationCoordinate2D coordinate = [mapView convertPoint:CGPointMake(x,y)
-            toCoordinateFromView:mapView];
-
-            resolve(@{
-                      @"latitude": @(coordinate.latitude),
-                      @"longitude": @(coordinate.longitude),
-                      });
-        
+    CGPoint pt = CGPointMake(x,y);
+    [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
+        resolve([mapView getCoordinatesForPoint:pt]);
     } reject:reject];
-    
    
 }
 
@@ -201,80 +143,7 @@
     return nil;
 }
 
-#pragma mark Take Snapshot
-- (void)takeMapSnapshot:(AIRMap *)mapView
-        snapshotter:(MKMapSnapshotter *) snapshotter
-        format:(NSString *)format
-        quality:(CGFloat) quality
-        result:(NSString *)result
-        callback:(RCTPromiseResolveBlock) callback {
-    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) {
-                      callback(@[error]);
-                      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 mapView.overlays) {
-                          if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
-                                  [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
-                          }
-                      }
-                      
-                      for (id <MKAnnotation> annotation in mapView.annotations) {
-                          CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                          
-                          MKAnnotationView* anView = [mapView 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);
-                              if (pin.image) {
-                                  [pin.image drawAtPoint:point];
-                              } else {
-                                  CGRect pinRect = CGRectMake(point.x, point.y, pin.bounds.size.width, pin.bounds.size.height);
-                                  [pin drawViewHierarchyInRect:pinRect afterScreenUpdates:NO];
-                              }
-                          }
-                      }
-
-                      UIImage *compositeImage = UIGraphicsGetImageFromCurrentImageContext();
-
-                      NSData *data;
-                      if ([format isEqualToString:@"png"]) {
-                          data = UIImagePNGRepresentation(compositeImage);
-                      }
-                      else if([format isEqualToString:@"jpg"]) {
-                          data = UIImageJPEGRepresentation(compositeImage, quality);
-                      }
-
-                      if ([result isEqualToString:@"file"]) {
-                          [data writeToFile:filePath atomically:YES];
-                          callback(filePath);
-                      }
-                      else if ([result isEqualToString:@"base64"]) {
-                          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
-                      }
-                  }
-                  UIGraphicsEndImageContext();
-              }];
-}
 
 @end
 

package/ios/AirMaps/RNMapsAirModuleDelegate.h

@@ -0,0 +1,24 @@
+//
+//  AIRUrlTileOverlay.h
+//  AirMaps
+//
+//  Created by cascadian on 3/19/16.
+//  Copyright © 2016. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+#import <React/RCTBridge.h>
+
+@protocol RNMapsAirModuleDelegate <NSObject>
+@required
+
+- (void)takeSnapshotWithConfig:(NSDictionary *)config
+                      callback:(RCTPromiseResolveBlock) callback;
+
+- (NSDictionary *) getCamera;
+- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
+- (NSArray *) getMapBoundaries;
+- (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location;
+- (NSDictionary *) getCoordinatesForPoint:(CGPoint) point;
+@end

package/ios/AirMaps/RNMapsHostVewDelegate.h

@@ -0,0 +1,17 @@
+//
+//  AIRUrlTileOverlay.h
+//  AirMaps
+//
+//  Created by cascadian on 3/19/16.
+//  Copyright © 2016. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "RNMapsAirModuleDelegate.h"
+
+@protocol RNMapsHostVewDelegate <NSObject>
+@required
+
+- (id<RNMapsAirModuleDelegate>) mapView;
+
+@end

package/ios/AirMaps/RNMapsMapView.h

@@ -5,17 +5,20 @@
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
 //
+#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
+#import "RNMapsHostVewDelegate.h"
+
 @class AIRMap;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNMapsMapView : RCTViewComponentView
-
-- (AIRMap *) mapView;
+@interface RNMapsMapView : RCTViewComponentView<RNMapsHostVewDelegate>
 
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif