aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-08-06 20:25:55 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-08-06 20:26:08 +1200
commit3ed2536aae70188fb6c7f20ff7a6a8ab7dfbba80 (patch)
treebf887e76a4ced8b95b2751ccf3582ec4b4c77fb3 /src/org/traccar/protocol
parentbc4856d376a555a65059f5295b9ed744e07e7585 (diff)
downloadtrackermap-server-3ed2536aae70188fb6c7f20ff7a6a8ab7dfbba80.tar.gz
trackermap-server-3ed2536aae70188fb6c7f20ff7a6a8ab7dfbba80.tar.bz2
trackermap-server-3ed2536aae70188fb6c7f20ff7a6a8ab7dfbba80.zip
Fix hours formatting
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/TelemaxProtocolDecoder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/TelemaxProtocolDecoder.java b/src/org/traccar/protocol/TelemaxProtocolDecoder.java
index fd2f03e1c..5eb5ca0b5 100644
--- a/src/org/traccar/protocol/TelemaxProtocolDecoder.java
+++ b/src/org/traccar/protocol/TelemaxProtocolDecoder.java
@@ -93,7 +93,7 @@ public class TelemaxProtocolDecoder extends BaseProtocolDecoder {
position.setLatitude((Integer.parseInt(readValue(sentence, index, 6), 16) - 5400000) / 30000.0);
if (i == 0 | i == count - 1) {
- time = new SimpleDateFormat("yyMMddhhmmss").parse(readValue(sentence, index, 12));
+ time = new SimpleDateFormat("yyMMddHHmmss").parse(readValue(sentence, index, 12));
position.set(Position.KEY_STATUS, readValue(sentence, index, 8));
} else {
time = new Date(time.getTime() + interval * 1000);