diff --git a/README.md b/README.md index 4cb3c8b..8b73398 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ is provided. `./bin/kafka-streams-application-reset.sh --application-id kafkatorio-events-processor --input-topics factorio-server-log` -`:screen-fps=60.000000 :live-caching=300 :screen-width=1920 :screen-height=1080 :screen-top=20 :screen-left:20` +`:screen-fps=60.000000 :live-caching=300 :screen-width=1920 :screen-height=1080 :screen-top=100 :screen-left:20` `:screen-fps=60.000000 :live-caching=300 --screen-width=1920 --screen-height=1080 :sout=#transcode{vcodec=h264,vb=0,scale=0,acodec=mpga,ab=128,channels=2,samplerate=44100}:file{dst=D:\\savedir.mp4} :sout-keep` ## todo diff --git a/modules/events-mod/src/main/typescript/main/queue/queue.ts b/modules/events-mod/src/main/typescript/main/queue/queue.ts index f5d60f2..b985b2e 100644 --- a/modules/events-mod/src/main/typescript/main/queue/queue.ts +++ b/modules/events-mod/src/main/typescript/main/queue/queue.ts @@ -72,6 +72,7 @@ export namespace Queue { } } + export function dequeueValues(targetWeight: uint = 50): EventData[] { let values: EventData[] = [] let weight: uint = 0 @@ -107,18 +108,10 @@ export namespace Queue { [key: string]: EventData | null; } -// interface PacketQueue { -// enqueue(key: string, packet: T, weight: int): void -// -// dequeue(): WeightedPacket | null -// -// dequeueValues(targetWeight: int): T[] -// } -// + interface WeightedPacket { value: EventData, weight: int, } - } 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 1177aa7..386370b 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 @@ -4,4 +4,4 @@ import dev.adamko.kafkatorio.events.schema.PlayerData import io.kvision.maps.Maps import io.kvision.maps.externals.leaflet.geo.LatLng -fun PlayerData.latLng(): LatLng = Maps.L.latLng((position.y * -1) / 2 to position.x / 2) +fun PlayerData.latLng(): LatLng = Maps.L.latLng((position.y * -1) to position.x) 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 c6f308f..c8bda6d 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 @@ -27,22 +27,28 @@ fun createFactorioMap() = Maps { configureLeafletMap { setView(LatLng(0, 0), 1) -// DefaultTileLayers.OpenStreetMap.addTo(this) + L.tileLayer( """http://localhost:9073/tiles/s1/z{z}/x{x}/y{y}.png""" ) { attribution = "kafkatorio" tileSize = 256 tms = true -// minZoom = -2 -// maxZoom = 1 - maxNativeZoom = 4 - minNativeZoom = 0 + + minZoom = -2 + maxZoom = 6 + + // NOTE: offset the zoom, so 1 meter = 1 tile + maxNativeZoom = 3 + minNativeZoom = -1 + zoomOffset = 1 + noWrap = true - updateWhenIdle = true + updateWhenIdle = false updateWhenZooming = true }.addTo(this) + L.scale { metric = true imperial = false @@ -50,6 +56,7 @@ fun createFactorioMap() = Maps { options.crs = CRS.Simple + options.zoomSnap = 0.1 } }