react-native-maps 2.0.0-beta.6 → 2.0.0-beta.8

package/README.md

@@ -299,11 +299,7 @@ import MapView, { PROVIDER_GOOGLE } from 'react-native-maps'
 >
 ```
 
-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
+Then update your Podfile and add the Google API key as described in the [installation docs](docs/installation.md#ios).
 
 ### MapView Events
 

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

@@ -20,8 +20,6 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.android.gms.location.Priority;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
@@ -278,12 +276,6 @@ public class MapManager extends ViewGroupManager<MapView> {
 
   @Override
   public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
-    int duration;
-    double lat;
-    double lng;
-    double lngDelta;
-    double latDelta;
-    ReadableMap region;
     ReadableMap camera;
 
     switch (commandId) {
@@ -295,53 +287,6 @@ public class MapManager extends ViewGroupManager<MapView> {
         view.animateToCamera(camera, 0);
         break;
 
-      case "animateCamera":
-        if(args == null) {
-          break;
-        }
-        camera = args.getMap(0);
-        duration = args.getInt(1);
-        view.animateToCamera(camera, duration);
-        break;
-
-      case "animateToRegion":
-        if(args == null) {
-          break;
-        }
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        lngDelta = region.getDouble("longitudeDelta");
-        latDelta = region.getDouble("latitudeDelta");
-        LatLngBounds bounds = new LatLngBounds(
-            new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
-            new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
-        );
-        view.animateToRegion(bounds, duration);
-        break;
-
-      case "fitToElements":
-        if(args == null) {
-          break;
-        }
-        view.fitToElements(args.getMap(0), args.getBoolean(1));
-        break;
-
-      case "fitToSuppliedMarkers":
-        if(args == null) {
-          break;
-        }
-        view.fitToSuppliedMarkers(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case "fitToCoordinates":
-        if(args == null) {
-          break;
-        }
-        view.fitToCoordinates(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
       case "setMapBoundaries":
         if(args == null) {
           break;

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

@@ -213,7 +213,9 @@ public class MapTileProvider implements TileProvider {
 			} catch (Exception e) {
 			  e.printStackTrace();
 			}
-		} else if (image == null && !this.offlineMode) {
+		}
+
+		if (image == null && !this.offlineMode) {
 			Log.d("urlTile", "Normal fetch");
 			image = fetchTile(x, y, zoom);
 			if (image == null) {

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

@@ -93,7 +93,7 @@ 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;
+  public final int baseMapPadding = 50;
 
   private LatLngBounds boundsToMove;
   private CameraUpdate cameraToSet;
@@ -114,7 +114,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private static final String[] PERMISSIONS = new String[]{
       "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
-  private final List<MapFeature> features = new ArrayList<>();
+  public final List<MapFeature> features = new ArrayList<>();
   private final Map<Marker, MapMarker> markerMap = new HashMap<>();
   private final Map<Polyline, MapPolyline> polylineMap = new HashMap<>();
   private final Map<Polygon, MapPolygon> polygonMap = new HashMap<>();
@@ -831,8 +831,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
-  public void animateToCamera(ReadableMap camera, int duration) {
-    if (map == null) return;
+  public CameraUpdate buildCameraUpdate(ReadableMap camera) {
     CameraPosition.Builder builder = new CameraPosition.Builder(map.getCameraPosition());
     if (camera.hasKey("zoom")) {
       builder.zoom((float)camera.getDouble("zoom"));
@@ -848,103 +847,26 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       builder.target(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
     }
 
-    CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
-
-    if (duration <= 0) {
-      map.moveCamera(update);
-    }
-    else {
-      map.animateCamera(update, duration, null);
-    }
-  }
-
-  public void animateToRegion(LatLngBounds bounds, int duration) {
-    if (map == null) return;
-    if(duration <= 0) {
-      map.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0));
-    } else {
-      map.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0), duration, null);
-    }
+    return CameraUpdateFactory.newCameraPosition(builder.build());
   }
 
-  public void fitToElements(ReadableMap edgePadding, boolean animated) {
+  public void animateToCamera(ReadableMap camera, int duration) {
     if (map == null) return;
 
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    boolean addedPosition = false;
-
-    for (MapFeature feature : features) {
-      if (feature instanceof MapMarker) {
-        Marker marker = (Marker) feature.getFeature();
-        builder.include(marker.getPosition());
-        addedPosition = true;
-      }
-      // TODO(lmr): may want to include shapes / etc.
-    }
-    if (addedPosition) {
-      LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-      if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
-          edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-      }
-
-      if (animated) {
-        map.animateCamera(cu);
-      } else {
-        map.moveCamera(cu);
-      }
-    }
-  }
-
-  public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgePadding, boolean animated) {
-    if (map == null) return;
+    CameraUpdate update = buildCameraUpdate(camera);
 
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    String[] markerIDs = new String[markerIDsArray.size()];
-    for (int i = 0; i < markerIDsArray.size(); i++) {
-      markerIDs[i] = markerIDsArray.getString(i);
-    }
-
-    boolean addedPosition = false;
-
-    List<String> markerIDList = Arrays.asList(markerIDs);
-
-    for (MapFeature feature : features) {
-      if (feature instanceof MapMarker) {
-        String identifier = ((MapMarker) feature).getIdentifier();
-        Marker marker = (Marker) feature.getFeature();
-        if (markerIDList.contains(identifier)) {
-          builder.include(marker.getPosition());
-          addedPosition = true;
-        }
-      }
+    if (duration <= 0) {
+      map.moveCamera(update);
     }
-
-    if (addedPosition) {
-      LatLngBounds bounds = builder.build();
-      CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-      if (edgePadding != null) {
-        map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
-          edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-      }
-
-      if (animated) {
-        map.animateCamera(cu);
-      } else {
-        map.moveCamera(cu);
-      }
+    else {
+      map.animateCamera(update, duration, null);
     }
   }
 
-  int baseLeftMapPadding;
-  int baseRightMapPadding;
-  int baseTopMapPadding;
-  int baseBottomMapPadding;
+  public int baseLeftMapPadding;
+  public int baseRightMapPadding;
+  public int baseTopMapPadding;
+  public int baseBottomMapPadding;
 
   public void applyBaseMapPadding(int left, int top, int right, int bottom){
     this.map.setPadding(left, top, right, bottom);
@@ -954,36 +876,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     baseBottomMapPadding = bottom;
   }
 
-  public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
-      boolean animated) {
-    if (map == null) return;
-
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    for (int i = 0; i < coordinatesArray.size(); i++) {
-      ReadableMap latLng = coordinatesArray.getMap(i);
-      double lat = latLng.getDouble("latitude");
-      double lng = latLng.getDouble("longitude");
-      builder.include(new LatLng(lat, lng));
-    }
-
-    LatLngBounds bounds = builder.build();
-    CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
-
-    if (edgePadding != null) {
-      appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"), edgePadding.getInt("right"), edgePadding.getInt("bottom"));
-    }
-
-    if (animated) {
-      map.animateCamera(cu);
-    } else {
-      map.moveCamera(cu);
-    }
-    // Move the google logo to the default base padding value.
-    map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
-  }
-
-  private void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
+  public void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
     int left;
     int top;
     int right;