simplify taf encoding

andrewgryan · Nov 12, 2024 · 31d3863 · 31d3863
1 parent c65587c
commit 31d3863
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/src/detaf/lib.py b/src/detaf/lib.py
@@ -91,18 +91,6 @@ class TAF:
     issue_time: str = None
     weather_conditions: list[WeatherCondition] = field(default_factory=list)
 
-    def taf_encode(self) -> str:
-        parts = ["TAF"]
-        if self.version != Version.ORIGINAL:
-            parts.append(self.version.taf_encode())
-        if self.icao_identifier:
-            parts.append(self.icao_identifier)
-        if self.issue_time:
-            parts.append(encode_issue_time(self.issue_time))
-        for weather in self.weather_conditions:
-            parts.append(weather.taf_encode())
-        return " ".join(parts)
-
     def __iter__(self):
         yield "TAF"
         if self.version != Version.ORIGINAL:
@@ -113,6 +101,9 @@ def __iter__(self):
             yield self.issue_time
         yield from self.weather_conditions
 
+    def taf_encode(self) -> str:
+        return " ".join(encode(item) for item in self)
+
 
 def parse(bulletin: str) -> TAF:
     words = bulletin.strip().split()