react-native-maps 1.0.0-beta.4 → 1.0.0-beta.7

package/README.md

@@ -114,7 +114,7 @@ import { Marker } from 'react-native-maps';
 ```
 
 ### Rendering a Marker with a custom image
-1. You need to generate an `png` image with various resolution (lets call them `custom_pin`) - for more information go to [Android](https://developer.android.com/studio/write/image-asset-studio#access), [iOS](https://developer.apple.com/library/archive/documentation/ToolsLanguages/Conceptual/Xcode_Overview/AddingImages.html)
+1. You need to generate an `png` image with various resolution (lets call them `custom_pin`) - for more information go to [Android](https://developer.android.com/studio/write/image-asset-studio#access), [iOS](https://developer.apple.com/documentation/xcode/adding-images-to-your-xcode-project)
 2. put all images in Android drawables and iOS assets dir 
 3. Now you can use the following code:
 ```jsx

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -64,6 +64,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   MKCoordinateRegion _region;
   BOOL _initialRegionSet;
   BOOL _initialCameraSet;
+  BOOL _didLayoutSubviews;
   BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
   BOOL _zoomTapEnabled;
@@ -86,6 +87,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     _region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(0.0, 0.0), MKCoordinateSpanMake(0.0, 0.0));
     _initialRegionSet = false;
     _initialCameraSet = false;
+    _didLayoutSubviews = false;
     _didPrepareMap = false;
     _didCallOnMapReady = false;
     _zoomTapEnabled = YES;
@@ -247,9 +249,28 @@ id regionAsJSON(MKCoordinateRegion region) {
     ];
 }
 
+- (void)layoutSubviews {
+  [super layoutSubviews];
+  if(_didLayoutSubviews) return;
+  _didLayoutSubviews = true;
+
+  if (_initialCamera != nil) {
+    self.camera = _initialCamera;
+    _initialCameraSet = true;
+  }
+  else if (_initialRegion.span.latitudeDelta != 0.0 &&
+      _initialRegion.span.longitudeDelta != 0.0) {
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
+    _initialRegionSet = true;
+  } else if (_region.span.latitudeDelta != 0.0 &&
+      _region.span.longitudeDelta != 0.0) {
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
+  }
+}
+
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
   _initialRegion = initialRegion;
-  if(!_initialRegionSet && _didPrepareMap){
+  if(!_initialRegionSet && _didLayoutSubviews){
     self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
     _initialRegionSet = true;
   }
@@ -257,7 +278,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
 - (void)setInitialCamera:(GMSCameraPosition*)initialCamera {
     _initialCamera = initialCamera;
-    if(!_initialCameraSet && _didPrepareMap){
+    if(!_initialCameraSet && _didLayoutSubviews){
       self.camera = initialCamera;
       _initialCameraSet = true;
     }
@@ -266,7 +287,9 @@ id regionAsJSON(MKCoordinateRegion region) {
 - (void)setRegion:(MKCoordinateRegion)region {
   // TODO: The JS component is repeatedly setting region unnecessarily. We might want to deal with that in here.
   _region = region;
-  self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
+  if(_didLayoutSubviews) {
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self  andMKCoordinateRegion:region];
+  }
 }
 
 - (void)setCameraProp:(GMSCameraPosition*)camera {
@@ -286,17 +309,6 @@ id regionAsJSON(MKCoordinateRegion region) {
   UIView* mapView = [self valueForKey:@"mapView"]; //GMSVectorMapView
   [self overrideGestureRecognizersForView:mapView];
 
-  if(!_didPrepareMap && !_initialRegionSet && !_initialCameraSet){
-    if(_initialRegion.span.latitudeDelta != 0.0 && _initialRegion.span.longitudeDelta != 0.0){
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
-    _initialRegionSet = true;
-  } else if(_initialCamera != nil) {
-    self.camera = _initialCamera;
-    _initialCameraSet = true;
-  } else if(_region.span.latitudeDelta != 0.0 && _region.span.longitudeDelta != 0.0) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
-  }
-  }
   if (!_didCallOnMapReady && self.onMapReady) {
     self.onMapReady(@{});
     _didCallOnMapReady = true;

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -326,6 +326,12 @@ CGRect unionRect(CGRect a, CGRect b) {
     _reloadImageCancellationBlock = nil;
   }
 
+  if (!_realMarker.icon) {
+    // prevent glitch with marker (cf. https://github.com/react-native-maps/react-native-maps/issues/3657)
+    UIImage *emptyImage = [[UIImage alloc] init];
+    _realMarker.icon = emptyImage;
+  }
+
   _reloadImageCancellationBlock =
   [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_iconSrc]
                                           size:self.bounds.size

package/lib/MapView.d.ts

@@ -386,7 +386,7 @@ export declare type MapViewProps = ViewProps & {
      * @platform iOS: Not supported
      * @platform Android: Supported
      */
-    showBuildings?: boolean;
+    showsBuildings?: boolean;
     /**
      * If `false` compass won't be displayed on the map.
      *

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native Mapview component for iOS + Android",
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.7",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",