diff options
| author | Thiritin <me@thiritin.com> | 2021-06-22 20:14:44 +0200 |
|---|---|---|
| committer | Thiritin <me@thiritin.com> | 2021-06-22 20:14:44 +0200 |
| commit | 741ec70faa97305eea8d95e261af5e3f1a5d77d4 (patch) | |
| tree | e4051803b4ec29afe2a9787377af6a3a2de67bab | |
| parent | acc947ffd409d70dddd1ad3624210dfc3da2a1ea (diff) | |
| download | trackermap-server-741ec70faa97305eea8d95e261af5e3f1a5d77d4.tar.gz trackermap-server-741ec70faa97305eea8d95e261af5e3f1a5d77d4.tar.bz2 trackermap-server-741ec70faa97305eea8d95e261af5e3f1a5d77d4.zip | |
Make altitude optional
| -rw-r--r-- | src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java b/src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java index 706307d89..f0ff4a4c4 100644 --- a/src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java @@ -246,7 +246,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder { .number("(d+.d+),") // hdop .number("(d+.d+)?,") // speed .number("(d+.d+)?,") // course - .number("(-?d+.d+),") // altitude + .number("(-?d+.d+)?,") // altitude .number("(d+.d+)?,") // odometer .number("(d+),") // mcc .number("(d+),") // mnc diff --git a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java index dbf84e4db..25f4627cd 100644 --- a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -12,13 +12,16 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { var decoder = new MegastekProtocolDecoder(null); verifyPosition(decoder, text( - "0132$MGV002,869152024261561,,S,310818,133945,V,3814.35442,N,02144.50662,E,00,00,00,99.9,,,44.2,,202,10,,,13,0,0,0,0,90,,,,11,100,Timer;!")); + "0143$MGV002,869152024261564,,R,220621,120804,V,5152.09429,N,01051.32158,E,00,00,00,99.9,,,,,232,10,A5AE,5A4908,22,0000,0000,0,,,,,,00,093,Timer,,;!")); verifyPosition(decoder, text( - "0151$MGV002,869152024261561,ID,S,070918,155544,V,3814.35419,N,02144.52113,E,00,00,00,99.9,0.062,,12.3,,202,01,0898,D1BE,8,34,1055,0,0,600,,,,11,010,Timer;!")); + "0174$MGV002,014682001957744,,R,260318,042537,A,3853.77301,N,07728.66673,W,00,09,00,1.06,0.147,329.51,123.3,,310,26,B46C,5E69375,5,0000,0000,0,,,,,,10,019,Timer,,;!")); + + verifyPosition(decoder, text( + "0132$MGV002,869152024261561,,S,310818,133945,V,3814.35442,N,02144.50662,E,00,00,00,99.9,,,44.2,,202,10,,,13,0,0,0,0,90,,,,11,100,Timer;!")); verifyPosition(decoder, text( - "0174$MGV002,014682001957744,014682001957744,R,260318,042537,A,3853.77301,N,07728.66673,W,00,09,00,1.06,0.147,329.51,123.3,,310,26,B46C,5E69375,5,0000,0000,0,,,,,,10,019,Timer,,;!")); + "0151$MGV002,869152024261561,ID,S,070918,155544,V,3814.35419,N,02144.52113,E,00,00,00,99.9,0.062,,12.3,,202,01,0898,D1BE,8,34,1055,0,0,600,,,,11,010,Timer;!")); verifyNull(decoder, text( "0112$MGV002,,GVT900-3,S,010114,000003,,,,,,00,00,00,,0.000,0.00,,0.0,,,,,,0000,0000,14,10,0, , ,,1-0,0,Low Ext Vol;!")); @@ -38,9 +41,6 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$MGV002,869152024446923,869152024446923,S,240816,151631,A,5053.83335,N,00424.05702,E,00,10,00,0.88,2.645,76.09,22.7,,206,01,07D1,6600,28,,,,,,,,,01,100,Timer;!")); - - verifyPosition(decoder, text( - "0137$MGV002,851823152506442,,S,260521,111106,A,2255.09641,N,11404.01665,E,00,08,00,0.95,0.027,,24.7,,,,,,23,0000,0000,0,,,,,,10,100,Timer,,;!")); verifyPosition(decoder, text( "STX,013950007137061,$GPRMC,191959.000,A,5203.09602,N,00830.77057,E,5.73,255.27,240716,,,A*62,L,Belt Up,imei:013950007137061,0/5,,Battery=52%,,1,262,03,0084,B20E;FD")); |