Disable parallel map layer loading for now

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

Author: kylecorry31

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

@@ -62,8 +62,12 @@ class MapLayerBackgroundTask {
             val taskCopy = synchronized(taskLock) {
                 tasks.toList()
             }
-            val parallel = ParallelCoroutineRunner()
-            parallel.run(taskCopy.map { { it(bounds, metersPerPixel) } })
+            for (task in taskCopy) {
+                task(bounds, metersPerPixel)
+            }
+            // TODO: Parallel execution is not working properly - I think it's cancellation related
+//            val parallel = ParallelCoroutineRunner()
+//            parallel.run(taskCopy.map { { it(bounds, metersPerPixel) } })
         }
     ) {
 

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

@@ -2,7 +2,6 @@ package com.kylecorry.trail_sense.shared.map_layers
 
 import com.kylecorry.andromeda.core.cache.AppServiceRegistry
 import com.kylecorry.luna.coroutines.CoroutineQueueRunner
-import com.kylecorry.luna.coroutines.ParallelCoroutineRunner
 import com.kylecorry.sol.math.geometry.Rectangle
 import com.kylecorry.sol.science.geology.CoordinateBounds
 import com.kylecorry.trail_sense.shared.andromeda_temp.grow
@@ -65,8 +64,12 @@ class MapLayerBackgroundTask2 {
             val taskCopy = synchronized(taskLock) {
                 tasks.toList()
             }
-            val parallel = ParallelCoroutineRunner()
-            parallel.run(taskCopy.map { { it(viewBounds, bounds, projection) } })
+            for (task in taskCopy) {
+                task(viewBounds, bounds, projection)
+            }
+            // TODO: Parallel execution is not working properly - I think it's cancellation related
+//            val parallel = ParallelCoroutineRunner()
+//            parallel.run(taskCopy.map { { it(viewBounds, bounds, projection) } })
         }
     ) {
 

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

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