Merge pull request #92 from pytroll/fix-tle-designator

Fix bogus designator assignment

Author: mraspaud

pyorbital/tests/test_tlefile.py

@@ -38,6 +38,12 @@
 line1_2 = "1 38771U 12049A   21137.30264622  .00000000  00000+0 -49996-5 0 00017"
 line2_2 = "2 38771  98.7162 197.7716 0002383 106.1049 122.6344 14.21477797449453"
 
+
+NOAA19_2LINES = """1 33591U 09005A   21355.91138073  .00000074  00000+0  65091-4 0  9998
+2 33591  99.1688  21.1338 0013414 329.8936  30.1462 14.12516400663123
+"""
+NOAA19_3LINES = "NOAA 19\n" + NOAA19_2LINES
+
 tle_xml = '\n'.join(
     ('<?xml version="1.0" encoding="UTF-8"?>',
         '<multi-mission-administrative-message>',
@@ -117,6 +123,32 @@ def test_from_file(self):
         finally:
             remove(filename)
 
+    def test_from_file_with_hyphenated_platform_name(self):
+        """Test reading and parsing from a file with a slightly different name."""
+        from tempfile import mkstemp
+        from os import write, close, remove
+        filehandle, filename = mkstemp()
+        try:
+            write(filehandle, NOAA19_3LINES.encode('utf-8'))
+            close(filehandle)
+            tle = Tle("NOAA-19", filename)
+            assert tle.satnumber == "33591"
+        finally:
+            remove(filename)
+
+    def test_from_file_with_no_platform_name(self):
+        """Test reading and parsing from a file with a slightly different name."""
+        from tempfile import mkstemp
+        from os import write, close, remove
+        filehandle, filename = mkstemp()
+        try:
+            write(filehandle, NOAA19_2LINES.encode('utf-8'))
+            close(filehandle)
+            tle = Tle("NOAA-19", filename)
+            assert tle.satnumber == "33591"
+        finally:
+            remove(filename)
+
     def test_from_mmam_xml(self):
         """Test reading from an MMAM XML file."""
         from tempfile import TemporaryDirectory

pyorbital/tlefile.py

@@ -286,7 +286,7 @@ def _get_first_tle(uris, open_func, platform=''):
 
 def _get_tles_from_uris(uris, open_func, platform='', only_first=True):
     tles = []
-    designator = "1 " + platform
+    designator = "1 " + SATELLITES.get(platform, '')
     for url in uris:
         fid = open_func(url)
         for l_0 in fid:
@@ -296,7 +296,7 @@ def _get_tles_from_uris(uris, open_func, platform='', only_first=True):
                 l_1 = _decode(next(fid))
                 l_2 = _decode(next(fid))
                 tle = l_1.strip() + "\n" + l_2.strip()
-            elif((platform in SATELLITES or not only_first) and l_0.strip().startswith(designator)):
+            elif (platform in SATELLITES or not only_first) and l_0.strip().startswith(designator):
                 l_1 = l_0
                 l_2 = _decode(next(fid))
                 tle = l_1.strip() + "\n" + l_2.strip()