2ndbeam/ktheightmap
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed map loading

Browse source
This commit is contained in:
Alexey 2025-11-27 13:56:56 +03:00
commit 3a05a71f7f
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt
View file

@ -175,7 +175,7 @@ fun MapCanvas(
} }
val crossRadius = 24F 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 additionalSize = if (debug) 96F else 0F
val infoBoxSize = Size(216F, 96F + additionalSize) val infoBoxSize = Size(216F, 96F + additionalSize)

6
app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt
View file

@ -23,15 +23,15 @@ class KhmParser {
fun load(filePath: String, ctx: Context) { fun load(filePath: String, ctx: Context) {
if (fileExists(ctx)) { if (fileExists(ctx)) {
return clear(ctx)
} }
val inp = FileInputStream(filePath) val inp = FileInputStream(filePath)
if (checkHeader(inp))
ctx.openFileOutput(HEIGHT_FILE, Context.MODE_PRIVATE).use { ctx.openFileOutput(HEIGHT_FILE, Context.MODE_PRIVATE).use {
it.write(inp.readBytes()) it.write(inp.readBytes())
} }
inp.close() inp.close()
} }
@ -93,7 +93,7 @@ class KhmParser {
fun getHeight(lon: Float, lat: Float, ctx: Context): UShort { fun getHeight(lon: Float, lat: Float, ctx: Context): UShort {
if (!fileExists(ctx)) if (!fileExists(ctx))
return 0u.toUShort() return 0u
val dis = DataInputStream(ctx.openFileInput(HEIGHT_FILE)) val dis = DataInputStream(ctx.openFileInput(HEIGHT_FILE))
dis.use { dis.use {
val header = readHeader(dis) val header = readHeader(dis)