fix : #93

note11g · May 16, 2023 · 5e5ff80 · 5e5ff80
1 parent 1bc039f
commit 5e5ff80
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/ios/Classes/controller/NaverMapController.swift b/ios/Classes/controller/NaverMapController.swift
@@ -111,6 +111,7 @@ internal class NaverMapController: NaverMapControlSender, NaverMapControlHandler
 
     func setLocationTrackingMode(locationTrackingMode: NMFMyPositionMode, onSuccess: @escaping (Any?) -> ()) {
         mapView.positionMode = locationTrackingMode
+        onSuccess(nil)
     }
 
     func getLocationTrackingMode(onSuccess: @escaping (String) -> ()) {

diff --git a/ios/Classes/controller/overlay/OverlayController.swift b/ios/Classes/controller/overlay/OverlayController.swift
@@ -184,7 +184,11 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setIcon(_ overlay: NMFLocationOverlay, rawNOverlayImage: Any) {
-        overlay.icon = NOverlayImage.fromMessageable(rawNOverlayImage).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawNOverlayImage)
+        nOverlayImage.applyToOverlay { (image, size) in
+            overlay.icon = image
+            size?.use(widthFun: { overlay.iconWidth = $0 }, heightFun: { overlay.iconHeight = $0 })
+        }
     }
 
     func setIconSize(_ overlay: NMFLocationOverlay, rawSize: Any) {
@@ -206,7 +210,11 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setSubIcon(_ overlay: NMFLocationOverlay, rawNOverlayImage: Any) {
-        overlay.subIcon = NOverlayImage.fromMessageable(rawNOverlayImage).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawNOverlayImage)
+        nOverlayImage.applyToOverlay { (image, size) in
+            overlay.subIcon = image
+            size?.use(widthFun: { overlay.subIconWidth = $0 }, heightFun: { overlay.subIconHeight = $0 })
+        }
     }
 
     func setSubIconSize(_ overlay: NMFLocationOverlay, rawSize: Any) {
@@ -234,7 +242,11 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setIcon(_ marker: NMFMarker, rawIcon: Any) {
-        marker.iconImage = NOverlayImage.fromMessageable(rawIcon).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawIcon)
+        nOverlayImage.applyToOverlay { (image, size) in
+            marker.iconImage = image
+            size?.use(widthFun: { marker.width = $0 }, heightFun: { marker.height = $0 })
+        }
     }
 
     func setIconTintColor(_ marker: NMFMarker, rawIconTintColor: Any) {
@@ -381,7 +393,8 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setImage(_ groundOverlay: NMFGroundOverlay, rawNOverlayImage: Any) {
-        groundOverlay.overlayImage = NOverlayImage.fromMessageable(rawNOverlayImage).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawNOverlayImage)
+        nOverlayImage.applyToOverlay { (image, size) in groundOverlay.overlayImage = image }
     }
 
     func setAlpha(_ groundOverlay: NMFGroundOverlay, rawAlpha: Any) {
@@ -483,7 +496,10 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setPatternImage(_ pathOverlay: NMFPath, rawNOverlayImage: Any) {
-        pathOverlay.patternIcon = NOverlayImage.fromMessageable(rawNOverlayImage).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawNOverlayImage)
+        nOverlayImage.applyToOverlay { (image, size) in
+            pathOverlay.patternIcon = image
+        }
     }
 
     func setPatternInterval(_ pathOverlay: NMFPath, rawInterval: Any) {
@@ -526,7 +542,10 @@ internal class OverlayController: OverlaySender, OverlayHandler, ArrowheadPathOv
     }
 
     func setPatternImage(_ multipartPathOverlay: NMFMultipartPath, rawNOverlayImage: Any) {
-        multipartPathOverlay.patternIcon = NOverlayImage.fromMessageable(rawNOverlayImage).overlayImage
+        let nOverlayImage = NOverlayImage.fromMessageable(rawNOverlayImage)
+        nOverlayImage.applyToOverlay { (image, size) in
+            multipartPathOverlay.patternIcon = image
+        }
     }
 
     func setPatternInterval(_ multipartPathOverlay: NMFMultipartPath, rawInterval: Any) {