File tree Expand file tree Collapse file tree 7 files changed +13
-16
lines changed
app/src/main/java/com/kylecorry/trail_sense Expand file tree Collapse file tree 7 files changed +13
-16
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ class TileLoader {
3838 }
3939
4040 suspend fun loadTiles (
41- sourceSelector : ITileSourceSelector ,
41+ sourceSelector : TileSource ,
4242 bounds : CoordinateBounds ,
4343 metersPerPixel : Float ,
4444 minZoom : Int = 0,
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ package com.kylecorry.trail_sense.shared.map_layers.tiles
22
33import com.kylecorry.sol.science.geology.CoordinateBounds
44
5- interface ITileSourceSelector {
5+ interface TileSource {
66 suspend fun getRegionLoaders (bounds : CoordinateBounds ): List <IGeographicImageRegionLoader >
77 suspend fun getRegionLoaders (bounds : List <CoordinateBounds >): List <List <IGeographicImageRegionLoader >> {
88 return bounds.map { getRegionLoaders(it) }
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import com.kylecorry.sol.math.geometry.Size
1010import com.kylecorry.sol.science.geology.CoordinateBounds
1111import com.kylecorry.sol.units.Coordinate
1212import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionLoader
13- import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
13+ import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource
1414import com.kylecorry.trail_sense.tools.photo_maps.domain.MapCalibration
1515import com.kylecorry.trail_sense.tools.photo_maps.domain.MapCalibrationPoint
1616import com.kylecorry.trail_sense.tools.photo_maps.domain.MapMetadata
@@ -19,7 +19,7 @@ import com.kylecorry.trail_sense.tools.photo_maps.domain.PercentCoordinate
1919import com.kylecorry.trail_sense.tools.photo_maps.domain.PhotoMap
2020import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.tiles.PhotoMapTileSourceSelector
2121
22- class BaseMapTileSource : ITileSourceSelector {
22+ class BaseMapTileSource : TileSource {
2323
2424 private val context = AppServiceRegistry .get<Context >()
2525 private val internalSelector = PhotoMapTileSourceSelector (
Original file line number Diff line number Diff line change 11package com.kylecorry.trail_sense.shared.map_layers.ui.layers.tiles
22
3- import com.kylecorry.sol.math.SolMath.deltaAngle
43import com.kylecorry.sol.science.geology.CoordinateBounds
5- import com.kylecorry.sol.science.geology.CoordinateBounds.Companion.empty
6- import com.kylecorry.sol.units.Coordinate
74import com.kylecorry.trail_sense.shared.andromeda_temp.from2
85import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionLoader
9- import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
6+ import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource
107import kotlinx.coroutines.sync.Mutex
118import kotlinx.coroutines.sync.withLock
129
13- abstract class FullRegionMapTileSource : ITileSourceSelector {
10+ abstract class FullRegionMapTileSource : TileSource {
1411
1512 private var loaderLock = Mutex ()
1613 private var lastLoader: FullRegionMapTileLoader ? = null
Original file line number Diff line number Diff line change @@ -12,15 +12,15 @@ import com.kylecorry.sol.science.geology.CoordinateBounds
1212import com.kylecorry.trail_sense.main.errors.SafeMode
1313import com.kylecorry.trail_sense.shared.getBounds
1414import com.kylecorry.trail_sense.shared.map_layers.MapLayerBackgroundTask2
15- import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
15+ import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource
1616import com.kylecorry.trail_sense.shared.map_layers.tiles.TileLoader
1717import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IAsyncLayer
1818import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IMapView
1919import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IMapViewProjection
2020import com.kylecorry.trail_sense.shared.map_layers.ui.layers.toPixel
2121import kotlinx.coroutines.CancellationException
2222
23- abstract class TileMapLayer <T : ITileSourceSelector >(
23+ abstract class TileMapLayer <T : TileSource >(
2424 protected val source : T ,
2525 private val taskRunner : MapLayerBackgroundTask2 = MapLayerBackgroundTask2 (),
2626 private val minZoomLevel : Int? = null ,
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import com.kylecorry.sol.math.SolMath
66import com.kylecorry.sol.science.geology.CoordinateBounds
77import com.kylecorry.trail_sense.shared.andromeda_temp.intersects2
88import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionLoader
9- import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
9+ import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource
1010import com.kylecorry.trail_sense.tools.photo_maps.domain.PhotoMap
1111
1212class PhotoMapTileSourceSelector (
@@ -16,7 +16,7 @@ class PhotoMapTileSourceSelector(
1616 private val loadPdfs : Boolean = true ,
1717 private val isPixelPerfect : Boolean = false ,
1818 private val operations : List <BitmapOperation > = emptyList()
19- ) : ITileSourceSelector {
19+ ) : TileSource {
2020
2121 private val sortedMaps = maps
2222 .filter { it.isCalibrated }
Original file line number Diff line number Diff line change @@ -3,17 +3,17 @@ package com.kylecorry.trail_sense.tools.photo_maps.map_layers
33import com.kylecorry.andromeda.core.cache.AppServiceRegistry
44import com.kylecorry.sol.science.geology.CoordinateBounds
55import com.kylecorry.trail_sense.shared.map_layers.tiles.IGeographicImageRegionLoader
6- import com.kylecorry.trail_sense.shared.map_layers.tiles.ITileSourceSelector
6+ import com.kylecorry.trail_sense.shared.map_layers.tiles.TileSource
77import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.MapRepo
88import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.tiles.PhotoMapTileSourceSelector
99import kotlinx.coroutines.sync.Mutex
1010import kotlinx.coroutines.sync.withLock
1111
12- class PhotoMapTileSource : ITileSourceSelector {
12+ class PhotoMapTileSource : TileSource {
1313
1414 var loadPdfs = true
1515 private var lastLoadPdfs = loadPdfs
16- private var internalSelector: ITileSourceSelector ? = null
16+ private var internalSelector: TileSource ? = null
1717 private val lock = Mutex ()
1818
1919 override suspend fun getRegionLoaders (bounds : CoordinateBounds ): List <IGeographicImageRegionLoader > {
You can’t perform that action at this time.
0 commit comments