diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt b/src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt
index decc7b0..ebd8483 100644
--- a/src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt
+++ b/src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt
@@ -20,7 +20,7 @@ expect fun MapView(
     mapTileProvider: MapTileProvider,
     computeViewPoint: (canvasSize: DpSize) -> MapViewPoint,
     features: Map<FeatureId, MapFeature>,
-    onClick: (GeodeticMapCoordinates) -> Unit = {},
+    onClick: MapViewPoint.() -> Unit = {},
     //TODO consider replacing by modifier
     config: MapViewConfig = MapViewConfig(),
     modifier: Modifier = Modifier.fillMaxSize(),
@@ -31,7 +31,7 @@ fun MapView(
     mapTileProvider: MapTileProvider,
     initialViewPoint: MapViewPoint,
     features: Map<FeatureId, MapFeature> = emptyMap(),
-    onClick: (GeodeticMapCoordinates) -> Unit = {},
+    onClick: MapViewPoint.() -> Unit = {},
     config: MapViewConfig = MapViewConfig(),
     modifier: Modifier = Modifier.fillMaxSize(),
     buildFeatures: @Composable (FeatureBuilder.() -> Unit) = {},
@@ -46,7 +46,7 @@ fun MapView(
     mapTileProvider: MapTileProvider,
     box: GmcBox,
     features: Map<FeatureId, MapFeature> = emptyMap(),
-    onClick: (GeodeticMapCoordinates) -> Unit = {},
+    onClick: MapViewPoint.() -> Unit = {},
     config: MapViewConfig = MapViewConfig(),
     modifier: Modifier = Modifier.fillMaxSize(),
     buildFeatures: @Composable (FeatureBuilder.() -> Unit) = {},
diff --git a/src/jvmMain/kotlin/Main.kt b/src/jvmMain/kotlin/Main.kt
index 6ca12d5..7e60182 100644
--- a/src/jvmMain/kotlin/Main.kt
+++ b/src/jvmMain/kotlin/Main.kt
@@ -48,7 +48,7 @@ fun App() {
             MapView(
                 mapTileProvider = mapTileProvider,
                 initialViewPoint = viewPoint,
-                onClick = { gmc -> coordinates = gmc },
+                onClick = { coordinates = focus },
                 config = MapViewConfig(inferViewBoxFromFeatures = true)
             ) {
                 val pointOne = 55.568548 to 37.568604
diff --git a/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt b/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt
index 1e254ca..b4bf970 100644
--- a/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt
+++ b/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt
@@ -39,14 +39,14 @@ actual fun MapView(
     mapTileProvider: MapTileProvider,
     computeViewPoint: (canvasSize: DpSize) -> MapViewPoint,
     features: Map<FeatureId, MapFeature>,
-    onClick: (GeodeticMapCoordinates) -> Unit,
+    onClick: MapViewPoint.() -> Unit,
     config: MapViewConfig,
     modifier: Modifier,
 ) {
     var canvasSize by remember { mutableStateOf(DpSize(512.dp, 512.dp)) }
 
-    var viewPointOverride by remember {
-        mutableStateOf<MapViewPoint?>(
+    var viewPointOverride: MapViewPoint? by remember {
+        mutableStateOf(
             if (config.inferViewBoxFromFeatures) {
                 features.values.computeBoundingBox(1)?.let { box ->
                     val zoom = log2(
@@ -124,7 +124,7 @@ actual fun MapView(
                         } else {
                             val dragStart = change.position
                             val dpPos = DpOffset(dragStart.x.toDp(), dragStart.y.toDp())
-                            onClick(dpPos.toGeodetic())
+                            onClick(MapViewPoint(dpPos.toGeodetic(), viewPoint.zoom))
                             drag(change.id) { dragChange ->
                                 val dragAmount = dragChange.position - dragChange.previousPosition
                                 viewPointOverride = viewPoint.move(