Merge pull request #19 from vtoupet/master

Add support for additional wind observations (OD1, OD2, OD3)

ish_parser/Components/WindObservationComponent.py

@@ -0,0 +1,24 @@
+from ..Speed import Speed
+from ..Direction import Direction
+from .BaseComponent import BaseComponent
+
+
+class WindObservationComponent(BaseComponent):
+  ''' handle OD1/OD2/OD3 Additional Wind observation types '''
+  WIND_OBSERVATION_TYPES = {
+    '1': 'Average speed of prevailing wind',
+    '2': 'Mean wind speed',
+    '3': 'Maximum instantaneous wind speed',
+    '4': 'Maximum gust speed',
+    '5': 'Maximum mean wind speed',
+    '6': 'Maximum 1 - minute mean wind speed',
+    '9': 'Missing'
+  }
+
+  def loads(self, string):
+    self.wind_observation = {
+      'type': self.WIND_OBSERVATION_TYPES[string[0:1]],
+      'hours': int(string[1:3]),
+      'speed': Speed(float(string[3:7]) / 10.0, Speed.METERSPERSECOND, string[7:8]),
+      'direction': Direction(string[8:11], Direction.RADIANS)
+    }

ish_parser/Components/__init__.py

@@ -9,3 +9,4 @@
 from .SnowDepthComponent import SnowDepthComponent
 from .SolarIrradianceComponent import SolarIrradianceComponent
 from .PressureComponent import PressureComponent
+from .WindObservationComponent import WindObservationComponent

ish_parser/ish_report.py

@@ -233,9 +233,9 @@ class ish_report(object):
          'OB1': ['HOURLY-SUBHOURLY-WIND', 28],
          'OB2': ['HOURLY-SUBHOURLY-WIND', 28],
          'OC1': ['WIND-GUST-OBSERVATION', 5],
-         'OD1': ['SUPPLEMENTARY-WIND-OBSERVATION', 11],
-         'OD2': ['SUPPLEMENTARY-WIND-OBSERVATION', 11],
-         'OD3': ['SUPPLEMENTARY-WIND-OBSERVATION', 11],
+         'OD1': ['SUPPLEMENTARY-WIND-OBSERVATION', 11, WindObservationComponent],
+         'OD2': ['SUPPLEMENTARY-WIND-OBSERVATION', 11, WindObservationComponent],
+         'OD3': ['SUPPLEMENTARY-WIND-OBSERVATION', 11, WindObservationComponent],
          'OE1': ['SUMMARY-OF-DAY-WIND', 16],
          'OE2': ['SUMMARY-OF-DAY-WIND', 16],
          'OE3': ['SUMMARY-OF-DAY-WIND', 16],