react-native-maps 1.21.0-alpha.3 → 1.21.0-alpha.31

package/ios/AirMaps/AIRMap.m

@@ -20,6 +20,7 @@
 #import "AIRMapWMSTile.h"
 #import "AIRMapLocalTile.h"
 #import "AIRMapOverlay.h"
+#import "AIRMapSnapshot.h"
 
 const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
@@ -38,8 +39,6 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 @property (nonatomic, strong) UIActivityIndicatorView *activityIndicatorView;
 @property (nonatomic, assign) NSNumber *shouldZoomEnabled;
 @property (nonatomic, assign) NSNumber *shouldScrollEnabled;
-@property (nonatomic, strong) MKCompassButton *defaultCompassButton;
-@property (nonatomic, strong) MKCompassButton *overlayCompassButton;
 
 - (void)updateScrollEnabled;
 - (void)updateZoomEnabled;
@@ -51,6 +50,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     UIView *_legalLabel;
     BOOL _initialRegionSet;
     BOOL _initialCameraSet;
+    BOOL _initialized;
     
     // Array to manually track RN subviews
     //
@@ -85,10 +85,12 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         self.calloutView = [SMCalloutView platformCalloutView];
         self.calloutView.delegate = self;
         
-        self.minZoomLevel = 0;
-        self.maxZoomLevel = AIRMapMaxZoomLevel;
+        self.minZoom = 0;
+        self.maxZoom = AIRMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
         self.legacyZoomConstraintsEnabled = YES;
+        _initialized = YES;
+        [self listenToMemoryWarnings];
     }
     return self;
 }
@@ -100,6 +102,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         [super addSubview:view];
     }
 }
+- (void) didSetRegion {
+    _initialRegionSet = YES;
+}
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
@@ -199,36 +204,25 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     }
     return marker;
 }
-
+// Create Polyline with coordinates
+-(void) fitToCoordinates:(NSArray<AIRMapCoordinate*>*) coordinates edgePadding:(UIEdgeInsets) edgeInsets animated:(Boolean) animated {
+    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
+    
+    [self setVisibleMapRect:[polyline boundingMapRect] edgePadding:edgeInsets animated:animated];
+}
 - (CGRect) frameForMarker:(AIRMapMarker*) mrkAnn {
     MKAnnotationView* mrkView = [self viewForAnnotation: mrkAnn];
     CGRect mrkFrame = mrkView.frame;
     return mrkFrame;
 }
 
-- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
-    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
-    for (AIRMapMarker* mrkAnn in self.markers) {
-        CGRect frame = [self frameForMarker:mrkAnn];
-        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
-        NSDictionary* frameDict = @{
-            @"x": @(frame.origin.x),
-            @"y": @(frame.origin.y),
-            @"width": @(frame.size.width),
-            @"height": @(frame.size.height)
-        };
-        NSDictionary* pointDict = @{
-            @"x": @(point.x),
-            @"y": @(point.y)
-        };
-        NSString* k = mrkAnn.identifier;
-        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
-        if (k != nil && (!onlyVisible || isVisible)) {
-            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
-        }
-    }
-    return markersFrames;
-}
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point {
     AIRMapMarker* mrk = nil;
@@ -322,7 +316,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     return kSMCalloutViewRepositionDelayForUIScrollView;
 }
 
-#pragma mark Accessors
+#pragma mark RNMapsAirModuleDelegate.h
 
 - (NSArray *)getMapBoundaries
 {
@@ -342,6 +336,174 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         ]
     ];
 }
+- (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
+{
+    CGPoint touchPoint = [self convertCoordinate:location toPointToView:self];
+    
+    return @{
+        @"x": @(touchPoint.x),
+        @"y": @(touchPoint.y),
+    };
+}
+- (NSDictionary *) getCoordinatesForPoint:(CGPoint)point
+{
+    CLLocationCoordinate2D coordinate = [self convertPoint:point toCoordinateFromView:self];
+    return @{
+        @"latitude": @(coordinate.latitude),
+        @"longitude": @(coordinate.longitude),
+    };
+    
+}
+
+- (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible {
+    NSMutableDictionary* markersFrames = [NSMutableDictionary new];
+    for (AIRMapMarker* mrkAnn in self.markers) {
+        CGRect frame = [self frameForMarker:mrkAnn];
+        CGPoint point = [self convertCoordinate:mrkAnn.coordinate toPointToView:self];
+        NSDictionary* frameDict = @{
+            @"x": @(frame.origin.x),
+            @"y": @(frame.origin.y),
+            @"width": @(frame.size.width),
+            @"height": @(frame.size.height)
+        };
+        NSDictionary* pointDict = @{
+            @"x": @(point.x),
+            @"y": @(point.y)
+        };
+        NSString* k = mrkAnn.identifier;
+        BOOL isVisible = CGRectIntersectsRect(self.bounds, frame);
+        if (k != nil && (!onlyVisible || isVisible)) {
+            [markersFrames setObject:@{ @"frame": frameDict, @"point": pointDict } forKey:k];
+        }
+    }
+    return markersFrames;
+}
+
+- (NSDictionary *) getCamera {
+    MKMapCamera *camera = [self camera];
+    return @{
+        @"center": @{
+            @"latitude": @(camera.centerCoordinate.latitude),
+            @"longitude": @(camera.centerCoordinate.longitude),
+        },
+        @"pitch": @(camera.pitch),
+        @"heading": @(camera.heading),
+        @"altitude": @(camera.altitude),
+    };
+}
+- (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"];
+    NSNumber *quality = config[@"quality"];
+    NSString*format =config[@"format"];
+    NSString*result =config[@"result"];
+    if (config[@"region"]){
+        MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
+        options.region =  region;
+    } else
+    {
+        options.region =  self.region;
+    }
+    options.size = CGSizeMake(
+                              ([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]
+                   result:result
+                  success:success error:error];
+}
+
+#pragma mark Take Snapshot
+- (void)takeMapSnapshot:(MKMapSnapshotter *) snapshotter
+                 format:(NSString *)format
+                quality:(CGFloat) quality
+                 result:(NSString *)result
+               success:(RCTPromiseResolveBlock) success
+                  error:(RCTPromiseRejectBlock) errorCallback {
+    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) {
+            errorCallback(@"snapshotterError", @"failed", 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 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);
+                    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];
+                success(filePath);
+            }
+            else if ([result isEqualToString:@"base64"]) {
+                success([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+            }
+        }
+        UIGraphicsEndImageContext();
+    }];
+}
+
+
 
 - (void)setShowsUserLocation:(BOOL)showsUserLocation
 {
@@ -380,13 +542,14 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     _userLocationCalloutEnabled = calloutEnabled;
 }
 
-- (void)setHandlePanDrag:(BOOL)handleMapDrag {
+- (void)setHandlePanDrag:(BOOL)handlePanDrag {
     for (UIGestureRecognizer *recognizer in [self gestureRecognizers]) {
         if ([recognizer isKindOfClass:[UIPanGestureRecognizer class]]) {
-            recognizer.enabled = handleMapDrag;
+            recognizer.enabled = handlePanDrag;
             break;
         }
     }
+    _handlePanDrag = handlePanDrag;
 }
 
 - (void)setRegion:(MKCoordinateRegion)region animated:(BOOL)animated
@@ -409,6 +572,9 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 }
 
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
+    if (!CLLocationCoordinate2DIsValid(initialRegion.center)) {
+        return;
+    }
     if (!_initialRegionSet) {
         _initialRegionSet = YES;
         [self setRegion:initialRegion animated:NO];
@@ -505,53 +671,6 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     }
 }
 
-// Include properties of MKMapView which are only available on iOS 9+
-// and check if their selector is available before calling super method.
-
-- (void)setShowsCompass:(BOOL)showsCompass {
-    if (self.overlayCompassButton != nil) {
-        self.overlayCompassButton.compassVisibility = showsCompass ? MKFeatureVisibilityAdaptive : MKFeatureVisibilityHidden;
-    }
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsCompass:)]) {
-        [super setShowsCompass:showsCompass];
-    }
-}
-
-- (BOOL)showsCompass {
-    if ([MKMapView instancesRespondToSelector:@selector(showsCompass)]) {
-        return [super showsCompass];
-    } else {
-        return NO;
-    }
-}
-
-- (void)setShowsScale:(BOOL)showsScale {
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsScale:)]) {
-        [super setShowsScale:showsScale];
-    }
-}
-
-- (BOOL)showsScale {
-    if ([MKMapView instancesRespondToSelector:@selector(showsScale)]) {
-        return [super showsScale];
-    } else {
-        return NO;
-    }
-}
-
-- (void)setShowsTraffic:(BOOL)showsTraffic {
-    if ([MKMapView instancesRespondToSelector:@selector(setShowsTraffic:)]) {
-        [super setShowsTraffic:showsTraffic];
-    }
-}
-
-- (BOOL)showsTraffic {
-    if ([MKMapView instancesRespondToSelector:@selector(showsTraffic)]) {
-        return [super showsTraffic];
-    } else {
-        return NO;
-    }
-}
 
 - (void)setScrollEnabled:(BOOL)scrollEnabled {
     self.shouldScrollEnabled = [NSNumber numberWithBool:scrollEnabled];
@@ -617,6 +736,35 @@ const NSInteger AIRMapMaxZoomLevel = 20;
     }
 }
 
+- (void) listenToMemoryWarnings
+{
+    __weak typeof(self) weakSelf = self;
+    static dispatch_once_t onceToken;
+    static dispatch_source_t source;
+    dispatch_once(&onceToken, ^{
+            source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_WARN|DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
+            dispatch_source_set_event_handler(source, ^{
+                [weakSelf handleMemoryWarning];
+            });
+            dispatch_resume(source);
+    });
+}
+/*
+ hacky way to release all cache
+ this is our last chance to release cache before app crash
+ */
+- (void) handleMemoryWarning
+{
+    NSLog(@"handleMemoryWarning warning");
+    MKMapType type = self.mapType;
+    if (type == MKMapTypeSatellite){
+        self.mapType = MKMapTypeStandard;
+    } else {
+        self.mapType = MKMapTypeSatellite;
+    }
+    self.mapType = type;
+}
+
 - (void)updateLegalLabelInsets {
     if (_legalLabel) {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -706,29 +854,6 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 - (void)layoutSubviews {
     [super layoutSubviews];
     [self cacheViewIfNeeded];
-    
-    if (self.overlayCompassButton == nil) {
-        for (UIView *subview in self.subviews) {
-            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
-            self.overlayCompassButton = [MKCompassButton compassButtonWithMapView:self];
-            [subview addSubview:self.overlayCompassButton];
-            self.overlayCompassButton.frame = CGRectMake(self.overlayCompassButton.frame.origin.x + _compassOffset.x, self.overlayCompassButton.frame.origin.y + _compassOffset.y, self.overlayCompassButton.frame.size.width, self.overlayCompassButton.frame.size.height);
-            break;
-        }
-    }
-    
-    if (self.defaultCompassButton == nil) {
-        for (UIView *subview in self.subviews) {
-            if (![NSStringFromClass(subview.class) isEqualToString:@"MKPassThroughStackView"]) continue;
-            for (UIView *subview2 in subview.subviews) {
-                if (![NSStringFromClass(subview2.class) isEqualToString:@"MKCompassView"]) continue;
-                self.defaultCompassButton = subview2;
-                self.defaultCompassButton.hidden = YES;
-            }
-            break;
-        }
-    }
-    
 }
 
 // based on https://medium.com/@dmytrobabych/getting-actual-rotation-and-zoom-level-for-mapkit-mkmapview-e7f03f430aa9

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
@@ -1175,11 +1166,11 @@ static int kDragCenterContext;
 
     CGFloat zoomLevel = [mapView getZoomLevel];
 
-    if (zoomLevel < mapView.minZoomLevel) {
-      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.minZoomLevel animated:TRUE mapView:mapView];
+    if (zoomLevel < mapView.minZoom) {
+      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.minZoom animated:TRUE mapView:mapView];
     }
-    else if (zoomLevel > mapView.maxZoomLevel) {
-      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.maxZoomLevel animated:TRUE mapView:mapView];
+    else if (zoomLevel > mapView.maxZoom) {
+      [self setCenterCoordinate:[mapView centerCoordinate] zoomLevel:mapView.maxZoom animated:TRUE mapView:mapView];
     }
 }
 

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