Merge pull request #280 from mapbox/rl/remove_scaling_on_ios

Match screen units to Flutter

Author: evil159

CHANGELOG.md

@@ -1,3 +1,10 @@
+## main
+
+### Common
+
+* Screen-related units(screen coordinates, dimentions, etc.) are expected to be provided in logical pixels.
+We have matched screen-related units expected by the maps plugin to the units that Flutter operates with(logical pixels).
+
 ## 0.4.5
 ### Common
 

android/src/main/java/com/mapbox/maps/pigeons/FLTGestureListeners.java

@@ -1,17 +1,18 @@
 package com.mapbox.maps.mapbox_maps
 
+import android.content.Context
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.pigeons.FLTMapInterfaces
 import com.mapbox.maps.plugin.animation.*
 
-class AnimationController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._AnimationManager {
+class AnimationController(private val mapboxMap: MapboxMap, private val context: Context) : FLTMapInterfaces._AnimationManager {
   var cancelable: Cancelable? = null
   override fun easeTo(
     cameraOptions: FLTMapInterfaces.CameraOptions,
     mapAnimationOptions: FLTMapInterfaces.MapAnimationOptions?
   ) {
     cancelable = mapboxMap.easeTo(
-      cameraOptions.toCameraOptions(),
+      cameraOptions.toCameraOptions(context),
       mapAnimationOptions?.toMapAnimationOptions()
     )
   }
@@ -21,7 +22,7 @@ class AnimationController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._
     mapAnimationOptions: FLTMapInterfaces.MapAnimationOptions?
   ) {
     cancelable = mapboxMap.flyTo(
-      cameraOptions.toCameraOptions(),
+      cameraOptions.toCameraOptions(context),
       mapAnimationOptions?.toMapAnimationOptions()
     )
   }
@@ -31,7 +32,7 @@ class AnimationController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._
     mapAnimationOptions: FLTMapInterfaces.MapAnimationOptions?
   ) {
     cancelable = mapboxMap.moveBy(
-      screenCoordinate.toScreenCoordinate(),
+      screenCoordinate.toScreenCoordinate(context),
       mapAnimationOptions?.toMapAnimationOptions()
     )
   }
@@ -42,8 +43,8 @@ class AnimationController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._
     mapAnimationOptions: FLTMapInterfaces.MapAnimationOptions?
   ) {
     cancelable = mapboxMap.rotateBy(
-      first.toScreenCoordinate(),
-      second.toScreenCoordinate(),
+      first.toScreenCoordinate(context),
+      second.toScreenCoordinate(context),
       mapAnimationOptions?.toMapAnimationOptions()
     )
   }
@@ -55,7 +56,7 @@ class AnimationController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._
   ) {
     cancelable = mapboxMap.scaleBy(
       amount,
-      screenCoordinate?.toScreenCoordinate(),
+      screenCoordinate?.toScreenCoordinate(context),
       mapAnimationOptions?.toMapAnimationOptions()
     )
   }

android/src/main/java/com/mapbox/maps/pigeons/FLTMapInterfaces.java

@@ -8,7 +8,7 @@ import com.mapbox.maps.plugin.attribution.attribution
 
 class AttributionController(private val mapView: MapView) :
   FLTSettings.AttributionSettingsInterface {
-  override fun getSettings(): FLTSettings.AttributionSettings = mapView.attribution.toFLT()
+  override fun getSettings(): FLTSettings.AttributionSettings = mapView.attribution.toFLT(mapView.context)
   override fun updateSettings(settings: FLTSettings.AttributionSettings) {
     mapView.attribution.applyFromFLT(settings, mapView.context)
   }

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AnimationController.kt

@@ -1,10 +1,11 @@
 package com.mapbox.maps.mapbox_maps
 
+import android.content.Context
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.pigeons.FLTMapInterfaces
 import com.mapbox.maps.plugin.animation.*
 
-class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._CameraManager {
+class CameraController(private val mapboxMap: MapboxMap, private val context: Context) : FLTMapInterfaces._CameraManager {
   override fun cameraForCoordinateBounds(
     bounds: FLTMapInterfaces.CoordinateBounds,
     padding: FLTMapInterfaces.MbxEdgeInsets,
@@ -13,11 +14,11 @@ class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._Cam
   ): FLTMapInterfaces.CameraOptions {
     val cameraOptions = mapboxMap.cameraForCoordinateBounds(
       bounds.toCoordinateBounds(),
-      padding.toEdgeInsets(),
+      padding.toEdgeInsets(context),
       bearing,
       pitch
     )
-    return cameraOptions.toFLTCameraOptions()
+    return cameraOptions.toFLTCameraOptions(context)
   }
 
   override fun cameraForCoordinates(
@@ -28,11 +29,11 @@ class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._Cam
   ): FLTMapInterfaces.CameraOptions {
     val cameraOptions = mapboxMap.cameraForCoordinates(
       coordinates.map { it.toPoint() },
-      padding.toEdgeInsets(),
+      padding.toEdgeInsets(context),
       bearing,
       pitch
     )
-    return cameraOptions.toFLTCameraOptions()
+    return cameraOptions.toFLTCameraOptions(context)
   }
 
   override fun cameraForCoordinatesCameraOptions(
@@ -42,10 +43,10 @@ class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._Cam
   ): FLTMapInterfaces.CameraOptions {
     val cameraOptions = mapboxMap.cameraForCoordinates(
       coordinates.map { it.toPoint() },
-      camera.toCameraOptions(),
-      box.toScreenBox()
+      camera.toCameraOptions(context),
+      box.toScreenBox(context)
     )
-    return cameraOptions.toFLTCameraOptions()
+    return cameraOptions.toFLTCameraOptions(context)
   }
 
   override fun cameraForGeometry(
@@ -56,61 +57,61 @@ class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._Cam
   ): FLTMapInterfaces.CameraOptions {
     val cameraOptions = mapboxMap.cameraForGeometry(
       geometry.toGeometry(),
-      padding.toEdgeInsets(),
+      padding.toEdgeInsets(context),
       bearing,
       pitch
     )
-    return cameraOptions.toFLTCameraOptions()
+    return cameraOptions.toFLTCameraOptions(context)
   }
 
   override fun coordinateBoundsForCamera(camera: FLTMapInterfaces.CameraOptions): FLTMapInterfaces.CoordinateBounds {
-    val coordinateBounds = mapboxMap.coordinateBoundsForCamera(camera.toCameraOptions())
+    val coordinateBounds = mapboxMap.coordinateBoundsForCamera(camera.toCameraOptions(context))
     return coordinateBounds.toFLTCoordinateBounds()
   }
 
   override fun coordinateBoundsForCameraUnwrapped(camera: FLTMapInterfaces.CameraOptions): FLTMapInterfaces.CoordinateBounds {
     val coordinateBounds =
-      mapboxMap.coordinateBoundsForCameraUnwrapped(camera.toCameraOptions())
+      mapboxMap.coordinateBoundsForCameraUnwrapped(camera.toCameraOptions(context))
     return coordinateBounds.toFLTCoordinateBounds()
   }
 
   override fun coordinateBoundsZoomForCamera(camera: FLTMapInterfaces.CameraOptions): FLTMapInterfaces.CoordinateBoundsZoom {
-    val coordinateBoundsZoom = mapboxMap.coordinateBoundsZoomForCamera(camera.toCameraOptions())
+    val coordinateBoundsZoom = mapboxMap.coordinateBoundsZoomForCamera(camera.toCameraOptions(context))
     return coordinateBoundsZoom.toFLTCoordinateBoundsZoom()
   }
 
   override fun coordinateBoundsZoomForCameraUnwrapped(camera: FLTMapInterfaces.CameraOptions): FLTMapInterfaces.CoordinateBoundsZoom {
     val coordinateBoundsZoom =
-      mapboxMap.coordinateBoundsZoomForCameraUnwrapped(camera.toCameraOptions())
+      mapboxMap.coordinateBoundsZoomForCameraUnwrapped(camera.toCameraOptions(context))
     return coordinateBoundsZoom.toFLTCoordinateBoundsZoom()
   }
 
   override fun pixelForCoordinate(coordinate: MutableMap<String, Any>): FLTMapInterfaces.ScreenCoordinate {
     val screenCoordinate = mapboxMap.pixelForCoordinate(coordinate.toPoint())
-    return screenCoordinate.toFLTScreenCoordinate()
+    return screenCoordinate.toFLTScreenCoordinate(context)
   }
 
   override fun coordinateForPixel(pixel: FLTMapInterfaces.ScreenCoordinate): MutableMap<String, Any> {
-    val screenCoordinate = mapboxMap.coordinateForPixel(pixel.toScreenCoordinate())
+    val screenCoordinate = mapboxMap.coordinateForPixel(pixel.toScreenCoordinate(context))
     return screenCoordinate.toMap() as MutableMap<String, Any>
   }
 
   override fun pixelsForCoordinates(coordinates: MutableList<MutableMap<String, Any>>): MutableList<FLTMapInterfaces.ScreenCoordinate> {
     val screenCoordinates = mapboxMap.pixelsForCoordinates(coordinates.map { it.toPoint() })
-    return screenCoordinates.map { it.toFLTScreenCoordinate() }.toMutableList()
+    return screenCoordinates.map { it.toFLTScreenCoordinate(context) }.toMutableList()
   }
 
   override fun coordinatesForPixels(pixels: MutableList<FLTMapInterfaces.ScreenCoordinate>): MutableList<MutableMap<String, Any>> {
-    val points = mapboxMap.coordinatesForPixels(pixels.map { it.toScreenCoordinate() })
+    val points = mapboxMap.coordinatesForPixels(pixels.map { it.toScreenCoordinate(context) })
     return points.map { it.toMap().toMutableMap() }.toMutableList()
   }
 
   override fun setCamera(cameraOptions: FLTMapInterfaces.CameraOptions) {
-    mapboxMap.setCamera(cameraOptions.toCameraOptions())
+    mapboxMap.setCamera(cameraOptions.toCameraOptions(context))
   }
 
   override fun getCameraState(): FLTMapInterfaces.CameraState {
-    return mapboxMap.cameraState.toCameraState()
+    return mapboxMap.cameraState.toCameraState(context)
   }
 
   override fun setBounds(options: FLTMapInterfaces.CameraBoundsOptions) {
@@ -122,17 +123,17 @@ class CameraController(private val mapboxMap: MapboxMap) : FLTMapInterfaces._Cam
   }
 
   override fun dragStart(point: FLTMapInterfaces.ScreenCoordinate) {
-    mapboxMap.dragStart(point.toScreenCoordinate())
+    mapboxMap.dragStart(point.toScreenCoordinate(context))
   }
 
   override fun getDragCameraOptions(
     fromPoint: FLTMapInterfaces.ScreenCoordinate,
     toPoint: FLTMapInterfaces.ScreenCoordinate
   ): FLTMapInterfaces.CameraOptions {
     return mapboxMap.getDragCameraOptions(
-      fromPoint.toScreenCoordinate(),
-      toPoint.toScreenCoordinate()
-    ).toFLTCameraOptions()
+      fromPoint.toScreenCoordinate(context),
+      toPoint.toScreenCoordinate(context)
+    ).toFLTCameraOptions(context)
   }
 
   override fun dragEnd() {

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/AttributionController.kt

@@ -8,7 +8,7 @@ import com.mapbox.maps.plugin.compass.compass
 
 class CompassController(private val mapView: MapView) :
   FLTSettings.CompassSettingsInterface {
-  override fun getSettings(): FLTSettings.CompassSettings = mapView.compass.toFLT()
+  override fun getSettings(): FLTSettings.CompassSettings = mapView.compass.toFLT(mapView.context)
   override fun updateSettings(settings: FLTSettings.CompassSettings) {
     mapView.compass.applyFromFLT(settings, mapView.context)
   }