From 88e777a2ceb50e34dbe9577237483d8d3cebf346 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 4 May 2015 10:53:27 +1200 Subject: Create other data keys --- src/org/traccar/protocol/Stl060ProtocolDecoder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/protocol/Stl060ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index d5ad651e7..d3db10d90 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.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 Stl060ProtocolDecoder extends BaseProtocolDecoder { @@ -43,7 +44,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { "(\\d{3})(\\d{2})\\.?(\\d+)([EW])," + // Longitude "(\\d+\\.?\\d*)," + // Speed "(\\d+\\.?\\d*)," + // Course - "(\\d+)," + // Milage + "(\\d+)," + // Odometer "(\\d+)," + // Ignition "(\\d+)," + // DIP1 "(\\d+)," + // DIP2 @@ -108,11 +109,11 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { position.setCourse(Double.valueOf(parser.group(index++))); // Other - position.set("milage", Integer.valueOf(parser.group(index++))); + position.set(Event.KEY_ODOMETER, Integer.valueOf(parser.group(index++))); position.set("ignition", Integer.valueOf(parser.group(index++))); position.set("dip1", Integer.valueOf(parser.group(index++))); position.set("dip2", Integer.valueOf(parser.group(index++))); - position.set("fuel", Integer.valueOf(parser.group(index++))); + position.set(Event.KEY_FUEL, Integer.valueOf(parser.group(index++))); // Validity position.setValid(parser.group(index++).compareTo("A") == 0); -- cgit v1.2.3