1 files changed, 33 insertions, 33 deletions
diff --git a/test/daemon/ait250.log.chk b/test/daemon/ait250.log.chk
index 3a34d6c4..e745b162 100644
--- a/test/daemon/ait250.log.chk
+++ b/test/daemon/ait250.log.chk
@@ -3,13 +3,13 @@ $GPRMC,194907.00,A,5241.99815,N,00517.56525,E,0.005,,010809,,,A*7B
 !AIVDO,1,1,,,B3aC3LP00063aj7RNpl03wSUwP06,0*43
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175652,"lat":31619981,"course":0,"heading":511,"second":7,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,B,13njCt031t0DA=lN2:jKmad60l1p,0*12
-{"class":"AIS","type":1,"repeat":0,"mmsi":258774000,"scaled":false,"status":0,"turn":12,"speed":124,"accuracy":false,"lon":2656698,"lat":31492809,"course":3030,"heading":310,"second":3,"maneuver":0,"raim":false,"radio":213112}
+{"class":"AIS","type":1,"repeat":0,"mmsi":258774000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":12,"speed":124,"accuracy":false,"lon":2656698,"lat":31492809,"course":3030,"heading":310,"second":3,"maneuver":0,"raim":false,"radio":213112}
 $GPGBS,194907.00,3.0,1.9,4.2,,,,*4E
 $GPRMC,194908.00,A,5241.99805,N,00517.56503,E,0.003,,010809,,,A*77
 !AIVDO,1,1,,,B3aC3LP00063ai7RNph03wT5wP06,0*23
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175650,"lat":31619980,"course":0,"heading":511,"second":8,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,B,33meMd50000EoJPMvw?:Ubp@0000,0*4F
-{"class":"AIS","type":3,"repeat":0,"mmsi":257646000,"scaled":false,"status":5,"turn":0,"speed":0,"accuracy":false,"lon":2866000,"lat":31440700,"course":2710,"heading":348,"second":8,"maneuver":0,"raim":false,"radio":0}
+{"class":"AIS","type":3,"repeat":0,"mmsi":257646000,"scaled":false,"status":5,"status_text":"Moored","turn":0,"speed":0,"accuracy":false,"lon":2866000,"lat":31440700,"course":2710,"heading":348,"second":8,"maneuver":0,"raim":false,"radio":0}
 $GPGBS,194908.00,3.0,1.9,4.2,,,,*41
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:08.000Z","ept":0.005,"lat":52.699967500,"lon":5.292750500,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.002}
 $GPRMC,194909.00,A,5241.99792,N,00517.56477,E,0.004,,010809,,,A*72
@@ -20,7 +20,7 @@ $GPGBS,194909.00,3.0,1.9,4.2,,,,*40
 !AIVDM,1,1,,A,B3`gaQ000062PeWRIt403wTUoP06,0*11
 {"class":"AIS","type":18,"repeat":0,"mmsi":244050308,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3166299,"lat":31614913,"course":0,"heading":511,"second":9,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,A,13b?ED00000E2`dN1S9=oS0@00Sb,0*6E
-{"class":"AIS","type":1,"repeat":0,"mmsi":245618000,"scaled":false,"status":0,"turn":0,"speed":0,"accuracy":false,"lon":2757910,"lat":31482660,"course":3550,"heading":96,"second":8,"maneuver":0,"raim":false,"radio":2282}
+{"class":"AIS","type":1,"repeat":0,"mmsi":245618000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":0,"accuracy":false,"lon":2757910,"lat":31482660,"course":3550,"heading":96,"second":8,"maneuver":0,"raim":false,"radio":2282}
 $GPRMC,194910.00,A,5241.99782,N,00517.56453,E,0.006,,010809,,,A*7F
 !AIVDO,1,1,,,B3aC3LP00063afWRNp`03wU5wP06,0*45
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175645,"lat":31619978,"course":0,"heading":511,"second":10,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
@@ -29,21 +29,21 @@ $GPRMC,194910.00,A,5241.99782,N,00517.56453,E,0.006,,010809,,,A*7F
 $GPGBS,194910.00,3.0,1.9,4.2,,,,*48
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:10.000Z","ept":0.005,"lat":52.699963667,"lon":5.292742167,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.003}
 !AIVDM,1,1,,A,139QcE7P?w<tSF0l4Q@>4?wv0PS<,0*5A
-{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":133324}
+{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"status_text":"Engaged in fishing","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":133324}
 $GPRMC,194911.00,A,5241.99772,N,00517.56430,E,0.020,229.98,010809,,,A*66
 !AIVDM,1,1,,B,402E3:0000HttPGEahN7pi700p6T,0*09
-{"class":"AIS","type":4,"repeat":0,"mmsi":2442024,"scaled":false,"timestamp":"0000-00-00T24:60:60Z","accuracy":true,"lon":3059000,"lat":31586500,"epfd":7,"raim":false,"radio":229796}
+{"class":"AIS","type":4,"repeat":0,"mmsi":2442024,"scaled":false,"timestamp":"0000-00-00T24:60:60Z","accuracy":true,"lon":3059000,"lat":31586500,"epfd":7,"epfd_text":"Surveyed","raim":false,"radio":229796}
 !AIVDM,1,1,,A,14S64>51ASPEeIpN05::v`lF086a,0*3B
-{"class":"AIS","type":1,"repeat":0,"mmsi":305235000,"scaled":false,"status":5,"turn":5,"speed":99,"accuracy":true,"lon":2845500,"lat":31458600,"course":2810,"heading":282,"second":11,"maneuver":0,"raim":false,"radio":33193}
+{"class":"AIS","type":1,"repeat":0,"mmsi":305235000,"scaled":false,"status":5,"status_text":"Moored","turn":5,"speed":99,"accuracy":true,"lon":2845500,"lat":31458600,"course":2810,"heading":282,"second":11,"maneuver":0,"raim":false,"radio":33193}
 !AIVDO,1,1,,,B3aC3LP00063aeWRNpV?gwUUwP06,0*4B
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175643,"lat":31619977,"course":2299,"heading":511,"second":11,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194911.00,3.0,1.9,4.2,,,,*49
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:11.000Z","ept":0.005,"lat":52.699962000,"lon":5.292738333,"epx":1.900,"epy":3.000,"track":229.9800,"speed":0.010}
 !AIVDM,1,1,,B,13bf9v00010IaB<N8IK3uSvH00SC,0*44
-{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"turn":0,"speed":1,"accuracy":false,"lon":3361350,"lat":31594860,"course":1014,"heading":127,"second":12,"maneuver":0,"raim":false,"radio":2259}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":1,"accuracy":false,"lon":3361350,"lat":31594860,"course":1014,"heading":127,"second":12,"maneuver":0,"raim":false,"radio":2259}
 $GPRMC,194912.00,A,5241.99761,N,00517.56408,E,0.012,,010809,,,A*7B
 !AIVDM,1,1,,B,13bcuF0P000H@EhN:0s1dgvF087B,0*28
-{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"turn":-128,"speed":0,"accuracy":false,"lon":3179192,"lat":31621356,"course":434,"heading":511,"second":11,"maneuver":0,"raim":false,"radio":33234}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":0,"accuracy":false,"lon":3179192,"lat":31621356,"course":434,"heading":511,"second":11,"maneuver":0,"raim":false,"radio":33234}
 !AIVDO,1,1,,,B3aC3LP00063ad7RNpP03wV5wP06,0*14
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175640,"lat":31619976,"course":0,"heading":511,"second":12,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194912.00,3.0,1.9,4.2,,,,*4A
@@ -59,21 +59,21 @@ $GPRMC,194914.00,A,5241.99742,N,00517.56388,E,0.005,,010809,,,A*75
 $GPGBS,194914.00,3.0,1.9,4.2,,,,*4C
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:14.000Z","ept":0.005,"lat":52.699957000,"lon":5.292731333,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.003}
 !AIVDM,1,1,,A,13aC225P130HqLfN3t4i6OvJP<0<,0*33
-{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"turn":-128,"speed":67,"accuracy":false,"lon":3263383,"lat":31521811,"course":281,"heading":511,"second":13,"maneuver":1,"raim":false,"radio":49164}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"status_text":"Moored","turn":-128,"speed":67,"accuracy":false,"lon":3263383,"lat":31521811,"course":281,"heading":511,"second":13,"maneuver":1,"raim":false,"radio":49164}
 $GPRMC,194915.00,A,5241.99733,N,00517.56384,E,0.013,,010809,,,A*79
 !AIVDO,1,1,,,B3aC3LP00063ac7RNpD03wWUwP06,0*66
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175638,"lat":31619973,"course":0,"heading":511,"second":15,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194915.00,3.0,1.9,4.2,,,,*4D
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:15.000Z","ept":0.005,"lat":52.699955500,"lon":5.292730667,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.007}
 !AIVDM,1,1,,A,13`e>5OP1S0GmF@N0OLBF?vL00SQ,0*35
-{"class":"AIS","type":1,"repeat":0,"mmsi":244010517,"scaled":false,"status":15,"turn":-128,"speed":99,"accuracy":false,"lon":3123912,"lat":31465329,"course":600,"heading":511,"second":14,"maneuver":0,"raim":false,"radio":2273}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244010517,"scaled":false,"status":15,"status_text":"Not defined","turn":-128,"speed":99,"accuracy":false,"lon":3123912,"lat":31465329,"course":600,"heading":511,"second":14,"maneuver":0,"raim":false,"radio":2273}
 $GPRMC,194916.00,A,5241.99726,N,00517.56385,E,0.007,,010809,,,A*7A
 !AIVDO,1,1,,,B3aC3LP00063ac7RNp@03w`5wP06,0*35
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175638,"lat":31619972,"course":0,"heading":511,"second":16,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194916.00,3.0,1.9,4.2,,,,*4E
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:16.000Z","ept":0.005,"lat":52.699954333,"lon":5.292730833,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.004}
 !AIVDM,1,1,,B,100001?P?w<tSF0l4Q@>4?wp0W3h,0*28
-{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":159984}
+{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"status_text":"Not defined","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":159984}
 $GPRMC,194917.00,A,5241.99721,N,00517.56389,E,0.003,,010809,,,A*74
 !AIVDO,1,1,,,B3aC3LP00063ac7RNp@03w`UwP06,0*55
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175638,"lat":31619972,"course":0,"heading":511,"second":17,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
@@ -86,7 +86,7 @@ $GPGBS,194918.00,3.0,1.9,4.2,,,,*40
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:18.000Z","ept":0.005,"lat":52.699952500,"lon":5.292732333,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.002}
 !AIVDM,2,1,8,B,54S64>02;dlqK8@cL00lDADl0000000000000016;0<:65wj0?hCDm1DQ0C@,0*63
 !AIVDM,2,2,8,B,00000000002,2*2D
-{"class":"AIS","type":5,"repeat":0,"mmsi":305235000,"scaled":false,"imo":9155406,"ais_version":0,"callsign":"V2DJ7","shipname":"MEDUM","shiptype":70,"to_bow":88,"to_stern":12,"to_port":10,"to_starboard":6,"epfd":1,"eta":"07-31T18:00Z","draught":63,"destination":"AMSTERDAM","dte":0}
+{"class":"AIS","type":5,"repeat":0,"mmsi":305235000,"scaled":false,"imo":9155406,"ais_version":0,"callsign":"V2DJ7","shipname":"MEDUM","shiptype":70,"shiptype_text":"Cargo - all ships of this type","to_bow":88,"to_stern":12,"to_port":10,"to_starboard":6,"epfd":1,"epfd_text":"GPS","eta":"07-31T18:00Z","draught":63,"destination":"AMSTERDAM","dte":0}
 $GPRMC,194919.00,A,5241.99711,N,00517.56399,E,0.004,,010809,,,A*7F
 !AIVDO,1,1,,,B3aC3LP00063acWRNp<03waUwP06,0*48
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175639,"lat":31619971,"course":0,"heading":511,"second":19,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
@@ -94,29 +94,29 @@ $GPGBS,194919.00,3.0,1.9,4.2,,,,*41
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:19.000Z","ept":0.005,"lat":52.699951833,"lon":5.292733167,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.002}
 $GPRMC,194920.00,A,5241.99711,N,00517.56409,E,0.005,,010809,,,A*7A
 !AIVDM,1,1,,B,13`g5:0P0`0E9MbN1FgDE?vV06K4,0*45
-{"class":"AIS","type":1,"repeat":0,"mmsi":244041000,"scaled":false,"status":0,"turn":-128,"speed":40,"accuracy":false,"lon":2771893,"lat":31479485,"course":1108,"heading":511,"second":19,"maneuver":0,"raim":false,"radio":26308}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244041000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":40,"accuracy":false,"lon":2771893,"lat":31479485,"course":1108,"heading":511,"second":19,"maneuver":0,"raim":false,"radio":26308}
 !AIVDO,1,1,,,B3aC3LP00063ad7RNp<03wb5wP06,0*4C
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175640,"lat":31619971,"course":0,"heading":511,"second":20,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,A,13BE3l001n0DJHVN1fQJrHjb00SU,0*35
-{"class":"AIS","type":1,"repeat":0,"mmsi":220546000,"scaled":false,"status":0,"turn":0,"speed":118,"accuracy":false,"lon":2675475,"lat":31485573,"course":2793,"heading":281,"second":21,"maneuver":0,"raim":false,"radio":2277}
+{"class":"AIS","type":1,"repeat":0,"mmsi":220546000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":118,"accuracy":false,"lon":2675475,"lat":31485573,"course":2793,"heading":281,"second":21,"maneuver":0,"raim":false,"radio":2277}
 $GPGBS,194920.00,3.0,1.9,4.2,,,,*4B
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:20.000Z","ept":0.005,"lat":52.699951833,"lon":5.292734833,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.003}
 $GPRMC,194921.00,A,5241.99708,N,00517.56417,E,0.007,,010809,,,A*7E
 !AIVDM,1,1,,A,13bf9v00010IaApN8IK3uSvd0H<V,0*26
-{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"turn":0,"speed":1,"accuracy":false,"lon":3361340,"lat":31594860,"course":1014,"heading":127,"second":22,"maneuver":0,"raim":false,"radio":99110}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":1,"accuracy":false,"lon":3361340,"lat":31594860,"course":1014,"heading":127,"second":22,"maneuver":0,"raim":false,"radio":99110}
 !AIVDO,1,1,,,B3aC3LP00063adWRNp803wbUwP06,0*48
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175641,"lat":31619970,"course":0,"heading":511,"second":21,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194921.00,3.0,1.9,4.2,,,,*4A
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:21.000Z","ept":0.005,"lat":52.699951333,"lon":5.292736167,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.004}
 !AIVDM,1,1,,A,13bcuF0P000H@EjN:0sEiOv`00T4,0*43
-{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"turn":-128,"speed":0,"accuracy":false,"lon":3179193,"lat":31621357,"course":1477,"heading":511,"second":20,"maneuver":0,"raim":false,"radio":2308}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":0,"accuracy":false,"lon":3179193,"lat":31621357,"course":1477,"heading":511,"second":20,"maneuver":0,"raim":false,"radio":2308}
 $GPRMC,194922.00,A,5241.99705,N,00517.56418,E,0.003,,010809,,,A*7B
 !AIVDO,1,1,,,B3aC3LP00063adWRNp803wc5wP06,0*29
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175641,"lat":31619970,"course":0,"heading":511,"second":22,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 $GPGBS,194922.00,3.0,1.9,4.2,,,,*49
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:22.000Z","ept":0.005,"lat":52.699950833,"lon":5.292736333,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.002}
 !AIVDM,1,1,,A,13ck<f10?wPCe;`N3>f>428b0D1S,0*43
-{"class":"AIS","type":1,"repeat":0,"mmsi":247254200,"scaled":false,"status":1,"turn":0,"speed":1023,"accuracy":true,"lon":2582900,"lat":31510200,"course":3600,"heading":68,"second":21,"maneuver":0,"raim":false,"radio":82019}
+{"class":"AIS","type":1,"repeat":0,"mmsi":247254200,"scaled":false,"status":1,"status_text":"At anchor","turn":0,"speed":1023,"accuracy":true,"lon":2582900,"lat":31510200,"course":3600,"heading":68,"second":21,"maneuver":0,"raim":false,"radio":82019}
 $GPRMC,194923.00,A,5241.99704,N,00517.56423,E,0.007,,010809,,,A*77
 $GPGBS,194923.00,3.0,1.9,4.2,,,,*48
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:23.000Z","ept":0.005,"lat":52.699950667,"lon":5.292737167,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.004}
@@ -128,9 +128,9 @@ $GPGBS,194924.00,3.0,1.9,4.2,,,,*4F
 !AIVDO,1,1,,,B3aC3LP00063ae7RNp803wd5wP06,0*4F
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175642,"lat":31619970,"course":0,"heading":511,"second":24,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,B,100001?P?w<tSF0l4Q@>4?wp0PS6,0*11
-{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":133318}
+{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"status_text":"Not defined","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":133318}
 !AIVDM,1,1,,B,13aC225P130HqQ@N3tfQ5OvfP6K4,0*37
-{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"turn":-128,"speed":67,"accuracy":false,"lon":3263528,"lat":31521978,"course":277,"heading":511,"second":23,"maneuver":1,"raim":false,"radio":26308}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"status_text":"Moored","turn":-128,"speed":67,"accuracy":false,"lon":3263528,"lat":31521978,"course":277,"heading":511,"second":23,"maneuver":1,"raim":false,"radio":26308}
 $GPRMC,194925.00,A,5241.99714,N,00517.56429,E,0.002,,010809,,,A*7F
 $GPGBS,194925.00,3.0,1.9,4.2,,,,*4E
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:25.000Z","ept":0.005,"lat":52.699952333,"lon":5.292738167,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.001}
@@ -149,46 +149,46 @@ $GPGBS,194927.00,3.0,1.9,4.2,,,,*4C
 !AIVDO,1,1,,,B3aC3LP00063afWRNp@03weUsP06,0*31
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175645,"lat":31619972,"course":0,"heading":511,"second":27,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,A,13`p;<0P0`0E8p0N1GU4G?vl@@@G,0*32
-{"class":"AIS","type":1,"repeat":0,"mmsi":244190000,"scaled":false,"status":0,"turn":-128,"speed":40,"accuracy":false,"lon":2770688,"lat":31479700,"course":1116,"heading":511,"second":26,"maneuver":0,"raim":false,"radio":66583}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244190000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":40,"accuracy":false,"lon":2770688,"lat":31479700,"course":1116,"heading":511,"second":26,"maneuver":0,"raim":false,"radio":66583}
 $GPRMC,194928.00,A,5241.99730,N,00517.56469,E,0.005,,010809,,,A*77
 $GPGBS,194928.00,3.0,1.9,4.2,,,,*43
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:28.000Z","ept":0.005,"lat":52.699955000,"lon":5.292744833,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.003}
 !AIVDO,1,1,,,B3aC3LP00063ag7RNpD03wf5sP06,0*37
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175646,"lat":31619973,"course":0,"heading":511,"second":28,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,B,100001?P?w<tSF0l4Q@>4?wp0PS3,0*14
-{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":133315}
+{"class":"AIS","type":1,"repeat":0,"mmsi":4,"scaled":false,"status":15,"status_text":"Not defined","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":60,"maneuver":0,"raim":false,"radio":133315}
 $GPRMC,194929.00,A,5241.99738,N,00517.56482,E,0.002,,010809,,,A*7C
 $GPGBS,194929.00,3.0,1.9,4.2,,,,*42
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:29.000Z","ept":0.005,"lat":52.699956333,"lon":5.292747000,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.001}
 !AIVDO,1,1,,,B3aC3LP00063ah7RNpD03wfUsP06,0*58
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175648,"lat":31619973,"course":0,"heading":511,"second":29,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,A,139QcE7P?w<tSF0l4Q@>4?wv0URP,0*32
-{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":153760}
+{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"status_text":"Engaged in fishing","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":153760}
 $GPRMC,194930.00,A,5241.99745,N,00517.56492,E,0.006,,010809,,,A*7B
 $GPGBS,194930.00,3.0,1.9,4.2,,,,*4A
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:30.000Z","ept":0.005,"lat":52.699957500,"lon":5.292748667,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.003}
 !AIVDO,1,1,,,B3aC3LP00063ahWRNpH03wg5sP06,0*55
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175649,"lat":31619974,"course":0,"heading":511,"second":30,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,B,402E3:0000HttPGEahN7pi700pBB,0*6B
-{"class":"AIS","type":4,"repeat":0,"mmsi":2442024,"scaled":false,"timestamp":"0000-00-00T24:60:60Z","accuracy":true,"lon":3059000,"lat":31586500,"epfd":7,"raim":false,"radio":230546}
+{"class":"AIS","type":4,"repeat":0,"mmsi":2442024,"scaled":false,"timestamp":"0000-00-00T24:60:60Z","accuracy":true,"lon":3059000,"lat":31586500,"epfd":7,"epfd_text":"Surveyed","raim":false,"radio":230546}
 $GPRMC,194931.00,A,5241.99750,N,00517.56500,E,0.002,,010809,,,A*70
 $GPGBS,194931.00,3.0,1.9,4.2,,,,*4B
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:31.000Z","ept":0.005,"lat":52.699958333,"lon":5.292750000,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.001}
 !AIVDM,1,1,,B,13bcuF0P000H@F2N:0tL<wvt0<0=,0*0D
-{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"turn":-128,"speed":0,"accuracy":false,"lon":3179201,"lat":31621361,"course":3123,"heading":511,"second":30,"maneuver":0,"raim":false,"radio":49165}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246087000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":0,"accuracy":false,"lon":3179201,"lat":31621361,"course":3123,"heading":511,"second":30,"maneuver":0,"raim":false,"radio":49165}
 !AIVDM,1,1,,B,13bf9v00000IaBlN8IMSuSw006K4,0*63
-{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"turn":0,"speed":0,"accuracy":false,"lon":3361370,"lat":31594870,"course":1014,"heading":127,"second":32,"maneuver":0,"raim":false,"radio":26308}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246123000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":0,"accuracy":false,"lon":3361370,"lat":31594870,"course":1014,"heading":127,"second":32,"maneuver":0,"raim":false,"radio":26308}
 !AIVDO,1,1,,,B3aC3LP00063ai7RNpL03wgUsP06,0*50
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175650,"lat":31619975,"course":0,"heading":511,"second":31,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 $GPRMC,194932.00,A,5241.99756,N,00517.56508,E,0.002,,010809,,,A*7D
 !AIVDM,1,1,,B,33a9=20P@g0DvDhN1Jbd78tv00vi,0*3A
-{"class":"AIS","type":3,"repeat":0,"mmsi":244469000,"scaled":false,"status":0,"turn":-127,"speed":47,"accuracy":false,"lon":2749080,"lat":31480490,"course":3100,"heading":286,"second":31,"maneuver":0,"raim":false,"radio":4017}
+{"class":"AIS","type":3,"repeat":0,"mmsi":244469000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-127,"speed":47,"accuracy":false,"lon":2749080,"lat":31480490,"course":3100,"heading":286,"second":31,"maneuver":0,"raim":false,"radio":4017}
 $GPGBS,194932.00,3.0,1.9,4.2,,,,*48
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:32.000Z","ept":0.005,"lat":52.699959333,"lon":5.292751333,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.001}
 !AIVDO,1,1,,,B3aC3LP00063ai7RNpL03wh5sP06,0*3F
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175650,"lat":31619975,"course":0,"heading":511,"second":32,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,A,13c7O4001N0EmBtMweB6GF?22D2n,0*57
-{"class":"AIS","type":1,"repeat":0,"mmsi":246538000,"scaled":false,"status":0,"turn":0,"speed":94,"accuracy":false,"lon":2861662,"lat":31452488,"course":1629,"heading":199,"second":33,"maneuver":0,"raim":true,"radio":82102}
+{"class":"AIS","type":1,"repeat":0,"mmsi":246538000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":0,"speed":94,"accuracy":false,"lon":2861662,"lat":31452488,"course":1629,"heading":199,"second":33,"maneuver":0,"raim":true,"radio":82102}
 $GPRMC,194933.00,A,5241.99761,N,00517.56512,E,0.011,,010809,,,A*71
 $GPGBS,194933.00,3.0,1.9,4.2,,,,*49
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:33.000Z","ept":0.005,"lat":52.699960167,"lon":5.292752000,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.006}
@@ -200,7 +200,7 @@ $GPGBS,194934.00,3.0,1.9,4.2,,,,*4E
 !AIVDO,1,1,,,B3aC3LP00063aiWRNpP03wi5sP06,0*42
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175651,"lat":31619976,"course":0,"heading":511,"second":34,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 !AIVDM,1,1,,A,13aC225P150HqUlN3uHA5ww2P<0<,0*31
-{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"turn":-128,"speed":69,"accuracy":false,"lon":3263674,"lat":31522145,"course":279,"heading":511,"second":33,"maneuver":1,"raim":false,"radio":49164}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244630024,"scaled":false,"status":5,"status_text":"Moored","turn":-128,"speed":69,"accuracy":false,"lon":3263674,"lat":31522145,"course":279,"heading":511,"second":33,"maneuver":1,"raim":false,"radio":49164}
 $GPRMC,194935.00,A,5241.99779,N,00517.56509,E,0.002,,010809,,,A*76
 !AIVDM,1,1,,A,B3`qKD@00064BIWRQGVI;wiUoP06,0*75
 {"class":"AIS","type":18,"repeat":0,"mmsi":244210513,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3180851,"lat":31622521,"course":2450,"heading":511,"second":35,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
@@ -208,16 +208,16 @@ $GPGBS,194935.00,3.0,1.9,4.2,,,,*4F
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:35.000Z","ept":0.005,"lat":52.699963167,"lon":5.292751500,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.001}
 !AIVDM,1,1,,B,H3`gaQ1AU0Pttp0000000000003,2*6D
 !AIVDM,1,1,,B,13a6ld3P@9PDv3TN1GdRv7k800SH,0*60
-{"class":"AIS","type":1,"repeat":0,"mmsi":244430000,"scaled":false,"status":3,"turn":-127,"speed":9,"accuracy":true,"lon":2748530,"lat":31479730,"course":760,"heading":249,"second":36,"maneuver":0,"raim":false,"radio":2264}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244430000,"scaled":false,"status":3,"status_text":"Restricted manoeuverability","turn":-127,"speed":9,"accuracy":true,"lon":2748530,"lat":31479730,"course":760,"heading":249,"second":36,"maneuver":0,"raim":false,"radio":2264}
 !AIVDO,1,1,,,B3aC3LP00063ai7RNpT03wiUsP06,0*46
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175650,"lat":31619977,"course":0,"heading":511,"second":35,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 $GPRMC,194936.00,A,5241.99789,N,00517.56508,E,0.014,,010809,,,A*7C
 !AIVDM,1,1,,A,33a9=20P@g0DvAtN1Jgd28q20000,0*7E
-{"class":"AIS","type":3,"repeat":0,"mmsi":244469000,"scaled":false,"status":0,"turn":-127,"speed":47,"accuracy":false,"lon":2748990,"lat":31480510,"course":3080,"heading":284,"second":33,"maneuver":0,"raim":false,"radio":0}
+{"class":"AIS","type":3,"repeat":0,"mmsi":244469000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-127,"speed":47,"accuracy":false,"lon":2748990,"lat":31480510,"course":3080,"heading":284,"second":33,"maneuver":0,"raim":false,"radio":0}
 $GPGBS,194936.00,3.0,1.9,4.2,,,,*4C
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:36.000Z","ept":0.005,"lat":52.699964833,"lon":5.292751333,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.007}
 !AIVDM,1,1,,B,H3`gaQ4UDBE5847@9nohh01@3220,0*7F
-{"class":"AIS","type":24,"repeat":0,"mmsi":244050308,"scaled":false,"shipname":"TYPHOON","shiptype":37,"vendorid":"TRUEHDG","model":1,"serial":295175,"callsign":"PI6700","to_bow":10,"to_stern":3,"to_port":2,"to_starboard":2}
+{"class":"AIS","type":24,"repeat":0,"mmsi":244050308,"scaled":false,"shipname":"TYPHOON","shiptype":37,"shiptype_text":"Pleasure Craft","vendorid":"TRUEHDG","model":1,"serial":295175,"callsign":"PI6700","to_bow":10,"to_stern":3,"to_port":2,"to_starboard":2}
 !AIVDO,1,1,,,B3aC3LP00063ai7RNp`03wj5sP06,0*11
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175650,"lat":31619978,"course":0,"heading":511,"second":36,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 $GPRMC,194937.00,A,5241.99795,N,00517.56519,E,0.008,,010809,,,A*7D
@@ -229,7 +229,7 @@ $GPRMC,194938.00,A,5241.99803,N,00517.56530,E,0.010,,010809,,,A*70
 $GPGBS,194938.00,3.0,1.9,4.2,,,,*42
 {"class":"TPV","tag":"GBS","mode":2,"time":"2009-08-01T19:49:38.000Z","ept":0.005,"lat":52.699967167,"lon":5.292755000,"epx":1.900,"epy":3.000,"track":0.0000,"speed":0.005}
 !AIVDM,1,1,,B,13`p;<0P0a0E8upN1GJDG?w:@@Fs,0*7F
-{"class":"AIS","type":1,"repeat":0,"mmsi":244190000,"scaled":false,"status":0,"turn":-128,"speed":41,"accuracy":false,"lon":2770876,"lat":31479657,"course":1116,"heading":511,"second":37,"maneuver":0,"raim":false,"radio":67003}
+{"class":"AIS","type":1,"repeat":0,"mmsi":244190000,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":41,"accuracy":false,"lon":2770876,"lat":31479657,"course":1116,"heading":511,"second":37,"maneuver":0,"raim":false,"radio":67003}
 !AIVDO,1,1,,,B3aC3LP00063ajWRNph03wk5sP06,0*7B
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175653,"lat":31619980,"course":0,"heading":511,"second":38,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 $GPRMC,194939.00,A,5241.99809,N,00517.56539,E,0.009,,010809,,,A*7A
@@ -242,7 +242,7 @@ $GPGBS,194939.00,3.0,1.9,4.2,,,,*43
 !AIVDM,1,1,,B,B3`gaQ000062Pc7RIt403wkUoP06,0*4B
 {"class":"AIS","type":18,"repeat":0,"mmsi":244050308,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3166294,"lat":31614913,"course":0,"heading":511,"second":39,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
 !AIVDM,1,1,,B,139QcE7P?w<tSF0l4Q@>4?wv0l08,0*02
-{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":213000}
+{"class":"AIS","type":1,"repeat":0,"mmsi":211315540,"scaled":false,"status":7,"status_text":"Engaged in fishing","turn":-128,"speed":1023,"accuracy":false,"lon":108600000,"lat":54600000,"course":3600,"heading":511,"second":63,"maneuver":0,"raim":false,"radio":213000}
 !AIVDO,1,1,,,B3aC3LP00063ajWRNph03wkUsP06,0*1B
 {"class":"AIS","type":18,"repeat":0,"mmsi":244630386,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":3175653,"lat":31619980,"course":0,"heading":511,"second":39,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":false,"radio":917510}
 $GPRMC,194940.00,A,5241.99812,N,00517.56549,E,0.005,,010809,,,A*75