react-native-google-maps-plus 1.7.0-dev.9 → 1.8.0

package/android/build.gradle

@@ -136,6 +136,6 @@ dependencies {
   implementation "com.google.android.gms:play-services-base:${getExtOrDefault('googlePlayServicesBaseVersion')}"
   implementation "com.google.android.gms:play-services-maps:${getExtOrDefault('googlePlayServicesMapsVersion')}"
   implementation "com.google.android.gms:play-services-location:${getExtOrDefault('googlePlayServicesLocationVersion')}"
-  implementation 'com.google.maps.android:android-maps-utils:3.10.0'
+  implementation "com.google.maps.android:android-maps-utils:${getExtOrDefault('mapsUtilsVersion')}"
   implementation 'com.caverock:androidsvg-aar:1.4'
 }

package/android/gradle.properties

@@ -3,6 +3,7 @@ RNGoogleMapsPlus_minSdkVersion=26
 RNGoogleMapsPlus_targetSdkVersion=36
 RNGoogleMapsPlus_compileSdkVersion=36
 RNGoogleMapsPlus_ndkVersion=27.1.12297006
-RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.8.0
+RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.9.0
 RNGoogleMapsPlus_googlePlayServicesMapsVersion=19.2.0
 RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
+RNGoogleMapsPlus_mapsUtilsVersion=3.19.0

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -1,12 +1,15 @@
 package com.rngooglemapsplus
 
+import CircleTag
+import MarkerTag
+import PolygonTag
+import PolylineTag
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.location.Location
-import android.util.Base64
 import android.util.Size
+import android.view.View
 import android.widget.FrameLayout
-import androidx.core.graphics.scale
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
@@ -33,6 +36,7 @@ import com.google.android.gms.maps.model.TileOverlay
 import com.google.android.gms.maps.model.TileOverlayOptions
 import com.google.maps.android.data.kml.KmlLayer
 import com.margelo.nitro.core.Promise
+import com.rngooglemapsplus.extensions.encode
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.onUiSync
 import com.rngooglemapsplus.extensions.toGooglePriority
@@ -45,10 +49,10 @@ import com.rngooglemapsplus.extensions.toRnCamera
 import com.rngooglemapsplus.extensions.toRnLatLng
 import com.rngooglemapsplus.extensions.toRnLocation
 import com.rngooglemapsplus.extensions.toRnRegion
+import com.rngooglemapsplus.extensions.withPaddingPixels
+import idTag
+import tagData
 import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
 
 class GoogleMapsViewImpl(
@@ -74,6 +78,7 @@ class GoogleMapsViewImpl(
   GoogleMap.OnInfoWindowLongClickListener,
   GoogleMap.OnMyLocationClickListener,
   GoogleMap.OnMyLocationButtonClickListener,
+  GoogleMap.InfoWindowAdapter,
   LifecycleEventListener {
   private var initialized = false
   private var loaded = false
@@ -81,7 +86,7 @@ class GoogleMapsViewImpl(
   private var googleMap: GoogleMap? = null
   private var mapView: MapView? = null
 
-  private val pendingMarkers = mutableListOf<Pair<String, MarkerOptions>>()
+  private val pendingMarkers = mutableListOf<Triple<String, MarkerOptions, MarkerTag>>()
   private val pendingPolylines = mutableListOf<Pair<String, PolylineOptions>>()
   private val pendingPolygons = mutableListOf<Pair<String, PolygonOptions>>()
   private val pendingCircles = mutableListOf<Pair<String, CircleOptions>>()
@@ -142,6 +147,7 @@ class GoogleMapsViewImpl(
           googleMap?.setOnInfoWindowLongClickListener(this@GoogleMapsViewImpl)
           googleMap?.setOnMyLocationClickListener(this@GoogleMapsViewImpl)
           googleMap?.setOnMyLocationButtonClickListener(this@GoogleMapsViewImpl)
+          googleMap?.setInfoWindowAdapter(this@GoogleMapsViewImpl)
           loaded = true
           onMapLoaded?.invoke(
             map.projection.visibleRegion.toRnRegion(),
@@ -217,31 +223,31 @@ class GoogleMapsViewImpl(
     locationConfig = locationConfig
 
     if (pendingMarkers.isNotEmpty()) {
-      pendingMarkers.forEach { (id, opts) -> internalAddMarker(id, opts) }
+      pendingMarkers.forEach { (id, opts, markerTag) -> addMarkerInternal(id, opts, markerTag) }
       pendingMarkers.clear()
     }
     if (pendingPolylines.isNotEmpty()) {
-      pendingPolylines.forEach { (id, opts) -> internalAddPolyline(id, opts) }
+      pendingPolylines.forEach { (id, opts) -> addPolylineInternal(id, opts) }
       pendingPolylines.clear()
     }
     if (pendingPolygons.isNotEmpty()) {
-      pendingPolygons.forEach { (id, opts) -> internalAddPolygon(id, opts) }
+      pendingPolygons.forEach { (id, opts) -> addPolygonInternal(id, opts) }
       pendingPolygons.clear()
     }
     if (pendingCircles.isNotEmpty()) {
-      pendingCircles.forEach { (id, opts) -> internalAddCircle(id, opts) }
+      pendingCircles.forEach { (id, opts) -> addCircleInternal(id, opts) }
       pendingCircles.clear()
     }
     if (pendingHeatmaps.isNotEmpty()) {
-      pendingHeatmaps.forEach { (id, opts) -> internalAddHeatmap(id, opts) }
+      pendingHeatmaps.forEach { (id, opts) -> addHeatmapInternal(id, opts) }
       pendingHeatmaps.clear()
     }
     if (pendingKmlLayers.isNotEmpty()) {
-      pendingKmlLayers.forEach { (id, str) -> internalAddKmlLayer(id, str) }
+      pendingKmlLayers.forEach { (id, str) -> addKmlLayerInternal(id, str) }
       pendingKmlLayers.clear()
     }
     if (pendingUrlTilesOverlays.isNotEmpty()) {
-      pendingUrlTilesOverlays.forEach { (id, opts) -> internalAddUrlTileOverlay(id, opts) }
+      pendingUrlTilesOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) }
       pendingUrlTilesOverlays.clear()
     }
   }
@@ -368,24 +374,36 @@ class GoogleMapsViewImpl(
   var onMapPress: ((RNLatLng) -> Unit)? = null
   var onMapLongPress: ((RNLatLng) -> Unit)? = null
   var onPoiPress: ((String, String, RNLatLng) -> Unit)? = null
-  var onMarkerPress: ((String?) -> Unit)? = null
-  var onPolylinePress: ((String?) -> Unit)? = null
-  var onPolygonPress: ((String?) -> Unit)? = null
-  var onCirclePress: ((String?) -> Unit)? = null
-  var onMarkerDragStart: ((String?, RNLatLng) -> Unit)? = null
-  var onMarkerDrag: ((String?, RNLatLng) -> Unit)? = null
-  var onMarkerDragEnd: ((String?, RNLatLng) -> Unit)? = null
+  var onMarkerPress: ((String) -> Unit)? = null
+  var onPolylinePress: ((String) -> Unit)? = null
+  var onPolygonPress: ((String) -> Unit)? = null
+  var onCirclePress: ((String) -> Unit)? = null
+  var onMarkerDragStart: ((String, RNLatLng) -> Unit)? = null
+  var onMarkerDrag: ((String, RNLatLng) -> Unit)? = null
+  var onMarkerDragEnd: ((String, RNLatLng) -> Unit)? = null
   var onIndoorBuildingFocused: ((RNIndoorBuilding) -> Unit)? = null
   var onIndoorLevelActivated: ((RNIndoorLevel) -> Unit)? = null
-  var onInfoWindowPress: ((String?) -> Unit)? = null
-  var onInfoWindowClose: ((String?) -> Unit)? = null
-  var onInfoWindowLongPress: ((String?) -> Unit)? = null
+  var onInfoWindowPress: ((String) -> Unit)? = null
+  var onInfoWindowClose: ((String) -> Unit)? = null
+  var onInfoWindowLongPress: ((String) -> Unit)? = null
   var onMyLocationPress: ((RNLocation) -> Unit)? = null
   var onMyLocationButtonPress: ((Boolean) -> Unit)? = null
   var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
 
+  fun showMarkerInfoWindow(id: String) =
+    onUi {
+      val marker = markersById[id] ?: return@onUi
+      marker.showInfoWindow()
+    }
+
+  fun hideMarkerInfoWindow(id: String) =
+    onUi {
+      val marker = markersById[id] ?: return@onUi
+      marker.hideInfoWindow()
+    }
+
   fun setCamera(
     cameraPosition: CameraPosition,
     animated: Boolean,
@@ -406,56 +424,23 @@ class GoogleMapsViewImpl(
     durationMs: Int,
   ) = onUi {
     if (coordinates.isEmpty()) return@onUi
-    val builder = LatLngBounds.Builder()
+
+    val w = mapView?.width ?: 0
+    val h = mapView?.height ?: 0
+
+    val builder = LatLngBounds.builder()
     coordinates.forEach { coord -> builder.include(coord.toLatLng()) }
-    val bounds = builder.build()
-
-    val latSpan = bounds.northeast.latitude - bounds.southwest.latitude
-    val lngSpan = bounds.northeast.longitude - bounds.southwest.longitude
-
-    val h = (mapView?.height ?: 0)
-    val w = (mapView?.width ?: 0)
-    val latPerPixel = if (h != 0) latSpan / h else 0.0
-    val lngPerPixel = if (w != 0) lngSpan / w else 0.0
-
-    builder.include(
-      LatLng(
-        bounds.northeast.latitude + (padding.top.dpToPx() * latPerPixel),
-        bounds.northeast.longitude,
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.southwest.latitude - (padding.bottom.dpToPx() * latPerPixel),
-        bounds.southwest.longitude,
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.northeast.latitude,
-        bounds.northeast.longitude + (padding.right.dpToPx() * lngPerPixel),
-      ),
-    )
-    builder.include(
-      LatLng(
-        bounds.southwest.latitude,
-        bounds.southwest.longitude - (padding.left.dpToPx() * lngPerPixel),
-      ),
-    )
-
-    val paddedBounds = builder.build()
+
+    val baseBounds = builder.build()
+    val paddedBounds = baseBounds.withPaddingPixels(w, h, padding)
+
     val adjustedWidth =
       (w - padding.left.dpToPx() - padding.right.dpToPx()).toInt().coerceAtLeast(0)
     val adjustedHeight =
       (h - padding.top.dpToPx() - padding.bottom.dpToPx()).toInt().coerceAtLeast(0)
 
-    val update =
-      CameraUpdateFactory.newLatLngBounds(
-        paddedBounds,
-        adjustedWidth,
-        adjustedHeight,
-        0,
-      )
+    val update = CameraUpdateFactory.newLatLngBounds(paddedBounds, adjustedWidth, adjustedHeight, 0)
+
     if (animated) {
       googleMap?.animateCamera(update, durationMs, null)
     } else {
@@ -491,30 +476,9 @@ class GoogleMapsViewImpl(
     val promise = Promise<String?>()
     onUi {
       googleMap?.snapshot { bitmap ->
-        try {
-          if (bitmap == null) {
-            promise.resolve(null)
-            return@snapshot
-          }
-          val scaledBitmap = size?.let { bitmap.scale(it.width, it.height) } ?: bitmap
-          val output = ByteArrayOutputStream()
-          scaledBitmap.compress(compressFormat, (quality * 100).toInt().coerceIn(0, 100), output)
-          val bytes = output.toByteArray()
-
-          if (resultIsFile) {
-            val file = File(context.cacheDir, "map_snapshot_${System.currentTimeMillis()}.$format")
-            FileOutputStream(file).use { it.write(bytes) }
-            promise.resolve(file.absolutePath)
-          } else {
-            val base64 = Base64.encodeToString(bytes, Base64.NO_WRAP)
-            promise.resolve("data:image/$format;base64,$base64")
-          }
-
-          if (scaledBitmap !== bitmap) scaledBitmap.recycle()
-          bitmap.recycle()
-        } catch (_: Exception) {
-          promise.resolve(null)
-        }
+        bitmap
+          ?.encode(context, size, format, compressFormat, quality, resultIsFile)
+          ?.let(promise::resolve) ?: promise.resolve(null)
       }
     }
     return promise
@@ -523,21 +487,30 @@ class GoogleMapsViewImpl(
   fun addMarker(
     id: String,
     opts: MarkerOptions,
+    markerTag: MarkerTag,
   ) = onUi {
     if (googleMap == null) {
-      pendingMarkers.add(id to opts)
+      pendingMarkers.add(Triple(id, opts, markerTag))
       return@onUi
     }
+
     markersById.remove(id)?.remove()
-    internalAddMarker(id, opts)
+    addMarkerInternal(id, opts, markerTag)
   }
 
-  private fun internalAddMarker(
+  private fun addMarkerInternal(
     id: String,
     opts: MarkerOptions,
+    markerTag: MarkerTag,
   ) = onUi {
-    val marker = googleMap?.addMarker(opts).also { it?.tag = id }
-    if (marker != null) markersById[id] = marker
+    val marker =
+      googleMap?.addMarker(opts)?.apply {
+        tag = markerTag
+      }
+
+    if (marker != null) {
+      markersById[id] = marker
+    }
   }
 
   fun updateMarker(
@@ -546,6 +519,10 @@ class GoogleMapsViewImpl(
   ) = onUi {
     val marker = markersById[id] ?: return@onUi
     block(marker)
+    if (marker.isInfoWindowShown) {
+      marker.hideInfoWindow()
+      marker.showInfoWindow()
+    }
   }
 
   fun removeMarker(id: String) =
@@ -569,14 +546,17 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     polylinesById.remove(id)?.remove()
-    internalAddPolyline(id, opts)
+    addPolylineInternal(id, opts)
   }
 
-  private fun internalAddPolyline(
+  private fun addPolylineInternal(
     id: String,
     opts: PolylineOptions,
   ) = onUi {
-    val pl = googleMap?.addPolyline(opts).also { it?.tag = id }
+    val pl =
+      googleMap?.addPolyline(opts).also {
+        it?.tag = PolylineTag(id = id)
+      }
     if (pl != null) polylinesById[id] = pl
   }
 
@@ -609,14 +589,17 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     polygonsById.remove(id)?.remove()
-    internalAddPolygon(id, opts)
+    addPolygonInternal(id, opts)
   }
 
-  private fun internalAddPolygon(
+  private fun addPolygonInternal(
     id: String,
     opts: PolygonOptions,
   ) = onUi {
-    val polygon = googleMap?.addPolygon(opts).also { it?.tag = id }
+    val polygon =
+      googleMap?.addPolygon(opts).also {
+        it?.tag = PolygonTag(id = id)
+      }
     if (polygon != null) polygonsById[id] = polygon
   }
 
@@ -649,14 +632,17 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     circlesById.remove(id)?.remove()
-    internalAddCircle(id, opts)
+    addCircleInternal(id, opts)
   }
 
-  private fun internalAddCircle(
+  private fun addCircleInternal(
     id: String,
     opts: CircleOptions,
   ) = onUi {
-    val circle = googleMap?.addCircle(opts).also { it?.tag = id }
+    val circle =
+      googleMap?.addCircle(opts).also {
+        it?.tag = CircleTag(id = id)
+      }
     if (circle != null) circlesById[id] = circle
   }
 
@@ -689,10 +675,10 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     heatmapsById.remove(id)?.remove()
-    internalAddHeatmap(id, opts)
+    addHeatmapInternal(id, opts)
   }
 
-  private fun internalAddHeatmap(
+  private fun addHeatmapInternal(
     id: String,
     opts: TileOverlayOptions,
   ) = onUi {
@@ -710,7 +696,10 @@ class GoogleMapsViewImpl(
 
   fun clearHeatmaps() =
     onUi {
-      heatmapsById.values.forEach { it.remove() }
+      heatmapsById.values.forEach {
+        it.clearTileCache()
+        it.remove()
+      }
       heatmapsById.clear()
       pendingHeatmaps.clear()
     }
@@ -724,10 +713,10 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     kmlLayersById.remove(id)?.removeLayerFromMap()
-    internalAddKmlLayer(id, kmlString)
+    addKmlLayerInternal(id, kmlString)
   }
 
-  private fun internalAddKmlLayer(
+  private fun addKmlLayerInternal(
     id: String,
     kmlString: String,
   ) = onUi {
@@ -762,10 +751,10 @@ class GoogleMapsViewImpl(
       return@onUi
     }
     urlTileOverlaysById.remove(id)?.remove()
-    internalAddUrlTileOverlay(id, opts)
+    addUrlTileOverlayInternal(id, opts)
   }
 
-  private fun internalAddUrlTileOverlay(
+  private fun addUrlTileOverlayInternal(
     id: String,
     opts: TileOverlayOptions,
   ) = onUi {
@@ -783,7 +772,10 @@ class GoogleMapsViewImpl(
 
   fun clearUrlTileOverlays() =
     onUi {
-      urlTileOverlaysById.values.forEach { it.remove() }
+      urlTileOverlaysById.values.forEach {
+        it.clearTileCache()
+        it.remove()
+      }
       urlTileOverlaysById.clear()
       pendingUrlTilesOverlays.clear()
     }
@@ -818,6 +810,7 @@ class GoogleMapsViewImpl(
         setOnInfoWindowLongClickListener(null)
         setOnMyLocationClickListener(null)
         setOnMyLocationButtonClickListener(null)
+        setInfoWindowAdapter(null)
       }
       googleMap = null
       mapView?.apply {
@@ -873,25 +866,24 @@ class GoogleMapsViewImpl(
 
   override fun onMarkerClick(marker: Marker): Boolean {
     onUi {
-      marker.showInfoWindow()
-      onMarkerPress?.invoke(marker.tag?.toString())
+      onMarkerPress?.invoke(marker.idTag)
     }
     return uiSettings?.consumeOnMarkerPress ?: false
   }
 
   override fun onPolylineClick(polyline: Polyline) =
     onUi {
-      onPolylinePress?.invoke(polyline.tag?.toString())
+      onPolylinePress?.invoke(polyline.idTag)
     }
 
   override fun onPolygonClick(polygon: Polygon) =
     onUi {
-      onPolygonPress?.invoke(polygon.tag?.toString())
+      onPolygonPress?.invoke(polygon.idTag)
     }
 
   override fun onCircleClick(circle: Circle) =
     onUi {
-      onCirclePress?.invoke(circle.tag?.toString())
+      onCirclePress?.invoke(circle.idTag)
     }
 
   override fun onMapClick(coordinates: LatLng) =
@@ -906,17 +898,17 @@ class GoogleMapsViewImpl(
 
   override fun onMarkerDragStart(marker: Marker) =
     onUi {
-      onMarkerDragStart?.invoke(marker.tag?.toString(), marker.position.toRnLatLng())
+      onMarkerDragStart?.invoke(marker.idTag, marker.position.toRnLatLng())
     }
 
   override fun onMarkerDrag(marker: Marker) =
     onUi {
-      onMarkerDrag?.invoke(marker.tag?.toString(), marker.position.toRnLatLng())
+      onMarkerDrag?.invoke(marker.idTag, marker.position.toRnLatLng())
     }
 
   override fun onMarkerDragEnd(marker: Marker) =
     onUi {
-      onMarkerDragEnd?.invoke(marker.tag?.toString(), marker.position.toRnLatLng())
+      onMarkerDragEnd?.invoke(marker.idTag, marker.position.toRnLatLng())
     }
 
   override fun onIndoorBuildingFocused() =
@@ -941,17 +933,17 @@ class GoogleMapsViewImpl(
 
   override fun onInfoWindowClick(marker: Marker) =
     onUi {
-      onInfoWindowPress?.invoke(marker.tag?.toString())
+      onInfoWindowPress?.invoke(marker.idTag)
     }
 
   override fun onInfoWindowClose(marker: Marker) =
     onUi {
-      onInfoWindowClose?.invoke(marker.tag?.toString())
+      onInfoWindowClose?.invoke(marker.idTag)
     }
 
   override fun onInfoWindowLongClick(marker: Marker) =
     onUi {
-      onInfoWindowLongPress?.invoke(marker.tag?.toString())
+      onInfoWindowLongPress?.invoke(marker.idTag)
     }
 
   override fun onMyLocationClick(location: Location) =
@@ -965,4 +957,8 @@ class GoogleMapsViewImpl(
     }
     return uiSettings?.consumeOnMyLocationButtonPress ?: false
   }
+
+  override fun getInfoContents(marker: Marker): View? = null
+
+  override fun getInfoWindow(marker: Marker): View? = markerBuilder.buildInfoWindow(marker.tagData.iconSvg)
 }

package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt

@@ -4,6 +4,7 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.CircleOptions
+import com.rngooglemapsplus.extensions.centerEquals
 import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
@@ -25,9 +26,7 @@ class MapCircleBuilder {
     next: RNCircle,
     circle: Circle,
   ) = onUi {
-    if (prev.center.latitude != next.center.latitude ||
-      prev.center.longitude != next.center.longitude
-    ) {
+    if (!prev.centerEquals(next)) {
       circle.center = next.center.toLatLng()
     }