Move NavMesh out of MapModel.

game/server/app.py

@@ -1,10 +1,11 @@
 from fastapi import Depends, FastAPI
 
-from . import debuggeometries, eventstream, flights, waypoints
+from . import debuggeometries, eventstream, flights, navmesh, waypoints
 from .security import ApiKeyManager
 
 app = FastAPI(dependencies=[Depends(ApiKeyManager.verify)])
 app.include_router(debuggeometries.router)
 app.include_router(eventstream.router)
 app.include_router(flights.router)
+app.include_router(navmesh.router)
 app.include_router(waypoints.router)

game/server/dependencies.py

@@ -1,5 +1,10 @@
-from game import Game
-from qt_ui.models import GameModel
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from game import Game
+    from qt_ui.models import GameModel
 
 
 class GameContext:

game/server/eventstream/eventstream.py

@@ -1,6 +1,6 @@
 from asyncio import Queue
 
-from game.sim.gameupdateevents import GameUpdateEvents
+from game.sim import GameUpdateEvents
 
 
 class EventStream:

game/server/eventstream/models.py

@@ -10,13 +10,14 @@ from game.server.leaflet import LeafletLatLon
 
 if TYPE_CHECKING:
     from game import Game
-    from game.sim.gameupdateevents import GameUpdateEvents
+    from game.sim import GameUpdateEvents
 
 
 class GameUpdateEventsJs(BaseModel):
     updated_flights: dict[UUID, LeafletLatLon]
     new_combats: list[FrozenCombatJs] = []
     updated_combats: list[FrozenCombatJs] = []
+    navmesh_updates: set[bool] = set()
 
     @classmethod
     def from_events(cls, events: GameUpdateEvents, game: Game) -> GameUpdateEventsJs:
@@ -31,4 +32,5 @@ class GameUpdateEventsJs(BaseModel):
                 FrozenCombatJs.for_combat(c, game.theater)
                 for c in events.updated_combats
             ],
+            navmesh_updates=events.navmesh_updates,
         )

game/server/navmesh/__init__.py

@@ -0,0 +1 @@
+from .routes import router

game/server/navmesh/models.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+from game.server.leaflet import LeafletPoly
+
+
+class NavMeshPolyJs(BaseModel):
+    poly: LeafletPoly
+    threatened: bool

game/server/navmesh/routes.py

@@ -0,0 +1,20 @@
+from fastapi import APIRouter, Depends
+
+from game import Game
+from game.server import GameContext
+from .models import NavMeshPolyJs
+from ..leaflet import ShapelyUtil
+
+router: APIRouter = APIRouter(prefix="/navmesh")
+
+
+@router.get("/", response_model=list[NavMeshPolyJs])
+def get(for_player: bool, game: Game = Depends(GameContext.get)) -> list[NavMeshPolyJs]:
+    mesh = game.coalition_for(for_player).nav_mesh
+    return [
+        NavMeshPolyJs(
+            poly=ShapelyUtil.poly_to_leaflet(p.poly, game.theater),
+            threatened=p.threatened,
+        )
+        for p in mesh.polys
+    ]