aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/WatchProtocolEncoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-04 18:01:43 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-04 18:01:43 +0500
commit87392d9fbb0289b5486496b6e6b97db1ea84e2b7 (patch)
tree6d8413ad76307ee7bc52b5788dc202bb55762958 /src/org/traccar/protocol/WatchProtocolEncoder.java
parent99fd421c76c8e7491095a91630516f6d2db27034 (diff)
downloadtrackermap-server-87392d9fbb0289b5486496b6e6b97db1ea84e2b7.tar.gz
trackermap-server-87392d9fbb0289b5486496b6e6b97db1ea84e2b7.tar.bz2
trackermap-server-87392d9fbb0289b5486496b6e6b97db1ea84e2b7.zip
Accept timezone id instead of offset in commands
Diffstat (limited to 'src/org/traccar/protocol/WatchProtocolEncoder.java')
-rw-r--r--src/org/traccar/protocol/WatchProtocolEncoder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 6fcd109c2..e585a91c1 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,13 +26,14 @@ import java.text.DecimalFormatSymbols;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.TimeZone;
public class WatchProtocolEncoder extends StringProtocolEncoder implements StringProtocolEncoder.ValueFormatter {
@Override
public String formatValue(String key, Object value) {
if (key.equals(Command.KEY_TIMEZONE)) {
- double offset = ((Number) value).longValue() / 3600.0;
+ double offset = TimeZone.getTimeZone(value.toString()).getRawOffset() / 3600000.0;
DecimalFormat fmt = new DecimalFormat("+#.##;-#.##", DecimalFormatSymbols.getInstance(Locale.US));
return fmt.format(offset);
}
@@ -41,6 +42,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
}
+ @Override
protected String formatCommand(Command command, String format, String... keys) {
String content = super.formatCommand(command, format, this, keys);
return String.format("[CS*%s*%04x*%s]",