react-native-maps 1.6.1-beta.1 → 1.7.0-beta.1

package/android/build.gradle

@@ -47,6 +47,6 @@ dependencies {
   implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.1.0')}"
   implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}"
   implementation "com.google.android.gms:play-services-location:20.0.0"
-  implementation 'com.google.maps.android:android-maps-utils:0.5'
+  implementation 'com.google.maps.android:android-maps-utils:3.4.0'
   implementation "androidx.work:work-runtime:2.7.1"
 }

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

@@ -2,10 +2,10 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.maps.android.collections.CircleManager;
 
 public class MapCircle extends MapFeature {
 
@@ -89,12 +89,14 @@ public class MapCircle extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    circle = map.addCircle(getCircleOptions());
+  public void addToMap(Object collection) {
+    CircleManager.Collection circleCollection = (CircleManager.Collection) collection;
+    circle = circleCollection.addCircle(getCircleOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    circle.remove();
+  public void removeFromMap(Object collection) {
+    CircleManager.Collection circleCollection = (CircleManager.Collection) collection;
+    circleCollection.remove(circle);
   }
 }

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

@@ -3,16 +3,15 @@ package com.rnmaps.maps;
 import android.content.Context;
 
 import com.facebook.react.views.view.ReactViewGroup;
-import com.google.android.gms.maps.GoogleMap;
 
 public abstract class MapFeature extends ReactViewGroup {
   public MapFeature(Context context) {
     super(context);
   }
 
-  public abstract void addToMap(GoogleMap map);
+  public abstract void addToMap(Object mapOrCollection);
 
-  public abstract void removeFromMap(GoogleMap map);
+  public abstract void removeFromMap(Object mapOrCollection);
 
   public abstract Object getFeature();
 }

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

@@ -321,14 +321,13 @@ public class MapGradientPolyline extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    Log.d("AirMapGradientPolyline", "ADDTOMAP");
-    this.map = map;
-    this.tileOverlay = map.addTileOverlay(createTileOverlayOptions());
+  public void addToMap(Object map) {
+    this.map = (GoogleMap) map;
+    this.tileOverlay = this.map.addTileOverlay(createTileOverlayOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object map) {
     tileOverlay.remove();
   }
 

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

@@ -101,13 +101,12 @@ public class MapHeatmap extends MapFeature {
     }
 
     @Override
-    public void addToMap(GoogleMap map) {
-        Log.d("AirMapHeatmap", "ADD TO MAP");
-        heatmap = map.addTileOverlay(getHeatmapOptions());
+    public void addToMap(Object map) {
+        heatmap = ((GoogleMap) map).addTileOverlay(getHeatmapOptions());
     }
 
     @Override
-    public void removeFromMap(GoogleMap map) {
+    public void removeFromMap(Object map) {
         heatmap.remove();
     }
 

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

@@ -140,12 +140,12 @@ public class MapLocalTile extends MapFeature {
     }
 
     @Override
-    public void addToMap(GoogleMap map) {
-        this.tileOverlay = map.addTileOverlay(getTileOverlayOptions());
+    public void addToMap(Object map) {
+        this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions());
     }
 
     @Override
-    public void removeFromMap(GoogleMap map) {
+    public void removeFromMap(Object map) {
         tileOverlay.remove();
     }
 }

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

@@ -33,12 +33,12 @@ import com.facebook.imagepipeline.image.ImageInfo;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.maps.android.collections.MarkerManager;
 
 public class MapMarker extends MapFeature {
 
@@ -427,17 +427,19 @@ public class MapMarker extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    marker = map.addMarker(getMarkerOptions());
+  public void addToMap(Object collection) {
+    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+    marker = markerCollection.addMarker(getMarkerOptions());
     updateTracksViewChanges();
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object collection) {
     if (marker == null) {
       return;
     }
-    marker.remove();
+    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+    markerCollection.remove(marker);
     marker = null;
     updateTracksViewChanges();
   }

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

@@ -4,13 +4,13 @@ import android.content.Context;
 import android.graphics.Bitmap;
 
 import com.facebook.react.bridge.ReadableArray;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.GroundOverlay;
 import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.maps.android.collections.GroundOverlayManager;
 
 public class MapOverlay extends MapFeature implements ImageReadable {
 
@@ -24,7 +24,7 @@ public class MapOverlay extends MapFeature implements ImageReadable {
   private float transparency;
 
   private final ImageReader mImageReader;
-  private GoogleMap map;
+  private GroundOverlayManager.Collection groundOverlayCollection;
 
   public MapOverlay(Context context) {
     super(context);
@@ -107,24 +107,26 @@ public class MapOverlay extends MapFeature implements ImageReadable {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
+  public void addToMap(Object collection) {
+    GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
     GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
     if (groundOverlayOptions != null) {
-      this.groundOverlay = map.addGroundOverlay(groundOverlayOptions);
-      this.groundOverlay.setClickable(this.tappable);
+      groundOverlay = groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
+      groundOverlay.setClickable(this.tappable);
     } else {
-      this.map = map;
+      this.groundOverlayCollection = groundOverlayCollection;
     }
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    this.map = null;
-    if (this.groundOverlay != null) {
-      this.groundOverlay.remove();
-      this.groundOverlay = null;
-      this.groundOverlayOptions = null;
+  public void removeFromMap(Object collection) {
+    if (groundOverlay != null) {
+      GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
+      groundOverlayCollection.remove(groundOverlay);
+      groundOverlay = null;
+      groundOverlayOptions = null;
     }
+    groundOverlayCollection = null;
   }
 
   @Override
@@ -152,12 +154,12 @@ public class MapOverlay extends MapFeature implements ImageReadable {
     if (this.groundOverlay != null) {
       return this.groundOverlay;
     }
-    if (this.map == null) {
+    if (this.groundOverlayCollection == null) {
       return null;
     }
     GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
     if (groundOverlayOptions != null) {
-      return this.map.addGroundOverlay(groundOverlayOptions);
+      return this.groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
     }
     return null;
   }

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

@@ -4,10 +4,10 @@ import android.content.Context;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
+import com.google.maps.android.collections.PolygonManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -148,13 +148,15 @@ public class MapPolygon extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    polygon = map.addPolygon(getPolygonOptions());
+  public void addToMap(Object collection) {
+    PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection;
+    polygon = polygonCollection.addPolygon(getPolygonOptions());
     polygon.setClickable(this.tappable);
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    polygon.remove();
+  public void removeFromMap(Object collection) {
+    PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection;
+    polygonCollection.remove(polygon);
   }
 }

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

@@ -4,7 +4,6 @@ import android.content.Context;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Cap;
 import com.google.android.gms.maps.model.Dash;
 import com.google.android.gms.maps.model.Dot;
@@ -14,6 +13,7 @@ import com.google.android.gms.maps.model.PatternItem;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.PolylineOptions;
 import com.google.android.gms.maps.model.RoundCap;
+import com.google.maps.android.collections.PolylineManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -150,13 +150,15 @@ public class MapPolyline extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    polyline = map.addPolyline(getPolylineOptions());
+  public void addToMap(Object collection) {
+    PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
+    polyline = polylineCollection.addPolyline(getPolylineOptions());
     polyline.setClickable(this.tappable);
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    polyline.remove();
+  public void removeFromMap(Object collection) {
+    PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
+    polylineCollection.remove(polyline);
   }
 }

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

@@ -196,12 +196,12 @@ public class MapUrlTile extends MapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    this.tileOverlay = map.addTileOverlay(getTileOverlayOptions());
+  public void addToMap(Object map) {
+    this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object map) {
     tileOverlay.remove();
   }
 }

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

@@ -52,6 +52,11 @@ import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.TileOverlay;
 import com.google.android.gms.maps.model.IndoorBuilding;
 import com.google.android.gms.maps.model.IndoorLevel;
+import com.google.maps.android.collections.CircleManager;
+import com.google.maps.android.collections.GroundOverlayManager;
+import com.google.maps.android.collections.MarkerManager;
+import com.google.maps.android.collections.PolygonManager;
+import com.google.maps.android.collections.PolylineManager;
 import com.google.maps.android.data.kml.KmlContainer;
 import com.google.maps.android.data.kml.KmlLayer;
 import com.google.maps.android.data.kml.KmlPlacemark;
@@ -73,6 +78,15 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission;
 public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
     GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
   public GoogleMap map;
+  private MarkerManager markerManager;
+  private MarkerManager.Collection markerCollection;
+  private PolylineManager polylineManager;
+  private PolylineManager.Collection polylineCollection;
+  private PolygonManager polygonManager;
+  private PolygonManager.Collection polygonCollection;
+  private CircleManager.Collection circleCollection;
+  private GroundOverlayManager groundOverlayManager;
+  private GroundOverlayManager.Collection groundOverlayCollection;
   private ProgressBar mapLoadingProgressBar;
   private RelativeLayout mapLoadingLayout;
   private ImageView cacheImageView;
@@ -214,8 +228,20 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       return;
     }
     this.map = map;
-    this.map.setInfoWindowAdapter(this);
-    this.map.setOnMarkerDragListener(this);
+
+    markerManager = new MarkerManager(map);
+    markerCollection = markerManager.newCollection();
+    polylineManager = new PolylineManager(map);
+    polylineCollection = polylineManager.newCollection();
+    polygonManager = new PolygonManager(map);
+    polygonCollection = polygonManager.newCollection();
+    CircleManager circleManager = new CircleManager(map);
+    circleCollection = circleManager.newCollection();
+    groundOverlayManager = new GroundOverlayManager(map);
+    groundOverlayCollection = groundOverlayManager.newCollection();
+
+    markerCollection.setInfoWindowAdapter(this);
+    markerCollection.setOnMarkerDragListener(this);
     this.map.setOnPoiClickListener(this);
     this.map.setOnIndoorStateChangeListener(this);
 
@@ -246,13 +272,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       }
     });
 
-    map.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
+    markerCollection.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
       @Override
-      public boolean onMarkerClick(Marker marker) {
-        WritableMap event;
+      public boolean onMarkerClick(@NonNull Marker marker) {
         MapMarker airMapMarker = getMarkerMap(marker);
 
-        event = makeClickEventData(marker.getPosition());
+        WritableMap event = makeClickEventData(marker.getPosition());
         event.putString("action", "marker-press");
         event.putString("id", airMapMarker.getIdentifier());
         manager.pushEvent(context, view, "onMarkerPress", event);
@@ -274,30 +299,28 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       }
     });
 
-    map.setOnPolygonClickListener(new GoogleMap.OnPolygonClickListener() {
+    polygonCollection.setOnPolygonClickListener(new GoogleMap.OnPolygonClickListener() {
       @Override
-      public void onPolygonClick(Polygon polygon) {
+      public void onPolygonClick(@NonNull Polygon polygon) {
         WritableMap event = makeClickEventData(tapLocation);
         event.putString("action", "polygon-press");
         manager.pushEvent(context, polygonMap.get(polygon), "onPress", event);
       }
     });
 
-    map.setOnPolylineClickListener(new GoogleMap.OnPolylineClickListener() {
+    polylineCollection.setOnPolylineClickListener(new GoogleMap.OnPolylineClickListener() {
       @Override
-      public void onPolylineClick(Polyline polyline) {
+      public void onPolylineClick(@NonNull Polyline polyline) {
         WritableMap event = makeClickEventData(tapLocation);
         event.putString("action", "polyline-press");
         manager.pushEvent(context, polylineMap.get(polyline), "onPress", event);
       }
     });
 
-    map.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
+    markerCollection.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
       @Override
-      public void onInfoWindowClick(Marker marker) {
-        WritableMap event;
-
-        event = makeClickEventData(marker.getPosition());
+      public void onInfoWindowClick(@NonNull Marker marker) {
+        WritableMap event = makeClickEventData(marker.getPosition());
         event.putString("action", "callout-press");
         manager.pushEvent(context, view, "onCalloutPress", event);
 
@@ -315,7 +338,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     map.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
       @Override
-      public void onMapClick(LatLng point) {
+      public void onMapClick(@NonNull LatLng point) {
         WritableMap event = makeClickEventData(point);
         event.putString("action", "press");
         manager.pushEvent(context, view, "onPress", event);
@@ -324,16 +347,16 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     map.setOnMapLongClickListener(new GoogleMap.OnMapLongClickListener() {
       @Override
-      public void onMapLongClick(LatLng point) {
+      public void onMapLongClick(@NonNull LatLng point) {
         WritableMap event = makeClickEventData(point);
         event.putString("action", "long-press");
         manager.pushEvent(context, view, "onLongPress", makeClickEventData(point));
       }
     });
 
-    map.setOnGroundOverlayClickListener(new GoogleMap.OnGroundOverlayClickListener() {
+    groundOverlayCollection.setOnGroundOverlayClickListener(new GoogleMap.OnGroundOverlayClickListener() {
       @Override
-      public void onGroundOverlayClick(GroundOverlay groundOverlay) {
+      public void onGroundOverlayClick(@NonNull GroundOverlay groundOverlay) {
         WritableMap event = makeClickEventData(groundOverlay.getPosition());
         event.putString("action", "overlay-press");
         manager.pushEvent(context, overlayMap.get(groundOverlay), "onPress", event);
@@ -655,7 +678,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     // This is where we intercept them and do the appropriate underlying mapview action.
     if (child instanceof MapMarker) {
       MapMarker annotation = (MapMarker) child;
-      annotation.addToMap(map);
+      annotation.addToMap(markerCollection);
       features.add(index, annotation);
 
       // Allow visibility event to be triggered later
@@ -681,7 +704,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       markerMap.put(marker, annotation);
     } else if (child instanceof MapPolyline) {
       MapPolyline polylineView = (MapPolyline) child;
-      polylineView.addToMap(map);
+      polylineView.addToMap(polylineCollection);
       features.add(index, polylineView);
       Polyline polyline = (Polyline) polylineView.getFeature();
       polylineMap.put(polyline, polylineView);
@@ -693,13 +716,13 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       gradientPolylineMap.put(tileOverlay, polylineView);
     } else if (child instanceof MapPolygon) {
       MapPolygon polygonView = (MapPolygon) child;
-      polygonView.addToMap(map);
+      polygonView.addToMap(polygonCollection);
       features.add(index, polygonView);
       Polygon polygon = (Polygon) polygonView.getFeature();
       polygonMap.put(polygon, polygonView);
     } else if (child instanceof MapCircle) {
       MapCircle circleView = (MapCircle) child;
-      circleView.addToMap(map);
+      circleView.addToMap(circleCollection);
       features.add(index, circleView);
     } else if (child instanceof MapUrlTile) {
       MapUrlTile urlTileView = (MapUrlTile) child;
@@ -715,7 +738,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       features.add(index, localTileView);
     } else if (child instanceof MapOverlay) {
       MapOverlay overlayView = (MapOverlay) child;
-      overlayView.addToMap(map);
+      overlayView.addToMap(groundOverlayCollection);
       features.add(index, overlayView);
       GroundOverlay overlay = (GroundOverlay) overlayView.getFeature();
       overlayMap.put(overlay, overlayView);
@@ -1185,7 +1208,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         return;
       }
 
-      KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context);
+      KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context, markerManager, polygonManager, polylineManager, groundOverlayManager, null);
       kmlLayer.addLayerToMap();
 
       WritableMap pointers = new WritableNativeMap();

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.6.1-beta.1",
+  "version": "1.7.0-beta.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -60,7 +60,7 @@
     "@react-native-community/eslint-config": "3.2.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@types/jest": "29.5.0",
+    "@types/jest": "29.5.1",
     "@types/react-native": "0.70.13",
     "babel-jest": "29.5.0",
     "detox": "20.7.0",
@@ -69,7 +69,7 @@
     "jest": "29.5.0",
     "prettier": "2.8.7",
     "react": "18.1.0",
-    "react-native": "0.70.8",
+    "react-native": "0.70.9",
     "semantic-release": "21.0.1",
     "typescript": "5.0.4"
   },