diff --git a/gen/flights/flightplan.py b/gen/flights/flightplan.py index 8619fa3f..0a3a3174 100644 --- a/gen/flights/flightplan.py +++ b/gen/flights/flightplan.py @@ -103,8 +103,8 @@ class FlightPlanBuilder: logging.error( "Troop transport flight plan generation not implemented" ) - except InvalidObjectiveLocation as ex: - logging.error(f"Could not create flight plan: {ex}") + except InvalidObjectiveLocation: + logging.exception(f"Could not create flight plan") def regenerate_package_waypoints(self) -> None: ingress_point = self._ingress_point() diff --git a/gen/flights/traveltime.py b/gen/flights/traveltime.py index 17879616..7340715e 100644 --- a/gen/flights/traveltime.py +++ b/gen/flights/traveltime.py @@ -42,8 +42,17 @@ class GroundSpeed: for flight in package.flights: waypoint = flight.waypoint_with_type(IP_TYPES) if waypoint is None: - logging.error(f"Could not find ingress point for {flight}") - continue + logging.error(f"Could not find ingress point for {flight}.") + if flight.points: + logging.warning( + "Using first waypoint for mission altitude.") + waypoint = flight.points[0] + else: + logging.warning( + "Flight has no waypoints. Assuming mission altitude " + "of 25000 feet.") + waypoint = FlightWaypoint(FlightWaypointType.NAV, 0, 0, + 25000) speeds.add(GroundSpeed.for_flight(flight, waypoint.alt)) return min(speeds)