diff options
| -rw-r--r-- | src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java | 6 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java index 34125bffa..aded35823 100644 --- a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java @@ -102,7 +102,6 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder { } position = new Position(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - position.setValid(true); dateBuilder = new DateBuilder(new Date()); } else if (position != null) { switch (key) { @@ -122,9 +121,11 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder { Integer.parseInt(value.substring(6)) * 10); break; case 0xA: + position.setValid(true); position.setLatitude(Double.parseDouble(value)); break; case 0xB: + position.setValid(true); position.setLongitude(Double.parseDouble(value)); break; case 0xC: @@ -177,6 +178,9 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder { } if (position != null) { + if (!position.getValid()) { + getLastLocation(position, null); + } position.setTime(dateBuilder.getDate()); positions.add(position); } diff --git a/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java index 566d66fd7..decd7fd38 100644 --- a/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java @@ -34,6 +34,9 @@ public class FreematicsProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, text( "1#0=68338,10D=79,30=1010,105=199,10C=4375,104=56,111=62,20=0;-1;95,10=6454200,A=-32.727482,B=150.150301,C=159,D=0,F=5,24=1250*7A")); + verifyAttributes(decoder, text( + "M0ZR4X0#0:566624,24:1246,20:0;0;0*D")); + verifyNull(decoder, text( "M0ZR4X0#DF=4208,SSI=-71,EV=1,TS=20866,ID=M0ZR4X0*9E")); |