From c7705fd5457ca2d2dfd3538ab64af11b76f81e77 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 22 Sep 2022 01:51:06 -0700
Subject: [PATCH] Update pydcs.

This update includes expanded runway data that lets us clean up some
code. It also include beacon IDs for runways and airfields that will let
us get ILS and TACAN info from pydcs, but that's a bigger change that
I'll land separately.
---
 game/runways.py  | 38 ++++++++++++++++----------------------
 requirements.txt |  2 +-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/game/runways.py b/game/runways.py
index 4764671c..8576ee7e 100644
--- a/game/runways.py
+++ b/game/runways.py
@@ -5,7 +5,7 @@ import logging
 from dataclasses import dataclass
 from typing import Iterator, Optional, TYPE_CHECKING
 
-from dcs.terrain.terrain import Airport
+from dcs.terrain.terrain import Airport, RunwayApproach
 
 from game.airfields import AirfieldData, AtcData
 from game.radio.radios import RadioFrequency
@@ -29,20 +29,18 @@ class RunwayData:
     icls: Optional[int] = None
 
     @classmethod
-    def for_airfield(
+    def for_pydcs_runway_runway(
         cls,
         theater: ConflictTheater,
         airport: Airport,
-        runway_heading: Heading,
-        runway_name: str,
+        runway: RunwayApproach,
     ) -> RunwayData:
         """Creates RunwayData for the given runway of an airfield.
 
         Args:
             theater: The theater the airport is in.
             airport: The airfield the runway belongs to.
-            runway_heading: Heading of the runway.
-            runway_name: Identifier of the runway to use. e.g. "03" or "20L".
+            runway: The pydcs runway.
         """
         atc: Optional[RadioFrequency] = None
         tacan: Optional[TacanChannel] = None
@@ -56,13 +54,13 @@ class RunwayData:
             airfield = AirfieldData.for_airport(theater, airport)
             tacan = airfield.tacan
             tacan_callsign = airfield.tacan_callsign
-            ils = airfield.ils_freq(runway_name)
+            ils = airfield.ils_freq(runway.name)
         except KeyError:
             logging.warning(f"No airfield data for {airport.name} ({airport.id}")
         return cls(
             airfield_name=airport.name,
-            runway_heading=runway_heading,
-            runway_name=runway_name,
+            runway_heading=Heading(runway.heading),
+            runway_name=runway.name,
             atc=atc,
             tacan=tacan,
             tacan_callsign=tacan_callsign,
@@ -74,20 +72,16 @@ class RunwayData:
         cls, theater: ConflictTheater, airport: Airport
     ) -> Iterator[RunwayData]:
         for runway in airport.runways:
-            runway_number = runway.heading // 10
-            runway_side = ["", "L", "R"][runway.leftright]
-            runway_name = f"{runway_number:02}{runway_side}"
-            yield cls.for_airfield(
-                theater, airport, Heading.from_degrees(runway.heading), runway_name
+            yield cls.for_pydcs_runway_runway(
+                theater,
+                airport,
+                runway.main,
+            )
+            yield cls.for_pydcs_runway_runway(
+                theater,
+                airport,
+                runway.opposite,
             )
-
-            # pydcs only exposes one runway per physical runway, so to expose
-            # both sides of the runway we need to generate the other.
-            heading = Heading.from_degrees(runway.heading).opposite
-            runway_number = heading.degrees // 10
-            runway_side = ["", "R", "L"][runway.leftright]
-            runway_name = f"{runway_number:02}{runway_side}"
-            yield cls.for_airfield(theater, airport, heading, runway_name)
 
 
 class RunwayAssigner:
diff --git a/requirements.txt b/requirements.txt
index 459234c7..71eac0ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ pluggy==1.0.0
 pre-commit==2.19.0
 py==1.11.0
 pydantic==1.9.1
--e git+https://github.com/pydcs/dcs@0d06bcdf8b2e0a82a2891c612b0a7d4c8a4a4548#egg=pydcs
+-e git+https://github.com/pydcs/dcs@4c104828ecb95b0f4b095a0a9ea353bde75f48d0#egg=pydcs
 pyinstaller==5.2
 pyinstaller-hooks-contrib==2022.8
 pyparsing==3.0.9