lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing deserialisation, and options

Browse source
This commit is contained in:
Adam 2022-02-05 12:20:51 +01:00
parent f108431033
commit f38143dee9
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/converters.kt
View file

@ -1,9 +1,7 @@
package dev.adamko.kafkatorio.webmap package dev.adamko.kafkatorio.webmap
import dev.adamko.kafkatorio.events.schema.Colour
import dev.adamko.kafkatorio.events.schema.PlayerData import dev.adamko.kafkatorio.events.schema.PlayerData
import io.kvision.maps.externals.leaflet.geo.LatLng
import io.kvision.maps.Maps 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)

2
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/json.kt
View file

@ -1,7 +1,9 @@
package dev.adamko.kafkatorio.webmap package dev.adamko.kafkatorio.webmap
import dev.adamko.kafkatorio.events.schema.jsonMapperKafkatorio
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
val jsonMapper = Json { val jsonMapper = Json {
prettyPrint = true prettyPrint = true
serializersModule = jsonMapperKafkatorio.serializersModule
} }

15
modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/map.kt
View file

@ -1,10 +1,9 @@
package dev.adamko.kafkatorio.webmap 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
import io.kvision.maps.Maps.Companion.L 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 import io.kvision.utils.px
// //
@ -39,15 +38,17 @@ fun createFactorioMap() = Maps {
// maxZoom = 1 // maxZoom = 1
maxNativeZoom = 1 maxNativeZoom = 1
minNativeZoom = 1 minNativeZoom = 1
noWrap = true
updateWhenIdle = true
updateWhenZooming = true
}.addTo(this) }.addTo(this)
L.scale { L.scale {
metric = true
}.addTo(this)
}
with(options) { options.crs = CRS.Simple
crs = CRS.Simple
}
} }
} }