Merge pull request #452 from ivpn/bugfix/map-marker-disappears

[iOS 18] Location marker disappears after app wakes up from background
ivpn · Sep 17, 2024 · 65dabaf · 65dabaf
2 parents 0fafc06 + 885fd1b
commit 65dabaf
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/IVPNClient/Scenes/MainScreen/Map/MapScrollView.swift b/IVPNClient/Scenes/MainScreen/Map/MapScrollView.swift
@@ -118,6 +118,9 @@ class MapScrollView: UIScrollView {
     func updateMapMarkers() {
         markerLocalView.updateView()
         markerGatewayView.updateView()
+        if let viewModel = viewModel {
+            updateMapPosition(viewModel: viewModel, animated: true)
+        }
     }
 
     func updateMapPosition(latitude: Double, longitude: Double, animated: Bool = false, isLocalPosition: Bool, updateMarkers: Bool = true) {
@@ -136,7 +139,7 @@ class MapScrollView: UIScrollView {
         }
 
         if updateMarkers {
-            updateMarkerPosition(x: point.0 - 49, y: point.1 - 49, isLocalPosition: isLocalPosition)
+            updateMarkerPosition(x: point.0, y: point.1, isLocalPosition: isLocalPosition)
         }
 
         currentCoordinates = (latitude, longitude)
@@ -249,7 +252,7 @@ class MapScrollView: UIScrollView {
 
     private func updateMarkerPosition(x: Double, y: Double, isLocalPosition: Bool) {
         if isLocalPosition {
-            markerLocalView.snp.updateConstraints { make in
+            markerLocalView.snp.remakeConstraints { make in
                 make.left.equalTo(x)
                 make.top.equalTo(y)
             }
@@ -258,7 +261,7 @@ class MapScrollView: UIScrollView {
                 self.layoutIfNeeded()
             }
         } else {
-            markerGatewayView.snp.updateConstraints { make in
+            markerGatewayView.snp.remakeConstraints { make in
                 make.left.equalTo(x)
                 make.top.equalTo(y)
             }