react-native-google-maps-plus 1.7.0-dev.15 → 1.7.0-dev.16

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

@@ -77,7 +77,10 @@ class MapMarkerBuilder(
                 val height = (svg.documentHeight.takeIf { it > 0 } ?: 128f).toInt()
 
                 createBitmap(width, height).apply {
-                  Canvas(this).also(svg::renderToCanvas)
+                  density = context.resources.displayMetrics.densityDpi
+                  Canvas(this).also {
+                    svg.renderToCanvas(it)
+                  }
                 }
               }
 
@@ -98,10 +101,12 @@ class MapMarkerBuilder(
                     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
+                    createBitmap(w.toInt(), h.toInt()).apply {
+                      density = context.resources.displayMetrics.densityDpi
+                      Canvas(this).also {
+                        innerSvg.renderToCanvas(it)
+                      }
+                    }
                   } else {
                     conn.inputStream.use { BitmapFactory.decodeStream(it) }
                   }
@@ -328,27 +333,28 @@ class MapMarkerBuilder(
       coroutineContext.ensureActive()
       val svg = SVG.getFromString(m.iconSvg.svgString)
 
-      coroutineContext.ensureActive()
-      svg.setDocumentWidth(m.iconSvg.width.dpToPx())
-      svg.setDocumentHeight(m.iconSvg.height.dpToPx())
+      val wPx =
+        m.iconSvg.width
+          .dpToPx()
+          .toInt()
+      val hPx =
+        m.iconSvg.height
+          .dpToPx()
+          .toInt()
 
       coroutineContext.ensureActive()
-      bmp =
-        createBitmap(
-          m.iconSvg.width
-            .dpToPx()
-            .toInt(),
-          m.iconSvg.height
-            .dpToPx()
-            .toInt(),
-          Bitmap.Config.ARGB_8888,
-        )
+      svg.setDocumentWidth(wPx.toFloat())
+      svg.setDocumentHeight(hPx.toFloat())
 
       coroutineContext.ensureActive()
-      val canvas = Canvas(bmp)
-      svg.renderToCanvas(canvas)
+      bmp =
+        createBitmap(wPx, hPx, Bitmap.Config.ARGB_8888).apply {
+          density = context.resources.displayMetrics.densityDpi
+          Canvas(this).also {
+            svg.renderToCanvas(it)
+          }
+        }
 
-      coroutineContext.ensureActive()
       return bmp
     } catch (t: Throwable) {
       try {

package/ios/GoogleMapViewImpl.swift

@@ -444,7 +444,10 @@ GMSIndoorDisplayDelegate {
 
   @MainActor
   func removeMarker(id: String) {
-    markersById.removeValue(forKey: id).map { $0.map = nil }
+    markersById.removeValue(forKey: id).map {
+      $0.icon = nil
+      $0.map = nil
+    }
   }
 
   @MainActor

package/ios/MapMarkerBuilder.swift

@@ -51,8 +51,7 @@ final class MapMarkerBuilder {
     }
 
     if !prev.markerStyleEquals(next) {
-      buildIconAsync(next.id, next) { img in
-        m.tracksViewChanges = true
+      buildIconAsync(next) { img in
         m.icon = img
 
         if !prev.anchorEquals(next) {
@@ -69,9 +68,9 @@ final class MapMarkerBuilder {
           )
         }
 
-        onMainAsync { [weak m] in
-          try? await Task.sleep(nanoseconds: 250_000_000)
-          m?.tracksViewChanges = false
+        m.tracksViewChanges = true
+        DispatchQueue.main.async {
+          m.tracksViewChanges = false
         }
       }
     } else {
@@ -102,11 +101,10 @@ final class MapMarkerBuilder {
       m.snippet = next.snippet
     }
 
-    if(tracksInfoWindowChanges) {
+    if tracksInfoWindowChanges {
       m.tracksInfoWindowChanges = true
-      onMainAsync { [weak m] in
-        try? await Task.sleep(nanoseconds: 250_000_000)
-        m?.tracksInfoWindowChanges = false
+      DispatchQueue.main.async {
+        m.tracksInfoWindowChanges = false
       }
     }
 
@@ -140,7 +138,6 @@ final class MapMarkerBuilder {
     }
   }
 
-  @MainActor
   func buildIconAsync(
     _ m: RNMarker,
     onReady: @escaping (UIImage?) -> Void
@@ -158,18 +155,24 @@ final class MapMarkerBuilder {
       return
     }
 
+    let scale = UIScreen.main.scale
+
     let task = Task(priority: .userInitiated) { [weak self] in
       guard let self else { return }
-      defer { self.tasks.removeValue(forKey: m.id) }
+      defer {
+        Task { @MainActor in self.tasks.removeValue(forKey: m.id) }
+      }
 
-      let scale = UIScreen.main.scale
-      let img = await self.renderUIImage(m, scale)
+      let img = self.renderUIImage(m, scale)
       guard let img, !Task.isCancelled else { return }
 
       self.iconCache.setObject(img, forKey: key)
 
       await MainActor.run {
         guard !Task.isCancelled else { return }
+      }
+
+      Task { @MainActor in
         onReady(img)
       }
     }
@@ -212,18 +215,11 @@ final class MapMarkerBuilder {
 
     svgImg.size = size
 
-    guard let base = svgImg.uiImage else {
+    guard let finalImage = SVGKExporterUIImage.export(asUIImage: svgImg) else {
+      svgImg.clear()
       return nil
     }
-
-    let fmt = UIGraphicsImageRendererFormat.default()
-    fmt.opaque = false
-    fmt.scale = UIScreen.main.scale
-    let renderer = UIGraphicsImageRenderer(size: size, format: fmt)
-
-    let finalImage = renderer.image { _ in
-      base.draw(in: CGRect(origin: .zero, size: size))
-    }
+    svgImg.clear()
 
     let imageView = UIImageView(image: finalImage)
     imageView.frame = CGRect(origin: .zero, size: size)
@@ -233,10 +229,10 @@ final class MapMarkerBuilder {
     return imageView
   }
 
-  @MainActor
-  private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
-    guard let iconSvg = m.iconSvg,
-          let data = iconSvg.svgString.data(using: .utf8)
+  private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) -> UIImage? {
+    guard
+      let iconSvg = m.iconSvg,
+      let data = iconSvg.svgString.data(using: .utf8)
     else { return nil }
 
     let size = CGSize(
@@ -244,28 +240,21 @@ final class MapMarkerBuilder {
       height: max(1, CGFloat(iconSvg.height))
     )
 
-    return await Task.detached(priority: .userInitiated) {
-      autoreleasepool {
-        guard let svgImg = SVGKImage(data: data) else { return nil }
-        svgImg.size = size
+    return autoreleasepool { () -> UIImage? in
+      guard !Task.isCancelled else { return nil }
+      guard let svgImg = SVGKImage(data: data) else { return nil }
 
-        guard !Task.isCancelled else { return nil }
-        guard let base = svgImg.uiImage else { return nil }
+      svgImg.size = size
 
-        if let cg = base.cgImage {
-          return UIImage(cgImage: cg, scale: scale, orientation: .up)
-        }
-        guard !Task.isCancelled else { return nil }
-        let fmt = UIGraphicsImageRendererFormat.default()
-        fmt.opaque = false
-        fmt.scale = scale
-        guard !Task.isCancelled else { return nil }
-        let renderer = UIGraphicsImageRenderer(size: size, format: fmt)
-        return renderer.image { _ in
-          base.draw(in: CGRect(origin: .zero, size: size))
-        }
+      guard !Task.isCancelled else {
+        svgImg.clear()
+        return nil
       }
-    }.value
+
+      let uiImage = SVGKExporterUIImage.export(asUIImage: svgImg)
+      svgImg.clear()
+      return uiImage
+    }
   }
 
 }

package/ios/RNGoogleMapsPlusView.swift

@@ -141,12 +141,14 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
         for (id, next) in nextById {
           if let prev = prevById[id] {
             if !prev.markerEquals(next) {
-              self.impl.updateMarker(id: id) { m in
+              self.impl.updateMarker(id: id) { [weak self] m in
+                guard let self else { return }
                 self.markerBuilder.update(prev, next, m)
               }
             }
           } else {
-            self.markerBuilder.buildIconAsync(next) { icon in
+            self.markerBuilder.buildIconAsync(next) { [weak self] icon in
+              guard let self else { return }
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }
@@ -174,7 +176,8 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       for (id, next) in nextById {
         if let prev = prevById[id] {
           if !prev.polylineEquals(next) {
-            impl.updatePolyline(id: id) { pl in
+            impl.updatePolyline(id: id) { [weak self] pl in
+              guard let self else { return }
               self.polylineBuilder.update(prev, next, pl)
             }
           }
@@ -206,7 +209,8 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       for (id, next) in nextById {
         if let prev = prevById[id] {
           if !prev.polygonEquals(next) {
-            impl.updatePolygon(id: id) { pg in
+            impl.updatePolygon(id: id) { [weak self] pg in
+              guard let self else { return }
               self.polygonBuilder.update(prev, next, pg)
             }
           }
@@ -235,7 +239,8 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       for (id, next) in nextById {
         if let prev = prevById[id] {
           if !prev.circleEquals(next) {
-            impl.updateCircle(id: id) { circle in
+            impl.updateCircle(id: id) { [weak self] circle in
+              guard let self else { return }
               self.circleBuilder.update(prev, next, circle)
             }
           }
@@ -422,12 +427,12 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
 
   @MainActor
   func showMarkerInfoWindow(id: String) {
-    impl.showMarkerInfoWindow(id: id);
+    impl.showMarkerInfoWindow(id: id)
   }
 
   @MainActor
   func hideMarkerInfoWindow(id: String) {
-    impl.hideMarkerInfoWindow(id: id);
+    impl.hideMarkerInfoWindow(id: id)
   }
 
   @MainActor

package/ios/extensions/SVGKImage+Extension.swift

@@ -0,0 +1,22 @@
+import SVGKit
+
+extension SVGKImage {
+  @inline(__always)
+  func clear() {
+    caLayerTree?.sublayers?.forEach { $0.removeFromSuperlayer() }
+    if let layer = caLayerTree {
+      layer.sublayers?.forEach { $0.removeFromSuperlayer() }
+      layer.removeFromSuperlayer()
+    }
+
+    if let dom = domDocument {
+      dom.childNodes = nil
+    }
+
+    if let root = domTree {
+      root.childNodes = nil
+    }
+
+    caLayerTree.sublayers?.removeAll()
+  }
+}

package/package.json

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