aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Menk <menk@mestrona.net>2016-12-20 12:47:19 +0100
committerAlexander Menk <menk@mestrona.net>2016-12-20 12:47:19 +0100
commite0f8ae0ef6a2dbaa973e23650e347cbcf77b387a (patch)
treea0e77b367127bc765115bfcbb80f8ad3be98f59b
parentfd4422aa07017e467925a06608a412d15c2a08a4 (diff)
downloadtrackermap-server-e0f8ae0ef6a2dbaa973e23650e347cbcf77b387a.tar.gz
trackermap-server-e0f8ae0ef6a2dbaa973e23650e347cbcf77b387a.tar.bz2
trackermap-server-e0f8ae0ef6a2dbaa973e23650e347cbcf77b387a.zip
#2702 SetTimezone: Conversion to Seconds, Formating improvement (+ sign)
-rw-r--r--src/org/traccar/protocol/WatchProtocolEncoder.java17
-rw-r--r--test/org/traccar/protocol/WatchProtocolEncoderTest.java14
2 files changed, 29 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 7c96c8a83..7c353e26d 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -21,13 +21,26 @@ import org.traccar.model.Command;
import javax.xml.bind.DatatypeConverter;
import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
-public class WatchProtocolEncoder extends StringProtocolEncoder {
+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() / 60.0;
+ DecimalFormat fmt = new DecimalFormat("+#.##;-#.##");
+ return fmt.format(offset);
+ }
+
+ return null;
+ }
+
protected String formatCommand(Command command, String format, String... keys) {
- String content = super.formatCommand(command, format, keys);
+ String content = super.formatCommand(command, format, this, keys);
return String.format("[CS*%s*%04x*%s]",
getUniqueId(command.getDeviceId()), content.length(), content);
}
diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
index 4e707a47b..eaf290216 100644
--- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
@@ -32,6 +32,20 @@ public class WatchProtocolEncoderTest extends ProtocolTest {
command.set(Command.KEY_DATA, "3333");
Assert.assertEquals("[CS*123456789012345*0005*TK,33]", encoder.encodeCommand(command));
+ command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_SET_TIMEZONE);
+ command.set(Command.KEY_TIMEZONE, 60);
+ Assert.assertEquals("[CS*123456789012345*0006*LZ,,+1]", encoder.encodeCommand(command));
+
+ command.set(Command.KEY_TIMEZONE, 90);
+ Assert.assertEquals("[CS*123456789012345*0008*LZ,,+1.5]", encoder.encodeCommand(command));
+
+ command.set(Command.KEY_TIMEZONE, -60);
+ Assert.assertEquals("[CS*123456789012345*0006*LZ,,-1]", encoder.encodeCommand(command));
+
+ command.set(Command.KEY_TIMEZONE, -11 * 60 - 30);
+ Assert.assertEquals("[CS*123456789012345*0009*LZ,,-11.5]", encoder.encodeCommand(command));
}
}