aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/XirgoProtocolDecoder.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/XirgoProtocolDecoder.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/XirgoProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/XirgoProtocolDecoder.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/org/traccar/protocol/XirgoProtocolDecoder.java
index 813a7a995..74b1bd077 100644
--- a/src/org/traccar/protocol/XirgoProtocolDecoder.java
+++ b/src/org/traccar/protocol/XirgoProtocolDecoder.java
@@ -25,6 +25,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 XirgoProtocolDecoder extends BaseProtocolDecoder {
@@ -48,7 +49,7 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
"(\\d+)," + // HDOP
"(\\d+\\.\\d+)," + // Battery
"(\\d+)," + // GSM
- "(\\d+\\.?\\d*)," + // Milage
+ "(\\d+\\.?\\d*)," + // Odometer
"(\\d+)," + // GPS
".*");
@@ -77,7 +78,7 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
}
position.setDeviceId(getDeviceId());
- position.set("event", parser.group(index++));
+ position.set(Event.KEY_EVENT, parser.group(index++));
// Date
Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
@@ -98,11 +99,11 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(Double.valueOf(parser.group(index++)));
// Additional data
- position.set("satellites", parser.group(index++));
- position.set("hdop", parser.group(index++));
- position.set("battery", parser.group(index++));
- position.set("gsm", parser.group(index++));
- position.set("milage", parser.group(index++));
+ position.set(Event.KEY_SATELLITES, parser.group(index++));
+ position.set(Event.KEY_HDOP, parser.group(index++));
+ position.set(Event.KEY_BATTERY, parser.group(index++));
+ position.set(Event.KEY_GSM, parser.group(index++));
+ position.set(Event.KEY_ODOMETER, parser.group(index++));
// Validity
position.setValid(Integer.valueOf(parser.group(index++)) == 1);