diff options
| author | Anton Tananaev <anton@traccar.org> | 2022-12-24 11:41:14 -0800 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2022-12-24 11:41:14 -0800 |
| commit | 2e1b77d6aa5a2c2d2e07b29f80c40ec741004819 (patch) | |
| tree | c8901f3fa37be4dba61ff5caae9c0f9917a013ce | |
| parent | 1963e01a6597734636fac22ab859452b8000b623 (diff) | |
| download | trackermap-server-2e1b77d6aa5a2c2d2e07b29f80c40ec741004819.tar.gz trackermap-server-2e1b77d6aa5a2c2d2e07b29f80c40ec741004819.tar.bz2 trackermap-server-2e1b77d6aa5a2c2d2e07b29f80c40ec741004819.zip | |
Extend Iridium format
| -rw-r--r-- | src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java index 0306770b6..0e1c7568b 100644 --- a/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2022 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public class Tr20ProtocolDecoder extends BaseProtocolDecoder { .number("(ddd)(dd.d+),") // longitude .number("(d+),") // speed .number("(d+),") // course - .number("(?:NA|[FC]?(-?d+)[^,]*),") // temperature + .number("(?:NA|[BFC]?(-?d+)[^,]*),") // temperature .number("(x{8}),") // status .number("(d+)") // event .any() diff --git a/src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java index c4513cbdc..e4917c872 100644 --- a/src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class Tr20ProtocolDecoderTest extends ProtocolTest { var decoder = inject(new Tr20ProtocolDecoder(null)); verifyPosition(decoder, text( + "%%m13,L,221221103115,N1237.2271W00801.9500,000,000,B13.1:F0.0,04020000,253,CFG:133.00|")); + + verifyPosition(decoder, text( "%%TR20GRANT,L,210602170135,N0951.1733W08356.7672,000,000,C80:F0,00020008,108,CFG:6980.00|")); verifyPosition(decoder, text( |