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

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/LocationHandler.swift

@@ -35,6 +35,8 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
 
   func showLocationDialog() {
     onMainAsync { [weak self] in
+      guard let self = self else { return }
+
       guard let vc = Self.topMostViewController() else { return }
       let title =
         Bundle.main.object(forInfoDictionaryKey: "LocationNotAvailableTitle")
@@ -61,7 +63,7 @@ final class LocationHandler: NSObject, CLLocationManagerDelegate {
           title: openLocationSettingsButton ?? "Open settings",
           style: .default
         ) { _ in
-          self?.openLocationSettings()
+          self.openLocationSettings()
         }
       )
       vc.present(alert, animated: true, completion: nil)

package/ios/MapHelper.swift

@@ -32,11 +32,9 @@ func onMain(_ block: @escaping @MainActor () -> Void) {
 
 @inline(__always)
 func onMainAsync(
-  _ block: @MainActor @escaping () async -> Void
+  _ block: @escaping @MainActor () async -> Void
 ) {
-  if Thread.isMainThread {
-    Task { @MainActor in await block() }
-  } else {
-    Task { @MainActor in await block() }
+  Task { @MainActor in
+    await block()
   }
 }

package/ios/MapMarkerBuilder.swift

@@ -46,15 +46,35 @@ final class MapMarkerBuilder {
 
   @MainActor
   func update(_ prev: RNMarker, _ next: RNMarker, _ m: GMSMarker) {
-    if !prev.coordinateEquals(next) {
-      m.position = next.coordinate.toCLLocationCoordinate2D()
-    }
+    withCATransaction(disableActions: true) {
+
+      var tracksViewChanges = false
+      var tracksInfoWindowChanges = false
 
-    if !prev.markerStyleEquals(next) {
-      buildIconAsync(next.id, next) { img in
-        m.tracksViewChanges = true
-        m.icon = img
+      if !prev.coordinateEquals(next) {
+        m.position = next.coordinate.toCLLocationCoordinate2D()
+      }
 
+      if !prev.markerStyleEquals(next) {
+        self.buildIconAsync(next) { img in
+          tracksViewChanges = true
+          m.icon = img
+
+          if !prev.anchorEquals(next) {
+            m.groundAnchor = CGPoint(
+              x: next.anchor?.x ?? 0.5,
+              y: next.anchor?.y ?? 1
+            )
+          }
+
+          if !prev.infoWindowAnchorEquals(next) {
+            m.infoWindowAnchor = CGPoint(
+              x: next.infoWindowAnchor?.x ?? 0.5,
+              y: next.infoWindowAnchor?.y ?? 0
+            )
+          }
+        }
+      } else {
         if !prev.anchorEquals(next) {
           m.groundAnchor = CGPoint(
             x: next.anchor?.x ?? 0.5,
@@ -68,79 +88,70 @@ final class MapMarkerBuilder {
             y: next.infoWindowAnchor?.y ?? 0
           )
         }
-
-        onMainAsync { [weak m] in
-          try? await Task.sleep(nanoseconds: 250_000_000)
-          m?.tracksViewChanges = false
-        }
       }
-    } else {
-      if !prev.anchorEquals(next) {
-        m.groundAnchor = CGPoint(
-          x: next.anchor?.x ?? 0.5,
-          y: next.anchor?.y ?? 1
-        )
+
+      if prev.title != next.title {
+        tracksInfoWindowChanges = true
+        m.title = next.title
       }
 
-      if !prev.infoWindowAnchorEquals(next) {
-        m.infoWindowAnchor = CGPoint(
-          x: next.infoWindowAnchor?.x ?? 0.5,
-          y: next.infoWindowAnchor?.y ?? 0
-        )
+      if prev.snippet != next.snippet {
+        tracksInfoWindowChanges = true
+        m.snippet = next.snippet
       }
-    }
 
-    var tracksInfoWindowChanges = false
+      if prev.opacity != next.opacity {
+        let opacity = Float(next.opacity ?? 1)
+        m.opacity = opacity
+        m.iconView?.alpha = CGFloat(opacity)
+      }
 
-    if prev.title != next.title {
-      tracksInfoWindowChanges = true
-      m.title = next.title
-    }
+      if prev.flat != next.flat {
+        m.isFlat = next.flat ?? false
+      }
 
-    if prev.snippet != next.snippet {
-      tracksInfoWindowChanges = true
-      m.snippet = next.snippet
-    }
+      if prev.draggable != next.draggable {
+        m.isDraggable = next.draggable ?? false
+      }
 
-    if(tracksInfoWindowChanges) {
-      m.tracksInfoWindowChanges = true
-      onMainAsync { [weak m] in
-        try? await Task.sleep(nanoseconds: 250_000_000)
-        m?.tracksInfoWindowChanges = false
+      if prev.rotation != next.rotation {
+        m.rotation = next.rotation ?? 0
       }
-    }
 
-    if prev.opacity != next.opacity {
-      let opacity = Float(next.opacity ?? 1)
-      m.opacity = opacity
-      m.iconView?.alpha = CGFloat(opacity)
-    }
+      if prev.zIndex != next.zIndex {
+        m.zIndex = Int32(next.zIndex ?? 0)
+      }
 
-    if prev.flat != next.flat {
-      m.isFlat = next.flat ?? false
-    }
+      if !prev.markerInfoWindowStyleEquals(next) {
+        m.tagData = MarkerTag(
+          id: next.id,
+          iconSvg: next.infoWindowIconSvg
+        )
+      }
 
-    if prev.draggable != next.draggable {
-      m.isDraggable = next.draggable ?? false
-    }
+      if tracksViewChanges {
+        m.tracksViewChanges = tracksViewChanges
+      }
+      if tracksInfoWindowChanges {
+        m.tracksInfoWindowChanges = tracksInfoWindowChanges
+      }
 
-    if prev.rotation != next.rotation {
-      m.rotation = next.rotation ?? 0
-    }
+      if tracksViewChanges || tracksInfoWindowChanges {
+        onMain { [weak m] in
+          guard let m = m else { return }
 
-    if prev.zIndex != next.zIndex {
-      m.zIndex = Int32(next.zIndex ?? 0)
-    }
+          if tracksViewChanges {
+            m.tracksViewChanges = false
+          }
 
-    if !prev.markerInfoWindowStyleEquals(next) {
-      m.tagData = MarkerTag(
-        id: next.id,
-        iconSvg: next.infoWindowIconSvg
-      )
+          if tracksInfoWindowChanges {
+            m.tracksInfoWindowChanges = false
+          }
+        }
+      }
     }
   }
 
-  @MainActor
   func buildIconAsync(
     _ m: RNMarker,
     onReady: @escaping (UIImage?) -> Void
@@ -158,12 +169,15 @@ 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)
@@ -212,18 +226,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 +240,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 +251,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

@@ -131,26 +131,26 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       )
 
       let removed = Set(prevById.keys).subtracting(nextById.keys)
-      withCATransaction(disableActions: true) {
 
-        removed.forEach {
-          self.impl.removeMarker(id: $0)
-          self.markerBuilder.cancelIconTask($0)
-        }
+      removed.forEach {
+        self.impl.removeMarker(id: $0)
+        self.markerBuilder.cancelIconTask($0)
+      }
 
-        for (id, next) in nextById {
-          if let prev = prevById[id] {
-            if !prev.markerEquals(next) {
-              self.impl.updateMarker(id: id) { m in
-                self.markerBuilder.update(prev, next, m)
-              }
-            }
-          } else {
-            self.markerBuilder.buildIconAsync(next) { icon in
-              let marker = self.markerBuilder.build(next, icon: icon)
-              self.impl.addMarker(id: id, marker: marker)
+      for (id, next) in nextById {
+        if let prev = prevById[id] {
+          if !prev.markerEquals(next) {
+            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) { [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 +174,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 +207,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 +237,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 +425,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.17",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",