Move classes to common

src/commonMain/kotlin/centre/sciprog/maps/GeodeticMapCoordinates.kt

@@ -1,4 +1,4 @@
-package centre.sciprog.maps.compose
+package centre.sciprog.maps
 
 import kotlin.math.PI
 

src/commonMain/kotlin/centre/sciprog/maps/MapViewPoint.kt

@@ -1,4 +1,4 @@
-package centre.sciprog.maps.compose
+package centre.sciprog.maps
 
 import kotlin.math.roundToInt
 

src/commonMain/kotlin/centre/sciprog/maps/MercatorProjection.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package centre.sciprog.maps.compose
+package centre.sciprog.maps
 
 import kotlin.math.*
 

src/commonMain/kotlin/centre/sciprog/maps/WebMercatorProjection.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package centre.sciprog.maps.compose
+package centre.sciprog.maps
 
 import kotlin.math.*
 

src/commonMain/kotlin/centre/sciprog/maps/compose/MapFeature.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.VectorPainter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.unit.IntSize
+import centre.sciprog.maps.GeodeticMapCoordinates
 
 //TODO replace zoom range with zoom-based representation change
 sealed class MapFeature(val zoomRange: IntRange)

src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt

@@ -0,0 +1,16 @@
+package centre.sciprog.maps.compose
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import centre.sciprog.maps.GeodeticMapCoordinates
+import centre.sciprog.maps.MapViewPoint
+
+@Composable
+expect fun MapView(
+    initialViewPoint: MapViewPoint,
+    mapTileProvider: MapTileProvider,
+    features: Collection<MapFeature> = emptyList(),
+    modifier: Modifier = Modifier.fillMaxSize(),
+    onClick: (GeodeticMapCoordinates) -> Unit = {},
+)

src/jvmMain/kotlin/Main.kt

@@ -8,6 +8,8 @@ import androidx.compose.material.icons.filled.Home
 import androidx.compose.runtime.*
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
+import centre.sciprog.maps.GeodeticMapCoordinates
+import centre.sciprog.maps.MapViewPoint
 import centre.sciprog.maps.compose.*
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.cio.CIO

src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt

@@ -18,11 +18,11 @@ import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.input.pointer.pointerInput
+import centre.sciprog.maps.*
 import mu.KotlinLogging
 import org.jetbrains.skia.Font
 import org.jetbrains.skia.Paint
 import kotlin.math.pow
-import kotlin.math.round
 import kotlin.math.roundToInt
 
 
@@ -38,12 +38,12 @@ private val logger = KotlinLogging.logger("MapView")
  */
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun MapView(
+actual fun MapView(
     initialViewPoint: MapViewPoint,
     mapTileProvider: MapTileProvider,
-    features: Collection<MapFeature> = emptyList(),
+    features: Collection<MapFeature>,
-    modifier: Modifier = Modifier.fillMaxSize(),
+    modifier: Modifier,
-    onClick: (GeodeticMapCoordinates) -> Unit = {},
+    onClick: (GeodeticMapCoordinates) -> Unit,
 ) {
     var viewPoint by remember { mutableStateOf(initialViewPoint) }