react-native-google-maps-plus 1.6.2 → 1.7.0-dev.10

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

@@ -38,7 +38,6 @@ class LocationHandler(
   private var priority: Int = PRIORITY_DEFAULT
   private var interval: Long = INTERVAL_DEFAULT
   private var minUpdateInterval: Long = MIN_UPDATE_INTERVAL
-  private var lastSubmittedLocation: Location? = null
   private var isActive = false
 
   var onUpdate: ((Location) -> Unit)? = null
@@ -57,6 +56,8 @@ class LocationHandler(
     this.interval = interval ?: INTERVAL_DEFAULT
     this.minUpdateInterval = minUpdateInterval ?: MIN_UPDATE_INTERVAL
     buildLocationRequest(this.priority, this.interval, this.minUpdateInterval)
+    stop()
+    start()
   }
 
   fun showLocationDialog() {
@@ -143,9 +144,8 @@ class LocationHandler(
       fusedLocationClientProviderClient.lastLocation
         .addOnSuccessListener(
           OnSuccessListener { location ->
-            if (location != null && location != lastSubmittedLocation) {
+            if (location != null) {
               onUpdate?.invoke(location)
-              lastSubmittedLocation = location
             }
           },
         ).addOnFailureListener { e ->
@@ -157,11 +157,8 @@ class LocationHandler(
           override fun onLocationResult(locationResult: LocationResult) {
             val location = locationResult.lastLocation
             if (location != null) {
-              if (location != lastSubmittedLocation) {
-                lastSubmittedLocation = location
-                listener?.onLocationChanged(location)
-                onUpdate?.invoke(location)
-              }
+              listener?.onLocationChanged(location)
+              onUpdate?.invoke(location)
             } else {
               onError?.invoke(RNLocationErrorCode.POSITION_UNAVAILABLE)
             }

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.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -23,7 +24,7 @@ class MapCircleBuilder {
     prev: RNCircle,
     next: RNCircle,
     circle: Circle,
-  ) {
+  ) = onUi {
     if (prev.center.latitude != next.center.latitude ||
       prev.center.longitude != next.center.longitude
     ) {

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

@@ -19,7 +19,7 @@ class MapHeatmapBuilder {
           heatmap.gradient?.let {
             val colors = it.colors.map { c -> c.toColor() }.toIntArray()
             val startPoints = it.startPoints.map { p -> p.toFloat() }.toFloatArray()
-            gradient(Gradient(colors, startPoints))
+            gradient(Gradient(colors, startPoints, it.colorMapSize.toInt()))
           }
         }.build()
 

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

@@ -0,0 +1,22 @@
+package com.rngooglemapsplus.extensions
+
+import com.facebook.react.bridge.UiThreadUtil
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.runBlocking
+
+inline fun onUi(crossinline block: () -> Unit) {
+  if (UiThreadUtil.isOnUiThread()) {
+    block()
+  } else {
+    UiThreadUtil.runOnUiThread { block() }
+  }
+}
+
+inline fun <T> onUiSync(crossinline block: () -> T): T {
+  if (UiThreadUtil.isOnUiThread()) return block()
+  val result = CompletableDeferred<T>()
+  UiThreadUtil.runOnUiThread {
+    runCatching(block).onSuccess(result::complete).onFailure(result::completeExceptionally)
+  }
+  return runBlocking { result.await() }
+}

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

@@ -1,16 +1,26 @@
 package com.rngooglemapsplus
 
+import MarkerTag
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.graphics.Canvas
+import android.graphics.Typeface
+import android.graphics.drawable.PictureDrawable
+import android.util.Base64
 import android.util.LruCache
+import android.widget.ImageView
+import android.widget.LinearLayout
 import androidx.core.graphics.createBitmap
 import com.caverock.androidsvg.SVG
+import com.caverock.androidsvg.SVGExternalFileResolver
 import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 import com.rngooglemapsplus.extensions.markerStyleEquals
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.styleHash
 import com.rngooglemapsplus.extensions.toLatLng
 import kotlinx.coroutines.CoroutineScope
@@ -20,9 +30,14 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.net.HttpURLConnection
+import java.net.URL
+import java.net.URLDecoder
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.coroutineContext
 
 class MapMarkerBuilder(
+  val context: ThemedReactContext,
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =
@@ -33,7 +48,103 @@ class MapMarkerBuilder(
       ): Int = 1
     }
 
-  private val jobsById = mutableMapOf<String, Job>()
+  private val jobsById = ConcurrentHashMap<String, Job>()
+
+  init {
+    // / TODO: refactor with androidsvg 1.5 release
+    SVG.registerExternalFileResolver(
+      object : SVGExternalFileResolver() {
+        override fun resolveImage(filename: String?): Bitmap? {
+          if (filename.isNullOrBlank()) return null
+
+          return runCatching {
+            when {
+              filename.startsWith("data:image/svg+xml") -> {
+                val svgContent =
+                  if ("base64," in filename) {
+                    val base64 = filename.substringAfter("base64,")
+                    String(Base64.decode(base64, Base64.DEFAULT), Charsets.UTF_8)
+                  } else {
+                    URLDecoder.decode(filename.substringAfter(","), "UTF-8")
+                  }
+
+                val svg = SVG.getFromString(svgContent)
+                val width = (svg.documentWidth.takeIf { it > 0 } ?: 128f).toInt()
+                val height = (svg.documentHeight.takeIf { it > 0 } ?: 128f).toInt()
+
+                createBitmap(width, height).apply {
+                  Canvas(this).also(svg::renderToCanvas)
+                }
+              }
+
+              filename.startsWith("http://") || filename.startsWith("https://") -> {
+                val conn =
+                  (URL(filename).openConnection() as HttpURLConnection).apply {
+                    connectTimeout = 5000
+                    readTimeout = 5000
+                    requestMethod = "GET"
+                    instanceFollowRedirects = true
+                  }
+                conn.connect()
+
+                val contentType = conn.contentType ?: ""
+                val result =
+                  if (contentType.contains("svg") || filename.endsWith(".svg")) {
+                    val svgText = conn.inputStream.bufferedReader().use { it.readText() }
+                    val innerSvg = SVG.getFromString(svgText)
+                    val w = innerSvg.documentWidth.takeIf { it > 0 } ?: 128f
+                    val h = innerSvg.documentHeight.takeIf { it > 0 } ?: 128f
+                    val bmp = createBitmap(w.toInt(), h.toInt())
+                    val canvas = Canvas(bmp)
+                    innerSvg.renderToCanvas(canvas)
+                    bmp
+                  } else {
+                    conn.inputStream.use { BitmapFactory.decodeStream(it) }
+                  }
+
+                conn.disconnect()
+                result
+              }
+
+              else -> null
+            }
+          }.getOrNull()
+        }
+
+        override fun resolveFont(
+          fontFamily: String?,
+          fontWeight: Int,
+          fontStyle: String?,
+        ): Typeface? {
+          if (fontFamily.isNullOrBlank()) return null
+
+          return runCatching {
+            val assetManager = context.assets
+
+            val candidates =
+              listOf(
+                "fonts/$fontFamily.ttf",
+                "fonts/$fontFamily.otf",
+              )
+
+            for (path in candidates) {
+              try {
+                return Typeface.createFromAsset(assetManager, path)
+              } catch (_: Throwable) {
+                // / ignore
+              }
+            }
+
+            Typeface.create(fontFamily, Typeface.NORMAL)
+          }.getOrElse {
+            Typeface.create(fontFamily, fontWeight)
+          }
+        }
+
+        override fun isFormatSupported(mimeType: String?): Boolean = mimeType?.startsWith("image/") == true
+      },
+    )
+  }
 
   fun build(
     m: RNMarker,
@@ -57,7 +168,7 @@ class MapMarkerBuilder(
     prev: RNMarker,
     next: RNMarker,
     marker: Marker,
-  ) {
+  ) = onUi {
     if (prev.coordinate.latitude != next.coordinate.latitude ||
       prev.coordinate.longitude != next.coordinate.longitude
     ) {
@@ -132,6 +243,10 @@ class MapMarkerBuilder(
     if (prev.zIndex != next.zIndex) {
       marker.zIndex = next.zIndex?.toFloat() ?: 0f
     }
+
+    if (prev.infoWindowIconSvg != next.infoWindowIconSvg) {
+      marker.tag = MarkerTag(id = next.id, iconSvg = next.infoWindowIconSvg)
+    }
   }
 
   fun buildIconAsync(
@@ -189,6 +304,31 @@ class MapMarkerBuilder(
     iconCache.evictAll()
   }
 
+  fun buildInfoWindow(iconSvg: RNMarkerSvg?): ImageView? {
+    val iconSvg = iconSvg ?: return null
+
+    val svgView =
+      ImageView(context).apply {
+        layoutParams =
+          LinearLayout.LayoutParams(
+            iconSvg.width.dpToPx().toInt(),
+            iconSvg.height.dpToPx().toInt(),
+          )
+      }
+
+    try {
+      val svg = SVG.getFromString(iconSvg.svgString)
+      svg.setDocumentWidth(iconSvg.width.dpToPx())
+      svg.setDocumentHeight(iconSvg.height.dpToPx())
+      val drawable = PictureDrawable(svg.renderToPicture())
+      svgView.setImageDrawable(drawable)
+    } catch (e: Exception) {
+      return null
+    }
+
+    return svgView
+  }
+
   private suspend fun renderBitmap(m: RNMarker): Bitmap? {
     m.iconSvg ?: return null
 

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

@@ -4,6 +4,7 @@ import android.graphics.Color
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -30,7 +31,7 @@ class MapPolygonBuilder {
     prev: RNPolygon,
     next: RNPolygon,
     poly: Polygon,
-  ) {
+  ) = onUi {
     val coordsChanged =
       prev.coordinates.size != next.coordinates.size ||
         !prev.coordinates.zip(next.coordinates).all { (a, b) ->

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

@@ -9,6 +9,7 @@ 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.android.gms.maps.model.SquareCap
+import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 
@@ -34,7 +35,7 @@ class MapPolylineBuilder {
     prev: RNPolyline,
     next: RNPolyline,
     polyline: Polyline,
-  ) {
+  ) = onUi {
     val coordsChanged =
       prev.coordinates.size != next.coordinates.size ||
         !prev.coordinates.zip(next.coordinates).all { (a, b) ->

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

@@ -0,0 +1,40 @@
+package com.rngooglemapsplus
+
+import com.google.android.gms.maps.model.TileOverlayOptions
+import com.google.android.gms.maps.model.UrlTileProvider
+import java.net.URL
+
+class MapUrlTileOverlayBuilder {
+  fun build(t: RNUrlTileOverlay): TileOverlayOptions {
+    val provider =
+      object : UrlTileProvider(
+        t.tileSize.toInt(),
+        t.tileSize.toInt(),
+      ) {
+        override fun getTileUrl(
+          x: Int,
+          y: Int,
+          zoom: Int,
+        ): URL? {
+          val url =
+            t.url
+              .replace("{x}", x.toString())
+              .replace("{y}", y.toString())
+              .replace("{z}", zoom.toString())
+
+          return try {
+            URL(url)
+          } catch (e: Exception) {
+            null
+          }
+        }
+      }
+
+    val opts = TileOverlayOptions().tileProvider(provider)
+
+    t.fadeIn?.let { opts.fadeIn(it) }
+    t.zIndex?.let { opts.zIndex(it.toFloat()) }
+    t.opacity?.let { opts.transparency(1f - it.toFloat()) }
+    return opts
+  }
+}

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

@@ -1,7 +1,7 @@
 package com.rngooglemapsplus
 
+import MarkerTag
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.model.MapStyleOptions
@@ -14,6 +14,7 @@ import com.rngooglemapsplus.extensions.polylineEquals
 import com.rngooglemapsplus.extensions.toCameraPosition
 import com.rngooglemapsplus.extensions.toCompressFormat
 import com.rngooglemapsplus.extensions.toFileExtension
+import com.rngooglemapsplus.extensions.toGoogleMapType
 import com.rngooglemapsplus.extensions.toLatLngBounds
 import com.rngooglemapsplus.extensions.toMapColorScheme
 import com.rngooglemapsplus.extensions.toSize
@@ -28,11 +29,12 @@ class RNGoogleMapsPlusView(
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
 
-  private val markerBuilder = MapMarkerBuilder()
+  private val markerBuilder = MapMarkerBuilder(context)
   private val polylineBuilder = MapPolylineBuilder()
   private val polygonBuilder = MapPolygonBuilder()
   private val circleBuilder = MapCircleBuilder()
   private val heatmapBuilder = MapHeatmapBuilder()
+  private val urlTileOverlayBuilder = MapUrlTileOverlayBuilder()
 
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder)
@@ -128,9 +130,7 @@ class RNGoogleMapsPlusView(
     set(value) {
       if (field == value) return
       field = value
-      value?.let {
-        view.mapType = it.value
-      }
+      view.mapType = value?.toGoogleMapType()
     }
 
   override var markers: Array<RNMarker>? = null
@@ -150,12 +150,19 @@ class RNGoogleMapsPlusView(
         when {
           prev == null ->
             markerBuilder.buildIconAsync(id, next) { icon ->
-              view.addMarker(id, markerBuilder.build(next, icon))
+              view.addMarker(
+                id,
+                markerBuilder.build(next, icon),
+                MarkerTag(
+                  id = id,
+                  iconSvg = next.infoWindowIconSvg,
+                ),
+              )
             }
 
           !prev.markerEquals(next) ->
             view.updateMarker(id) { marker ->
-              onUi { markerBuilder.update(prev, next, marker) }
+              markerBuilder.update(prev, next, marker)
             }
         }
       }
@@ -179,7 +186,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polylineEquals(next) ->
             view.updatePolyline(id) { polyline ->
-              onUi { polylineBuilder.update(prev, next, polyline) }
+              polylineBuilder.update(prev, next, polyline)
             }
         }
       }
@@ -204,7 +211,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polygonEquals(next) ->
             view.updatePolygon(id) { polygon ->
-              onUi { polygonBuilder.update(prev, next, polygon) }
+              polygonBuilder.update(prev, next, polygon)
             }
         }
       }
@@ -229,7 +236,7 @@ class RNGoogleMapsPlusView(
 
           !prev.circleEquals(next) ->
             view.updateCircle(id) { circle ->
-              onUi { circleBuilder.update(prev, next, circle) }
+              circleBuilder.update(prev, next, circle)
             }
         }
       }
@@ -264,6 +271,21 @@ class RNGoogleMapsPlusView(
       }
     }
 
+  override var urlTileOverlays: Array<RNUrlTileOverlay>? = null
+    set(value) {
+      if (field.contentEquals(value)) return
+      val prevById = field?.associateBy { it.id } ?: emptyMap()
+      val nextById = value?.associateBy { it.id } ?: emptyMap()
+      field = value
+      (prevById.keys - nextById.keys).forEach { id ->
+        view.removeUrlTileOverlay(id)
+      }
+
+      nextById.forEach { (id, next) ->
+        view.addUrlTileOverlay(id, urlTileOverlayBuilder.build(next))
+      }
+    }
+
   override var locationConfig: RNLocationConfig? = null
     set(value) {
       if (field == value) return
@@ -281,6 +303,11 @@ class RNGoogleMapsPlusView(
       view.onMapReady = cb
     }
 
+  override var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
+    set(cb) {
+      view.onMapLoaded = cb
+    }
+
   override var onLocationUpdate: ((RNLocation) -> Unit)? = null
     set(cb) {
       view.onLocationUpdate = cb
@@ -296,37 +323,47 @@ class RNGoogleMapsPlusView(
       view.onMapPress = cb
     }
 
-  override var onMarkerPress: ((String?) -> Unit)? = null
+  override var onMapLongPress: ((RNLatLng) -> Unit)? = null
+    set(cb) {
+      view.onMapLongPress = cb
+    }
+
+  override var onMarkerPress: ((String) -> Unit)? = null
     set(cb) {
       view.onMarkerPress = cb
     }
 
-  override var onPolylinePress: ((String?) -> Unit)? = null
+  override var onPoiPress: ((String, String, RNLatLng) -> Unit)? = null
+    set(cb) {
+      view.onPoiPress = cb
+    }
+
+  override var onPolylinePress: ((String) -> Unit)? = null
     set(cb) {
       view.onPolylinePress = cb
     }
 
-  override var onPolygonPress: ((String?) -> Unit)? = null
+  override var onPolygonPress: ((String) -> Unit)? = null
     set(cb) {
       view.onPolygonPress = cb
     }
 
-  override var onCirclePress: ((String?) -> Unit)? = null
+  override var onCirclePress: ((String) -> Unit)? = null
     set(cb) {
       view.onCirclePress = cb
     }
 
-  override var onMarkerDragStart: ((String?, RNLatLng) -> Unit)? = null
+  override var onMarkerDragStart: ((String, RNLatLng) -> Unit)? = null
     set(cb) {
       view.onMarkerDragStart = cb
     }
 
-  override var onMarkerDrag: ((String?, RNLatLng) -> Unit)? = null
+  override var onMarkerDrag: ((String, RNLatLng) -> Unit)? = null
     set(cb) {
       view.onMarkerDrag = cb
     }
 
-  override var onMarkerDragEnd: ((String?, RNLatLng) -> Unit)? = null
+  override var onMarkerDragEnd: ((String, RNLatLng) -> Unit)? = null
     set(cb) {
       view.onMarkerDragEnd = cb
     }
@@ -341,6 +378,31 @@ class RNGoogleMapsPlusView(
       view.onIndoorLevelActivated = cb
     }
 
+  override var onInfoWindowPress: ((String) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowPress = cb
+    }
+
+  override var onInfoWindowClose: ((String) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowClose = cb
+    }
+
+  override var onInfoWindowLongPress: ((String) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowLongPress = cb
+    }
+
+  override var onMyLocationPress: ((RNLocation) -> Unit)? = null
+    set(cb) {
+      view.onMyLocationPress = cb
+    }
+
+  override var onMyLocationButtonPress: ((Boolean) -> Unit)? = null
+    set(cb) {
+      view.onMyLocationButtonPress = cb
+    }
+
   override var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeStart = cb
@@ -356,19 +418,25 @@ class RNGoogleMapsPlusView(
       view.onCameraChangeComplete = cb
     }
 
+  override fun showMarkerInfoWindow(id: String) {
+    view.showMarkerInfoWindow(id)
+  }
+
+  override fun hideMarkerInfoWindow(id: String) {
+    view.hideMarkerInfoWindow(id)
+  }
+
   override fun setCamera(
     camera: RNCamera,
     animated: Boolean?,
     durationMs: Double?,
   ) {
-    onUi {
-      val current = view.currentCamera
-      view.setCamera(
-        camera.toCameraPosition(current),
-        animated == true,
-        durationMs?.toInt() ?: 3000,
-      )
-    }
+    val current = view.currentCamera
+    view.setCamera(
+      camera.toCameraPosition(current),
+      animated == true,
+      durationMs?.toInt() ?: 3000,
+    )
   }
 
   override fun setCameraToCoordinates(
@@ -426,11 +494,3 @@ class RNGoogleMapsPlusView(
 
   override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
 }
-
-private inline fun onUi(crossinline block: () -> Unit) {
-  if (UiThreadUtil.isOnUiThread()) {
-    block()
-  } else {
-    UiThreadUtil.runOnUiThread { block() }
-  }
-}

package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt

@@ -0,0 +1,10 @@
+package com.rngooglemapsplus.extensions
+
+import com.google.android.gms.maps.model.LatLngBounds
+import com.rngooglemapsplus.RNLatLngBounds
+
+fun LatLngBounds.toRnLatLngBounds(): RNLatLngBounds =
+  RNLatLngBounds(
+    northeast = northeast.toRnLatLng(),
+    southwest = southwest.toRnLatLng(),
+  )