react-native-maps 1.21.0-alpha.27 → 1.21.0-alpha.29

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -517,13 +517,9 @@ using namespace facebook::react;
 
 
     REMAP_MAPVIEW_PROP(pitchEnabled)
-
     REMAP_MAPVIEW_PROP(zoomTapEnabled)
-
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    if (_view.scrollEnabled != newViewProps.scrollEnabled){
-        [_view setScrollEnabled:newViewProps.scrollEnabled];
-    }
+
 
     if (newViewProps.minZoom != oldViewProps.minZoom || newViewProps.maxZoom != oldViewProps.maxZoom){
         [_view setMinZoom:newViewProps.minZoom maxZoom:newViewProps.maxZoom];

package/ios/AirMaps/AIRMap.m

@@ -90,6 +90,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
         self.compassOffset = CGPointMake(0, 0);
         self.legacyZoomConstraintsEnabled = YES;
         _initialized = YES;
+        [self listenToMemoryWarnings];
     }
     return self;
 }
@@ -735,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(), ^{

package/ios/AirMaps/AIRMapMarker.m

@@ -30,7 +30,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
     BOOL _useLegacyPinView;
-
+    
     CADisplayLink *_displayLink;
     CLLocationCoordinate2D _startCoordinate;
     CLLocationCoordinate2D _endCoordinate;
@@ -52,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;
 }
@@ -102,36 +102,36 @@ 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;
-
+            
             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;
+            
         }
         return _markerView ?: _pinView;
     } else {
@@ -147,14 +147,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;
@@ -167,13 +167,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;
@@ -187,37 +187,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.
@@ -239,12 +239,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
@@ -258,22 +258,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);
@@ -281,25 +281,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];
 }
 
@@ -309,19 +309,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);
 }
@@ -344,41 +344,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;
     }
-
+    __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) {
-        NSLog(@"image load completed");
-                                                                     if (error) {
-                                                                         // TODO(lmr): do something with the error?
-                                                                         NSLog(@"failed to load image: %@", error);
-                                                                     }
-                                                                     dispatch_async(dispatch_get_main_queue(), ^{
-                                                                         self.image = image;
-                                                                     });
-                                                                 }];
+                                                                                                                 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 {
@@ -394,7 +395,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 }
 
 - (BOOL)isSelected {
-  return _isPreselected || [super isSelected];
+    return _isPreselected || [super isSelected];
 }
 
 - (void)dealloc {
@@ -416,16 +417,16 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         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];
@@ -437,15 +438,15 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (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];

package/lib/specs/NativeComponentGoogleMapView.d.ts

@@ -517,7 +517,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    pitchEnabled?: boolean;
+    pitchEnabled?: WithDefault<boolean, true>;
     /**
      * The region to be displayed by the map.
      * The region is defined by the center coordinates and the span of coordinates to display.
@@ -533,7 +533,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    rotateEnabled?: boolean;
+    rotateEnabled?: WithDefault<boolean, true>;
     /**
      * If `false` the map will stay centered while rotating or zooming.
      *
@@ -541,7 +541,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    scrollDuringRotateOrZoomEnabled?: boolean;
+    scrollDuringRotateOrZoomEnabled?: WithDefault<boolean, true>;
     /**
      * If `false` the user won't be able to change the map region being displayed.
      *
@@ -549,7 +549,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    scrollEnabled?: boolean;
+    scrollEnabled?: WithDefault<boolean, true>;
     /**
      * A Boolean indicating whether the map displays extruded building information.
      *
@@ -557,7 +557,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Not supported
      * @platform Android: Supported
      */
-    showsBuildings?: boolean;
+    showsBuildings?: WithDefault<boolean, true>;
     /**
      * If `false` compass won't be displayed on the map.
      *
@@ -565,7 +565,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    showsCompass?: boolean;
+    showsCompass?: WithDefault<boolean, true>;
     /**
      * A Boolean indicating whether indoor level picker should be enabled.
      *
@@ -581,7 +581,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    showsIndoors?: boolean;
+    showsIndoors?: WithDefault<boolean, true>;
     /**
      * If `false` hide the button to move map to the current user's location.
      *
@@ -589,7 +589,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    showsMyLocationButton?: boolean;
+    showsMyLocationButton?: WithDefault<boolean, true>;
     /**
      * If `false` points of interest won't be displayed on the map.
      * TODO: DEPRECATED? Doesn't seem to do anything
@@ -689,7 +689,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    zoomEnabled?: boolean;
+    zoomEnabled?: WithDefault<boolean, true>;
     /**
      * If `false` the user won't be able to double tap to zoom the map.
      * **Note:** But it will greatly decrease delay of tap gesture recognition.
@@ -698,7 +698,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Not supported
      */
-    zoomTapEnabled?: boolean;
+    zoomTapEnabled?: WithDefault<boolean, true>;
 }
 export interface NativeCommands {
     animateToRegion: (viewRef: React.ElementRef<React.ComponentType>, regionJSON: string, duration: Int32) => void;

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.27",
+  "version": "1.21.0-alpha.29",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",