react-native-maps 1.18.2 → 1.18.4

package/README.md

@@ -302,43 +302,10 @@ render() {
 }
 ```
 
-### Customizing the map style
+### Customizing the map style (Google Maps Only)
 
-Create the json object, or download a generated one from the [google style generator](https://mapstyle.withgoogle.com/).
-
-```jsx
-// The generated json object
-mapStyle = [ ... ]
-
-render() {
-  return (
-    <MapView
-      region={this.state.region}
-      onRegionChange={this.onRegionChange}
-      customMapStyle={mapStyle}
-    />
-  );
-}
-```
-
-For iOS, in addition to providing the `mapStyle` you will need to do the following
-
-```jsx
-import MapView, { PROVIDER_GOOGLE } from 'react-native-maps'
-
-// ...
-
-<MapView
-  provider={PROVIDER_GOOGLE}
-  customMapStyle={MapStyle}
->
-```
-
-Then add the AirGoogleMaps directory:
-
-https://github.com/react-native-maps/react-native-maps/blob/1e71a21f39e7b88554852951f773c731c94680c9/docs/installation.md#ios
-
-An unofficial step-by-step guide is also available at https://gist.github.com/heron2014/e60fa003e9b117ce80d56bb1d5bfe9e0
+The `<MapView provider="google" googleMapId="yourStyledMapId" />` Google Maps on iOS and Android supports styling via google cloud platform, the styled maps are published under a googleMapId, by simply setting the property googleMapId to the MapView you can use that styled map
+more info here: [google map id](https://developers.google.com/maps/documentation/get-map-id)
 
 ### MapView Events
 

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -152,7 +152,7 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "initialCamera")
     public void setInitialCamera(MapView view, ReadableMap initialCamera) {
-        // do nothing, passed as part of the InitialProps
+        view.setInitialCamera(initialCamera);
     }
 
     @ReactProp(name = "mapType")

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -96,19 +96,21 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private Boolean isMapLoaded = false;
   private Integer loadingBackgroundColor = null;
   private Integer loadingIndicatorColor = null;
-  private final int baseMapPadding = 50;
 
   private LatLngBounds boundsToMove;
   private CameraUpdate cameraToSet;
+  private boolean setPaddingDeferred = false;
   private boolean showUserLocation = false;
   private boolean handlePanDrag = false;
   private boolean moveOnMarkerPress = true;
   private boolean cacheEnabled = false;
   private ReadableMap initialRegion;
   private ReadableMap region;
+  private ReadableMap initialCamera;
   private ReadableMap camera;
   private String customMapStyleString;
   private boolean initialRegionSet = false;
+  private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
   private MapMarker selectedMarker;
@@ -536,13 +538,24 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
+  public void setInitialCamera(ReadableMap initialCamera) {
+    this.initialCamera = initialCamera;
+    if (!initialCameraSet && map != null) {
+      moveToCamera(initialCamera);
+      initialCameraSet = true;
+    }
+  }
+
   private void applyBridgedProps() {
     if(initialRegion != null) {
       moveToRegion(initialRegion);
       initialRegionSet = true;
     } else if(region != null) {
       moveToRegion(region);
-    } else {
+    } else if (initialCamera != null) {
+      moveToCamera(initialCamera);
+      initialCameraSet = true;
+    } else if (camera != null) {
       moveToCamera(camera);
     }
     if(customMapStyleString != null) {
@@ -845,6 +858,21 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   }
 
   public void updateExtraData(Object extraData) {
+    if (setPaddingDeferred && super.getHeight() > 0 && super.getWidth() > 0) {
+      CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
+
+      map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+          edgeTopPadding + baseTopMapPadding,
+          edgeRightPadding + baseRightMapPadding,
+          edgeBottomPadding + baseBottomMapPadding);
+      map.moveCamera(cu);
+
+      // Move the google logo to the default base padding value.
+      map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+
+      setPaddingDeferred = false;
+    }
+
     // if boundsToMove is not null, we now have the MapView's width/height, so we can apply
     // a proper camera move
     if (boundsToMove != null) {
@@ -922,10 +950,10 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
     }
     if (addedPosition) {
       LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
 
       if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
+        appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
           edgePadding.getInt("right"), edgePadding.getInt("bottom"));
       }
 
@@ -934,6 +962,8 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
       } else {
         map.moveCamera(cu);
       }
+      // Move the google logo to the default base padding value.
+      map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
     }
   }
 
@@ -964,10 +994,10 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
 
     if (addedPosition) {
       LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
 
       if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
+        appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
           edgePadding.getInt("right"), edgePadding.getInt("bottom"));
       }
 
@@ -976,20 +1006,54 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
       } else {
         map.moveCamera(cu);
       }
+      // Move the google logo to the default base padding value.
+      map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
     }
   }
 
+  // padding configured by 'mapPadding' property
   int baseLeftMapPadding;
   int baseRightMapPadding;
   int baseTopMapPadding;
   int baseBottomMapPadding;
+  // extra padding specified by 'edgePadding' option of fitToElements/fitToSuppliedMarkers/fitToCoordinates
+  int edgeLeftPadding;
+  int edgeRightPadding;
+  int edgeTopPadding;
+  int edgeBottomPadding;
 
   public void applyBaseMapPadding(int left, int top, int right, int bottom){
-    this.map.setPadding(left, top, right, bottom);
+    if (super.getHeight() <= 0 || super.getWidth() <= 0) {
+      // the map is not laid out yet and calling setPadding() now has no effect
+      baseLeftMapPadding = left;
+      baseRightMapPadding = right;
+      baseTopMapPadding = top;
+      baseBottomMapPadding = bottom;
+      setPaddingDeferred = true;
+      return;
+    }
+
+    // retrieve current camera with current edge paddings configured
+    map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+        edgeTopPadding + baseTopMapPadding,
+        edgeRightPadding + baseRightMapPadding,
+        edgeBottomPadding + baseBottomMapPadding);
+    CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
+
     baseLeftMapPadding = left;
     baseRightMapPadding = right;
     baseTopMapPadding = top;
     baseBottomMapPadding = bottom;
+
+    // apply base paddings and restore center position of the map
+    map.setPadding(edgeLeftPadding + left,
+        edgeTopPadding + top,
+        edgeRightPadding + right,
+        edgeBottomPadding + bottom);
+    map.moveCamera(cu);
+
+    // Move the google logo to the default base padding value.
+    map.setPadding(left, top, right, bottom);
   }
 
   public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
@@ -1006,7 +1070,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
     }
 
     LatLngBounds bounds = builder.build();
-    CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+    CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
 
     if (edgePadding != null) {
       appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"), edgePadding.getInt("right"), edgePadding.getInt("bottom"));
@@ -1022,21 +1086,17 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   }
 
   private void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
-    int left;
-    int top;
-    int right;
-    int bottom;
     double density = getResources().getDisplayMetrics().density;
 
-    left = (int) (iLeft * density);
-    top = (int) (iTop * density);
-    right = (int) (iRight * density);
-    bottom = (int) (iBottom * density);
+    edgeLeftPadding = (int) (iLeft * density);
+    edgeTopPadding = (int) (iTop * density);
+    edgeRightPadding = (int) (iRight * density);
+    edgeBottomPadding = (int) (iBottom * density);
 
-    map.setPadding(left + baseLeftMapPadding,
-            top + baseTopMapPadding,
-            right + baseRightMapPadding,
-            bottom + baseBottomMapPadding);
+    map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+            edgeTopPadding + baseTopMapPadding,
+            edgeRightPadding + baseRightMapPadding,
+            edgeBottomPadding + baseBottomMapPadding);
   }
 
   public double[][] getMapBoundaries() {

package/ios/AirMaps/AIRMapMarker.m

@@ -272,7 +272,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                          @"latitude": @(marker.coordinate.latitude),
                          @"longitude": @(marker.coordinate.longitude)
                          },
-                 @"point": @{
+                 @"position": @{
                          @"x": @(touchPointReal.x),
                          @"y": @(touchPointReal.y),
                          }

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.18.2",
+  "version": "1.18.4",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",