aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolEncoder.java2
-rw-r--r--src/org/traccar/protocol/T55ProtocolDecoder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Gps103ProtocolEncoder.java b/src/org/traccar/protocol/Gps103ProtocolEncoder.java
index 50a15350a..db4bbc832 100644
--- a/src/org/traccar/protocol/Gps103ProtocolEncoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolEncoder.java
@@ -48,7 +48,7 @@ public class Gps103ProtocolEncoder extends StringProtocolEncoder implements Stri
case Command.TYPE_POSITION_PERIODIC:
return formatCommand(command, "**,imei:{%s},C,{%s}", this, Command.KEY_UNIQUE_ID, Command.KEY_FREQUENCY);
case Command.TYPE_ENGINE_STOP:
- return formatCommand(command, "**,imei:{%s},J;", Command.KEY_UNIQUE_ID);
+ return formatCommand(command, "**,imei:{%s},J", Command.KEY_UNIQUE_ID);
case Command.TYPE_ENGINE_RESUME:
return formatCommand(command, "**,imei:{%s},K", Command.KEY_UNIQUE_ID);
case Command.TYPE_ALARM_ARM:
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java
index 63444ccd4..1376ca123 100644
--- a/src/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/T55ProtocolDecoder.java
@@ -50,9 +50,9 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern patternGPGGA = Pattern.compile(
"\\$GPGGA," +
"(\\d{2})(\\d{2})(\\d{2})\\.?\\d*," + // Time
- "(\\d{2})(\\d{2}\\.\\d+)," + // Latitude
+ "(\\d+)(\\d{2}\\.\\d+)," + // Latitude
"([NS])," +
- "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude
+ "(\\d+)(\\d{2}\\.\\d+)," + // Longitude
"([EW])," +
".+");