react-native-maps 2.0.0-beta.1 → 2.0.0-beta.10

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;
@@ -110,11 +110,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
+  private LatLngBounds boundary;
 
   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<>();
@@ -275,17 +276,17 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     markerCollection.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
       @Override
       public boolean onMarkerClick(@NonNull Marker marker) {
-        MapMarker airMapMarker = getMarkerMap(marker);
+        MapMarker rnmMapMarker = getMarkerMap(marker);
 
         WritableMap event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
-        event.putString("id", airMapMarker.getIdentifier());
+        event.putString("id", rnmMapMarker.getIdentifier());
         manager.pushEvent(context, view, "onMarkerPress", event);
 
         event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
-        event.putString("id", airMapMarker.getIdentifier());
-        manager.pushEvent(context, airMapMarker, "onPress", event);
+        event.putString("id", rnmMapMarker.getIdentifier());
+        manager.pushEvent(context, rnmMapMarker, "onPress", event);
 
         // Return false to open the callout info window and center on the marker
         // https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap
@@ -500,7 +501,42 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
+  public void setBoundary(ReadableMap boundary) {
+    if(boundary == null) {
+      this.boundary = null;
+      if(map != null) {
+        // consumers can pass null to clear boundary
+        map.setLatLngBoundsForCameraTarget(null);
+      }
+    } else {
+      LatLngBounds.Builder builder = new LatLngBounds.Builder();
+
+      ReadableMap northEast = boundary.getMap("northEast");
+      ReadableMap southWest = boundary.getMap("southWest");
+
+      double neLat = northEast.getDouble("latitude");
+      double neLng = northEast.getDouble("longitude");
+      builder.include(new LatLng(neLat, neLng));
+
+      double swLat = southWest.getDouble("latitude");
+      double swLng = southWest.getDouble("longitude");
+      builder.include(new LatLng(swLat, swLng));
+
+      LatLngBounds bounds = builder.build();
+
+      this.boundary = bounds;
+
+      if(map != null) {
+        map.setLatLngBoundsForCameraTarget(bounds);
+      }
+    }
+  }
+
+  // called as soon as the map is ready. Assuming nothing was set on the map at this point.
   private void applyBridgedProps() {
+    if(boundary != null) {
+      map.setLatLngBoundsForCameraTarget(boundary);
+    }
     if(initialRegion != null) {
       moveToRegion(initialRegion);
       initialRegionSet = true;
@@ -770,10 +806,21 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     MapFeature feature = features.remove(index);
     if (feature instanceof MapMarker) {
       markerMap.remove(feature.getFeature());
+      feature.removeFromMap(markerCollection);
     } else if (feature instanceof MapHeatmap) {
       heatmapMap.remove(feature.getFeature());
+      feature.removeFromMap(map);
+    } else if(feature instanceof MapCircle) {
+      feature.removeFromMap(circleCollection);
+    } else if(feature instanceof MapOverlay) {
+      feature.removeFromMap(groundOverlayCollection);
+    } else if(feature instanceof MapPolygon) {
+      feature.removeFromMap(polygonCollection);
+    } else if(feature instanceof  MapPolyline) {
+      feature.removeFromMap(polylineCollection);
+    } else {
+      feature.removeFromMap(map);
     }
-    feature.removeFromMap(map);
   }
 
   public WritableMap makeClickEventData(LatLng point) {
@@ -820,8 +867,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"));
@@ -837,103 +883,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);
-    }
-  }
-
-  public void fitToElements(ReadableMap edgePadding, boolean animated) {
-    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);
-      }
-    }
+    return CameraUpdateFactory.newCameraPosition(builder.build());
   }
 
-  public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgePadding, boolean animated) {
+  public void animateToCamera(ReadableMap camera, int duration) {
     if (map == null) return;
 
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
+    CameraUpdate update = buildCameraUpdate(camera);
 
-    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);
@@ -943,36 +912,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;
@@ -1001,24 +941,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     };
   }
 
-  public void setMapBoundaries(ReadableMap northEast, ReadableMap southWest) {
-    if (map == null) return;
-
-    LatLngBounds.Builder builder = new LatLngBounds.Builder();
-
-    double latNE = northEast.getDouble("latitude");
-    double lngNE = northEast.getDouble("longitude");
-    builder.include(new LatLng(latNE, lngNE));
-
-    double latSW = southWest.getDouble("latitude");
-    double lngSW = southWest.getDouble("longitude");
-    builder.include(new LatLng(latSW, lngSW));
-
-    LatLngBounds bounds = builder.build();
-
-    map.setLatLngBoundsForCameraTarget(bounds);
-  }
-
   // InfoWindowAdapter interface
 
   @Override
@@ -1364,21 +1286,21 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   }
 
   private MapMarker getMarkerMap(Marker marker) {
-    MapMarker airMarker = markerMap.get(marker);
+    MapMarker rnmMarker = markerMap.get(marker);
 
-    if (airMarker != null) {
-      return airMarker;
+    if (rnmMarker != null) {
+      return rnmMarker;
     }
 
     for (Map.Entry<Marker, MapMarker> entryMarker : markerMap.entrySet()) {
       if (entryMarker.getKey().getPosition().equals(marker.getPosition())
           && entryMarker.getKey().getTitle().equals(marker.getTitle())) {
-        airMarker = entryMarker.getValue();
+        rnmMarker = entryMarker.getValue();
         break;
       }
     }
 
-    return airMarker;
+    return rnmMarker;
   }
 
   @Override