diff options
Diffstat (limited to 'src/org/traccar/protocol/Ev603ProtocolDecoder.java')
-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]+);");
|