diff --git a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/converters.kt b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/converters.kt index 6f9662d..1177aa7 100644 --- a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/converters.kt +++ b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/converters.kt @@ -1,9 +1,7 @@ package dev.adamko.kafkatorio.webmap -import dev.adamko.kafkatorio.events.schema.Colour import dev.adamko.kafkatorio.events.schema.PlayerData -import io.kvision.maps.externals.leaflet.geo.LatLng import io.kvision.maps.Maps -import kotlin.math.roundToInt +import io.kvision.maps.externals.leaflet.geo.LatLng -fun PlayerData.latLng(): LatLng = Maps.L.latLng((position.y * -1) to position.x) +fun PlayerData.latLng(): LatLng = Maps.L.latLng((position.y * -1) / 2 to position.x / 2) diff --git a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/json.kt b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/json.kt index d1acf02..0bed951 100644 --- a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/json.kt +++ b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/json.kt @@ -1,7 +1,9 @@ package dev.adamko.kafkatorio.webmap +import dev.adamko.kafkatorio.events.schema.jsonMapperKafkatorio import kotlinx.serialization.json.Json val jsonMapper = Json { prettyPrint = true + serializersModule = jsonMapperKafkatorio.serializersModule } diff --git a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/map.kt b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/map.kt index 14a3326..1fc21aa 100644 --- a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/map.kt +++ b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/map.kt @@ -1,10 +1,9 @@ package dev.adamko.kafkatorio.webmap -import io.kvision.maps.DefaultTileLayers -import io.kvision.maps.externals.leaflet.geo.CRS -import io.kvision.maps.externals.leaflet.geo.LatLng import io.kvision.maps.Maps import io.kvision.maps.Maps.Companion.L +import io.kvision.maps.externals.leaflet.geo.CRS +import io.kvision.maps.externals.leaflet.geo.LatLng import io.kvision.utils.px // @@ -39,15 +38,17 @@ fun createFactorioMap() = Maps { // maxZoom = 1 maxNativeZoom = 1 minNativeZoom = 1 + noWrap = true + updateWhenIdle = true + updateWhenZooming = true }.addTo(this) L.scale { + metric = true + }.addTo(this) - } - with(options) { - crs = CRS.Simple - } + options.crs = CRS.Simple } }