More flexible rules loading lat/lon.

castelao · Jun 18, 2014 · 17e7088 · 17e7088
1 parent 2eb384d
commit 17e7088
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@ def run_tests(self):
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.5.3'
+version = '0.5.4'
 
 install_requires = [
     'numpy>=1.1',

diff --git a/src/seabird/rules/cnv.yaml b/src/seabird/rules/cnv.yaml
@@ -100,19 +100,24 @@ fieldspan: |
 
 latitude: |
     # [LAT|LATITUDE]
+        (?:Latitude:?)?
+        \ *
     (?P<degree>\d{2})
-    \ 
-    (?P<minute>\d{2}.\d{2,3})
+    \ +
+    (?P<minute>\d{2}
+        [\.|\,]
+        \d{1,3})
     \ *
     (?P<hemisphere>[N|n|S|s])
-    #- "(\\d{2} \\d{2}\\.\\d{2}\\s+[sn])"
-    #- |
-    #    \d{2}\                  # Test
 
 longitude: |
-    # [LON|LONG|LONGITUDe]
-    (?P<degree>\d{3})
-    \ 
-    (?P<minute>\d{2}.\d{2,3})
+    # [LON|LONG|LONGITUDE]
+        (?:Latitude:?)?
+        \ *
+    (?P<degree>\d{2,3})
+    \ +
+    (?P<minute>\d{2}
+        [\.|\,]
+        \d{1,3})
     \ *
     (?P<hemisphere>[W|w|E|e])