diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-10-26 19:39:33 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-10-26 19:39:33 -0700 |
| commit | 72171038c2140acfc11ccae2c90c8b28c592e554 (patch) | |
| tree | 0f16fc1f33d45be8b363597d7952323430ec3014 | |
| parent | 47274f73878ac429ac261cfbcba84c06c48fb547 (diff) | |
| parent | a4edfb6dec7de8a80ca7c3081e81aac40ed73542 (diff) | |
| download | traccar-server-72171038c2140acfc11ccae2c90c8b28c592e554.tar.gz traccar-server-72171038c2140acfc11ccae2c90c8b28c592e554.tar.bz2 traccar-server-72171038c2140acfc11ccae2c90c8b28c592e554.zip | |
Merge pull request #66 from hackerunet/master
Fixed wrong regular expression in EV603 Protocol
| -rw-r--r-- | src/org/traccar/protocol/Ev603ProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Ev603ProtocolDecoder.java b/src/org/traccar/protocol/Ev603ProtocolDecoder.java index cbef74e98..6bc13d6d7 100644 --- a/src/org/traccar/protocol/Ev603ProtocolDecoder.java +++ b/src/org/traccar/protocol/Ev603ProtocolDecoder.java @@ -46,10 +46,10 @@ public class Ev603ProtocolDecoder extends GenericProtocolDecoder{ "!A," + // Start Character
"([\\d]{2})\\/([\\d]{2})\\/([\\d]{2})," + // Date dd/mm/YY
"([\\d]{2}):([\\d]{2}):([\\d]{2})," + // Time hh:mm:ss
- "(-?[\\d]{2})([\\d]{2}.[\\d]{4})," + // Latitude (DDMM.MMMM)
- "(-?[\\d]{3})([\\d]{2}.[\\d]{4})," + // Longitude (DDDMM.MMMM)
+ "(-?[\\d]+\\.[\\d]+)," + // Latitude (DDMM.MMMM)
+ "(-?[\\d]+\\.[\\d]+)," + // Longitude (DDDMM.MMMM)
"([\\d]+.[\\d]{2})," + // Speed
- "([\\d]{2-3}+.[\\d]{1-3})," + // degrees
+ "([\\d]+|[\\d]+\\.[\\d]+)," + // degrees
".*");
static private Pattern deviceImei = Pattern.compile("([\\d]+);");
|