Fix basemap loading

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

Author: kylecorry31

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

@@ -45,9 +45,19 @@ abstract class TileMapLayer<T : ITileSourceSelector>(
         shouldReloadTiles = true
     }
 
-    init {
+    override fun draw(drawer: ICanvasDrawer, map: IMapView) {
+        // Avoid drawing while in safe mode
+        if (SafeMode.isEnabled()) {
+            return
+        }
+
         // Load tiles if needed
-        taskRunner.addTask { viewBounds: Rectangle, bounds: CoordinateBounds, projection: IMapViewProjection ->
+        taskRunner.scheduleUpdate(
+            drawer.getBounds(45f), // TODO: Cache this
+            map.mapBounds,
+            map.mapProjection,
+            shouldReloadTiles
+        ){ viewBounds: Rectangle, bounds: CoordinateBounds, projection: IMapViewProjection ->
             shouldReloadTiles = false
             try {
                 loader.loadTiles(
@@ -72,21 +82,6 @@ abstract class TileMapLayer<T : ITileSourceSelector>(
                 shouldReloadTiles = true
             }
         }
-    }
-
-    override fun draw(drawer: ICanvasDrawer, map: IMapView) {
-        // Avoid drawing while in safe mode
-        if (SafeMode.isEnabled()) {
-            return
-        }
-
-        // Load tiles if needed
-        taskRunner.scheduleUpdate(
-            drawer.getBounds(45f), // TODO: Cache this
-            map.mapBounds,
-            map.mapProjection,
-            shouldReloadTiles
-        )
 
         // Render loaded tiles
         synchronized(loader.lock) {

app/src/main/java/com/kylecorry/trail_sense/tools/photo_maps/map_layers/PhotoMapTileSource.kt

@@ -6,24 +6,30 @@ import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionL
 import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
 import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.MapRepo
 import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.tiles.PhotoMapTileSourceSelector
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 class PhotoMapTileSource : ITileSourceSelector {
 
     var loadPdfs = true
     private var lastLoadPdfs = loadPdfs
     private var internalSelector: ITileSourceSelector? = null
+    private val lock = Mutex()
 
     override suspend fun getRegionLoaders(bounds: CoordinateBounds): List<IGeographicImageRegionLoader> {
-        if (internalSelector == null || loadPdfs != lastLoadPdfs) {
-            val repo = AppServiceRegistry.get<MapRepo>()
-            internalSelector = PhotoMapTileSourceSelector(
-                AppServiceRegistry.get(),
-                repo.getAllMaps().filter { it.visible },
-                8,
-                loadPdfs
-            )
-            lastLoadPdfs = loadPdfs
+        val selector = lock.withLock {
+            if (internalSelector == null || loadPdfs != lastLoadPdfs) {
+                val repo = AppServiceRegistry.get<MapRepo>()
+                internalSelector = PhotoMapTileSourceSelector(
+                    AppServiceRegistry.get(),
+                    repo.getAllMaps().filter { it.visible },
+                    8,
+                    loadPdfs
+                )
+                lastLoadPdfs = loadPdfs
+            }
+            internalSelector
         }
-        return internalSelector?.getRegionLoaders(bounds) ?: emptyList()
+        return selector?.getRegionLoaders(bounds) ?: emptyList()
     }
 }