From dab978408966a8f69d8908a2e3acde3e9121551b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 13 Feb 2023 17:01:16 +0300
Subject: [PATCH] Optional zoom on double click

---
 .../kotlin/center/sciprog/maps/features/ViewConfig.kt      | 3 ++-
 .../kotlin/center/sciprog/maps/compose/mapControls.kt      | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/ViewConfig.kt b/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/ViewConfig.kt
index 2108cb0..aca3d4f 100644
--- a/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/ViewConfig.kt
+++ b/maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/ViewConfig.kt
@@ -8,6 +8,7 @@ public data class ViewConfig<T : Any>(
     val dragHandle: DragHandle<T>? = null,
     val onViewChange: ViewPoint<T>.() -> Unit = {},
     val onSelect: (Rectangle<T>) -> Unit = {},
-    val zoomOnSelect: Boolean = true,
     val onCanvasSizeChange: (DpSize) -> Unit = {},
+    val zoomOnSelect: Boolean = true,
+    val zoomOnDoubleClick: Boolean = true
 )
\ No newline at end of file
diff --git a/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/compose/mapControls.kt b/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/compose/mapControls.kt
index c4d7fa4..5aec2fa 100644
--- a/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/compose/mapControls.kt
+++ b/maps-kt-features/src/jvmMain/kotlin/center/sciprog/maps/compose/mapControls.kt
@@ -19,7 +19,6 @@ import kotlin.math.min
 public fun <T : Any> Modifier.mapControls(
     state: CoordinateViewScope<T>,
     features: FeatureGroup<T>,
-    zoomOnDoubleClick: Boolean = true,
 ): Modifier = with(state) {
 
 //    //selecting all tapabales ahead of time
@@ -48,8 +47,8 @@ public fun <T : Any> Modifier.mapControls(
         }
     }.pointerInput(Unit) {
         detectClicks(
-            onDoubleClick = { event ->
-                if (zoomOnDoubleClick) {
+            onDoubleClick = if (state.config.zoomOnDoubleClick) {
+                { event ->
                     val invariant = event.position.toCoordinates(this)
                     viewPoint = with(space) {
                         viewPoint.zoomBy(
@@ -58,7 +57,7 @@ public fun <T : Any> Modifier.mapControls(
                         )
                     }
                 }
-            },
+            } else null,
             onClick = { event ->
                 val coordinates = event.position.toCoordinates(this)
                 val point = space.ViewPoint(coordinates, zoom)