From c6e7f17791f5721c994128c8165c71bcb40a02fb Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 6 Jan 2023 19:44:12 -0800 Subject: Fix TLT2H LBS decoding --- .../org/traccar/protocol/Tlt2hProtocolDecoder.java | 25 ++++++---------------- 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java index 7976b825f..e85bdf9b3 100644 --- a/src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 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. @@ -191,25 +191,14 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { DateBuilder dateBuilder = new DateBuilder() .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); - boolean isPositionValid = parser.next().equals("A"); - position.setValid(isPositionValid); - - if (isPositionValid) { - position.setLatitude(parser.nextCoordinate()); - position.setLongitude(parser.nextCoordinate()); - position.setSpeed(parser.nextDouble(0)); - position.setCourse(parser.nextDouble(0)); - } else { - parser.skip(8); - } + position.setValid(parser.next().equals("A")); + position.setLatitude(parser.nextCoordinate()); + position.setLongitude(parser.nextCoordinate()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()); - - if (isPositionValid) { - position.setTime(dateBuilder.getDate()); - } else { - getLastLocation(position, dateBuilder.getDate()); - } + position.setTime(dateBuilder.getDate()); } else { continue; -- cgit v1.2.3