aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-07-08 05:44:23 -0700
committerAnton Tananaev <anton@traccar.org>2024-07-08 05:44:23 -0700
commitb48e4a456f0e44a91d563a8d5b42295e131ebdaf (patch)
tree22ff60fa9bcf8e1dd767c092de95e047724a169b /src
parentcf6aa038b7514201ffb89fa26a4ba7d921b8f16f (diff)
downloadtrackermap-server-b48e4a456f0e44a91d563a8d5b42295e131ebdaf.tar.gz
trackermap-server-b48e4a456f0e44a91d563a8d5b42295e131ebdaf.tar.bz2
trackermap-server-b48e4a456f0e44a91d563a8d5b42295e131ebdaf.zip
Revert "Invalid ST-901L-4G coordinates"
This reverts commit 864872b2df3e26c94d3a5826f4df504de3cf6c62.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/H02ProtocolDecoder.java20
-rw-r--r--src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java3
2 files changed, 6 insertions, 17 deletions
diff --git a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java
index ed6460e97..38c063b52 100644
--- a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java
@@ -350,32 +350,24 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
position.setValid(true);
}
- double latitude = 0;
if (parser.hasNext(3)) {
- latitude = parser.nextCoordinate();
+ position.setLatitude(parser.nextCoordinate());
}
if (parser.hasNext(3)) {
- latitude = parser.nextCoordinate();
+ position.setLatitude(parser.nextCoordinate());
}
if (parser.hasNext(4)) {
- latitude = parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM);
- }
- if (latitude != 99 + 99.9999 / 60) {
- position.setLatitude(latitude);
+ position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM));
}
- double longitude = 0;
if (parser.hasNext(3)) {
- longitude = parser.nextCoordinate();
+ position.setLongitude(parser.nextCoordinate());
}
if (parser.hasNext(3)) {
- longitude = parser.nextCoordinate();
+ position.setLongitude(parser.nextCoordinate());
}
if (parser.hasNext(4)) {
- longitude = parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM);
- }
- if (longitude != 999 + 99.9999 / 60) {
- position.setLongitude(longitude);
+ position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM));
}
position.setSpeed(parser.nextDouble(0));
diff --git a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java
index 05a362cb0..a63488960 100644
--- a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java
@@ -12,9 +12,6 @@ public class H02ProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new H02ProtocolDecoder(null));
verifyPosition(decoder, buffer(
- "*HQ,8888888888,V1,083600,V,9999.9999,N,99999.9999,E,000.00,000,070724,FFFFDFFF,231,03,10,196354#"));
-
- verifyPosition(decoder, buffer(
"*HQ,3177718238,V6,002926,V,3514.4088,N,9733.2842,W,0.00,0.00,151222,FFF7FBFF,310,260,32936,13641,8944501311217563382F,#"));
verifyPosition(decoder, buffer(