From 6461a7fad516e46250daca301305f36ba8bab8e6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 30 Mar 2017 06:49:15 +1300 Subject: Fix another Telic issue --- src/org/traccar/protocol/TelicProtocolDecoder.java | 6 ------ test/org/traccar/protocol/TelicProtocolDecoderTest.java | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/org/traccar/protocol/TelicProtocolDecoder.java index dd20932d9..579a6466b 100644 --- a/src/org/traccar/protocol/TelicProtocolDecoder.java +++ b/src/org/traccar/protocol/TelicProtocolDecoder.java @@ -53,8 +53,6 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder { .number("(d+)?,") // satellites .expression("(?:[^,]*,){7}") .number("(d+),") // battery - .expression("[^,]*,") - .number("(d+)?") // external .any() .compile(); @@ -131,10 +129,6 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_BATTERY, parser.nextInt()); - if (parser.hasNext()) { - position.set(Position.KEY_POWER, parser.nextInt()); - } - return position; } diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/test/org/traccar/protocol/TelicProtocolDecoderTest.java index 66ad3db79..74257ee6b 100644 --- a/test/org/traccar/protocol/TelicProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TelicProtocolDecoderTest.java @@ -10,6 +10,12 @@ public class TelicProtocolDecoderTest extends ProtocolTest { TelicProtocolDecoder decoder = new TelicProtocolDecoder(new TelicProtocol()); + verifyPosition(decoder, text( + "442045993198,290317131935,0,290317131935,269158,465748,3,26,183,,,,184,85316567,226,01,00,68,218")); + + verifyPosition(decoder, text( + "673091036017,290317131801,0,290317131801,262214,450536,3,40,199,8,,,154,19969553,,0011,00,59,240,0,0406")); + verifyPosition(decoder, text( "092020621198,280317084155,0,280317084156,259762,444356,3,42,278,9,,,89,56793311,,0110,00,67,0,,0400")); -- cgit v1.2.3