From af8883215fa823d3caba860174396840e7e63ce2 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 01:53:42 -0600 Subject: ETBSA branding --- .../src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared/src/commonMain/kotlin/mx/trackermap') 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 -- cgit v1.2.3 From c8d423b0933b21c9e16475f9bf89160fc8861825 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 01:11:04 -0600 Subject: Branded merge --- .../TrackerMap/android/units/UnitsActivity.kt | 3 ++- androidApp/src/main/res/menu/map_layers.xml | 8 ++++---- androidApp/src/main/res/values-es-rMX/map_layers.xml | 4 ++-- androidApp/src/main/res/values/map_layers.xml | 5 +++-- .../mx/trackermap/TrackerMap/client/models/MapLayer.kt | 17 ++++++++++++----- 5 files changed, 23 insertions(+), 14 deletions(-) (limited to 'shared/src/commonMain/kotlin/mx/trackermap') diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt index e9b9010..475575e 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt @@ -96,7 +96,8 @@ class UnitsActivity : AppCompatActivity() { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } unitsViewModel.setMapLayerType(layer) diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml index 46165da..db0a813 100644 --- a/androidApp/src/main/res/menu/map_layers.xml +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -7,11 +7,11 @@ android:title="@string/layer_streets"/> + android:id="@+id/layerGmapsStreets" + android:title="@string/layer_gmaps_streets"/> + android:id="@+id/layerGmapsSatellite" + android:title="@string/layer_gmaps_satellite"/> \ No newline at end of file diff --git a/androidApp/src/main/res/values-es-rMX/map_layers.xml b/androidApp/src/main/res/values-es-rMX/map_layers.xml index ef56b76..8afadc4 100644 --- a/androidApp/src/main/res/values-es-rMX/map_layers.xml +++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml @@ -1,6 +1,6 @@ OpenStreetMap - Google Calles - Google Satélite + Google Calles + Google Satélite \ No newline at end of file diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml index 034f3e5..50e1a7c 100644 --- a/androidApp/src/main/res/values/map_layers.xml +++ b/androidApp/src/main/res/values/map_layers.xml @@ -1,5 +1,6 @@ - Streets - Satellite + OpenStreetMap + Google Streets + Google Satellite \ No newline at end of file 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 | © OpenStreetMap 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" ) ) -- cgit v1.2.3