diff options
Diffstat (limited to 'shared/src')
| -rw-r--r-- | shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt | 17 | ||||
| -rw-r--r-- | shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt | 2 |
2 files changed, 13 insertions, 6 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 ff0489e..4a48952 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 @@ -8,7 +8,8 @@ data class MapLayer( ) { enum class Type { STREETS, - SATELLITE + GMAPS_STREETS, + GMAPS_SATELLITE } companion object { @@ -19,11 +20,17 @@ data class MapLayer( maxZoom = 23, attribution = "© OpenStreetMap France | © <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 © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community" + maxZoom = 23, + attribution = "© 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 = "© Google" ) ) diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt index 65048ed..58d8d1c 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt @@ -1,7 +1,7 @@ package mx.trackermap.TrackerMap.utils enum class MarkerType { - ANIMAL, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, + ANIMAL, BACKHOE, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, PICKUP, PLANE, SCOOTER, SHIP, TRACTOR, TRAIN, TRAM, TROLLEYBUS, TRUCK, VAN, REPORT_POSITION, REPORT_START, REPORT_END |