First pass at cargo ships.

The simple form of this works, but without the multi-mode routing it'll
only get used when the final destination is a port with a link to a port
with a factory.

These also aren't targetable or simulated yet.

https://github.com/Khopa/dcs_liberation/issues/826

qt_ui/widgets/map/QLiberationMap.py

@@ -4,7 +4,7 @@ import datetime
 import logging
 import math
 from functools import singledispatchmethod
-from typing import Iterable, Iterator, List, Optional, Tuple
+from typing import Iterable, Iterator, List, Optional, Sequence, Tuple
 
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtCore import QLineF, QPointF, QRectF, Qt
@@ -87,7 +87,7 @@ def bernstein(t: float, i: int, n: int) -> float:
     return binomial(i, n) * (t ** i) * ((1 - t) ** (n - i))
 
 
-def bezier(t: float, points: Iterable[Tuple[float, float]]) -> Tuple[float, float]:
+def bezier(t: float, points: Sequence[Tuple[float, float]]) -> Tuple[float, float]:
     """Calculate coordinate of a point in the bezier curve"""
     n = len(points) - 1
     x = y = 0
@@ -99,7 +99,7 @@ def bezier(t: float, points: Iterable[Tuple[float, float]]) -> Tuple[float, floa
 
 
 def bezier_curve_range(
-    n: int, points: Iterable[Tuple[float, float]]
+    n: int, points: Sequence[Tuple[float, float]]
 ) -> Iterator[Tuple[float, float]]:
     """Range of points in a curve bezier"""
     for i in range(n):
@@ -145,7 +145,7 @@ class QLiberationMap(QGraphicsView):
             QtCore.QLineF(QPointF(0, 0), QPointF(0, 0))
         )
         self.movement_line.setPen(QPen(CONST.COLORS["orange"], width=10.0))
-        self.selected_cp: QMapControlPoint = None
+        self.selected_cp: Optional[QMapControlPoint] = None
 
         GameUpdateSignal.get_instance().flight_paths_changed.connect(
             lambda: self.draw_flight_plans(self.scene())
@@ -767,7 +767,7 @@ class QLiberationMap(QGraphicsView):
         scene: QGraphicsScene,
         number: int,
         waypoint: FlightWaypoint,
-        position: Tuple[int, int],
+        position: Tuple[float, float],
         flight_plan: FlightPlan,
     ) -> None:
 
@@ -880,19 +880,28 @@ class QLiberationMap(QGraphicsView):
                     self.draw_shipping_lane_between(cp, destination)
 
     def draw_shipping_lane_between(self, a: ControlPoint, b: ControlPoint) -> None:
+        ship_map = self.game.transfers.cargo_ships
+        ships = []
+        ship = ship_map.find_transport(a, b)
+        if ship is not None:
+            ships.append(ship)
+        ship = ship_map.find_transport(b, a)
+        if ship is not None:
+            ships.append(ship)
+
         scene = self.scene()
         for pa, pb in self.bezier_points(a.shipping_lanes[b]):
-            scene.addItem(ShippingLaneSegment(pa[0], pa[1], pb[0], pb[1], a, b))
+            scene.addItem(ShippingLaneSegment(pa[0], pa[1], pb[0], pb[1], a, b, ships))
 
     def draw_supply_route_between(self, a: ControlPoint, b: ControlPoint) -> None:
         scene = self.scene()
 
         convoy_map = self.game.transfers.convoys
         convoys = []
-        convoy = convoy_map.find_convoy(a, b)
+        convoy = convoy_map.find_transport(a, b)
         if convoy is not None:
             convoys.append(convoy)
-        convoy = convoy_map.find_convoy(b, a)
+        convoy = convoy_map.find_transport(b, a)
         if convoy is not None:
             convoys.append(convoy)
 

qt_ui/widgets/map/ShippingLaneSegment.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import List, Optional
 
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QColor, QPen
@@ -8,6 +8,7 @@ from PySide2.QtWidgets import (
 )
 
 from game.theater import ControlPoint
+from game.transfers import CargoShip
 from qt_ui.uiconstants import COLORS
 
 
@@ -20,12 +21,13 @@ class ShippingLaneSegment(QGraphicsLineItem):
         y1: float,
         control_point_a: ControlPoint,
         control_point_b: ControlPoint,
+        ships: List[CargoShip],
         parent: Optional[QGraphicsItem] = None,
     ) -> None:
         super().__init__(x0, y0, x1, y1, parent)
         self.control_point_a = control_point_a
         self.control_point_b = control_point_b
-        self.ships = []
+        self.ships = ships
         self.setPen(self.make_pen())
         self.setToolTip(self.make_tooltip())
         self.setAcceptHoverEvents(True)