From 808e1134878630796bb9e35e0f5501be942f4c5b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Mar 2013 22:51:17 +1300 Subject: Fix negative altitude --- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 2 +- src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index d81655933..2e3620179 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -154,7 +154,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { position.setAltitude(0.0); // Speed - position.setSpeed(Double.valueOf(parser.group(index++)) * 0.539957); + position.setSpeed(Double.valueOf(parser.group(index++))); // Course String course = parser.group(index++); diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java index 2e84ef47f..6981c8d42 100644 --- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2012 - 2013 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. @@ -26,14 +26,8 @@ import org.traccar.ServerManager; import org.traccar.helper.Log; import org.traccar.model.Position; -/** - * Xexun tracker protocol decoder - */ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder { - /** - * Initialize - */ public Xexun2ProtocolDecoder(ServerManager serverManager) { super(serverManager); } @@ -61,14 +55,12 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder { ".*imei:" + "(\\d+)," + // IMEI "(\\d+)," + // Satellites - "(\\d+\\.\\d+)," + // Altitude + "(-?\\d+\\.\\d+)," + // Altitude "[FL]:(\\d+\\.\\d+)V," + // Power ".*" + "[\r\n]*"); - /** - * Decode message - */ + @Override protected Object decode( ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception { @@ -77,7 +69,6 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder { String sentence = (String) msg; Matcher parser = pattern.matcher(sentence); if (!parser.matches()) { - //throw new ParseException(null, 0); return null; } -- cgit v1.2.3