Clean up leaflet polygon API surface.

qt_ui/widgets/map/model/controlpointjs.py

@@ -6,12 +6,12 @@ from PySide2.QtCore import Property, QObject, Signal, Slot
 from dcs import Point
 from dcs.mapping import LatLng
 
-from game.server.leaflet import LeafletLatLon
 from game.theater import ConflictTheater, ControlPoint
 from game.utils import meters, nautical_miles
 from qt_ui.dialogs import Dialog
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.QBaseMenu2 import QBaseMenu2
+from .leaflet import LeafletLatLon
 
 MAX_SHIP_DISTANCE = nautical_miles(80)
 

qt_ui/widgets/map/model/leaflet.py

@@ -0,0 +1,2 @@
+LeafletLatLon = list[float]
+LeafletPoly = list[LeafletLatLon]

qt_ui/widgets/map/model/mapmodel.py

@@ -7,13 +7,13 @@ from dcs.mapping import LatLng
 
 from game import Game
 from game.profiling import logged_duration
-from game.server.leaflet import LeafletLatLon
 from game.theater import (
     ConflictTheater,
 )
 from qt_ui.models import GameModel
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from .controlpointjs import ControlPointJs
+from .leaflet import LeafletLatLon
 from .supplyroutejs import SupplyRouteJs
 
 

qt_ui/widgets/map/model/supplyroutejs.py

@@ -5,9 +5,9 @@ from typing import List
 from PySide2.QtCore import Property, QObject, Signal
 
 from game import Game
-from game.server.leaflet import LeafletLatLon
 from game.theater import ControlPoint
 from game.transfers import MultiGroupTransport, TransportMap
+from .leaflet import LeafletLatLon
 
 
 class SupplyRouteJs(QObject):