aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/MtxProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-05-04 10:53:27 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-05-04 10:53:27 +1200
commit88e777a2ceb50e34dbe9577237483d8d3cebf346 (patch)
tree6b2058f1cf43e56a4be20d981acd8b03452bdc8e /src/org/traccar/protocol/MtxProtocolDecoder.java
parentbbfd08e59ba23c6aee85bc1083588529a7b90ebb (diff)
downloadtrackermap-server-88e777a2ceb50e34dbe9577237483d8d3cebf346.tar.gz
trackermap-server-88e777a2ceb50e34dbe9577237483d8d3cebf346.tar.bz2
trackermap-server-88e777a2ceb50e34dbe9577237483d8d3cebf346.zip
Create other data keys
Diffstat (limited to 'src/org/traccar/protocol/MtxProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/MtxProtocolDecoder.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/MtxProtocolDecoder.java b/src/org/traccar/protocol/MtxProtocolDecoder.java
index 809b26c25..1d32e83f6 100644
--- a/src/org/traccar/protocol/MtxProtocolDecoder.java
+++ b/src/org/traccar/protocol/MtxProtocolDecoder.java
@@ -24,6 +24,7 @@ import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.model.Event;
import org.traccar.model.Position;
public class MtxProtocolDecoder extends BaseProtocolDecoder {
@@ -41,7 +42,7 @@ public class MtxProtocolDecoder extends BaseProtocolDecoder {
"(-?\\d+\\.\\d+)," + // Longitude
"(\\d+\\.?\\d*)," + // Speed
"(\\d+)," + // Course
- "(\\d+\\.?\\d*)," + // Milage
+ "(\\d+\\.?\\d*)," + // Odometer
"(?:\\d+|X)," +
"(?:[01]|X)," +
"([01]+)," + // Input
@@ -99,9 +100,9 @@ public class MtxProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(Double.valueOf(parser.group(index++)));
// Other
- position.set("milage", Double.valueOf(parser.group(index++)));
- position.set("input", parser.group(index++));
- position.set("output", parser.group(index++));
+ position.set(Event.KEY_ODOMETER, Double.valueOf(parser.group(index++)));
+ position.set(Event.KEY_INPUT, parser.group(index++));
+ position.set(Event.KEY_OUTPUT, parser.group(index++));
position.set("adc1", parser.group(index++));
position.set("adc2", parser.group(index++));