aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-06 11:47:53 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-06 11:47:53 +1200
commit926873438a66abcbaa204884970663e70b6882f8 (patch)
tree071983935fd47d36269d0ec75b4781f787667a2b /src/org
parent16ebb921e416e94cb9e01340d38c7071882dd65f (diff)
downloadtraccar-server-926873438a66abcbaa204884970663e70b6882f8.tar.gz
traccar-server-926873438a66abcbaa204884970663e70b6882f8.tar.bz2
traccar-server-926873438a66abcbaa204884970663e70b6882f8.zip
Modify Visiontek regex pattern
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/VisiontekProtocolDecoder.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java
index 2fe58e5be..236f417e3 100644
--- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java
+++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.java
@@ -19,10 +19,8 @@ import java.util.Calendar;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-
import org.traccar.BaseProtocolDecoder;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
@@ -40,9 +38,9 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder {
"(?:(\\d+),)?" + // IMEI
"(\\d{2}),(\\d{2}),(\\d{2})," + // Date
"(\\d{2}),(\\d{2}),(\\d{2})," + // Time
- "(\\d{2})(\\d{6})([NS])," + // Latitude
- "(\\d{3})(\\d{6})([EW])," + // Longitude
- "(\\d+\\.\\d+)," + // Speed
+ "(\\d{2})(\\d{2}\\.?\\d{4})([NS])," + // Latitude
+ "(\\d{3})(\\d{2}\\.?\\d{4})([EW])," + // Longitude
+ "(\\d+\\.?\\d+)," + // Speed
"(\\d+)," + // Course
"(?:(\\d+)," + // Altitude
"(\\d+),)?" + // Satellites
@@ -97,18 +95,19 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder {
// Latitude
Double latitude = Double.valueOf(parser.group(index++));
- latitude += Double.valueOf(parser.group(index++)) / 600000;
+ latitude += Double.valueOf(parser.group(index++).replace(".", "")) / 600000;
if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
position.setLatitude(latitude);
// Longitude
Double longitude = Double.valueOf(parser.group(index++));
- longitude += Double.valueOf(parser.group(index++)) / 600000;
+ longitude += Double.valueOf(parser.group(index++).replace(".", "")) / 600000;
if (parser.group(index++).compareTo("W") == 0) longitude = -longitude;
position.setLongitude(longitude);
// Speed
- position.setSpeed(UnitsConverter.knotsFromKph(Double.valueOf(parser.group(index++))));
+ position.setSpeed(UnitsConverter.knotsFromKph(Double.valueOf(
+ parser.group(index++).replace(".", "")) / 10));
// Course
position.setCourse(Double.valueOf(parser.group(index++)));