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 --- .../java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'androidApp/src/main/java') diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt index 933cd8a..63dd9ed 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt @@ -52,6 +52,7 @@ object MarkerTransformations { private fun categoryToMarkerType(category: String?): MarkerType { return when (category?.lowercase()) { "animal" -> MarkerType.ANIMAL + "backhoe" -> MarkerType.BACKHOE "bicycle" -> MarkerType.BICYCLE "boat" -> MarkerType.BOAT "bus" -> MarkerType.BUS @@ -78,6 +79,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: MarkerType): Int { return when (markerType) { MarkerType.ANIMAL -> R.drawable.map_animal + MarkerType.BACKHOE -> R.drawable.map_backhoe MarkerType.BICYCLE -> R.drawable.map_bicycle MarkerType.BOAT -> R.drawable.map_boat MarkerType.BUS -> R.drawable.map_bus @@ -108,6 +110,7 @@ object MarkerTransformations { fun markerTypeToStringId(markerType: MarkerType): Int { return when (markerType) { MarkerType.ANIMAL -> R.string.unit_category_animal + MarkerType.BACKHOE -> R.string.unit_category_backhoe MarkerType.BICYCLE -> R.string.unit_category_bicycle MarkerType.BOAT -> R.string.unit_category_boat MarkerType.BUS -> R.string.unit_category_bus -- cgit v1.2.3 From 4f4b7f5755c164d4d9c3c4cc35118cf3429874c6 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sun, 16 Jan 2022 04:26:31 -0600 Subject: Added Google Maps and Google Satellites layers --- .../TrackerMap/android/units/UnitsActivity.kt | 1 + androidApp/src/main/res/menu/map_layers.xml | 4 ++++ androidApp/src/main/res/values-es-rMX/map_layers.xml | 5 +++-- androidApp/src/main/res/values/map_layers.xml | 18 +++++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) (limited to 'androidApp/src/main/java') 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 1bbcb80..f2ff30e 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 @@ -94,6 +94,7 @@ class UnitsActivity : AppCompatActivity() { val layer = resources.getStringArray( when (item.itemId) { R.id.layerStreets -> R.array.maps_streets_tile + R.id.layerGmaps -> R.array.maps_gmaps_tile R.id.layerSatellite -> R.array.maps_satellite_tile else -> R.array.maps_streets_tile } diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml index 334b9f9..46165da 100644 --- a/androidApp/src/main/res/menu/map_layers.xml +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -6,6 +6,10 @@ android:id="@+id/layerStreets" android:title="@string/layer_streets"/> + + 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 eff37d9..ef56b76 100644 --- a/androidApp/src/main/res/values-es-rMX/map_layers.xml +++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml @@ -1,5 +1,6 @@ - Calles - Satélite + OpenStreetMap + 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 bffceb9..59c6af5 100644 --- a/androidApp/src/main/res/values/map_layers.xml +++ b/androidApp/src/main/res/values/map_layers.xml @@ -1,7 +1,8 @@ - Streets - Satellite + OpenStreetMap + Google Streets + Google Satellite @@ -16,11 +17,18 @@ © OpenStreetMap France | © <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors + + https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga + 0 + 21 + © Google + + - https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x} + https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga 0 - 20 - Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community + 21 + © Google \ No newline at end of file -- 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 'androidApp/src/main/java') 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 From 31af6d69a7bb8a513a7bb9b1633cc015088384d3 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 23:53:25 -0600 Subject: Branded merge --- .../src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'androidApp/src/main/java') diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt index 56a9167..004bcaa 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt @@ -14,7 +14,8 @@ class Utils { 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 } callback(layer) -- cgit v1.2.3