Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile

 Conflicts:

	androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt

	androidApp/src/main/res/values/map_layers.xml

1 files changed, 4 insertions, 4 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
index d3060f0..2d2994b 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
@@ -29,14 +29,14 @@ class UnitsViewModel(
     private var _unitsDisplayMode = MutableLiveData(UnitsDisplayMode.MAP)
     private var _units = MutableLiveData<List<UnitInformation>>()
     private var _selectedUnit = MutableLiveData<UnitInformation?>()
-    private var _mapLayer = MutableLiveData<MapLayer>()
+    private var _mapLayerType = MutableLiveData<MapLayer.Type>()
     private var _geofences = MutableLiveData<Map<Int, Geofence>>()
 
     val searchQuery: LiveData<String> get() = _searchQuery
     val unitsDisplayMode: LiveData<UnitsDisplayMode> get() = _unitsDisplayMode
     val units: LiveData<List<UnitInformation>> get() = _units
     val selectedUnit: LiveData<UnitInformation?> get() = _selectedUnit
-    val mapLayer: LiveData<MapLayer> get() = _mapLayer
+    val mapLayerType: LiveData<MapLayer.Type> get() = _mapLayerType
     val geofences: LiveData<Map<Int, Geofence>> get() = _geofences
 
     init {
@@ -85,8 +85,8 @@ class UnitsViewModel(
         _unitsDisplayMode.postValue(displayMode)
     }
 
-    fun setMapLayer(layer: MapLayer) {
-        _mapLayer.postValue(layer)
+    fun setMapLayerType(layer: MapLayer.Type) {
+        _mapLayerType.postValue(layer)
     }
 
     fun toggleDisplayMode() {