aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-01-31 23:01:13 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-01-31 23:01:13 +1300
commit33a5306bb25af9c6b95858c82bed0c4deacbc537 (patch)
treefc7e7e622a2b8d7df5727013ac3e0dec39d91261 /src/org
parentce8154726e398ca47b3d3ea214ced111c0146769 (diff)
downloadtraccar-server-33a5306bb25af9c6b95858c82bed0c4deacbc537.tar.gz
traccar-server-33a5306bb25af9c6b95858c82bed0c4deacbc537.tar.bz2
traccar-server-33a5306bb25af9c6b95858c82bed0c4deacbc537.zip
Handle negative altitude (fix #535)
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/IntellitracProtocolDecoder.java4
-rw-r--r--src/org/traccar/protocol/MeitrackProtocolDecoder.java6
-rw-r--r--src/org/traccar/protocol/WondexProtocolDecoder.java6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/org/traccar/protocol/IntellitracProtocolDecoder.java
index de834965c..56ddfedfd 100644
--- a/src/org/traccar/protocol/IntellitracProtocolDecoder.java
+++ b/src/org/traccar/protocol/IntellitracProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class IntellitracProtocolDecoder extends BaseProtocolDecoder {
"(-?\\d+\\.\\d+)," + // Latitude
"(\\d+\\.?\\d*)," + // Speed
"(\\d+\\.?\\d*)," + // Course
- "(\\d+\\.?\\d*)," + // Altitude
+ "(-?\\d+\\.?\\d*)," + // Altitude
"(\\d+)," + // Satellites
"(\\d+)," + // Report Identifier
"(\\d+)," + // Input
diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
index 71a5a61c1..d1ed182b2 100644
--- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
"(\\d+)," + // GSM Signal
"(\\d+)," + // Speed
"(\\d+)," + // Course
- "(\\d+\\.?\\d*)," + // HDOP
- "(\\d+)," + // Altitude
+ "(\\d+\\.?\\d*)," + // HDOP
+ "(-?\\d+)," + // Altitude
"(\\d+)," + // Milage
".*"); // TODO: parse other stuff
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index 65fb3526d..90f2e62e9 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
super(serverManager);
}
- static private Pattern pattern = Pattern.compile(
+ private static final Pattern pattern = Pattern.compile(
"[^\\d]*" + // Header
"(\\d+)," + // Device Identifier
"(\\d{4})(\\d{2})(\\d{2})" + // Date (YYYYMMDD)
@@ -42,7 +42,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
"(-?\\d+\\.\\d+)," + // Latitude
"(\\d+)," + // Speed
"(\\d+)," + // Course
- "(\\d+)," + // Altitude
+ "(-?\\d+)," + // Altitude
"(\\d+)," + // Satellites
"(\\d+),?" + // Event
"(\\d+\\.\\d+)?,?" + // Milage