aboutsummaryrefslogtreecommitdiff
path: root/shared/src/commonMain/kotlin/mx
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-02-17 11:23:12 -0600
committerIván Ávalos <avalos@disroot.org>2022-02-17 11:23:12 -0600
commit91681e8dd5875ac1cfa2844f7a25df081a4b255d (patch)
treec8735af6b956c5e725fd4e258f1837685d54a7cc /shared/src/commonMain/kotlin/mx
parentc7e934a5b215961dcd8f63b6a5586a45a91b9186 (diff)
parent1a37308c876d09b045a0202804762bf32e9f431c (diff)
downloadetbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.tar.gz
etbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.tar.bz2
etbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.zip
Merged 'main' branch and solved conflicts.
Diffstat (limited to 'shared/src/commonMain/kotlin/mx')
-rw-r--r--shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt17
1 files changed, 12 insertions, 5 deletions
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
index 3266c0b..7bb41ae 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
@@ -25,7 +25,8 @@ data class MapLayer(
) {
enum class Type {
STREETS,
- SATELLITE
+ GMAPS_STREETS,
+ GMAPS_SATELLITE
}
companion object {
@@ -36,11 +37,17 @@ data class MapLayer(
maxZoom = 23,
attribution = "&#169; OpenStreetMap France | &#169; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
),
- Type.SATELLITE to MapLayer(
- url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+ Type.GMAPS_STREETS to MapLayer(
+ url = "https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga",
minZoom = 1,
- maxZoom = 20,
- attribution = "Tiles &#169; Esri &#8212; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+ maxZoom = 23,
+ attribution = "&#169; Google"
+ ),
+ Type.GMAPS_SATELLITE to MapLayer(
+ url = "https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga",
+ minZoom = 1,
+ maxZoom = 23,
+ attribution = "&#169; Google"
)
)