Remove screen coordinate scaling on iOS

evil159 · evil159 · commit 4fd78f5af79f · 2023-10-17T14:53:07.000+03:00
diff --git a/ios/Classes/AttributionController.swift b/ios/Classes/AttributionController.swift
@@ -8,16 +8,16 @@ class AttributionController: NSObject, FLT_SETTINGSAttributionSettingsInterface
         switch settings.position?.value {
         case .BOTTOM_LEFT:
             attributionButton.position = .bottomLeading
-            attributionButton.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            attributionButton.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .BOTTOM_RIGHT, .none:
             attributionButton.position = .bottomTrailing
-            attributionButton.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            attributionButton.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .TOP_LEFT:
             attributionButton.position = .topLeading
-            attributionButton.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            attributionButton.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         case .TOP_RIGHT:
             attributionButton.position = .topTrailing
-            attributionButton.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            attributionButton.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         }
 
         mapView.ornaments.options.attributionButton = attributionButton
@@ -35,10 +35,10 @@ class AttributionController: NSObject, FLT_SETTINGSAttributionSettingsInterface
         let settings = FLT_SETTINGSAttributionSettings.make(
             withIconColor: NSNumber(value: iconColor),
             position: .init(value: position),
-            marginLeft: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginTop: NSNumber(value: options.margins.y * UIScreen.main.scale),
-            marginRight: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginBottom: NSNumber(value: options.margins.y * UIScreen.main.scale),
+            marginLeft: NSNumber(value: options.margins.x),
+            marginTop: NSNumber(value: options.margins.y),
+            marginRight: NSNumber(value: options.margins.x),
+            marginBottom: NSNumber(value: options.margins.y),
             clickable: nil)
 
         return settings
diff --git a/ios/Classes/CompassController.swift b/ios/Classes/CompassController.swift
@@ -8,16 +8,16 @@ class CompassController: NSObject, FLT_SETTINGSCompassSettingsInterface {
         switch settings.position?.value {
         case .BOTTOM_LEFT:
             compass.position = .bottomLeading
-            compass.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            compass.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .BOTTOM_RIGHT:
             compass.position = .bottomTrailing
-            compass.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            compass.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .TOP_LEFT:
             compass.position = .topLeading
-            compass.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            compass.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         case .TOP_RIGHT, .none:
             compass.position = .topTrailing
-            compass.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            compass.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         }
 
         if let data = settings.image?.data {
@@ -64,10 +64,10 @@ class CompassController: NSObject, FLT_SETTINGSCompassSettingsInterface {
         let settings = FLT_SETTINGSCompassSettings.make(
             withEnabled: true,
             position: .init(value: position),
-            marginLeft: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginTop: NSNumber(value: options.margins.y * UIScreen.main.scale),
-            marginRight: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginBottom: NSNumber(value: options.margins.y * UIScreen.main.scale),
+            marginLeft: NSNumber(value: options.margins.x),
+            marginTop: NSNumber(value: options.margins.y),
+            marginRight: NSNumber(value: options.margins.x),
+            marginBottom: NSNumber(value: options.margins.y),
             opacity: NSNumber(value: 0.0),
             rotation: NSNumber(value: 0.0),
             visibility: visibility,
diff --git a/ios/Classes/Extensions.swift b/ios/Classes/Extensions.swift
@@ -114,10 +114,10 @@ extension FLTTransitionOptions {
 extension FLTMbxEdgeInsets {
     func toUIEdgeInsets() -> UIEdgeInsets {
         return UIEdgeInsets(
-            top: self.top.doubleValue / UIScreen.main.scale,
-            left: self.left.doubleValue / UIScreen.main.scale,
-            bottom: self.bottom.doubleValue / UIScreen.main.scale,
-            right: self.right.doubleValue / UIScreen.main.scale)
+            top: self.top.doubleValue,
+            left: self.left.doubleValue,
+            bottom: self.bottom.doubleValue,
+            right: self.right.doubleValue)
     }
 }
 
@@ -218,10 +218,10 @@ extension CameraOptions {
     func toFLTCameraOptions() -> FLTCameraOptions {
         let center = self.center != nil ? self.center?.toDict(): nil
         let padding = self.padding != nil ? FLTMbxEdgeInsets.make(
-            withTop: NSNumber(value: self.padding!.top * UIScreen.main.scale),
-            left: NSNumber(value: self.padding!.left * UIScreen.main.scale),
-            bottom: NSNumber(value: self.padding!.bottom * UIScreen.main.scale),
-            right: NSNumber(value: self.padding!.right * UIScreen.main.scale)) : nil
+            withTop: NSNumber(value: self.padding!.top),
+            left: NSNumber(value: self.padding!.left),
+            bottom: NSNumber(value: self.padding!.bottom),
+            right: NSNumber(value: self.padding!.right)) : nil
 
         let anchor = self.anchor != nil ? FLTScreenCoordinate.makeWith(x: self.anchor!.x as NSNumber, y: self.anchor!.y as NSNumber) : nil
         let zoom = self.zoom != nil ? NSNumber(value: self.zoom!) : nil
diff --git a/ios/Classes/LogoController.swift b/ios/Classes/LogoController.swift
@@ -7,16 +7,16 @@ class LogoController: NSObject, FLT_SETTINGSLogoSettingsInterface {
         switch settings.position?.value {
         case .BOTTOM_LEFT, .none:
             logo.position = .bottomLeading
-            logo.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            logo.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .BOTTOM_RIGHT:
             logo.position = .bottomTrailing
-            logo.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            logo.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .TOP_LEFT:
             logo.position = .topLeading
-            logo.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            logo.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         case .TOP_RIGHT:
             logo.position = .topTrailing
-            logo.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            logo.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         }
 
         mapView.ornaments.options.logo = logo
@@ -27,10 +27,10 @@ class LogoController: NSObject, FLT_SETTINGSLogoSettingsInterface {
         let position = getFLT_SETTINGSOrnamentPosition(position: options.position)
         let settings = FLT_SETTINGSLogoSettings.make(
             withPosition: .init(value: position),
-            marginLeft: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginTop: NSNumber(value: options.margins.y * UIScreen.main.scale),
-            marginRight: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginBottom: NSNumber(value: options.margins.y * UIScreen.main.scale)
+            marginLeft: NSNumber(value: options.margins.x),
+            marginTop: NSNumber(value: options.margins.y),
+            marginRight: NSNumber(value: options.margins.x),
+            marginBottom: NSNumber(value: options.margins.y)
         )
         return settings
     }
diff --git a/ios/Classes/MapboxMapFactory.swift b/ios/Classes/MapboxMapFactory.swift
@@ -114,10 +114,10 @@ class MapboxMapFactory: NSObject, FlutterPlatformViewFactory {
 
             if let paddingMap = cameraOptionsMap[1] as? [CGFloat] {
                 padding = UIEdgeInsets(
-                    top: paddingMap[0] / UIScreen.main.scale,
-                    left: paddingMap[1] / UIScreen.main.scale,
-                    bottom: paddingMap[2] / UIScreen.main.scale,
-                    right: paddingMap[3] / UIScreen.main.scale
+                    top: paddingMap[0],
+                    left: paddingMap[1],
+                    bottom: paddingMap[2],
+                    right: paddingMap[3]
                 )
             }
 
diff --git a/ios/Classes/ScalebarController.swift b/ios/Classes/ScalebarController.swift
@@ -8,16 +8,16 @@ class ScaleBarController: NSObject, FLT_SETTINGSScaleBarSettingsInterface {
         switch settings.position?.value {
         case .BOTTOM_LEFT:
             scaleBar.position = .bottomLeading
-            scaleBar.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            scaleBar.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .BOTTOM_RIGHT:
             scaleBar.position = .bottomTrailing
-            scaleBar.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginBottom?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            scaleBar.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginBottom?.CGFloat ?? 0.0)
         case .TOP_LEFT, .none:
             scaleBar.position = .topLeading
-            scaleBar.margins = CGPoint(x: (settings.marginLeft?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            scaleBar.margins = CGPoint(x: settings.marginLeft?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         case .TOP_RIGHT:
             scaleBar.position = .topTrailing
-            scaleBar.margins = CGPoint(x: (settings.marginRight?.CGFloat ?? 0.0)/UIScreen.main.scale, y: (settings.marginTop?.CGFloat ?? 0.0)/UIScreen.main.scale)
+            scaleBar.margins = CGPoint(x: settings.marginRight?.CGFloat ?? 0.0, y: settings.marginTop?.CGFloat ?? 0.0)
         }
         if let isMetric = settings.isMetricUnits?.boolValue {
             scaleBar.useMetricUnits = isMetric
@@ -36,10 +36,10 @@ class ScaleBarController: NSObject, FLT_SETTINGSScaleBarSettingsInterface {
         let settings = FLT_SETTINGSScaleBarSettings.make(
             withEnabled: NSNumber(value: mapView.ornaments.options.scaleBar.visibility != OrnamentVisibility.hidden),
             position: .init(value: position),
-            marginLeft: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginTop: NSNumber(value: options.margins.y * UIScreen.main.scale),
-            marginRight: NSNumber(value: options.margins.x * UIScreen.main.scale),
-            marginBottom: NSNumber(value: options.margins.y * UIScreen.main.scale),
+            marginLeft: NSNumber(value: options.margins.x),
+            marginTop: NSNumber(value: options.margins.y),
+            marginRight: NSNumber(value: options.margins.x),
+            marginBottom: NSNumber(value: options.margins.y),
             textColor: nil,
             primaryColor: nil,
             secondaryColor: nil,

Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,10 @@ class MapboxMapFactory: NSObject, FlutterPlatformViewFactory {`
`114`	`114`
`115`	`115`	`if let paddingMap = cameraOptionsMap[1] as? [CGFloat] {`
`116`	`116`	`padding = UIEdgeInsets(`
`117`		`- top: paddingMap[0] / UIScreen.main.scale,`
`118`		`- left: paddingMap[1] / UIScreen.main.scale,`
`119`		`- bottom: paddingMap[2] / UIScreen.main.scale,`
`120`		`- right: paddingMap[3] / UIScreen.main.scale`
	`117`	`+ top: paddingMap[0],`
	`118`	`+ left: paddingMap[1],`
	`119`	`+ bottom: paddingMap[2],`
	`120`	`+ right: paddingMap[3]`
`121`	`121`	`)`
`122`	`122`	`}`
`123`	`123`