From 3a05a71f7f52284d18ad7044c0cd569898773487 Mon Sep 17 00:00:00 2001 From: 2ndbeam <2ndbeam@disroot.org> Date: Thu, 27 Nov 2025 13:56:56 +0300 Subject: [PATCH] Fixed map loading --- .../java/com/mirenkov/ktheightmap/MapCanvas.kt | 2 +- .../com/mirenkov/ktheightmap/parser/KhmParser.kt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt b/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt index 5134a03..f71de2e 100644 --- a/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt +++ b/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt @@ -175,7 +175,7 @@ fun MapCanvas( } val crossRadius = 24F - drawCursor(halvedX, halvedY, crossRadius, KhmParser.getHeight(lon, lat, ctx), textMeasurer) + drawCursor(halvedX, halvedY, crossRadius, height, textMeasurer) val additionalSize = if (debug) 96F else 0F val infoBoxSize = Size(216F, 96F + additionalSize) diff --git a/app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt b/app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt index e22cf5b..8a29433 100644 --- a/app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt +++ b/app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt @@ -23,15 +23,15 @@ class KhmParser { fun load(filePath: String, ctx: Context) { if (fileExists(ctx)) { - return + clear(ctx) } val inp = FileInputStream(filePath) - if (checkHeader(inp)) - ctx.openFileOutput(HEIGHT_FILE, Context.MODE_PRIVATE).use { - it.write(inp.readBytes()) - } + ctx.openFileOutput(HEIGHT_FILE, Context.MODE_PRIVATE).use { + it.write(inp.readBytes()) + } + inp.close() } @@ -93,7 +93,7 @@ class KhmParser { fun getHeight(lon: Float, lat: Float, ctx: Context): UShort { if (!fileExists(ctx)) - return 0u.toUShort() + return 0u val dis = DataInputStream(ctx.openFileInput(HEIGHT_FILE)) dis.use { val header = readHeader(dis) @@ -164,4 +164,4 @@ class KhmParser { return header?.latPerValue ?: 0F } } -} \ No newline at end of file +}