Migrate zoom API from Double to Float and add edge glow effects (#2)

afarber · web-flow · commit e9f38a93ddfd · 2025-11-16T22:52:24.000+01:00
* Add edge effects. Use float to store zoom

* Use custom linear gradients

* Remove debug logs

* Change more zoom values from Double to Float

* Check the dimensions
diff --git a/examples/Example01Pan/src/main/kotlin/de/afarber/openmapview/example01pan/MainActivity.kt b/examples/Example01Pan/src/main/kotlin/de/afarber/openmapview/example01pan/MainActivity.kt
@@ -50,7 +50,7 @@ fun MapViewScreen() {
                 lifecycleOwner.lifecycle.addObserver(this)
 
                 setCenter(LatLng(51.4661, 7.2491)) // Bochum, Germany
-                setZoom(14.0)
+                setZoom(14.0f)
 
                 // Set attribution click listener to open OSM copyright page
                 setOnAttributionClickListener {
diff --git a/examples/Example02Zoom/src/main/kotlin/de/afarber/openmapview/example02zoom/MainActivity.kt b/examples/Example02Zoom/src/main/kotlin/de/afarber/openmapview/example02zoom/MainActivity.kt
@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {
 fun MapViewScreen() {
     val context = LocalContext.current
     val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
-    var zoomLevel by remember { mutableStateOf(14.0) }
+    var zoomLevel by remember { mutableStateOf(14.0f) }
     var mapView: OpenMapView? by remember { mutableStateOf(null) }
 
     Box(modifier = Modifier.fillMaxSize()) {
@@ -63,12 +63,17 @@ fun MapViewScreen() {
                     lifecycleOwner.lifecycle.addObserver(this)
 
                     setCenter(LatLng(51.4661, 7.2491)) // Bochum, Germany
-                    setZoom(14.0)
+                    setZoom(14.0f)
                     mapView = this
 
                     // Enable built-in zoom controls
                     getUiSettings().isZoomControlsEnabled = true
 
+                    // Add camera move listener to update zoom label
+                    setOnCameraMoveListener {
+                        zoomLevel = getZoom()
+                    }
+
                     // Set attribution click listener to open OSM copyright page
                     setOnAttributionClickListener {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.openstreetmap.org/copyright"))
diff --git a/examples/Example03Markers/src/main/kotlin/de/afarber/openmapview/example03markers/MainActivity.kt b/examples/Example03Markers/src/main/kotlin/de/afarber/openmapview/example03markers/MainActivity.kt
@@ -55,7 +55,7 @@ fun MapViewScreen() {
 
                 // Center on Bochum, Germany
                 setCenter(LatLng(51.4661, 7.2491))
-                setZoom(14.0)
+                setZoom(14.0f)
 
                 // Add several markers around Bochum with different colors
                 addMarker(
diff --git a/examples/Example04Polylines/src/main/kotlin/de/afarber/openmapview/example04polylines/MainActivity.kt b/examples/Example04Polylines/src/main/kotlin/de/afarber/openmapview/example04polylines/MainActivity.kt
@@ -55,7 +55,7 @@ fun MapViewScreen() {
 
                 // Center on Bochum, Germany
                 setCenter(LatLng(51.4661, 7.2491))
-                setZoom(14.0)
+                setZoom(14.0f)
 
                 // Add a blue polyline (route)
                 addPolyline(
diff --git a/examples/Example05Camera/src/main/kotlin/de/afarber/openmapview/example05camera/MainActivity.kt b/examples/Example05Camera/src/main/kotlin/de/afarber/openmapview/example05camera/MainActivity.kt
@@ -73,7 +73,7 @@ fun MapViewScreen() {
                     lifecycleOwner.lifecycle.addObserver(this)
 
                     setCenter(LatLng(51.4620, 7.2480))
-                    setZoom(13.0)
+                    setZoom(13.0f)
 
                     // Enable built-in zoom controls
                     getUiSettings().isZoomControlsEnabled = true
@@ -123,7 +123,7 @@ fun MapViewScreen() {
                 FloatingActionButton(
                     onClick = {
                         mapView?.animateCamera(
-                            CameraUpdateFactory.newLatLngZoom(location1, 15.0),
+                            CameraUpdateFactory.newLatLngZoom(location1, 15.0f),
                             1000,
                             object : CancelableCallback {
                                 override fun onFinish() {
@@ -144,7 +144,7 @@ fun MapViewScreen() {
                 FloatingActionButton(
                     onClick = {
                         mapView?.animateCamera(
-                            CameraUpdateFactory.newLatLngZoom(location2, 15.0),
+                            CameraUpdateFactory.newLatLngZoom(location2, 15.0f),
                             1000,
                         )
                     },
@@ -156,7 +156,7 @@ fun MapViewScreen() {
                 FloatingActionButton(
                     onClick = {
                         mapView?.animateCamera(
-                            CameraUpdateFactory.newLatLngZoom(location3, 15.0),
+                            CameraUpdateFactory.newLatLngZoom(location3, 15.0f),
                             2000,
                         )
                     },
diff --git a/examples/Example06Clicks/src/main/kotlin/de/afarber/openmapview/example06clicks/MainActivity.kt b/examples/Example06Clicks/src/main/kotlin/de/afarber/openmapview/example06clicks/MainActivity.kt
@@ -63,7 +63,7 @@ fun MapViewScreen() {
                 lifecycleOwner.lifecycle.addObserver(this)
 
                 setCenter(LatLng(51.4661, 7.2491)) // Bochum, Germany
-                setZoom(14.0)
+                setZoom(14.0f)
 
                 // Set map click listener
                 setOnMapClickListener(
diff --git a/examples/Example07DraggableMarkers/src/main/kotlin/de/afarber/openmapview/example07draggablemarkers/MainActivity.kt b/examples/Example07DraggableMarkers/src/main/kotlin/de/afarber/openmapview/example07draggablemarkers/MainActivity.kt
@@ -101,7 +101,7 @@ fun MapViewScreen() {
                     lifecycleOwner.lifecycle.addObserver(this)
 
                     setCenter(bochumCenter)
-                    setZoom(13.0)
+                    setZoom(13.0f)
 
                     // Set marker drag listener
                     setOnMarkerDragListener(
diff --git a/examples/Example08Circles/src/main/kotlin/de/afarber/openmapview/example08circles/MainActivity.kt b/examples/Example08Circles/src/main/kotlin/de/afarber/openmapview/example08circles/MainActivity.kt
@@ -174,7 +174,7 @@ fun MapViewScreen() {
                     lifecycleOwner.lifecycle.addObserver(this)
 
                     setCenter(bochumCenter)
-                    setZoom(12.0)
+                    setZoom(12.0f)
 
                     // Add initial demonstration circles
                     addDemoCircles()
diff --git a/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt b/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt
@@ -190,7 +190,7 @@ fun MapViewScreen() {
                         mapView = this
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(bochumCenter)
-                        setZoom(12.0)
+                        setZoom(12.0f)
                         setOnAttributionClickListener {
                             val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.openstreetmap.org/copyright"))
                             context.startActivity(intent)
@@ -229,7 +229,7 @@ fun MapViewScreen() {
                         mapView = this
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(bochumCenter)
-                        setZoom(12.0)
+                        setZoom(12.0f)
                         setOnAttributionClickListener {
                             val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.openstreetmap.org/copyright"))
                             context.startActivity(intent)
diff --git a/examples/Example10GroundOverlays/src/main/kotlin/de/afarber/openmapview/example10groundoverlays/MainActivity.kt b/examples/Example10GroundOverlays/src/main/kotlin/de/afarber/openmapview/example10groundoverlays/MainActivity.kt
@@ -199,7 +199,7 @@ fun MapViewScreen() {
                         mapView = this
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(bochumCenter)
-                        setZoom(13.0)
+                        setZoom(13.0f)
                         setOnGroundOverlayClickListener { groundOverlay ->
                             Toast.makeText(context, "Clicked: ${groundOverlay.tag}", Toast.LENGTH_SHORT).show()
                         }
@@ -237,7 +237,7 @@ fun MapViewScreen() {
                         mapView = this
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(bochumCenter)
-                        setZoom(13.0)
+                        setZoom(13.0f)
                         setOnGroundOverlayClickListener { groundOverlay ->
                             Toast.makeText(context, "Clicked: ${groundOverlay.tag}", Toast.LENGTH_SHORT).show()
                         }
diff --git a/examples/Example11MapTypes/src/main/kotlin/de/afarber/openmapview/example11maptypes/MainActivity.kt b/examples/Example11MapTypes/src/main/kotlin/de/afarber/openmapview/example11maptypes/MainActivity.kt
@@ -74,7 +74,7 @@ fun MapViewScreen() {
                     OpenMapView(ctx).apply {
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(LatLng(46.8182, 8.2275))
-                        setZoom(12.0)
+                        setZoom(12.0f)
                         mapView = this
                         setOnAttributionClickListener {
                             val intent =
@@ -110,7 +110,7 @@ fun MapViewScreen() {
                     OpenMapView(ctx).apply {
                         lifecycleOwner.lifecycle.addObserver(this)
                         setCenter(LatLng(46.8182, 8.2275))
-                        setZoom(12.0)
+                        setZoom(12.0f)
                         mapView = this
                         setOnAttributionClickListener {
                             val intent =
diff --git a/examples/Example12Toolbar/src/main/kotlin/de/afarber/openmapview/example12toolbar/MainActivity.kt b/examples/Example12Toolbar/src/main/kotlin/de/afarber/openmapview/example12toolbar/MainActivity.kt
@@ -77,7 +77,7 @@ fun MapWithToolbarScreen() {
 
                         // Set initial location (Bochum, Germany)
                         setCenter(LatLng(51.4661, 7.2491))
-                        setZoom(14.0)
+                        setZoom(14.0f)
 
                         // Long-press to open location in external app
                         setOnMapLongClickListener { latLng ->
diff --git a/openmapview/src/androidTest/kotlin/de/afarber/openmapview/MapControllerInstrumentationTest.kt b/openmapview/src/androidTest/kotlin/de/afarber/openmapview/MapControllerInstrumentationTest.kt
@@ -34,7 +34,7 @@ class MapControllerInstrumentationTest {
         val canvas = Canvas(bitmap)
 
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         controller.draw(canvas)
 
@@ -50,7 +50,7 @@ class MapControllerInstrumentationTest {
         val canvas = Canvas(bitmap)
 
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         // Add markers at different positions
         controller.addMarker(Marker(LatLng(51.4661, 7.2491)))
@@ -69,7 +69,7 @@ class MapControllerInstrumentationTest {
         val canvas = Canvas(bitmap)
 
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(10.0)
+        controller.setZoom(10.0f)
         controller.draw(canvas)
 
         // Zoom in
@@ -89,7 +89,7 @@ class MapControllerInstrumentationTest {
         val canvas = Canvas(bitmap)
 
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         // Pan the map
         controller.updatePanOffset(100f, 100f)
@@ -110,7 +110,7 @@ class MapControllerInstrumentationTest {
         val bitmap = Bitmap.createBitmap(1080, 1920, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         controller.draw(canvas)
 
@@ -137,7 +137,7 @@ class MapControllerInstrumentationTest {
         val bitmap = Bitmap.createBitmap(1080, 1920, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         controller.draw(canvas)
 
@@ -147,7 +147,7 @@ class MapControllerInstrumentationTest {
     @Test
     fun testLifecycle_OnDestroy() {
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(14.0)
+        controller.setZoom(14.0f)
 
         val bitmap = Bitmap.createBitmap(1080, 1920, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
diff --git a/openmapview/src/androidTest/kotlin/de/afarber/openmapview/UiSettingsInstrumentationTest.kt b/openmapview/src/androidTest/kotlin/de/afarber/openmapview/UiSettingsInstrumentationTest.kt
@@ -33,7 +33,7 @@ class UiSettingsInstrumentationTest {
 
         controller = openMapView.getMapControllerForTesting()
         controller.setCenter(LatLng(51.4661, 7.2491))
-        controller.setZoom(10.0)
+        controller.setZoom(10.0f)
     }
 
     @Test
@@ -106,7 +106,7 @@ class UiSettingsInstrumentationTest {
         pointer1Up.recycle()
 
         val finalZoom = controller.getZoom()
-        assertEquals(initialZoom, finalZoom, 0.001)
+        assertEquals(initialZoom, finalZoom, 0.001f)
     }
 
     @Test
@@ -208,7 +208,7 @@ class UiSettingsInstrumentationTest {
         val finalZoom = controller.getZoom()
         val finalCenter = controller.getCenter()
 
-        assertEquals(initialZoom, finalZoom, 0.001)
+        assertEquals(initialZoom, finalZoom, 0.001f)
         assertEquals(initialCenter.latitude, finalCenter.latitude, 0.0001)
         assertEquals(initialCenter.longitude, finalCenter.longitude, 0.0001)
     }
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/CameraPosition.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/CameraPosition.kt
@@ -19,15 +19,15 @@ package de.afarber.openmapview
  */
 data class CameraPosition(
     val target: LatLng,
-    val zoom: Double,
+    val zoom: Float,
 ) {
     init {
         require(zoom >= MIN_ZOOM) { "Zoom level must be at least $MIN_ZOOM" }
         require(zoom <= MAX_ZOOM) { "Zoom level must be at most $MAX_ZOOM" }
     }
 
     companion object {
-        private const val MIN_ZOOM = 2.0
-        private const val MAX_ZOOM = 19.0
+        private const val MIN_ZOOM = 2.0f
+        private const val MAX_ZOOM = 19.0f
     }
 }
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/CameraUpdate.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/CameraUpdate.kt
@@ -28,7 +28,7 @@ sealed class CameraUpdate {
      */
     internal data class NewLatLngZoom(
         val target: LatLng,
-        val zoom: Double,
+        val zoom: Float,
     ) : CameraUpdate()
 
     /**
@@ -52,14 +52,14 @@ sealed class CameraUpdate {
      * Sets zoom to a specific level.
      */
     internal data class ZoomTo(
-        val zoom: Double,
+        val zoom: Float,
     ) : CameraUpdate()
 
     /**
      * Adjusts zoom by a relative amount (positive to zoom in, negative to zoom out).
      */
     internal data class ZoomBy(
-        val amount: Double,
+        val amount: Float,
     ) : CameraUpdate()
 
     /**
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/CameraUpdateFactory.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/CameraUpdateFactory.kt
@@ -33,7 +33,7 @@ object CameraUpdateFactory {
      */
     fun newLatLngZoom(
         target: LatLng,
-        zoom: Double,
+        zoom: Float,
     ): CameraUpdate = CameraUpdate.NewLatLngZoom(target, zoom)
 
     /**
@@ -64,7 +64,7 @@ object CameraUpdateFactory {
      * @param zoom The target zoom level (2.0 to 19.0)
      * @return A CameraUpdate for the specified zoom level
      */
-    fun zoomTo(zoom: Double): CameraUpdate = CameraUpdate.ZoomTo(zoom)
+    fun zoomTo(zoom: Float): CameraUpdate = CameraUpdate.ZoomTo(zoom)
 
     /**
      * Returns a CameraUpdate that adjusts the zoom level by the specified amount.
@@ -74,7 +74,7 @@ object CameraUpdateFactory {
      * @param amount The amount to adjust the zoom level (e.g., 1.5 or -2.0)
      * @return A CameraUpdate for the relative zoom adjustment
      */
-    fun zoomBy(amount: Double): CameraUpdate = CameraUpdate.ZoomBy(amount)
+    fun zoomBy(amount: Float): CameraUpdate = CameraUpdate.ZoomBy(amount)
 
     /**
      * Returns a CameraUpdate that scrolls the map by the specified pixel amounts.
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/IntentUtils.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/IntentUtils.kt
@@ -34,13 +34,13 @@ import android.util.Log
  */
 fun openLocationInExternalApp(
     latLng: LatLng,
-    zoom: Double,
+    zoom: Float,
     context: Context,
     label: String? = null,
 ): Boolean =
     try {
         // Clamp zoom to valid range for map applications
-        val clampedZoom = zoom.coerceIn(2.0, 19.0).toInt()
+        val clampedZoom = zoom.coerceIn(2.0f, 19.0f).toInt()
 
         // Build geo URI based on whether label is provided
         val geoUri =
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/MapController.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/MapController.kt
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/OpenMapView.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/OpenMapView.kt
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/Projection.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/Projection.kt
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/TileDownloader.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/TileDownloader.kt
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/UiSettings.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/UiSettings.kt
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/UrlTileProvider.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/UrlTileProvider.kt
diff --git a/openmapview/src/test/kotlin/de/afarber/openmapview/CameraPositionTest.kt b/openmapview/src/test/kotlin/de/afarber/openmapview/CameraPositionTest.kt
diff --git a/openmapview/src/test/kotlin/de/afarber/openmapview/CameraUpdateFactoryTest.kt b/openmapview/src/test/kotlin/de/afarber/openmapview/CameraUpdateFactoryTest.kt
diff --git a/openmapview/src/test/kotlin/de/afarber/openmapview/MapControllerTest.kt b/openmapview/src/test/kotlin/de/afarber/openmapview/MapControllerTest.kt
