MGRS filters for time formats

Author: mubaldino

src/main/python/opensextant/extractors/xcoord.py

@@ -369,6 +369,7 @@ def __init__(self):
         GeocoordFilter.__init__(self)
         self.date_formats = ["DDMMMYYYY", "DMMMYYHHmm", "DDMMMYYHHmm", "DDMMMYY", "DMMMYY", "HHZZZYYYY"]
         self.sequences = ["1234", "123456", "12345678", "1234567890"]
+        self.stop_terms = { "PER", "SEC", "UTC", "GMT", "GAL"}
         self.today = arrow.utcnow()
         self.YEAR = self.today.date().year
         self.YY = self.YEAR - 2000
@@ -391,9 +392,9 @@ def filter_out(self, mgrs: GeocoordMatch) -> tuple:
 
         if not (mgrs.text.isupper() and len(mgrs.text.replace(" ", "")) > 6):
             return True, "lexical"
-        parts = set(mgrs.text.split())
-        if "SEC" in parts or "PER" in parts:
-            return True, "rate"
+        for term in self.stop_terms:
+            if term in mgrs.textnorm:
+                return True, "measure"
         for seq in self.sequences:
             if seq in mgrs.textnorm:
                 return True, "digit-seq"

src/main/python/opensextant/resources/geocoord_patterns_py.cfg

@@ -185,6 +185,7 @@
 #CLASS MGRS  opensextant.extractors.xcoord.MGRSMatch
 #RULE  MGRS    01      \b<MGRSZone>\s?<MGRSQuad>\s{0,2}<Easting_Northing>\b
 #TEST  MGRS    01      4QFJ 50007000
+#TEST  MGRS    01      Time of day 11:30 UTC 21  # FAIL - time component
 #TEST  MGRS    01     38SMB4611036560
 #TEST  MGRS    01     38SMB46113656
 #TEST  MGRS    01      8SMB46113656

src/main/python/setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='opensextant',
-    version='1.6.6',
+    version='1.6.7',
 
     description='OpenSextant APIs and Utilities',
     long_description=long_description,