react-native-google-maps-plus 1.10.1-dev.1 → 1.10.1-dev.2

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

@@ -41,8 +41,6 @@ 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
 import com.rngooglemapsplus.extensions.toLatLng
 import com.rngooglemapsplus.extensions.toLocationErrorCode
@@ -749,7 +747,7 @@ class GoogleMapsViewImpl(
       kmlLayersById[id] = layer
       layer.addLayerToMap()
     } catch (_: Exception) {
-      // ignore
+      mapsLog("kml layer parse failed: id=$id")
     }
   }
 
@@ -971,5 +969,5 @@ class GoogleMapsViewImpl(
 
   override fun getInfoContents(marker: Marker): View? = null
 
-  override fun getInfoWindow(marker: Marker): View? = markerBuilder.buildInfoWindow(marker.tagData.iconSvg)
+  override fun getInfoWindow(marker: Marker): View? = markerBuilder.buildInfoWindow(marker.tagData)
 }

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

@@ -19,7 +19,6 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationSettingsRequest
 import com.google.android.gms.location.Priority
 import com.google.android.gms.maps.LocationSource
-import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toLocationErrorCode
 
 private const val REQ_LOCATION_SETTINGS = 2001

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

@@ -5,7 +5,6 @@ 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
 

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

@@ -1,4 +1,4 @@
-package com.rngooglemapsplus.extensions
+package com.rngooglemapsplus
 
 import com.facebook.react.bridge.UiThreadUtil
 import kotlinx.coroutines.CompletableDeferred
@@ -20,3 +20,16 @@ inline fun <T> onUiSync(crossinline block: () -> T): T {
   }
   return runBlocking { result.await() }
 }
+
+private const val MAPS_LOG_TAG = "react-native-google-maps-plus"
+
+fun mapsLog(msg: String) {
+  android.util.Log.w(MAPS_LOG_TAG, msg)
+}
+
+fun mapsLog(
+  msg: String,
+  t: Throwable,
+) {
+  android.util.Log.w(MAPS_LOG_TAG, msg, t)
+}

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

@@ -13,6 +13,7 @@ import android.widget.LinearLayout
 import androidx.core.graphics.createBitmap
 import com.caverock.androidsvg.SVG
 import com.caverock.androidsvg.SVGExternalFileResolver
+import com.caverock.androidsvg.SVGParseException
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.gms.maps.model.BitmapDescriptor
@@ -24,13 +25,13 @@ import com.rngooglemapsplus.extensions.coordinatesEquals
 import com.rngooglemapsplus.extensions.infoWindowAnchorEquals
 import com.rngooglemapsplus.extensions.markerInfoWindowStyleEquals
 import com.rngooglemapsplus.extensions.markerStyleEquals
-import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.styleHash
 import com.rngooglemapsplus.extensions.toLatLng
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -38,7 +39,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.net.URLDecoder
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.coroutines.coroutineContext
+import kotlin.coroutines.cancellation.CancellationException
 
 class MapMarkerBuilder(
   val context: ThemedReactContext,
@@ -117,6 +118,8 @@ class MapMarkerBuilder(
 
               else -> null
             }
+          }.onFailure {
+            mapsLog("external svg resolve failed")
           }.getOrNull()
         }
 
@@ -140,7 +143,7 @@ class MapMarkerBuilder(
               try {
                 return Typeface.createFromAsset(assetManager, path)
               } catch (_: Throwable) {
-                // / ignore
+                mapsLog("font resolve failed: $path")
               }
             }
 
@@ -264,32 +267,40 @@ class MapMarkerBuilder(
       scope.launch {
         try {
           ensureActive()
-          val bmp = renderBitmap(m)
+          val renderResult = renderBitmap(m.iconSvg, m.id)
 
-          if (bmp == null) {
-            withContext(Dispatchers.Main) { onReady(null) }
+          if (renderResult?.bitmap == null) {
+            withContext(Dispatchers.Main) {
+              ensureActive()
+              onReady(createFallbackDescriptor())
+            }
             return@launch
           }
+
           ensureActive()
-          val desc = BitmapDescriptorFactory.fromBitmap(bmp)
+          val desc = BitmapDescriptorFactory.fromBitmap(renderResult.bitmap)
 
-          iconCache.put(key, desc)
-          bmp.recycle()
+          if (!renderResult.isFallback) {
+            iconCache.put(key, desc)
+          }
+          renderResult.bitmap.recycle()
 
           withContext(Dispatchers.Main) {
             ensureActive()
             onReady(desc)
           }
         } catch (_: OutOfMemoryError) {
+          mapsLog("markerId=${m.id} buildIconAsync out of memory")
           clearIconCache()
           withContext(Dispatchers.Main) {
             ensureActive()
-            onReady(null)
+            onReady(createFallbackDescriptor())
           }
         } catch (_: Throwable) {
+          mapsLog("markerId=${m.id} buildIconAsync failed")
           withContext(Dispatchers.Main) {
             ensureActive()
-            onReady(null)
+            onReady(createFallbackDescriptor())
           }
         } finally {
           jobsById.remove(m.id)
@@ -317,8 +328,22 @@ class MapMarkerBuilder(
     iconCache.evictAll()
   }
 
-  fun buildInfoWindow(iconSvg: RNMarkerSvg?): ImageView? {
-    val iconSvg = iconSvg ?: return null
+  fun buildInfoWindow(markerTag: MarkerTag): ImageView? {
+    val iconSvg = markerTag.iconSvg ?: return null
+
+    val wPx =
+      markerTag.iconSvg.width
+        .dpToPx()
+        .toInt()
+    val hPx =
+      markerTag.iconSvg.height
+        .dpToPx()
+        .toInt()
+
+    if (wPx <= 0 || hPx <= 0) {
+      mapsLog("markerId=${markerTag.id} invalid svg size")
+      return ImageView(context)
+    }
 
     val svgView =
       ImageView(context).apply {
@@ -330,40 +355,73 @@ class MapMarkerBuilder(
       }
 
     try {
-      val svg = SVG.getFromString(iconSvg.svgString)
-      svg.setDocumentWidth(iconSvg.width.dpToPx())
-      svg.setDocumentHeight(iconSvg.height.dpToPx())
+      val svg =
+        SVG.getFromString(iconSvg.svgString).apply {
+          documentWidth = wPx.toFloat()
+          documentHeight = hPx.toFloat()
+        }
       val drawable = PictureDrawable(svg.renderToPicture())
       svgView.setImageDrawable(drawable)
-    } catch (e: Exception) {
-      return null
+    } catch (_: Exception) {
+      mapsLog("markerId=${markerTag.id} infoWindow: svg render failed")
+      return ImageView(context)
     }
 
     return svgView
   }
 
-  private suspend fun renderBitmap(m: RNMarker): Bitmap? {
-    m.iconSvg ?: return null
+  private fun createFallbackBitmap(): Bitmap =
+    createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply {
+      setHasAlpha(true)
+    }
+
+  private fun createFallbackDescriptor(): BitmapDescriptor {
+    val bmp = createFallbackBitmap()
+    return BitmapDescriptorFactory.fromBitmap(bmp).also {
+      bmp.recycle()
+    }
+  }
+
+  private data class RenderBitmapResult(
+    val bitmap: Bitmap,
+    val isFallback: Boolean,
+  )
+
+  private suspend fun renderBitmap(
+    iconSvg: RNMarkerSvg,
+    markerId: String,
+  ): RenderBitmapResult? {
+    val wPx =
+      iconSvg.width
+        .dpToPx()
+        .toInt()
+    val hPx =
+      iconSvg.height
+        .dpToPx()
+        .toInt()
+
+    if (wPx <= 0 || hPx <= 0) {
+      mapsLog("markerId=$markerId invalid svg size")
+      return RenderBitmapResult(createFallbackBitmap(), true)
+    }
 
     var bmp: Bitmap? = null
     try {
-      coroutineContext.ensureActive()
-      val svg = SVG.getFromString(m.iconSvg.svgString)
-
-      val wPx =
-        m.iconSvg.width
-          .dpToPx()
-          .toInt()
-      val hPx =
-        m.iconSvg.height
-          .dpToPx()
-          .toInt()
-
-      coroutineContext.ensureActive()
-      svg.setDocumentWidth(wPx.toFloat())
-      svg.setDocumentHeight(hPx.toFloat())
-
-      coroutineContext.ensureActive()
+      val svg =
+        try {
+          SVG.getFromString(iconSvg.svgString).apply {
+            documentWidth = wPx.toFloat()
+            documentHeight = hPx.toFloat()
+          }
+        } catch (_: SVGParseException) {
+          mapsLog("markerId=$markerId icon: svg parse failed")
+          return RenderBitmapResult(createFallbackBitmap(), true)
+        } catch (_: IllegalArgumentException) {
+          mapsLog("markerId=$markerId icon: svg invalid")
+          return RenderBitmapResult(createFallbackBitmap(), true)
+        }
+
+      currentCoroutineContext().ensureActive()
       bmp =
         createBitmap(wPx, hPx, Bitmap.Config.ARGB_8888).apply {
           density = context.resources.displayMetrics.densityDpi
@@ -372,13 +430,13 @@ class MapMarkerBuilder(
           }
         }
 
-      return bmp
-    } catch (t: Throwable) {
-      try {
-        bmp?.recycle()
-      } catch (_: Throwable) {
-      }
-      throw t
+      currentCoroutineContext().ensureActive()
+
+      return RenderBitmapResult(bmp, false)
+    } catch (e: Exception) {
+      if (e is CancellationException) throw e
+      bmp?.recycle()
+      throw e
     }
   }
 }

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

@@ -6,7 +6,6 @@ import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.PolygonOptions
 import com.rngooglemapsplus.extensions.coordinatesEquals
 import com.rngooglemapsplus.extensions.holesEquals
-import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 import com.rngooglemapsplus.extensions.toMapsPolygonHoles

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

@@ -5,7 +5,6 @@ import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 import com.rngooglemapsplus.extensions.coordinatesEquals
-import com.rngooglemapsplus.extensions.onUi
 import com.rngooglemapsplus.extensions.toColor
 import com.rngooglemapsplus.extensions.toLatLng
 import com.rngooglemapsplus.extensions.toMapJointType

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

@@ -25,6 +25,7 @@ class MapUrlTileOverlayBuilder {
           return try {
             URL(url)
           } catch (e: Exception) {
+            mapsLog("tile url invalid: $url", e)
             null
           }
         }

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

@@ -5,6 +5,7 @@ import android.graphics.Bitmap
 import android.util.Base64
 import android.util.Size
 import androidx.core.graphics.scale
+import com.rngooglemapsplus.mapsLog
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -30,6 +31,7 @@ fun Bitmap.encode(
     } else {
       "data:image/$format;base64," + Base64.encodeToString(bytes, Base64.NO_WRAP)
     }
-  } catch (_: Exception) {
+  } catch (e: Exception) {
+    mapsLog("snapshot export failed", e)
     null
   }

package/ios/GoogleMapViewImpl.swift

@@ -20,7 +20,8 @@ GMSIndoorDisplayDelegate {
   private var pendingCircles: [(id: String, circle: GMSCircle)] = []
   private var pendingHeatmaps: [(id: String, heatmap: GMUHeatmapTileLayer)] = []
   private var pendingKmlLayers: [(id: String, kmlString: String)] = []
-  private var pendingUrlTileOverlays: [(id: String, urlTileOverlay: GMSURLTileLayer)] = []
+  private var pendingUrlTileOverlays:
+    [(id: String, urlTileOverlay: GMSURLTileLayer)] = []
 
   private var markersById: [String: GMSMarker] = [:]
   private var polylinesById: [String: GMSPolyline] = [:]
@@ -1004,11 +1005,10 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, markerInfoWindow marker: GMSMarker) -> UIView? {
-    return markerBuilder.buildInfoWindow(iconSvg: marker.tagData.iconSvg)
+    return markerBuilder.buildInfoWindow(markerTag: marker.tagData)
   }
 
-  func mapView(_ mapView: GMSMapView, markerInfoContents marker: GMSMarker)
-  -> UIView? {
+  func mapView(_ mapView: GMSMapView, markerInfoContents marker: GMSMarker) -> UIView? {
     return nil
   }
 }

package/ios/MapHelper.swift

@@ -33,3 +33,17 @@ func onMain(
     }
   }
 }
+
+@inline(__always)
+func mapsLog(_ message: String) {
+  NSLog("[react-native-google-maps-plus] %@", message)
+}
+
+@inline(__always)
+func mapsLog(_ message: String, _ error: Error) {
+  NSLog(
+    "[react-native-google-maps-plus] %@ | %@",
+    message,
+    String(describing: error)
+  )
+}

package/ios/MapMarkerBuilder.swift

@@ -10,6 +10,10 @@ final class MapMarkerBuilder {
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
 
+  init() {
+    warmupSVGKit()
+  }
+
   func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
     let marker = GMSMarker(
       position: m.coordinate.toCLLocationCoordinate2D()
@@ -154,7 +158,7 @@ final class MapMarkerBuilder {
   ) {
     tasks[m.id]?.cancel()
 
-    if m.iconSvg == nil {
+    guard let iconSvg = m.iconSvg else {
       onReady(nil)
       return
     }
@@ -173,14 +177,24 @@ final class MapMarkerBuilder {
         Task { @MainActor in self.tasks.removeValue(forKey: m.id) }
       }
 
-      let img = self.renderUIImage(m, scale)
-      guard let img, !Task.isCancelled else { return }
+      let renderResult = self.renderUIImage(iconSvg, m.id, scale)
+      guard !Task.isCancelled else { return }
 
-      self.iconCache.setObject(img, forKey: key)
+      guard let renderResult = renderResult else {
+        await MainActor.run {
+          guard !Task.isCancelled else { return }
+          onReady(self.createFallbackUIImage())
+        }
+        return
+      }
+
+      if !renderResult.isFallback {
+        self.iconCache.setObject(renderResult.image, forKey: key)
+      }
 
       await MainActor.run {
         guard !Task.isCancelled else { return }
-        onReady(img)
+        onReady(renderResult.image)
       }
     }
 
@@ -202,27 +216,36 @@ final class MapMarkerBuilder {
     CATransaction.flush()
   }
 
-  func buildInfoWindow(iconSvg: RNMarkerSvg?) -> UIImageView? {
-    guard let iconSvg = iconSvg else {
+  func buildInfoWindow(markerTag: MarkerTag) -> UIImageView? {
+    guard let iconSvg = markerTag.iconSvg else {
       return nil
     }
 
+    let w = CGFloat(iconSvg.width)
+    let h = CGFloat(iconSvg.height)
+
+    if w <= 0 || h <= 0 {
+      mapsLog("markerId=\(markerTag.id) icon: invalid svg size")
+      return createFallbackImageView()
+    }
+
     guard let data = iconSvg.svgString.data(using: .utf8),
           let svgImg = SVGKImage(data: data)
     else {
-      return nil
+      mapsLog("markerId=\(markerTag.id) infoWindow: svg utf8 decode failed")
+      return createFallbackImageView()
     }
 
-    let size = CGSize(
-      width: max(1, CGFloat(iconSvg.width)),
-      height: max(1, CGFloat(iconSvg.height))
-    )
+    let size = CGSize(width: w, height: h)
 
     svgImg.size = size
 
     guard let finalImage = SVGKExporterUIImage.export(asUIImage: svgImg) else {
+      mapsLog(
+        "markerId=\(markerTag.id) infoWindow: svg export to UIImage failed"
+      )
       svgImg.clear()
-      return nil
+      return createFallbackImageView()
     }
     svgImg.clear()
 
@@ -234,21 +257,63 @@ final class MapMarkerBuilder {
     return imageView
   }
 
-  private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) -> UIImage? {
+  private func warmupSVGKit() {
+    autoreleasepool {
+      let emptySvg = """
+      <svg xmlns="http://www.w3.org/2000/svg" width="1" height="1"></svg>
+      """
+      guard let data = emptySvg.data(using: .utf8),
+            let svgImg = SVGKImage(data: data)
+      else { return }
+      svgImg.clear()
+    }
+  }
+
+  private func createFallbackUIImage() -> UIImage {
+    let size = CGSize(width: 1, height: 1)
+    let renderer = UIGraphicsImageRenderer(size: size)
+    return renderer.image { _ in }
+  }
+
+  private func createFallbackImageView() -> UIImageView {
+    let iv = UIImageView(image: createFallbackUIImage())
+    iv.contentMode = .scaleAspectFit
+    iv.backgroundColor = .clear
+    return iv
+  }
+
+  private func renderUIImage(
+    _ iconSvg: RNMarkerSvg,
+    _ markerId: String,
+    _ scale: CGFloat
+  ) -> (
+    image: UIImage, isFallback: Bool
+  )? {
+
+    let w = CGFloat(iconSvg.width)
+    let h = CGFloat(iconSvg.height)
+
+    if w <= 0 || h <= 0 {
+      mapsLog("markerId=\(markerId) icon: invalid svg size")
+      return (createFallbackUIImage(), true)
+    }
+
     guard
-      let iconSvg = m.iconSvg,
       let data = iconSvg.svgString.data(using: .utf8)
-    else { return nil }
-    print("Is main thread:", Thread.isMainThread)
+    else {
+      mapsLog("markerId=\(markerId) icon: svg utf8 decode failed")
+      return (createFallbackUIImage(), true)
+    }
 
-    let size = CGSize(
-      width: max(1, CGFloat(iconSvg.width)),
-      height: max(1, CGFloat(iconSvg.height))
-    )
+    let size = CGSize(width: w, height: h)
 
-    return autoreleasepool { () -> UIImage? in
+    return autoreleasepool { () -> (image: UIImage, isFallback: Bool)? in
       guard !Task.isCancelled else { return nil }
-      guard let svgImg = SVGKImage(data: data) else { return nil }
+
+      guard let svgImg = SVGKImage(data: data) else {
+        mapsLog("markerId=\(markerId) icon: SVGKImage init failed")
+        return (createFallbackUIImage(), true)
+      }
 
       svgImg.size = size
 
@@ -259,8 +324,14 @@ final class MapMarkerBuilder {
 
       let uiImage = SVGKExporterUIImage.export(asUIImage: svgImg)
       svgImg.clear()
-      return uiImage
+
+      guard !Task.isCancelled else { return nil }
+
+      if let uiImage = uiImage {
+        return (uiImage, false)
+      } else {
+        return (createFallbackUIImage(), true)
+      }
     }
   }
-
 }

package/ios/extensions/UIImage+Extension.swift

@@ -35,6 +35,7 @@ extension UIImage {
         try imageData.write(to: fileURL)
         return fileURL.path
       } catch {
+        mapsLog("snapshot write failed", error)
         return nil
       }
     } else {

package/package.json

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