Partial fix for tile loading at antimeridian

Signed-off-by: Kyle Corry <[email protected]>

Author: kylecorry31

app/src/main/java/com/kylecorry/trail_sense/shared/andromeda_temp/Extensions.kt

@@ -8,10 +8,13 @@ import com.kylecorry.andromeda.core.ui.ReactiveComponent
 import com.kylecorry.andromeda.fragments.observeFlow
 import com.kylecorry.andromeda.fragments.useBackgroundEffect
 import com.kylecorry.luna.coroutines.ParallelCoroutineRunner
+import com.kylecorry.sol.math.SolMath.deltaAngle
 import com.kylecorry.sol.math.SolMath.isCloseTo
 import com.kylecorry.sol.science.geology.CoordinateBounds
+import com.kylecorry.sol.science.geology.CoordinateBounds.Companion.empty
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.sol.units.CompassDirection
+import com.kylecorry.sol.units.Coordinate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
@@ -200,4 +203,41 @@ inline fun IntArray.get(x: Int, y: Int, width: Int): Int {
 
 inline fun IntArray.set(x: Int, y: Int, width: Int, value: Int) {
     this[y * width + x] = value
+}
+
+// TODO: Sol
+fun CoordinateBounds.Companion.from2(points: List<Coordinate>): CoordinateBounds {
+    val west = getWestLongitudeBound(points) ?: return empty
+    val east = getEastLongitudeBound(points) ?: return empty
+    val north = getNorthLatitudeBound(points) ?: return empty
+    val south = getSouthLatitudeBound(points) ?: return empty
+    return CoordinateBounds(north, east, south, west)
+}
+
+private fun getWestLongitudeBound(locations: List<Coordinate>): Double? {
+    val first = locations.firstOrNull() ?: return null
+    return locations.minByOrNull {
+        deltaAngle(
+            first.longitude.toFloat() + 180,
+            it.longitude.toFloat() + 180
+        )
+    }?.longitude
+}
+
+private fun getEastLongitudeBound(locations: List<Coordinate>): Double? {
+    val first = locations.firstOrNull() ?: return null
+    return locations.maxByOrNull {
+        deltaAngle(
+            first.longitude.toFloat() + 180,
+            it.longitude.toFloat() + 180
+        )
+    }?.longitude
+}
+
+private fun getSouthLatitudeBound(locations: List<Coordinate>): Double? {
+    return locations.minByOrNull { it.latitude }?.latitude
+}
+
+private fun getNorthLatitudeBound(locations: List<Coordinate>): Double? {
+    return locations.maxByOrNull { it.latitude }?.latitude
 }

app/src/main/java/com/kylecorry/trail_sense/shared/dem/DEM.kt

@@ -99,15 +99,15 @@ object DEM {
 
         val longitudes = Interpolation.getMultiplesBetween(
             bounds.west - resolution,
-            bounds.east + resolution,
+            (if (bounds.west < bounds.east) bounds.east else bounds.east + 360) + resolution,
             resolution
         )
 
         gridCache.getOrPut(getGridKey(latitudes, longitudes, resolution)) {
             val toLookupCoordinates = mutableListOf<Coordinate>()
             latitudes.forEach { lat ->
                 longitudes.forEach { lon ->
-                    toLookupCoordinates.add(Coordinate(lat, lon))
+                    toLookupCoordinates.add(Coordinate(lat, Coordinate.toLongitude(lon)))
                 }
             }
 

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/tiles/TileMath.kt

@@ -79,25 +79,14 @@ object TileMath {
             distancePerPixelToZoom(metersPerPixel, (minLat + maxLat) / 2).coerceAtMost(maxZoom)
         val northWestTile = latLonToTileXY(bounds.north, bounds.west, zoom).getBounds()
         val southEastTile = latLonToTileXY(bounds.south, bounds.east, zoom).getBounds()
-        return CoordinateBounds.fromBounds(
-            listOf(
-                northWestTile,
-                southEastTile
-            )
+        return CoordinateBounds(
+            northWestTile.north,
+            southEastTile.east,
+            southEastTile.south,
+            northWestTile.west
         )
     }
 
-    private fun CoordinateBounds.Companion.fromBounds(bounds: List<CoordinateBounds>): CoordinateBounds {
-        return CoordinateBounds.from(bounds.flatMap {
-            listOf(
-                it.northWest,
-                it.northEast,
-                it.southWest,
-                it.southEast
-            )
-        })
-    }
-
     fun latLonToTileXY(lat: Double, lon: Double, zoom: Int): Tile {
         val latRad = Math.toRadians(lat)
         val n = 1 shl zoom

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/ui/layers/tiles/FullRegionMapTileSource.kt

@@ -1,6 +1,10 @@
 package com.kylecorry.trail_sense.shared.map_layers.ui.layers.tiles
 
+import com.kylecorry.sol.math.SolMath.deltaAngle
 import com.kylecorry.sol.science.geology.CoordinateBounds
+import com.kylecorry.sol.science.geology.CoordinateBounds.Companion.empty
+import com.kylecorry.sol.units.Coordinate
+import com.kylecorry.trail_sense.shared.andromeda_temp.from2
 import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionLoader
 import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
 import kotlinx.coroutines.sync.Mutex
@@ -14,7 +18,7 @@ abstract class FullRegionMapTileSource : ITileSourceSelector {
     abstract fun getLoader(fullBounds: CoordinateBounds): FullRegionMapTileLoader
 
     override suspend fun getRegionLoaders(bounds: List<CoordinateBounds>): List<List<IGeographicImageRegionLoader>> {
-        val fullBounds = CoordinateBounds.from(bounds.flatMap {
+        val fullBounds = CoordinateBounds.from2(bounds.flatMap {
             listOf(
                 it.northWest,
                 it.southEast