Merge pull request #189 from hschovanec-usgs/update-channels

Add channels to edge factory

geomagio/edge/EdgeFactory.py

@@ -385,6 +385,18 @@ class EdgeFactory(TimeseriesFactory):
             edge_channel = edge_interval_code + 'VX'
         elif channel == 'Y':
             edge_channel = edge_interval_code + 'VY'
+        elif channel == 'E-E':
+            edge_channel = edge_interval_code + 'QE'
+        elif channel == 'E-N':
+            edge_channel = edge_interval_code + 'QN'
+        elif channel == 'DIST':
+            edge_channel = edge_interval_code + 'DT'
+        elif channel == 'DST':
+            edge_channel = edge_interval_code + 'GD'
+        elif channel == 'SQ':
+            edge_channel = edge_interval_code + 'SQ'
+        elif channel == 'SV':
+            edge_channel = edge_interval_code + 'SV'
         else:
             edge_channel = channel
         return edge_channel

geomagio/iaga2002/IAGA2002Writer.py

@@ -194,7 +194,7 @@ class IAGA2002Writer(object):
         buf = ['DATE       TIME         DOY  ']
         for channel in channels:
             channel_len = len(channel)
-            if channel_len < 1 or channel_len > 3:
+            if channel_len < 1 or channel_len > 4:
                 raise TimeseriesFactoryException(
                         'channel "{}" is not 1 character'.format(channel))
             buf.append('   {:<7s}'.format(iaga_code + channel))

test/edge_test/EdgeFactory_test.py

@@ -34,8 +34,14 @@ def test__get_edge_channel():
             'MSF')
     assert_equals(EdgeFactory()._get_edge_channel('', 'H', '', 'minute'),
             'MVH')
-    assert_equals(EdgeFactory()._get_edge_channel('', 'Z', '', 'minute'),
-            'MVZ')
+    assert_equals(EdgeFactory()._get_edge_channel('', 'DIST', '', 'minute'),
+            'MDT')
+    assert_equals(EdgeFactory()._get_edge_channel('', 'DST', '', 'minute'),
+            'MGD')
+    assert_equals(EdgeFactory()._get_edge_channel('', 'E-E', '', 'minute'),
+            'MQE')
+    assert_equals(EdgeFactory()._get_edge_channel('', 'E-N', '', 'minute'),
+            'MQN')
 
 
 def test__get_edge_location():