Skip to content

Commit 05d5754

Browse files
committed
Rename tile source selector
Signed-off-by: Kyle Corry <[email protected]>
1 parent c15646c commit 05d5754

File tree

7 files changed

+13
-16
lines changed

7 files changed

+13
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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,

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/tiles/ITileSourceSelector.kt renamed to app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/tiles/TileSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense.shared.map_layers.tiles
22

33
import 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) }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.kylecorry.sol.math.geometry.Size
1010
import com.kylecorry.sol.science.geology.CoordinateBounds
1111
import com.kylecorry.sol.units.Coordinate
1212
import 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
1414
import com.kylecorry.trail_sense.tools.photo_maps.domain.MapCalibration
1515
import com.kylecorry.trail_sense.tools.photo_maps.domain.MapCalibrationPoint
1616
import com.kylecorry.trail_sense.tools.photo_maps.domain.MapMetadata
@@ -19,7 +19,7 @@ import com.kylecorry.trail_sense.tools.photo_maps.domain.PercentCoordinate
1919
import com.kylecorry.trail_sense.tools.photo_maps.domain.PhotoMap
2020
import 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(

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.kylecorry.trail_sense.shared.map_layers.ui.layers.tiles
22

3-
import com.kylecorry.sol.math.SolMath.deltaAngle
43
import com.kylecorry.sol.science.geology.CoordinateBounds
5-
import com.kylecorry.sol.science.geology.CoordinateBounds.Companion.empty
6-
import com.kylecorry.sol.units.Coordinate
74
import com.kylecorry.trail_sense.shared.andromeda_temp.from2
85
import 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
107
import kotlinx.coroutines.sync.Mutex
118
import 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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import com.kylecorry.sol.science.geology.CoordinateBounds
1212
import com.kylecorry.trail_sense.main.errors.SafeMode
1313
import com.kylecorry.trail_sense.shared.getBounds
1414
import 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
1616
import com.kylecorry.trail_sense.shared.map_layers.tiles.TileLoader
1717
import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IAsyncLayer
1818
import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IMapView
1919
import com.kylecorry.trail_sense.shared.map_layers.ui.layers.IMapViewProjection
2020
import com.kylecorry.trail_sense.shared.map_layers.ui.layers.toPixel
2121
import 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,

app/src/main/java/com/kylecorry/trail_sense/tools/photo_maps/infrastructure/tiles/PhotoMapTileSourceSelector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.kylecorry.sol.math.SolMath
66
import com.kylecorry.sol.science.geology.CoordinateBounds
77
import com.kylecorry.trail_sense.shared.andromeda_temp.intersects2
88
import 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
1010
import com.kylecorry.trail_sense.tools.photo_maps.domain.PhotoMap
1111

1212
class 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 }

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package com.kylecorry.trail_sense.tools.photo_maps.map_layers
33
import com.kylecorry.andromeda.core.cache.AppServiceRegistry
44
import com.kylecorry.sol.science.geology.CoordinateBounds
55
import 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
77
import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.MapRepo
88
import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.tiles.PhotoMapTileSourceSelector
99
import kotlinx.coroutines.sync.Mutex
1010
import 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> {

0 commit comments

Comments
 (0)