From 3f2b3eec455c593233bcd4372e8966850c4fb536 Mon Sep 17 00:00:00 2001
From: 2ndbeam <2ndbeam@disroot.org>
Date: Mon, 25 Aug 2025 15:41:31 +0300
Subject: [PATCH] little refactoring

---
 .idea/deploymentTargetSelector.xml                    |  4 ++--
 .../main/java/com/mirenkov/ktheightmap/MapCanvas.kt   | 11 ++++++-----
 app/src/main/java/com/mirenkov/ktheightmap/Tile.kt    |  4 ++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 338e0e6..ad9e385 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-08-21T11:17:37.943341883Z">
+        <DropdownSelection timestamp="2025-08-25T12:35:44.992136184Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=96DX21GPR" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/secondbeam/.config/.android/avd/Virtual_Pixel_3.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt b/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt
index e780240..05b1245 100644
--- a/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt
+++ b/app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt
@@ -91,7 +91,8 @@ fun MapCanvas(
                 val tileY = tileOffsetY + cellY
                 val localOffsetY = TILE_SIZE * (cellY - 1)
 
-                val bitmap = tiles.find { it.x == tileX && it.y == tileY && it.level == level }?.toBitmap()
+                val tile = tiles.find { it.x == tileX && it.y == tileY && it.level == level }!!
+                val bitmap = tile.toBitmap()
                 val totalOffset = Offset(localOffsetX, localOffsetY) - offset
 
                 bitmap?.let {
@@ -114,10 +115,8 @@ fun MapCanvas(
                     text = buildAnnotatedString {
                         withStyle(ParagraphStyle(textAlign = TextAlign.Center)) {
                             withStyle(SpanStyle(color = gridColor)) {
-                                val mapSize = (1 shl (level - 1)).toDouble()
-                                val mappedY = (tileY.toDouble() - (mapSize / 2.0))
-                                val mercX = SphereMercator.sx2lon((tileX * TILE_SIZE).toDouble(), level) - 180.0
-                                val mercY = -SphereMercator.sy2lat(mappedY * TILE_SIZE, level - 1)
+                                val mercX = tile.mercateX()
+                                val mercY = tile.mercateY()
                                 append("%.6f, %.6f,\n%d, %d".format(mercX, mercY, tileX, tileY))
                             }
                         }
@@ -125,6 +124,8 @@ fun MapCanvas(
                     topLeft = totalOffset,
                     size = Size(TILE_SIZE, TILE_SIZE)
                 )
+
+
             }
         }
     }
diff --git a/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt b/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
index fefd2f9..ba08f4b 100644
--- a/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
+++ b/app/src/main/java/com/mirenkov/ktheightmap/Tile.kt
@@ -46,4 +46,8 @@ class Tile {
         bitmap = BitmapFactory.decodeByteArray(ba, 0, ba.size)
         return bitmap
     }
+
+    fun mercateX(): Double = SphereMercator.sx2lon((x * TILE_SIZE).toDouble(), level) - 180.0
+
+    fun mercateY(): Double = -SphereMercator.sy2lat((y.toDouble() - ((1 shl (level - 1)).toDouble() / 2.0)) * TILE_SIZE, level - 1)
 }
\ No newline at end of file