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

package/README.md

@@ -607,6 +607,25 @@ Source: https://github.com/react-native-maps/react-native-maps/issues/1901
 
 Source: https://github.com/react-native-maps/react-native-maps/issues/3957#issuecomment-924161121
 
+#### onRegionChangeComplete() callback is called infinitely
+
+If changing the state in `onRegionChangeComplete` is called infinitely, add a condition to limit these calls to occur only when the region change was done as a result of a user's action.
+
+```javascript
+onRegionChangeComplete={ (region, gesture) => {
+	// This fix only works on Google Maps because isGesture is NOT available on Apple Maps
+	if (!gesture.isGesture) {
+    return;
+  }
+
+  // You can use
+  dispatch({ type: "map_region", payload: { mapRegion: region }}); // if using useReducer
+	// setMapRegionState(region); // if using useState
+}}
+```
+
+Source: https://github.com/react-native-maps/react-native-maps/issues/846#issuecomment-1210079461
+
 ## License
 
      Copyright (c) 2017 Airbnb

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/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

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/ios/AirMaps/AIRMap.h

@@ -17,7 +17,6 @@
 
 @class AIRMapMarker;
 
-extern const CLLocationDegrees AIRMapDefaultSpan;
 extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
 extern const CGFloat AIRMapZoomBoundBuffer;
 extern const NSInteger AIRMapMaxZoomLevel;

package/ios/AirMaps/AIRMap.m

@@ -21,7 +21,6 @@
 #import "AIRMapLocalTile.h"
 #import "AIRMapOverlay.h"
 
-const CLLocationDegrees AIRMapDefaultSpan = 0.005;
 const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
 const NSInteger AIRMapMaxZoomLevel = 20;

package/ios/AirMaps/AIRMapManager.m

@@ -928,14 +928,7 @@ static int kDragCenterContext;
     }
     
     if (mapView.followUserLocation) {
-        MKCoordinateRegion region;
-        region.span.latitudeDelta = AIRMapDefaultSpan;
-        region.span.longitudeDelta = AIRMapDefaultSpan;
-        region.center = location.coordinate;
-        [mapView setRegion:region animated:YES];
-
-        // Move to user location only for the first time it loads up.
-        // mapView.followUserLocation = NO;
+        [mapView setCenterCoordinate:location.coordinate animated:YES];
     }
     
 }

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.0",
+  "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"
   },