react-native-google-maps-plus 1.7.0-dev.6 → 1.7.0-dev.7

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/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

@@ -16,6 +16,7 @@ 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
@@ -28,6 +29,7 @@ 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(
@@ -42,7 +44,7 @@ class MapMarkerBuilder(
       ): Int = 1
     }
 
-  private val jobsById = mutableMapOf<String, Job>()
+  private val jobsById = ConcurrentHashMap<String, Job>()
 
   init {
     // / TODO: refactor with androidsvg 1.5 release
@@ -162,7 +164,7 @@ class MapMarkerBuilder(
     prev: RNMarker,
     next: RNMarker,
     marker: Marker,
-  ) {
+  ) = onUi {
     if (prev.coordinate.latitude != next.coordinate.latitude ||
       prev.coordinate.longitude != next.coordinate.longitude
     ) {

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/RNGoogleMapsPlusView.kt

@@ -1,7 +1,6 @@
 package com.rngooglemapsplus
 
 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
@@ -155,7 +154,7 @@ class RNGoogleMapsPlusView(
 
           !prev.markerEquals(next) ->
             view.updateMarker(id) { marker ->
-              onUi { markerBuilder.update(prev, next, marker) }
+              markerBuilder.update(prev, next, marker)
             }
         }
       }
@@ -179,7 +178,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polylineEquals(next) ->
             view.updatePolyline(id) { polyline ->
-              onUi { polylineBuilder.update(prev, next, polyline) }
+              polylineBuilder.update(prev, next, polyline)
             }
         }
       }
@@ -204,7 +203,7 @@ class RNGoogleMapsPlusView(
 
           !prev.polygonEquals(next) ->
             view.updatePolygon(id) { polygon ->
-              onUi { polygonBuilder.update(prev, next, polygon) }
+              polygonBuilder.update(prev, next, polygon)
             }
         }
       }
@@ -229,7 +228,7 @@ class RNGoogleMapsPlusView(
 
           !prev.circleEquals(next) ->
             view.updateCircle(id) { circle ->
-              onUi { circleBuilder.update(prev, next, circle) }
+              circleBuilder.update(prev, next, circle)
             }
         }
       }
@@ -416,14 +415,12 @@ class RNGoogleMapsPlusView(
     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(
@@ -481,11 +478,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/ios/MapCircleBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapCircleBuilder {
+  @MainActor
   func build(_ c: RNCircle) -> GMSCircle {
     let circle = GMSCircle()
     circle.position = c.center.toCLLocationCoordinate2D()
@@ -14,6 +15,7 @@ final class MapCircleBuilder {
     return circle
   }
 
+  @MainActor
   func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
     if prev.center.latitude != next.center.latitude
       || prev.center.longitude != next.center.longitude {

package/ios/MapHeatmapBuilder.swift

@@ -4,6 +4,7 @@ import GoogleMapsUtils
 import UIKit
 
 final class MapHeatmapBuilder {
+  @MainActor
   func build(_ h: RNHeatmap) -> GMUHeatmapTileLayer {
     let heatmap = GMUHeatmapTileLayer()
     heatmap.weightedData = h.weightedData.toWeightedLatLngs()

package/ios/MapMarkerBuilder.swift

@@ -10,6 +10,7 @@ final class MapMarkerBuilder {
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
 
+  @MainActor
   func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
@@ -160,11 +161,13 @@ final class MapMarkerBuilder {
     tasks[id] = task
   }
 
+  @MainActor
   func cancelIconTask(_ id: String) {
     tasks[id]?.cancel()
     tasks.removeValue(forKey: id)
   }
 
+  @MainActor
   func cancelAllIconTasks() {
     let ids = Array(tasks.keys)
     for id in ids {
@@ -174,6 +177,7 @@ final class MapMarkerBuilder {
     iconCache.removeAllObjects()
   }
 
+  @MainActor
   private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
     guard let iconSvg = m.iconSvg,
           let data = iconSvg.svgString.data(using: .utf8)

package/ios/MapPolygonBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolygonBuilder {
+  @MainActor
   func build(_ p: RNPolygon) -> GMSPolygon {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -28,6 +29,7 @@ final class MapPolygonBuilder {
     return pg
   }
 
+  @MainActor
   func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapPolylineBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 final class MapPolylineBuilder {
+  @MainActor
   func build(_ p: RNPolyline) -> GMSPolyline {
     let path = GMSMutablePath()
     p.coordinates.forEach {
@@ -22,6 +23,7 @@ final class MapPolylineBuilder {
     return pl
   }
 
+  @MainActor
   func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
     let coordsChanged =
       prev.coordinates.count != next.coordinates.count

package/ios/MapUrlTileOverlayBuilder.swift

@@ -1,6 +1,7 @@
 import GoogleMaps
 
 class MapUrlTileOverlayBuilder {
+  @MainActor
   func build(_ t: RNUrlTileOverlay) -> GMSURLTileLayer {
 
     let constructor: GMSTileURLConstructor = { (x: UInt, y: UInt, zoom: UInt) in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.6",
+  "version": "1.7.0-dev.7",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",