Refactor map layer management and navigation infrastructure (#4921)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

feature/map/src/androidMain/kotlin/org/meshtastic/feature/map/navigation/MapMainScreen.kt

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2025-2026 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.meshtastic.feature.map.navigation
-
-import androidx.compose.runtime.Composable
-import org.koin.compose.viewmodel.koinViewModel
-import org.meshtastic.feature.map.MapScreen
-import org.meshtastic.feature.map.SharedMapViewModel
-
-@Composable
-actual fun MapMainScreen(onClickNodeChip: (Int) -> Unit, navigateToNodeDetails: (Int) -> Unit, waypointId: Int?) {
-    val viewModel = koinViewModel<SharedMapViewModel>()
-    MapScreen(
-        viewModel = viewModel,
-        onClickNodeChip = onClickNodeChip,
-        navigateToNodeDetails = navigateToNodeDetails,
-        waypointId = waypointId,
-    )
-}

feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/navigation/MapNavigation.kt

@@ -16,7 +16,6 @@
  */
 package org.meshtastic.feature.map.navigation
 
-import androidx.compose.runtime.Composable
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
@@ -25,13 +24,11 @@ import org.meshtastic.core.navigation.NodesRoutes
 
 fun EntryProviderScope<NavKey>.mapGraph(backStack: NavBackStack<NavKey>) {
     entry<MapRoutes.Map> { args ->
-        MapMainScreen(
-            onClickNodeChip = { backStack.add(NodesRoutes.NodeDetailGraph(it)) },
-            navigateToNodeDetails = { backStack.add(NodesRoutes.NodeDetailGraph(it)) },
-            waypointId = args.waypointId,
+        val mapScreen = org.meshtastic.core.ui.util.LocalMapMainScreenProvider.current
+        mapScreen(
+            { backStack.add(NodesRoutes.NodeDetailGraph(it)) }, // onClickNodeChip
+            { backStack.add(NodesRoutes.NodeDetailGraph(it)) }, // navigateToNodeDetails
+            args.waypointId,
         )
     }
 }
-
-@Composable
-expect fun MapMainScreen(onClickNodeChip: (Int) -> Unit, navigateToNodeDetails: (Int) -> Unit, waypointId: Int?)

feature/map/src/commonTest/kotlin/org/meshtastic/feature/map/model/MapLayerTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025-2026 Meshtastic LLC
+ * Copyright (c) 2026 Meshtastic LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,11 +14,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.map.navigation
+package org.meshtastic.feature.map.model
 
-import androidx.compose.runtime.Composable
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 
-@Composable
-actual fun MapMainScreen(onClickNodeChip: (Int) -> Unit, navigateToNodeDetails: (Int) -> Unit, waypointId: Int?) {
-    // TODO: Implement iOS map main screen
+class MapLayerTest {
+
+    @Test
+    fun `MapLayerItem defaults are correct`() {
+        val item = MapLayerItem(name = "Test", layerType = LayerType.GEOJSON)
+
+        assertNotNull(item.id)
+        assertEquals("Test", item.name)
+        assertEquals(null, item.uriString)
+        assertEquals(true, item.isVisible)
+        assertEquals(LayerType.GEOJSON, item.layerType)
+        assertEquals(false, item.isNetwork)
+        assertEquals(false, item.isRefreshing)
+    }
 }

feature/map/src/commonTest/kotlin/org/meshtastic/feature/map/model/TracerouteOverlayTest.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.meshtastic.feature.map.model
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class TracerouteOverlayTest {
+
+    @Test
+    fun `TracerouteOverlay handles empty routes correctly`() {
+        val overlay = TracerouteOverlay(requestId = 1)
+
+        assertEquals(1, overlay.requestId)
+        assertTrue(overlay.forwardRoute.isEmpty())
+        assertTrue(overlay.returnRoute.isEmpty())
+        assertTrue(overlay.relatedNodeNums.isEmpty())
+        assertFalse(overlay.hasRoutes)
+    }
+
+    @Test
+    fun `TracerouteOverlay processes populated routes correctly`() {
+        val overlay = TracerouteOverlay(requestId = 2, forwardRoute = listOf(1, 2, 3), returnRoute = listOf(3, 4, 1))
+
+        assertEquals(setOf(1, 2, 3, 4), overlay.relatedNodeNums)
+        assertTrue(overlay.hasRoutes)
+    }
+}

feature/map/src/jvmMain/kotlin/org/meshtastic/feature/map/navigation/MapMainScreen.kt

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2025-2026 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.meshtastic.feature.map.navigation
-
-import androidx.compose.runtime.Composable
-import org.meshtastic.core.ui.component.PlaceholderScreen
-
-@Composable
-actual fun MapMainScreen(onClickNodeChip: (Int) -> Unit, navigateToNodeDetails: (Int) -> Unit, waypointId: Int?) {
-    // Desktop placeholder for now
-    PlaceholderScreen(name = "Map")
-}