mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Switched back to Wikimedia map tiles provider

develop
Arty Bishop 2023-10-13 15:07:51 +01:00
rodzic 842608bd78
commit 2c9fc39fa1
1 zmienionych plików z 4 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt
Wyświetl plik

@ -31,7 +31,7 @@ import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.domain.predict.GeoPos import com.rtbishop.look4sat.domain.predict.GeoPos
import com.rtbishop.look4sat.domain.predict.OrbitalObject import com.rtbishop.look4sat.domain.predict.OrbitalObject
import com.rtbishop.look4sat.domain.predict.OrbitalPos import com.rtbishop.look4sat.domain.predict.OrbitalPos
import org.osmdroid.tileprovider.tilesource.XYTileSource import org.osmdroid.tileprovider.tilesource.TileSourceFactory
import org.osmdroid.util.GeoPoint import org.osmdroid.util.GeoPoint
import org.osmdroid.views.CustomZoomButtonsController import org.osmdroid.views.CustomZoomButtonsController
import org.osmdroid.views.MapView import org.osmdroid.views.MapView
@ -204,7 +204,7 @@ private fun rememberMapViewWithLifecycle(): MapView {
val context = LocalContext.current val context = LocalContext.current
val mapView = remember { MapView(context) }.apply { val mapView = remember { MapView(context) }.apply {
setMultiTouchControls(true) setMultiTouchControls(true)
setTileSource(tonerLiteTileSource) setTileSource(TileSourceFactory.WIKIMEDIA)
minZoomLevel = getMinZoom(resources.displayMetrics.heightPixels) + 0.25 minZoomLevel = getMinZoom(resources.displayMetrics.heightPixels) + 0.25
maxZoomLevel = 5.99 maxZoomLevel = 5.99
controller.setZoom(minZoomLevel + 0.5) controller.setZoom(minZoomLevel + 0.5)
@ -237,16 +237,12 @@ private fun rememberMapViewLifecycleObserver(mapView: MapView) = remember(mapVie
} }
} }
private val tonerLiteTileSource = XYTileSource(
"Stamen", 0, 6, 256, ".png",
arrayOf("https://stamen-tiles.a.ssl.fastly.net/toner-lite/"),
"Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL."
)
private fun getColorFilter(): ColorMatrixColorFilter { private fun getColorFilter(): ColorMatrixColorFilter {
val grayScaleMatrix = ColorMatrix().apply { setSaturation(0f) }
val negativeMatrix = ColorMatrix( val negativeMatrix = ColorMatrix(
floatArrayOf(-1f, 0f, 0f, 0f, 260f, 0f, -1f, 0f, 0f, 260f, 0f, 0f, -1f, 0f, 260f, 0f, 0f, 0f, 1f, 0f) floatArrayOf(-1f, 0f, 0f, 0f, 260f, 0f, -1f, 0f, 0f, 260f, 0f, 0f, -1f, 0f, 260f, 0f, 0f, 0f, 1f, 0f)
) )
negativeMatrix.preConcat(grayScaleMatrix)
return ColorMatrixColorFilter(negativeMatrix) return ColorMatrixColorFilter(negativeMatrix)
} }