Factored out position code.

alanwatsonforster · Sep 29, 2023 · 114078c · 114078c
1 parent a9d5c44
commit 114078c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/airpower/aircraft/__init__.py b/airpower/aircraft/__init__.py
@@ -87,6 +87,20 @@ def __str__(self):
       s += "%-16s: %s\n" % (x[0], x[1])
     return s
 
+  def position(self):
+
+    if apmap.isonmap(self._x, self._y):
+      sheet = apmap.tosheet(self._x, self._y)
+      hexcode = aphexcode.fromxy(self._x, self._y)
+    else:
+      sheet = "--"
+      hexcode = "----"
+    azimuth = apazimuth.fromfacing(self._facing)
+    altitude = self._altitude
+    altitudeband = self._altitudeband
+    return "%2s %-9s  %-3s  %2d  %2s" % (sheet, hexcode, azimuth, altitude, altitudeband)
+
+
   #############################################################################
 
   def checkforterraincollision(self):

diff --git a/airpower/aircraft/_log.py b/airpower/aircraft/_log.py
@@ -16,18 +16,7 @@ def _logbreak(self):
 
 def _logposition(self, s, t):
 
-  if apmap.isonmap(self._x, self._y):
-    sheet = apmap.tosheet(self._x, self._y)
-    hexcode = aphexcode.fromxy(self._x, self._y)
-  else:
-    sheet = "--"
-    hexcode = "----"
-  azimuth = apazimuth.fromfacing(self._facing)
-  altitude = self._altitude
-  altitudeband = self._altitudeband
-  position = "%2s %-9s  %-3s  %2d  %2s" % (sheet, hexcode, azimuth, altitude, altitudeband)
-
-  self._log("%-5s : %-16s : %s" % (s, t, position))
+  self._log("%-5s : %-16s : %s" % (s, t, self.position()))
 
 def _logevent(self, s):
   self._log("%-5s : %s" % ("", s))