pep8 cleanup in jsongen.py.in

1 files changed, 642 insertions, 641 deletions

diff --git a/jsongen.py.in b/jsongen.py.in
index c7efb297..40b42159 100644
--- a/jsongen.py.in
+++ b/jsongen.py.in
@@ -27,84 +27,84 @@ import sys, getopt
 
 ais_specs = (
     {
-    "initname" : "json_ais1",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type1",
-    "fieldmap":(
-        # fieldname   type        default
-        ('status',     'uinteger', '0'),
-        ('status_text','ignore',   None),
-        ('turn',       'integer',  'AIS_TURN_NOT_AVAILABLE'),
-        ('speed',      'uinteger', 'AIS_SPEED_NOT_AVAILABLE'),
-        ('accuracy',   'boolean',  'false'),
-        ('lon',        'integer',  'AIS_LON_NOT_AVAILABLE'),
-        ('lat',        'integer',  'AIS_LAT_NOT_AVAILABLE'),
-        ('course',     'uinteger', 'AIS_COURSE_NOT_AVAILABLE'),
-        ('heading',    'uinteger', 'AIS_HEADING_NOT_AVAILABLE'),
-        ('second',     'uinteger', 'AIS_SEC_NOT_AVAILABLE'),
-        ('maneuver',   'uinteger', 'AIS_SEC_INOPERATIVE'),
-        ('raim',       'boolean',  'false'),
-        ('radio',      'uinteger', '0'),
+        "initname": "json_ais1",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type1",
+        "fieldmap": (
+            # fieldname   type        default
+            ('status',     'uinteger', '0'),
+            ('status_text', 'ignore',   None),
+            ('turn',       'integer',  'AIS_TURN_NOT_AVAILABLE'),
+            ('speed',      'uinteger', 'AIS_SPEED_NOT_AVAILABLE'),
+            ('accuracy',   'boolean',  'false'),
+            ('lon',        'integer',  'AIS_LON_NOT_AVAILABLE'),
+            ('lat',        'integer',  'AIS_LAT_NOT_AVAILABLE'),
+            ('course',     'uinteger', 'AIS_COURSE_NOT_AVAILABLE'),
+            ('heading',    'uinteger', 'AIS_HEADING_NOT_AVAILABLE'),
+            ('second',     'uinteger', 'AIS_SEC_NOT_AVAILABLE'),
+            ('maneuver',   'uinteger', 'AIS_SEC_INOPERATIVE'),
+            ('raim',       'boolean',  'false'),
+            ('radio',      'uinteger', '0'),
         ),
     },
     # Message types 2 and 3 duplicate 1
     {
-    "initname" : "json_ais4",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type4",
-    "fieldmap":(
-        # fieldname   type        default
-        ('timestamp', 'string',   None),
-        ('accuracy',  'boolean',  "true"),
-        ('lon',       'integer',  "AIS_LON_NOT_AVAILABLE"),
-        ('lat',       'integer',  "AIS_LAT_NOT_AVAILABLE"),
-        ('epfd',      'uinteger', "0"),
-        ('epfd_text', 'ignore',   None),
-        ('raim',      'boolean',  "false"),
-        ('radio',     'uinteger', "0"),
+        "initname": "json_ais4",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type4",
+        "fieldmap": (
+            # fieldname   type        default
+            ('timestamp', 'string',   None),
+            ('accuracy',  'boolean',  "true"),
+            ('lon',       'integer',  "AIS_LON_NOT_AVAILABLE"),
+            ('lat',       'integer',  "AIS_LAT_NOT_AVAILABLE"),
+            ('epfd',      'uinteger', "0"),
+            ('epfd_text', 'ignore',   None),
+            ('raim',      'boolean',  "false"),
+            ('radio',     'uinteger', "0"),
         ),
-    "stringbuffered":("timestamp",),
+        "stringbuffered": ("timestamp",),
     },
     {
-    "initname" : "json_ais5",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type5",
-    "fieldmap":(
-        # fieldname        type            default
-        ('imo',           'uinteger',      '0'),
-        ('ais_version',   'uinteger',      '0'),
-        ('callsign',      'string',        None),
-        ('shipname',      'string',        None),
-        ('shiptype',      'uinteger',      '0'),
-        ('shiptype_text', 'ignore',        None),
-        ('to_bow',        'uinteger',      '0'),
-        ('to_stern',      'uinteger',      '0'),
-        ('to_port',       'uinteger',      '0'),
-        ('to_starboard',  'uinteger',      '0'),
-        ('epfd',          'uinteger',      '0'),
-        ('epfd_text',     'ignore',        None),
-        ('eta',           'string',        None),
-        ('draught',       'uinteger',      '0'),
-        ('destination',   'string',        None),
-        ('dte',           'uinteger',      '1'),
+        "initname": "json_ais5",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type5",
+        "fieldmap": (
+            # fieldname        type            default
+            ('imo',           'uinteger',      '0'),
+            ('ais_version',   'uinteger',      '0'),
+            ('callsign',      'string',        None),
+            ('shipname',      'string',        None),
+            ('shiptype',      'uinteger',      '0'),
+            ('shiptype_text', 'ignore',        None),
+            ('to_bow',        'uinteger',      '0'),
+            ('to_stern',      'uinteger',      '0'),
+            ('to_port',       'uinteger',      '0'),
+            ('to_starboard',  'uinteger',      '0'),
+            ('epfd',          'uinteger',      '0'),
+            ('epfd_text',     'ignore',        None),
+            ('eta',           'string',        None),
+            ('draught',       'uinteger',      '0'),
+            ('destination',   'string',        None),
+            ('dte',           'uinteger',      '1'),
         ),
-    "stringbuffered":("eta",),
+        "stringbuffered": ("eta",),
     },
     {
-    "initname" : "json_ais6",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6",
-    "fieldmap":(
-        # fieldname       type             default
-        ('data',          'string',        None),
+        "initname": "json_ais6",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6",
+        "fieldmap": (
+            # fieldname       type             default
+            ('data',          'string',        None),
         ),
-    "stringbuffered":("data",),
+        "stringbuffered": ("data",),
     },
     {
-        "initname" : "json_ais6_fid10",
+        "initname": "json_ais6_fid10",
         "headers": ("AIS_HEADER", "AIS_TYPE6",),
         "structname": "ais->type6.dac235fid10",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('ana_int',    'uinteger', '0'),
             ('ana_ext1',   'uinteger', '0'),
@@ -119,61 +119,61 @@ ais_specs = (
         ),
     },
     {
-    "initname" : "json_ais6_fid12",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6.dac1fid12",
-    "fieldmap":(
-        # fieldname    type      default
-        ('lastport',   'string',   None),
-        ('departure',  'string',   None),
-        ('nextport',   'string',   None),
-        ('eta',        'string',   None),
-        ('dangerous',  'string',   None),
-        ('imdcat',     'string',   None),
-        ('unid',       'uinteger', '0'),
-        ('amount',     'uinteger', '0'),
-        ('unit',       'uinteger', '0'),
+        "initname": "json_ais6_fid12",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6.dac1fid12",
+        "fieldmap": (
+            # fieldname    type      default
+            ('lastport',   'string',   None),
+            ('departure',  'string',   None),
+            ('nextport',   'string',   None),
+            ('eta',        'string',   None),
+            ('dangerous',  'string',   None),
+            ('imdcat',     'string',   None),
+            ('unid',       'uinteger', '0'),
+            ('amount',     'uinteger', '0'),
+            ('unit',       'uinteger', '0'),
         ),
-    "stringbuffered":("departure","eta",),
+        "stringbuffered": ("departure", "eta",),
     },
     {
-    "initname" : "json_ais6_fid15",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6.dac1fid15",
-    "fieldmap":(
-        # fieldname    type        default
-        ('airdraught', 'uinteger', '0'),
+        "initname": "json_ais6_fid15",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6.dac1fid15",
+        "fieldmap": (
+            # fieldname    type        default
+            ('airdraught', 'uinteger', '0'),
         ),
     },
     {
-    "initname" : "json_ais6_fid16",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6.dac1fid16",
-    "fieldmap":(
-        # fieldname           type             default
-        ('persons',           'uinteger',      '0'),
+        "initname": "json_ais6_fid16",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6.dac1fid16",
+        "fieldmap": (
+            # fieldname           type             default
+            ('persons',           'uinteger',      '0'),
         ),
     },
     {
-        "initname" : "json_ais6_fid18",
-        "headers": ("AIS_HEADER","AIS_TYPE6",),
+        "initname": "json_ais6_fid18",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
         "structname": "ais->type6.dac1fid18",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('linkage',    'uinteger', '0'),
             ('arrival',    'string',   None),
             ('portname',   'string',   None),
-            ('destination','string',   None),
+            ('destination', 'string',   None),
             ('lon',        'integer',  'AIS_LON3_NOT_AVAILABLE'),
             ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
         ),
-    'stringbuffered' : ('arrival',),
+        'stringbuffered': ('arrival',),
     },
     {
-        "initname" : "json_ais6_fid20",
-        "headers": ("AIS_HEADER","AIS_TYPE6",),
+        "initname": "json_ais6_fid20",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
         "structname": "ais->type6.dac1fid20",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('linkage',    'uinteger', '0'),
             ('berth_length', 'uinteger', '0'),
@@ -212,30 +212,30 @@ ais_specs = (
             ('berth_lon',  'integer',  'AIS_LON3_NOT_AVAILABLE'),
             ('berth_lat',  'integer',  'AIS_LAT3_NOT_AVAILABLE'),
         ),
-    'stringbuffered' : ('arrival', 'berth_name',),
+        'stringbuffered': ('arrival', 'berth_name',),
     },
     {
-    "initname" : "json_ais6_fid21",
-    "headers": ("AIS_HEADER","AIS_TYPE6"),
-    "structname": "ais->type6.dac200fid21",
-    "fieldmap":(
-        # fieldname    type        default
-        ('country',    'string',   None),
-        ('locode',     'string',   None),
-        ('section',    'string',   None),
-        ('terminal',   'string',   None),
-        ('hectometre', 'string',   None),
-        ('eta',        'string',   None),
-        ('tugs',       'uinteger', '0'),
-        ('airdraught', 'uinteger', '0'),
+        "initname": "json_ais6_fid21",
+        "headers": ("AIS_HEADER", "AIS_TYPE6"),
+        "structname": "ais->type6.dac200fid21",
+        "fieldmap": (
+            # fieldname    type        default
+            ('country',    'string',   None),
+            ('locode',     'string',   None),
+            ('section',    'string',   None),
+            ('terminal',   'string',   None),
+            ('hectometre', 'string',   None),
+            ('eta',        'string',   None),
+            ('tugs',       'uinteger', '0'),
+            ('airdraught', 'uinteger', '0'),
         ),
-    "stringbuffered":("eta",),
+        "stringbuffered": ("eta",),
     },
     {
-        "initname" : "json_ais6_fid22",
-        "headers": ("AIS_HEADER","AIS_TYPE6"),
+        "initname": "json_ais6_fid22",
+        "headers": ("AIS_HEADER", "AIS_TYPE6"),
         "structname": "ais->type6.dac200fid22",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('country',    'string',   None),
             ('locode',     'string',   None),
@@ -245,13 +245,13 @@ ais_specs = (
             ('rta',        'string',   None),
             ('status',     'uinteger', 'DAC200FID22_STATUS_NOT_AVAILABLE'),
         ),
-        "stringbuffered":("rta",),
+        "stringbuffered": ("rta",),
     },
     {
-        "initname" : "json_ais6_fid25",
-        "headers": ("AIS_HEADER","AIS_TYPE6",),
+        "initname": "json_ais6_fid25",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
         "structname": "ais->type6.dac1fid25",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('unit',       'uinteger', '0'),
             ('amount',     'uinteger', '0'),
@@ -259,164 +259,164 @@ ais_specs = (
                 ('cargo_t', 'ncargos', (
                     ('code',       'uinteger', '0'),
                     ('subtype',    'uinteger', '0'),
-                    )))),
-            ),
+                )))),
+        ),
     },
     {
-    "initname" : "json_ais6_fid28",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6.dac1fid28",
-    "fieldmap":(
-        # fieldname    type        default
-        ('linkage',    'uinteger', '0'),
-        ('sender',     'uinteger', '0'),
-        ('rtype',      'uinteger', '0'),
-        ('rtype_text', 'ignore',   None),
-        ('start',      'string',   None),
-        ('duration',   'uinteger', '0'),
-        ('waypoints',  'array', (
-            ('waypoint_t', 'waycount', (
-                ('lon',        'integer',  'AIS_LON4_NOT_AVAILABLE'),
-                ('lat',        'integer',  'AIS_LAT4_NOT_AVAILABLE'),
+        "initname": "json_ais6_fid28",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6.dac1fid28",
+        "fieldmap": (
+            # fieldname    type        default
+            ('linkage',    'uinteger', '0'),
+            ('sender',     'uinteger', '0'),
+            ('rtype',      'uinteger', '0'),
+            ('rtype_text', 'ignore',   None),
+            ('start',      'string',   None),
+            ('duration',   'uinteger', '0'),
+            ('waypoints',  'array', (
+                ('waypoint_t', 'waycount', (
+                    ('lon',        'integer',  'AIS_LON4_NOT_AVAILABLE'),
+                    ('lat',        'integer',  'AIS_LAT4_NOT_AVAILABLE'),
                 )))),
         ),
-    'stringbuffered' : ('start',),
+        'stringbuffered': ('start',),
     },
     {
-    "initname" : "json_ais6_fid30",
-    "headers": ("AIS_HEADER","AIS_TYPE6",),
-    "structname": "ais->type6.dac1fid30",
-    "fieldmap":(
-        # fieldname     type             default
-        ('linkage',     'uinteger',      '0'),
-        ('text',        'string',        '0'),
+        "initname": "json_ais6_fid30",
+        "headers": ("AIS_HEADER", "AIS_TYPE6",),
+        "structname": "ais->type6.dac1fid30",
+        "fieldmap": (
+            # fieldname     type             default
+            ('linkage',     'uinteger',      '0'),
+            ('text',        'string',        '0'),
         ),
     },
     {
-    "initname" : "json_ais6_fid32",
-    "headers": ("AIS_HEADER","AIS_TYPE6"),
-    "structname": "ais->type6.dac1fid32",
-    "fieldmap":(
-        # fieldname    type        default
-        ('month',      'uinteger', 'AIS_MONTH_NOT_AVAILABLE'),
-        ('day',        'uinteger', 'AIS_DAY_NOT_AVAILABLE'),
-        ('tidals',     'array', (
-            ('tidal_t', 'ntidals', (
-                ('lon',        'integer',  'AIS_LON3_NOT_AVAILABLE'),
-                ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
-                ('from_hour',  'uinteger', 'AIS_MONTH_NOT_AVAILABLE'),
-                ('from_min',   'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
-                ('to_hour',    'uinteger', 'AIS_HOUR_NOT_AVAILABLE'),
-                ('to_min',     'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
-                ('cdir',       'uinteger', 'DAC1FID32_CDIR_NOT_AVAILABLE'),
-                ('cspeed',     'uinteger', 'DAC1FID32_CSPEED_NOT_AVAILABLE'),
+        "initname": "json_ais6_fid32",
+        "headers": ("AIS_HEADER", "AIS_TYPE6"),
+        "structname": "ais->type6.dac1fid32",
+        "fieldmap": (
+            # fieldname    type        default
+            ('month',      'uinteger', 'AIS_MONTH_NOT_AVAILABLE'),
+            ('day',        'uinteger', 'AIS_DAY_NOT_AVAILABLE'),
+            ('tidals',     'array', (
+                ('tidal_t', 'ntidals', (
+                    ('lon',        'integer',  'AIS_LON3_NOT_AVAILABLE'),
+                    ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
+                    ('from_hour',  'uinteger', 'AIS_MONTH_NOT_AVAILABLE'),
+                    ('from_min',   'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
+                    ('to_hour',    'uinteger', 'AIS_HOUR_NOT_AVAILABLE'),
+                    ('to_min',     'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
+                    ('cdir',       'uinteger', 'DAC1FID32_CDIR_NOT_AVAILABLE'),
+                    ('cspeed',     'uinteger', 'DAC1FID32_CSPEED_NOT_AVAILABLE'),
                 )))),
         ),
     },
     {
-    "initname" : "json_ais6_fid55",
-    "headers": ("AIS_HEADER","AIS_TYPE6"),
-    "structname": "ais->type6.dac200fid55",
-    "fieldmap":(
-        # fieldname    type        default
-        ('crew',       'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
-        ('passengers', 'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
-        ('personnel',  'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
+        "initname": "json_ais6_fid55",
+        "headers": ("AIS_HEADER", "AIS_TYPE6"),
+        "structname": "ais->type6.dac200fid55",
+        "fieldmap": (
+            # fieldname    type        default
+            ('crew',       'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
+            ('passengers', 'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
+            ('personnel',  'uinteger', 'DAC200FID55_COUNT_NOT_AVAILABLE'),
         ),
     },
     {
-    "initname" : "json_ais7",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type7",
-    "fieldmap":(
-        # fieldname       type             default
-        ('mmsi1',         'uinteger',      '0'),
-        ('mmsi2',         'uinteger',      '0'),
-        ('mmsi3',         'uinteger',      '0'),
-        ('mmsi4',         'uinteger',      '0'),
+        "initname": "json_ais7",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type7",
+        "fieldmap": (
+            # fieldname       type             default
+            ('mmsi1',         'uinteger',      '0'),
+            ('mmsi2',         'uinteger',      '0'),
+            ('mmsi3',         'uinteger',      '0'),
+            ('mmsi4',         'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais8",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8",
-    "fieldmap":(
-        # fieldname       type             default
-        ('data',          'string',        None),
+        "initname": "json_ais8",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8",
+        "fieldmap": (
+            # fieldname       type             default
+            ('data',          'string',        None),
         ),
-    "stringbuffered":("data",),
+        "stringbuffered": ("data",),
     },
     {
-    "initname" : "json_ais8_fid10",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac200fid10",
-    "fieldmap":(
-        # fieldname    type        default
-        ('vin',        'string',   None),
-        ('length',     'uinteger', '0'),
-        ('beam',       'uinteger', '0'),
-        ('shiptype',   'uinteger', '0'),
-        ('shiptype_text',  'ignore',   None),
-        ('hazard',     'uinteger', '0'),
-        ('hazard_text','ignore',   None),
-        ('draught',    'uinteger', '0'),
-        ('loaded',     'uinteger', '0'),
-        ('loaded_text','ignore',   None),
-        ('speed_q',    'boolean',  'false'),
-        ('course_q',   'boolean',  'false'),
-        ('heading_q',  'boolean',  'false'),
+        "initname": "json_ais8_fid10",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac200fid10",
+        "fieldmap": (
+            # fieldname    type        default
+            ('vin',        'string',   None),
+            ('length',     'uinteger', '0'),
+            ('beam',       'uinteger', '0'),
+            ('shiptype',   'uinteger', '0'),
+            ('shiptype_text',  'ignore',   None),
+            ('hazard',     'uinteger', '0'),
+            ('hazard_text', 'ignore',   None),
+            ('draught',    'uinteger', '0'),
+            ('loaded',     'uinteger', '0'),
+            ('loaded_text', 'ignore',   None),
+            ('speed_q',    'boolean',  'false'),
+            ('course_q',   'boolean',  'false'),
+            ('heading_q',  'boolean',  'false'),
         ),
     },
     {
-    "initname" : "json_ais8_fid11",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac1fid11",
-    "fieldmap":(
-        # fieldname      type         default
-        ('lat',          'integer',   'DAC1FID11_LAT_NOT_AVAILABLE'),
-        ('lon',          'integer',   'DAC1FID11_LON_NOT_AVAILABLE'),
-        ('timestamp',    'string',     None),
-        ('wspeed',       'uinteger',  'DAC1FID11_WSPEED_NOT_AVAILABLE'),
-        ('wgust',        'uinteger',  'DAC1FID11_WSPEED_NOT_AVAILABLE'),
-        ('wdir',         'uinteger',  'DAC1FID11_WDIR_NOT_AVAILABLE'),
-        ('wgustdir',     'uinteger',  'DAC1FID11_WDIR_NOT_AVAILABLE'),
-        ('airtemp',      'uinteger',  'DAC1FID11_AIRTEMP_NOT_AVAILABLE'),
-        ('humidity',     'uinteger',  'DAC1FID11_HUMIDITY_NOT_AVAILABLE'),
-        ('dewpoint',     'uinteger',  'DAC1FID11_DEWPOINT_NOT_AVAILABLE'),
-        ('pressure',     'uinteger',  'DAC1FID11_PRESSURE_NOT_AVAILABLE'),
-        ('pressuretend', 'uinteger',  'DAC1FID11_PRESSURETREND_NOT_AVAILABLE'),
-        ('visibility',   'uinteger',  'DAC1FID11_VISIBILITY_NOT_AVAILABLE'),
-        ('waterlevel',   'integer',   'DAC1FID11_WATERLEVEL_NOT_AVAILABLE'),
-        ('leveltrend',   'uinteger',  'DAC1FID11_WATERLEVELTREND_NOT_AVAILABLE'),
-        ('cspeed',       'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
-        ('cdir',         'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
-        ('cspeed2',      'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
-        ('cdir2',        'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
-        ('cdepth2',      'uinteger',  'DAC1FID11_CDEPTH_NOT_AVAILABLE'),
-        ('cspeed3',      'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
-        ('cdir3',        'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
-        ('cdepth3',      'uinteger',  'DAC1FID11_CDEPTH_NOT_AVAILABLE'),
-        ('waveheight',   'uinteger',  'DAC1FID11_WAVEHEIGHT_NOT_AVAILABLE'),
-        ('waveperiod',   'uinteger',  'DAC1FID11_WAVEPERIOD_NOT_AVAILABLE'),
-        ('wavedir',      'uinteger',  'DAC1FID11_WAVEDIR_NOT_AVAILABLE'),
-        ('swellheight',  'uinteger',  'DAC1FID11_WAVEHEIGHT_NOT_AVAILABLE'),
-        ('swellperiod',  'uinteger',  'DAC1FID11_WAVEPERIOD_NOT_AVAILABLE'),
-        ('swelldir',     'uinteger',  'DAC1FID11_WAVEDIR_NOT_AVAILABLE'),
-        ('seastate',     'uinteger',  'DAC1FID11_SEASTATE_NOT_AVAILABLE'),
-        ('watertemp',    'uinteger',  'DAC1FID11_WATERTEMP_NOT_AVAILABLE'),
-        ('preciptype',   'uinteger',  'DAC1FID11_PRECIPTYPE_NOT_AVAILABLE'),
-        ('preciptype_text', 'ignore', None),
-        ('salinity',     'uinteger',  'DAC1FID11_SALINITY_NOT_AVAILABLE'),
-        ('ice',          'uinteger',  'DAC1FID11_ICE_NOT_AVAILABLE'),
-        ('ice_text',     'ignore',    None),
+        "initname": "json_ais8_fid11",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac1fid11",
+        "fieldmap": (
+            # fieldname      type         default
+            ('lat',          'integer',   'DAC1FID11_LAT_NOT_AVAILABLE'),
+            ('lon',          'integer',   'DAC1FID11_LON_NOT_AVAILABLE'),
+            ('timestamp',    'string',     None),
+            ('wspeed',       'uinteger',  'DAC1FID11_WSPEED_NOT_AVAILABLE'),
+            ('wgust',        'uinteger',  'DAC1FID11_WSPEED_NOT_AVAILABLE'),
+            ('wdir',         'uinteger',  'DAC1FID11_WDIR_NOT_AVAILABLE'),
+            ('wgustdir',     'uinteger',  'DAC1FID11_WDIR_NOT_AVAILABLE'),
+            ('airtemp',      'uinteger',  'DAC1FID11_AIRTEMP_NOT_AVAILABLE'),
+            ('humidity',     'uinteger',  'DAC1FID11_HUMIDITY_NOT_AVAILABLE'),
+            ('dewpoint',     'uinteger',  'DAC1FID11_DEWPOINT_NOT_AVAILABLE'),
+            ('pressure',     'uinteger',  'DAC1FID11_PRESSURE_NOT_AVAILABLE'),
+            ('pressuretend', 'uinteger',  'DAC1FID11_PRESSURETREND_NOT_AVAILABLE'),
+            ('visibility',   'uinteger',  'DAC1FID11_VISIBILITY_NOT_AVAILABLE'),
+            ('waterlevel',   'integer',   'DAC1FID11_WATERLEVEL_NOT_AVAILABLE'),
+            ('leveltrend',   'uinteger',  'DAC1FID11_WATERLEVELTREND_NOT_AVAILABLE'),
+            ('cspeed',       'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
+            ('cdir',         'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
+            ('cspeed2',      'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
+            ('cdir2',        'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
+            ('cdepth2',      'uinteger',  'DAC1FID11_CDEPTH_NOT_AVAILABLE'),
+            ('cspeed3',      'uinteger',  'DAC1FID11_CSPEED_NOT_AVAILABLE'),
+            ('cdir3',        'uinteger',  'DAC1FID11_CDIR_NOT_AVAILABLE'),
+            ('cdepth3',      'uinteger',  'DAC1FID11_CDEPTH_NOT_AVAILABLE'),
+            ('waveheight',   'uinteger',  'DAC1FID11_WAVEHEIGHT_NOT_AVAILABLE'),
+            ('waveperiod',   'uinteger',  'DAC1FID11_WAVEPERIOD_NOT_AVAILABLE'),
+            ('wavedir',      'uinteger',  'DAC1FID11_WAVEDIR_NOT_AVAILABLE'),
+            ('swellheight',  'uinteger',  'DAC1FID11_WAVEHEIGHT_NOT_AVAILABLE'),
+            ('swellperiod',  'uinteger',  'DAC1FID11_WAVEPERIOD_NOT_AVAILABLE'),
+            ('swelldir',     'uinteger',  'DAC1FID11_WAVEDIR_NOT_AVAILABLE'),
+            ('seastate',     'uinteger',  'DAC1FID11_SEASTATE_NOT_AVAILABLE'),
+            ('watertemp',    'uinteger',  'DAC1FID11_WATERTEMP_NOT_AVAILABLE'),
+            ('preciptype',   'uinteger',  'DAC1FID11_PRECIPTYPE_NOT_AVAILABLE'),
+            ('preciptype_text', 'ignore', None),
+            ('salinity',     'uinteger',  'DAC1FID11_SALINITY_NOT_AVAILABLE'),
+            ('ice',          'uinteger',  'DAC1FID11_ICE_NOT_AVAILABLE'),
+            ('ice_text',     'ignore',    None),
         ),
-    "stringbuffered":("timestamp",),
+        "stringbuffered": ("timestamp",),
     },
     {
-        "initname" : "json_ais8_fid13",
-        "headers": ("AIS_HEADER","AIS_TYPE8",),
+        "initname": "json_ais8_fid13",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
         "structname": "ais->type8.dac1fid13",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('reason',     'string',   None),
             ('closefrom',  'string',   None),
@@ -432,52 +432,52 @@ ais_specs = (
             ('thour',      'uinteger', 'AIS_HOUR_NOT_AVAILABLE'),
             ('tminute',    'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
         ),
-    'stringbuffered' : ('closefrom', 'closeto'),
+        'stringbuffered': ('closefrom', 'closeto'),
     },
     {
-        "initname" : "json_ais8_fid15",
-        "headers": ("AIS_HEADER","AIS_TYPE8",),
+        "initname": "json_ais8_fid15",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
         "structname": "ais->type8.dac1fid15",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('airdraught', 'uinteger', '0'),
         ),
     },
     {
-    "initname" : "json_ais8_fid16",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac1fid16",
-    "fieldmap":(
-        # fieldname           type             default
-        ('persons',           'uinteger',      '0'),
+        "initname": "json_ais8_fid16",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac1fid16",
+        "fieldmap": (
+            # fieldname           type             default
+            ('persons',           'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais8_fid17",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac1fid17",
-    "fieldmap":(
-        # fieldname    type        default
-        ('targets',    'array', (
-            ('target_t', 'ntargets', (
-                ('idtype',     'uinteger', 'DAC1FID17_IDTYPE_OTHER'),
-                ("id.mmsi",    'uinteger', '0'),
-                ("id.imo",     'uinteger', '0'),
-                ("id.callsign",'string',   'DAC1FID17_ID_LENGTH'),
-                ("id.other",   'string',   'DAC1FID17_ID_LENGTH'),
-                ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
-                ('lon',        'integer',  'AIS_LON3_NOT_AVAILABLE'),
-                ('course',     'uinteger', 'DAC1FID17_COURSE_NOT_AVAILABLE'),
-                ('second',     'uinteger', 'AIS_SECOND_NOT_AVAILABLE'),
-                ('speed',      'uinteger', 'DAC1FID17_SPEED_NOT_AVAILABLE'),
+        "initname": "json_ais8_fid17",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac1fid17",
+        "fieldmap": (
+            # fieldname    type        default
+            ('targets',    'array', (
+                ('target_t', 'ntargets', (
+                    ('idtype',     'uinteger', 'DAC1FID17_IDTYPE_OTHER'),
+                    ("id.mmsi",    'uinteger', '0'),
+                    ("id.imo",     'uinteger', '0'),
+                    ("id.callsign", 'string',   'DAC1FID17_ID_LENGTH'),
+                    ("id.other",   'string',   'DAC1FID17_ID_LENGTH'),
+                    ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
+                    ('lon',        'integer',  'AIS_LON3_NOT_AVAILABLE'),
+                    ('course',     'uinteger', 'DAC1FID17_COURSE_NOT_AVAILABLE'),
+                    ('second',     'uinteger', 'AIS_SECOND_NOT_AVAILABLE'),
+                    ('speed',      'uinteger', 'DAC1FID17_SPEED_NOT_AVAILABLE'),
                 )))),
         ),
     },
     {
-        "initname" : "json_ais8_fid19",
-        "headers": ("AIS_HEADER","AIS_TYPE8",),
+        "initname": "json_ais8_fid19",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
         "structname": "ais->type8.dac1fid19",
-        "fieldmap":(
+        "fieldmap": (
             # fieldname    type        default
             ('linkage',    'uinteger', '0'),
             ('station',    'string',   None),
@@ -485,7 +485,7 @@ ais_specs = (
             ('lat',        'integer',  'AIS_LAT3_NOT_AVAILABLE'),
             ('status',     'uinteger', '0'),
             ('signal',     'uinteger', '0'),
-            ('signal_text','ignore',    None),
+            ('signal_text', 'ignore',    None),
             ('hour',       'uinteger', 'AIS_HOUR_NOT_AVAILABLE'),
             ('minute',     'uinteger', 'AIS_MINUTE_NOT_AVAILABLE'),
             ('nextsignal', 'uinteger', '0'),
@@ -493,437 +493,438 @@ ais_specs = (
         ),
     },
     {
-    "initname" : "json_ais8_fid23",
-    "headers": ("AIS_HEADER","AIS_TYPE8"),
-    "structname": "ais->type8.dac200fid23",
-    "fieldmap":(
-        # fieldname    type        default
-        ('start',      'string',   None),
-        ('end',        'string',   None),
-        ('start_lon',  'integer',  'AIS_LON4_NOT_AVAILABLE'),
-        ('start_lat',  'integer',  'AIS_LAT4_NOT_AVAILABLE'),
-        ('end_lon',    'integer',  'AIS_LON4_NOT_AVAILABLE'),
-        ('end_lat',    'integer',  'AIS_LAT4_NOT_AVAILABLE'),
-        ('type',       'uinteger', 'DAC200FID23_TYPE_UNKNOWN'),
-        ('type_text',  'ignore',   None),
-        ('min',        'integer',  'DAC200FID23_MIN_UNKNOWN'),
-        ('max',        'integer',  'DAC200FID23_MAX_UNKNOWN'),
-        ('intensity',  'uinteger', 'DAC200FID23_CLASS_UNKNOWN'),
-        ('intensity_text', 'ignore',   None),
-        ('wind',       'uinteger', 'DAC200FID23_WIND_UNKNOWN'),
-        ('wind_text',  'ignore',   None),
+        "initname": "json_ais8_fid23",
+        "headers": ("AIS_HEADER", "AIS_TYPE8"),
+        "structname": "ais->type8.dac200fid23",
+        "fieldmap": (
+            # fieldname    type        default
+            ('start',      'string',   None),
+            ('end',        'string',   None),
+            ('start_lon',  'integer',  'AIS_LON4_NOT_AVAILABLE'),
+            ('start_lat',  'integer',  'AIS_LAT4_NOT_AVAILABLE'),
+            ('end_lon',    'integer',  'AIS_LON4_NOT_AVAILABLE'),
+            ('end_lat',    'integer',  'AIS_LAT4_NOT_AVAILABLE'),
+            ('type',       'uinteger', 'DAC200FID23_TYPE_UNKNOWN'),
+            ('type_text',  'ignore',   None),
+            ('min',        'integer',  'DAC200FID23_MIN_UNKNOWN'),
+            ('max',        'integer',  'DAC200FID23_MAX_UNKNOWN'),
+            ('intensity',  'uinteger', 'DAC200FID23_CLASS_UNKNOWN'),
+            ('intensity_text', 'ignore',   None),
+            ('wind',       'uinteger', 'DAC200FID23_WIND_UNKNOWN'),
+            ('wind_text',  'ignore',   None),
         ),
-    'stringbuffered' : ('start', 'end'),
+        'stringbuffered': ('start', 'end'),
     },
     {
-    "initname" : "json_ais8_fid24",
-    "headers": ("AIS_HEADER","AIS_TYPE8"),
-    "structname": "ais->type8.dac200fid24",
-    "fieldmap":(
-        # fieldname    type        default
-        ('country',    'string',   None),
-        ('gauges',     'array', (
-            ('gauge_t', 'ngauges', (
-                ('id',        'uinteger', 'DAC200FID24_GAUGE_ID_UNKNOWN'),
-                ('level',     'integer',  'DAC200FID24_GAUGE_LEVEL_UNKNOWN'),
-                    )))),
+        "initname": "json_ais8_fid24",
+        "headers": ("AIS_HEADER", "AIS_TYPE8"),
+        "structname": "ais->type8.dac200fid24",
+        "fieldmap": (
+            # fieldname    type        default
+            ('country',    'string',   None),
+            ('gauges',     'array', (
+                ('gauge_t', 'ngauges', (
+                    ('id',        'uinteger', 'DAC200FID24_GAUGE_ID_UNKNOWN'),
+                    ('level',     'integer',  'DAC200FID24_GAUGE_LEVEL_UNKNOWN'),
+                )))),
         ),
     },
     {
-        "initname" : "json_ais8_fid27",
-        "headers": ("AIS_HEADER","AIS_TYPE8",),
+        "initname": "json_ais8_fid27",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
         "structname": "ais->type8.dac1fid27",
-        "fieldmap":(
-        # fieldname    type        default
-        ('linkage',    'uinteger', '0'),
-        ('sender',     'uinteger', '0'),
-        ('rtype',      'uinteger', '0'),
-        ('rtype_text', 'ignore',   None),
-        ('start',      'string',   None),
-        ('duration',   'uinteger', '0'),
-        ('waypoints',  'array', (
-            ('waypoint_t', 'waycount', (
-                ('lon',        'integer',  'AIS_LON4_NOT_AVAILABLE'),
-                ('lat',        'integer',  'AIS_LAT4_NOT_AVAILABLE'),
+        "fieldmap": (
+            # fieldname    type        default
+            ('linkage',    'uinteger', '0'),
+            ('sender',     'uinteger', '0'),
+            ('rtype',      'uinteger', '0'),
+            ('rtype_text', 'ignore',   None),
+            ('start',      'string',   None),
+            ('duration',   'uinteger', '0'),
+            ('waypoints',  'array', (
+                ('waypoint_t', 'waycount', (
+                    ('lon',        'integer',  'AIS_LON4_NOT_AVAILABLE'),
+                    ('lat',        'integer',  'AIS_LAT4_NOT_AVAILABLE'),
                 )))),
         ),
-    'stringbuffered' : ('start',),
+        'stringbuffered': ('start',),
     },
     {
-    "initname" : "json_ais8_fid29",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac1fid29",
-    "fieldmap":(
-        # fieldname     type             default
-        ('linkage',     'uinteger',      '0'),
-        ('text',        'string',        '0'),
+        "initname": "json_ais8_fid29",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac1fid29",
+        "fieldmap": (
+            # fieldname     type             default
+            ('linkage',     'uinteger',      '0'),
+            ('text',        'string',        '0'),
         ),
     },
     {
-    "initname" : "json_ais8_fid31",
-    "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8.dac1fid31",
-    "fieldmap":(
-        # fieldname      type         default
-        ('lon',        'integer',  'DAC1FID31_LON_NOT_AVAILABLE'),
-        ('lat',        'integer',  'DAC1FID31_LAT_NOT_AVAILABLE'),
-        ('accuracy',   'boolean',  'false'),
-        ('timestamp',    'string',     None),
-        ('wspeed',     'uinteger', 'DAC1FID31_WIND_NOT_AVAILABLE'),
-        ('wgust',      'uinteger', 'DAC1FID31_WIND_NOT_AVAILABLE'),
-        ('wdir',       'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('wgustdir',   'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('airtemp',    'integer',  'DAC1FID31_AIRTEMP_NOT_AVAILABLE'),
-        ('humidity',   'uinteger', 'DAC1FID31_HUMIDITY_NOT_AVAILABLE'),
-        ('dewpoint',   'integer',  'DAC1FID31_DEWPOINT_NOT_AVAILABLE'),
-        ('pressure',   'uinteger', 'DAC1FID31_PRESSURE_NOT_AVAILABLE'),
-        ('pressuretend', 'uinteger', 'DAC1FID31_PRESSURETEND_NOT_AVAILABLE'),
-        ('visgreater', 'boolean',  'false'),
-        ('visibility', 'uinteger', 'DAC1FID31_VISIBILITY_NOT_AVAILABLE'),
-        ('waterlevel', 'integer',  'DAC1FID31_WATERLEVEL_NOT_AVAILABLE'),
-        ('leveltrend', 'uinteger', 'DAC1FID31_WATERLEVELTREND_NOT_AVAILABLE'),
-        ('cspeed',     'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('cdir',       'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('cspeed2',    'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('cdir2',      'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('cdepth2',    'uinteger', 'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
-        ('cspeed3',    'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('cdir3',      'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('cdepth3',    'uinteger', 'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
-        ('waveheight', 'uinteger', 'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
-        ('waveperiod', 'uinteger', 'DAC1FID31_PERIOD_NOT_AVAILABLE'),
-        ('wavedir',    'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('swellheight', 'uinteger', 'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
-        ('swellperiod', 'uinteger', 'DAC1FID31_PERIOD_NOT_AVAILABLE'),
-        ('swelldir',   'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('seastate',   'uinteger', 'DAC1FID31_SEASTATE_NOT_AVAILABLE'),
-        ('watertemp',  'integer',  'DAC1FID31_WATERTEMP_NOT_AVAILABLE'),
-        ('preciptype', 'uinteger', 'DAC1FID31_PRECIPTYPE_NOT_AVAILABLE'),
-        ('preciptype_text', 'ignore', None),
-        ('salinity',   'uinteger', 'DAC1FID31_SALINITY_NOT_AVAILABLE'),
-        ('ice',        'uinteger', 'DAC1FID31_ICE_NOT_AVAILABLE'),
+        "initname": "json_ais8_fid31",
+        "headers": ("AIS_HEADER", "AIS_TYPE8",),
+        "structname": "ais->type8.dac1fid31",
+        "fieldmap": (
+            # fieldname      type         default
+            ('lon',        'integer',  'DAC1FID31_LON_NOT_AVAILABLE'),
+            ('lat',        'integer',  'DAC1FID31_LAT_NOT_AVAILABLE'),
+            ('accuracy',   'boolean',  'false'),
+            ('timestamp',    'string',     None),
+            ('wspeed',     'uinteger', 'DAC1FID31_WIND_NOT_AVAILABLE'),
+            ('wgust',      'uinteger', 'DAC1FID31_WIND_NOT_AVAILABLE'),
+            ('wdir',       'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('wgustdir',   'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('airtemp',    'integer',  'DAC1FID31_AIRTEMP_NOT_AVAILABLE'),
+            ('humidity',   'uinteger', 'DAC1FID31_HUMIDITY_NOT_AVAILABLE'),
+            ('dewpoint',   'integer',  'DAC1FID31_DEWPOINT_NOT_AVAILABLE'),
+            ('pressure',   'uinteger', 'DAC1FID31_PRESSURE_NOT_AVAILABLE'),
+            ('pressuretend', 'uinteger', 'DAC1FID31_PRESSURETEND_NOT_AVAILABLE'),
+            ('visgreater', 'boolean',  'false'),
+            ('visibility', 'uinteger', 'DAC1FID31_VISIBILITY_NOT_AVAILABLE'),
+            ('waterlevel', 'integer',  'DAC1FID31_WATERLEVEL_NOT_AVAILABLE'),
+            ('leveltrend', 'uinteger', 'DAC1FID31_WATERLEVELTREND_NOT_AVAILABLE'),
+            ('cspeed',     'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+            ('cdir',       'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('cspeed2',    'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+            ('cdir2',      'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('cdepth2',    'uinteger', 'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
+            ('cspeed3',    'uinteger', 'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+            ('cdir3',      'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('cdepth3',    'uinteger', 'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
+            ('waveheight', 'uinteger', 'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
+            ('waveperiod', 'uinteger', 'DAC1FID31_PERIOD_NOT_AVAILABLE'),
+            ('wavedir',    'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('swellheight', 'uinteger', 'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
+            ('swellperiod', 'uinteger', 'DAC1FID31_PERIOD_NOT_AVAILABLE'),
+            ('swelldir',   'uinteger', 'DAC1FID31_DIR_NOT_AVAILABLE'),
+            ('seastate',   'uinteger', 'DAC1FID31_SEASTATE_NOT_AVAILABLE'),
+            ('watertemp',  'integer',  'DAC1FID31_WATERTEMP_NOT_AVAILABLE'),
+            ('preciptype', 'uinteger', 'DAC1FID31_PRECIPTYPE_NOT_AVAILABLE'),
+            ('preciptype_text', 'ignore', None),
+            ('salinity',   'uinteger', 'DAC1FID31_SALINITY_NOT_AVAILABLE'),
+            ('ice',        'uinteger', 'DAC1FID31_ICE_NOT_AVAILABLE'),
         ),
-    "stringbuffered":("timestamp",),
+        "stringbuffered": ("timestamp",),
     },
     {
-    "initname" : "json_ais8_fid40",
-    "headers": ("AIS_HEADER","AIS_TYPE8"),
-    "structname": "ais->type8.dac200fid40",
-    "fieldmap":(
-        # fieldname    type        default
-        ('form',       'uinteger', 'DAC200FID40_FORM_UNKNOWN'),
-        ('facing',     'uinteger', 'DAC200FID40_FACING_UNKNOWN'),
-        ('direction',  'uinteger', 'DAC200FID40_DIRECTION_UNKNOWN'),
-        ('direction_text','ignore',   None),
-        ('status',     'uinteger', 'DAC200FID40_STATUS_UNKNOWN'),
-        ('status_text','ignore',   None),
+        "initname": "json_ais8_fid40",
+        "headers": ("AIS_HEADER", "AIS_TYPE8"),
+        "structname": "ais->type8.dac200fid40",
+        "fieldmap": (
+            # fieldname    type        default
+            ('form',       'uinteger', 'DAC200FID40_FORM_UNKNOWN'),
+            ('facing',     'uinteger', 'DAC200FID40_FACING_UNKNOWN'),
+            ('direction',  'uinteger', 'DAC200FID40_DIRECTION_UNKNOWN'),
+            ('direction_text', 'ignore',   None),
+            ('status',     'uinteger', 'DAC200FID40_STATUS_UNKNOWN'),
+            ('status_text', 'ignore',   None),
         ),
     },
     {
-    "initname" : "json_ais9",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type9",
-    "fieldmap":(
-        # fieldname       type             default
-        ('alt',           'uinteger',      'AIS_ALT_NOT_AVAILABLE'),
-        ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
-        ('accuracy',      'boolean',       'false'),
-        ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
-        ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
-        ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
-        ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
-        ('regional',      'uinteger',      '0'),
-        ('dte',           'uinteger',      '1'),
-        ('raim',          'boolean',       'false'),
-        ('radio',         'uinteger',      '0'),
+        "initname": "json_ais9",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type9",
+        "fieldmap": (
+            # fieldname       type             default
+            ('alt',           'uinteger',      'AIS_ALT_NOT_AVAILABLE'),
+            ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
+            ('accuracy',      'boolean',       'false'),
+            ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
+            ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
+            ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
+            ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
+            ('regional',      'uinteger',      '0'),
+            ('dte',           'uinteger',      '1'),
+            ('raim',          'boolean',       'false'),
+            ('radio',         'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais10",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type10",
-    "fieldmap":(
-        # fieldname       type             default
-        ('dest_mmsi',     'uinteger',      '0'),
+        "initname": "json_ais10",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type10",
+        "fieldmap": (
+            # fieldname       type             default
+            ('dest_mmsi',     'uinteger',      '0'),
         ),
     },
     # Message type 11 duplicates 4
     {
-    "initname" : "json_ais12",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type12",
-    "fieldmap":(
-        # fieldname       type             default
-        ('seqno',         'uinteger',      '0'),
-        ('dest_mmsi',     'uinteger',      '0'),
-        ('retransmit',    'boolean',       '0'),
-        ('text',          'string',        None),
+        "initname": "json_ais12",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type12",
+        "fieldmap": (
+            # fieldname       type             default
+            ('seqno',         'uinteger',      '0'),
+            ('dest_mmsi',     'uinteger',      '0'),
+            ('retransmit',    'boolean',       '0'),
+            ('text',          'string',        None),
         ),
     },
     # Message type 13 duplicates 7
     {
-    "initname" : "json_ais14",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type14",
-    "fieldmap":(
-        # fieldname       type             default
-        ('text',          'string',        None),
+        "initname": "json_ais14",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type14",
+        "fieldmap": (
+            # fieldname       type             default
+            ('text',          'string',        None),
         ),
     },
     {
-    "initname" : "json_ais15",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type15",
-    "fieldmap":(
-        # fieldname       type             default
-        ('mmsi1',         'uinteger',      '0'),
-        ('type1_1',       'uinteger',      '0'),
-        ('offset1_1',     'uinteger',      '0'),
-        ('type1_2',       'uinteger',      '0'),
-        ('offset1_2',     'uinteger',      '0'),
-        ('mmsi2',         'uinteger',      '0'),
-        ('type2_1',       'uinteger',      '0'),
-        ('offset2_1',     'uinteger',      '0'),
+        "initname": "json_ais15",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type15",
+        "fieldmap": (
+            # fieldname       type             default
+            ('mmsi1',         'uinteger',      '0'),
+            ('type1_1',       'uinteger',      '0'),
+            ('offset1_1',     'uinteger',      '0'),
+            ('type1_2',       'uinteger',      '0'),
+            ('offset1_2',     'uinteger',      '0'),
+            ('mmsi2',         'uinteger',      '0'),
+            ('type2_1',       'uinteger',      '0'),
+            ('offset2_1',     'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais16",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type16",
-    "fieldmap":(
-        # fieldname       type             default
-        ('mmsi1',         'uinteger',      '0'),
-        ('offset1',       'uinteger',      '0'),
-        ('increment1',    'uinteger',      '0'),
-        ('mmsi2',         'uinteger',      '0'),
-        ('offset2',       'uinteger',      '0'),
-        ('increment2',    'uinteger',      '0'),
+        "initname": "json_ais16",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type16",
+        "fieldmap": (
+            # fieldname       type             default
+            ('mmsi1',         'uinteger',      '0'),
+            ('offset1',       'uinteger',      '0'),
+            ('increment1',    'uinteger',      '0'),
+            ('mmsi2',         'uinteger',      '0'),
+            ('offset2',       'uinteger',      '0'),
+            ('increment2',    'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais17",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type17",
-    "fieldmap":(
-        # fieldname       type             default
-        ('lon',           'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
-        ('lat',           'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
-        ('data',          'string',        None),
+        "initname": "json_ais17",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type17",
+        "fieldmap": (
+            # fieldname       type             default
+            ('lon',           'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
+            ('lat',           'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
+            ('data',          'string',        None),
         ),
-    "stringbuffered":("data",),
+        "stringbuffered": ("data",),
     },
     {
-    "initname" : "json_ais18",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type18",
-    "fieldmap":(
-        # fieldname       type             default
-        ('reserved',      'uinteger',      '0'),
-        ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
-        ('accuracy',      'boolean',       'false'),
-        ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
-        ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
-        ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
-        ('heading',       'uinteger',      'AIS_HEADING_NOT_AVAILABLE'),
-        ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
-        ('regional',      'uinteger',      '0'),
-        ('cs',            'boolean',       'false'),
-        ('display',       'boolean',       'false'),
-        ('dsc',           'boolean',       'false'),
-        ('band',          'boolean',       'false'),
-        ('msg22',         'boolean',       'false'),
-        ('raim',          'boolean',       'false'),
-        ('radio',         'uinteger',      '0'),
+        "initname": "json_ais18",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type18",
+        "fieldmap": (
+            # fieldname       type             default
+            ('reserved',      'uinteger',      '0'),
+            ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
+            ('accuracy',      'boolean',       'false'),
+            ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
+            ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
+            ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
+            ('heading',       'uinteger',      'AIS_HEADING_NOT_AVAILABLE'),
+            ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
+            ('regional',      'uinteger',      '0'),
+            ('cs',            'boolean',       'false'),
+            ('display',       'boolean',       'false'),
+            ('dsc',           'boolean',       'false'),
+            ('band',          'boolean',       'false'),
+            ('msg22',         'boolean',       'false'),
+            ('raim',          'boolean',       'false'),
+            ('radio',         'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais19",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type19",
-    "fieldmap":(
-        # fieldname       type             default
-        ('reserved',      'uinteger',      '0'),
-        ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
-        ('accuracy',      'boolean',       'false'),
-        ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
-        ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
-        ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
-        ('heading',       'uinteger',      'AIS_HEADING_NOT_AVAILABLE'),
-        ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
-        ('regional',      'uinteger',      '0'),
-        ('shipname',      'string',        None),
-        ('shiptype',      'uinteger',      '0'),
-        ('shiptype_text', 'ignore',        None),
-        ('to_bow',        'uinteger',      '0'),
-        ('to_stern',      'uinteger',      '0'),
-        ('to_port',       'uinteger',      '0'),
-        ('to_starboard',  'uinteger',      '0'),
-        ('epfd',          'uinteger',      '0'),
-        ('epfd_text',     'ignore',        None),
-        ('raim',          'boolean',       'false'),
-        ('dte',           'uinteger',      '1'),
-        ('assigned',      'boolean',       'false'),
+        "initname": "json_ais19",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type19",
+        "fieldmap": (
+            # fieldname       type             default
+            ('reserved',      'uinteger',      '0'),
+            ('speed',         'uinteger',      'AIS_SPEED_NOT_AVAILABLE'),
+            ('accuracy',      'boolean',       'false'),
+            ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
+            ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
+            ('course',        'uinteger',      'AIS_COURSE_NOT_AVAILABLE'),
+            ('heading',       'uinteger',      'AIS_HEADING_NOT_AVAILABLE'),
+            ('second',        'uinteger',      'AIS_SEC_NOT_AVAILABLE'),
+            ('regional',      'uinteger',      '0'),
+            ('shipname',      'string',        None),
+            ('shiptype',      'uinteger',      '0'),
+            ('shiptype_text', 'ignore',        None),
+            ('to_bow',        'uinteger',      '0'),
+            ('to_stern',      'uinteger',      '0'),
+            ('to_port',       'uinteger',      '0'),
+            ('to_starboard',  'uinteger',      '0'),
+            ('epfd',          'uinteger',      '0'),
+            ('epfd_text',     'ignore',        None),
+            ('raim',          'boolean',       'false'),
+            ('dte',           'uinteger',      '1'),
+            ('assigned',      'boolean',       'false'),
         ),
     },
     {
-    "initname" : "json_ais20",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type20",
-    "fieldmap":(
-        # fieldname       type             default
-        ('offset1',       'uinteger',      '0'),
-        ('number1',       'uinteger',      '0'),
-        ('timeout1',      'uinteger',      '0'),
-        ('increment1',    'uinteger',      '0'),
-        ('offset2',       'uinteger',      '0'),
-        ('number2',       'uinteger',      '0'),
-        ('timeout2',      'uinteger',      '0'),
-        ('increment2',    'uinteger',      '0'),
-        ('offset3',       'uinteger',      '0'),
-        ('number3',       'uinteger',      '0'),
-        ('timeout3',      'uinteger',      '0'),
-        ('increment3',    'uinteger',      '0'),
-        ('offset4',       'uinteger',      '0'),
-        ('number4',       'uinteger',      '0'),
-        ('timeout4',      'uinteger',      '0'),
-        ('increment4',    'uinteger',      '0'),
+        "initname": "json_ais20",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type20",
+        "fieldmap": (
+            # fieldname       type             default
+            ('offset1',       'uinteger',      '0'),
+            ('number1',       'uinteger',      '0'),
+            ('timeout1',      'uinteger',      '0'),
+            ('increment1',    'uinteger',      '0'),
+            ('offset2',       'uinteger',      '0'),
+            ('number2',       'uinteger',      '0'),
+            ('timeout2',      'uinteger',      '0'),
+            ('increment2',    'uinteger',      '0'),
+            ('offset3',       'uinteger',      '0'),
+            ('number3',       'uinteger',      '0'),
+            ('timeout3',      'uinteger',      '0'),
+            ('increment3',    'uinteger',      '0'),
+            ('offset4',       'uinteger',      '0'),
+            ('number4',       'uinteger',      '0'),
+            ('timeout4',      'uinteger',      '0'),
+            ('increment4',    'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais21",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type21",
-    "fieldmap":(
-        # fieldname       type             default
-        ('aid_type',      'uinteger',      '0'),
-        ('aid_type_text', 'ignore',        None),
-        ('name',          'string',        None),
-        ('accuracy',      'boolean',       'false'),
-        ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
-        ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
-        ('to_bow',        'uinteger',      '0'),
-        ('to_stern',      'uinteger',      '0'),
-        ('to_port',       'uinteger',      '0'),
-        ('to_starboard',  'uinteger',      '0'),
-        ('epfd',          'uinteger',      '0'),
-        ('epfd_text',     'ignore',        None),
-        ('second',        'uinteger',      '0'),
-        ('regional',      'uinteger',      '0'),
-        ('off_position',  'boolean',       'false'),
-        ('raim',          'boolean',       'false'),
-        ('virtual_aid',   'boolean',       'false'),
+        "initname": "json_ais21",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type21",
+        "fieldmap": (
+            # fieldname       type             default
+            ('aid_type',      'uinteger',      '0'),
+            ('aid_type_text', 'ignore',        None),
+            ('name',          'string',        None),
+            ('accuracy',      'boolean',       'false'),
+            ('lon',           'integer',       'AIS_LON_NOT_AVAILABLE'),
+            ('lat',           'integer',       'AIS_LAT_NOT_AVAILABLE'),
+            ('to_bow',        'uinteger',      '0'),
+            ('to_stern',      'uinteger',      '0'),
+            ('to_port',       'uinteger',      '0'),
+            ('to_starboard',  'uinteger',      '0'),
+            ('epfd',          'uinteger',      '0'),
+            ('epfd_text',     'ignore',        None),
+            ('second',        'uinteger',      '0'),
+            ('regional',      'uinteger',      '0'),
+            ('off_position',  'boolean',       'false'),
+            ('raim',          'boolean',       'false'),
+            ('virtual_aid',   'boolean',       'false'),
         ),
     },
     {
-    "initname" : "json_ais22",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type22",
-    "fieldmap":(
-        # fieldname       type             default
-        ('channel_a',     'uinteger',      '0'),
-        ('channel_b',     'uinteger',      '0'),
-        ('txrx',          'uinteger',      '0'),
-        ('power',         'boolean',       'false'),
-        ('area.ne_lon',   'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
-        ('area.ne_lat',   'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
-        ('area.sw_lon',   'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
-        ('area.sw_lat',   'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
-        ('mmsi.dest1',    'uinteger',      '0'),
-        ('mmsi.dest2',    'uinteger',      '0'),
-        ('addressed',     'boolean',       'false'),
-        ('band_a',        'boolean',       'false'),
-        ('band_b',        'boolean',       'false'),
-        ('zonesize',      'uinteger',      '0'),
+        "initname": "json_ais22",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type22",
+        "fieldmap": (
+            # fieldname       type             default
+            ('channel_a',     'uinteger',      '0'),
+            ('channel_b',     'uinteger',      '0'),
+            ('txrx',          'uinteger',      '0'),
+            ('power',         'boolean',       'false'),
+            ('area.ne_lon',   'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
+            ('area.ne_lat',   'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
+            ('area.sw_lon',   'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
+            ('area.sw_lat',   'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
+            ('mmsi.dest1',    'uinteger',      '0'),
+            ('mmsi.dest2',    'uinteger',      '0'),
+            ('addressed',     'boolean',       'false'),
+            ('band_a',        'boolean',       'false'),
+            ('band_b',        'boolean',       'false'),
+            ('zonesize',      'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais23",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type23",
-    "fieldmap":(
-        # fieldname       type             default
-        ('ne_lon',        'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
-        ('ne_lat',        'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
-        ('sw_lon',        'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
-        ('sw_lat',        'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
-        ('stationtype',   'uinteger',      '0'),
-        ('stationtype_text', 'ignore',     None),
-        ('shiptype',      'uinteger',      '0'),
-        ('shiptype_text', 'ignore',        None),
-        ('txrx',          'uinteger',      '0'),
-        ('interval',      'uinteger',      '0'),
-        ('quiet',         'uinteger',      '0'),
+        "initname": "json_ais23",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type23",
+        "fieldmap": (
+            # fieldname       type             default
+            ('ne_lon',        'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
+            ('ne_lat',        'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
+            ('sw_lon',        'integer',       'AIS_GNS_LON_NOT_AVAILABLE'),
+            ('sw_lat',        'integer',       'AIS_GNS_LAT_NOT_AVAILABLE'),
+            ('stationtype',   'uinteger',      '0'),
+            ('stationtype_text', 'ignore',     None),
+            ('shiptype',      'uinteger',      '0'),
+            ('shiptype_text', 'ignore',        None),
+            ('txrx',          'uinteger',      '0'),
+            ('interval',      'uinteger',      '0'),
+            ('quiet',         'uinteger',      '0'),
         ),
     },
     {
-    "initname" : "json_ais24",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type24",
-    "fieldmap":(
-        # fieldname             type             default
-        ('shipname',          'string',        None),	# Part A
-        ('shiptype',          'uinteger',      '0'),	# Part B
-        ('shiptype_text',     'ignore',        None),
-        ('vendorid',          'string',        None),	# Part B
-        ('model',             'uinteger',      '0'),	# Part B
-        ('serial',            'uinteger',      '0'),	# Part B
-        ('callsign',          'string',        None),	# Part B
-        ('mothership_mmsi',   'uinteger',      '0'),	# Part B
-        ('dim.to_bow',        'uinteger',      '0'),	# Part B
-        ('dim.to_stern',      'uinteger',      '0'),	# Part B
-        ('dim.to_port',       'uinteger',      '0'),	# Part B
-        ('dim.to_starboard',  'uinteger',      '0'),	# Part B
+        "initname": "json_ais24",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type24",
+        "fieldmap": (
+            # fieldname             type             default
+            ('shipname',          'string',        None),       # Part A
+            ('shiptype',          'uinteger',      '0'),        # Part B
+            ('shiptype_text',     'ignore',        None),
+            ('vendorid',          'string',        None),       # Part B
+            ('model',             'uinteger',      '0'),        # Part B
+            ('serial',            'uinteger',      '0'),        # Part B
+            ('callsign',          'string',        None),       # Part B
+            ('mothership_mmsi',   'uinteger',      '0'),        # Part B
+            ('dim.to_bow',        'uinteger',      '0'),        # Part B
+            ('dim.to_stern',      'uinteger',      '0'),        # Part B
+            ('dim.to_port',       'uinteger',      '0'),        # Part B
+            ('dim.to_starboard',  'uinteger',      '0'),        # Part B
         ),
     },
     {
-    "initname" : "json_ais25",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type25",
-    "fieldmap":(
-        # fieldname       type             default
-        ('addressed',     'boolean',       'false'),
-        ('structured',    'boolean',       'false'),
-        ('dest_mmsi',     'uinteger',      '0'),
-        ('app_id',        'uinteger',      '0'),
-        ('data',          'string',        None),
+        "initname": "json_ais25",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type25",
+        "fieldmap": (
+            # fieldname       type             default
+            ('addressed',     'boolean',       'false'),
+            ('structured',    'boolean',       'false'),
+            ('dest_mmsi',     'uinteger',      '0'),
+            ('app_id',        'uinteger',      '0'),
+            ('data',          'string',        None),
         ),
-    "stringbuffered":("data",),
+        "stringbuffered": ("data",),
     },
     {
-    "initname" : "json_ais26",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type26",
-    "fieldmap":(
-        # fieldname       type             default
-        ('addressed',     'boolean',       'false'),
-        ('structured',    'boolean',       'false'),
-        ('dest_mmsi',     'uinteger',      '0'),
-        ('app_id',        'uinteger',      '0'),
-        ('data',          'string',        None),
-        ('radio',         'uinteger',      '0'),
+        "initname": "json_ais26",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type26",
+        "fieldmap": (
+            # fieldname       type             default
+            ('addressed',     'boolean',       'false'),
+            ('structured',    'boolean',       'false'),
+            ('dest_mmsi',     'uinteger',      '0'),
+            ('app_id',        'uinteger',      '0'),
+            ('data',          'string',        None),
+            ('radio',         'uinteger',      '0'),
         ),
-    "stringbuffered":("data",),
+        "stringbuffered": ("data",),
     },
     {
-    "initname" : "json_ais27",
-    "headers": ("AIS_HEADER",),
-    "structname": "ais->type27",
-    "fieldmap":(
-        # fieldname   type        default
-        ('status',   'uinteger', '0'),
-        ('speed',    'uinteger', 'AIS_LONGRANGE_SPEED_NOT_AVAILABLE'),
-        ('accuracy', 'boolean',  'false'),
-        ('lon',      'integer',  'AIS_LONGRANGE_LON_NOT_AVAILABLE'),
-        ('lat',      'integer',  'AIS_LONGRANGE_LAT_NOT_AVAILABLE'),
-        ('course',   'uinteger', 'AIS_LONGRANGE_COURSE_NOT_AVAILABLE'),
-        ('raim',     'boolean',  'false'),
-        ('gnss',     'boolean',  'true'),
+        "initname": "json_ais27",
+        "headers": ("AIS_HEADER",),
+        "structname": "ais->type27",
+        "fieldmap": (
+            # fieldname   type        default
+            ('status',   'uinteger', '0'),
+            ('speed',    'uinteger', 'AIS_LONGRANGE_SPEED_NOT_AVAILABLE'),
+            ('accuracy', 'boolean',  'false'),
+            ('lon',      'integer',  'AIS_LONGRANGE_LON_NOT_AVAILABLE'),
+            ('lat',      'integer',  'AIS_LONGRANGE_LAT_NOT_AVAILABLE'),
+            ('course',   'uinteger', 'AIS_LONGRANGE_COURSE_NOT_AVAILABLE'),
+            ('raim',     'boolean',  'false'),
+            ('gnss',     'boolean',  'true'),
         ),
     },
 )
 
 # You should not need to modify anything below this line.
 
+
 def generate(spec):
     report = ""
     leader = " " * 39
@@ -934,7 +935,7 @@ def generate(spec):
     for attr in spec.get("stringbuffered", []):
         if attr not in attributes:
             print >>sys.stderr, "buffered %s is not in base attributes of %s"\
-                  % (attr, initname)
+                % (attr, initname)
             raise SystemExit, 1
         elif attr not in outboard:
             report += "    char %s[JSON_VAL_MAX+1];\n" % attr
@@ -953,7 +954,7 @@ def generate(spec):
             report += "    const struct json_attr_t %s_%s_subtype[] = {\n" % (initname, attr)
             for (subattr, subitype, default) in elements:
                 report += '\t{"%s",%st_%s,%sSTRUCTOBJECT(struct %s, %s),\n' % \
-                       (subattr, " "*(14-len(subattr)), subitype, " "*(8-len(subitype)), innerstruct, subattr)
+                    (subattr, " " * (14 - len(subattr)), subitype, " " * (8 - len(subitype)), innerstruct, subattr)
                 if subitype != "string":
                     report += leader + ".dflt.%s = %s},\n" % (subitype, default)
                 elif default:
@@ -977,7 +978,7 @@ def generate(spec):
         if itype == 'array':
             (innerstruct, lengthfield, elements) = default
             report += '\t{"%s",%st_array,     STRUCTARRAY(%s.%s, %s_%s_subtype, &%s.%s)},\n' \
-                      % (attr, " "*(14-len(attr)), structname, attr, initname, attr, structname, lengthfield)
+                      % (attr, " " * (14 - len(attr)), structname, attr, initname, attr, structname, lengthfield)
         else:
             if itype == "string":
                 deref = ""
@@ -988,18 +989,18 @@ def generate(spec):
             else:
                 target = structname + "." + attr
             if "." in attr:
-                attr = attr[attr.rfind(".")+1:]
+                attr = attr[attr.rfind(".") + 1:]
             if itype == 'ignore':
                 report += '\t{"%s",   t_ignore},\n' % attr
                 continue
             report += '\t{"%s",%st_%s,%s.addr.%s = %s%s,\n' % \
-                   (attr, " "*(14-len(attr)), itype, " "*(10-len(itype)), itype, deref, target)
+                (attr, " " * (14 - len(attr)), itype, " " * (10 - len(itype)), itype, deref, target)
             if itype == "string":
                 report += leader + ".len = sizeof(%s)},\n" % target
             else:
                 report += leader + ".dflt.%s = %s},\n" % (itype, default)
     report += """\
-	{NULL}
+        {NULL}
     };
 """
     if pacify_splint: