aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-23 09:50:33 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-23 09:50:33 +1300
commitdfa728598edc0fd3ad495198c3b4666fc644d16c (patch)
tree3de6dec3840ba8eafe2546e65b364ac5322df024 /src/org/traccar
parent62b5879f68d5f2201b527082309808977de9e8f9 (diff)
downloadtrackermap-server-dfa728598edc0fd3ad495198c3b4666fc644d16c.tar.gz
trackermap-server-dfa728598edc0fd3ad495198c3b4666fc644d16c.tar.bz2
trackermap-server-dfa728598edc0fd3ad495198c3b4666fc644d16c.zip
Fix hemisphere decoding for H02 protocol
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/helper/Parser.java2
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java
index 7c5f84f55..a3f118df0 100644
--- a/src/org/traccar/helper/Parser.java
+++ b/src/org/traccar/helper/Parser.java
@@ -157,7 +157,7 @@ public class Parser {
}
public double nextCoordinate() {
- return nextCoordinate(CoordinateFormat.DEG_MIN_HEM);
+ return nextCoordinate(CoordinateFormat.DEG_MIN_HEM);
}
}
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index 2b8adda4a..c4ba6ffa3 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -123,15 +123,15 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
.number("(dd)(dd)(dd),") // time
.expression("([AV])?,") // validity
.groupBegin()
- .number("(d+)(dd.d+),") // latitude
- .or()
.number("-(d+)-(d+.d+),") // latitude
+ .or()
+ .number("(d+)(dd.d+),") // latitude
.groupEnd()
.expression("([NS]),")
.groupBegin()
- .number("(d+)(dd.d+),") // longitude
- .or()
.number("-(d+)-(d+.d+),") // longitude
+ .or()
+ .number("(d+)(dd.d+),") // longitude
.groupEnd()
.expression("([EW]),")
.number("(d+.?d*),") // speed
@@ -164,14 +164,14 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
}
if (parser.hasNext(2)) {
- position.setLatitude(parser.nextCoordinate());
+ position.setLatitude(-parser.nextCoordinate());
}
if (parser.hasNext(2)) {
position.setLatitude(parser.nextCoordinate());
}
if (parser.hasNext(2)) {
- position.setLongitude(parser.nextCoordinate());
+ position.setLongitude(-parser.nextCoordinate());
}
if (parser.hasNext(2)) {
position.setLongitude(parser.nextCoordinate());