Create other data keys

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);