diff options
| author | Alexander Menk <menk@mestrona.net> | 2016-12-21 09:45:02 +0100 |
|---|---|---|
| committer | Alexander Menk <menk@mestrona.net> | 2016-12-21 09:45:02 +0100 |
| commit | c70c026d31ae673e06abb58333f4808db875f6a6 (patch) | |
| tree | a7b30edd01877f105098845f709dd4e854c098e4 | |
| parent | e0f8ae0ef6a2dbaa973e23650e347cbcf77b387a (diff) | |
| download | traccar-server-c70c026d31ae673e06abb58333f4808db875f6a6.tar.gz traccar-server-c70c026d31ae673e06abb58333f4808db875f6a6.tar.bz2 traccar-server-c70c026d31ae673e06abb58333f4808db875f6a6.zip | |
#2702 SetTimezone: Really - Conversion to Seconds NOT Minutes
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocolEncoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/WatchProtocolEncoderTest.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java index 7c353e26d..f394034d3 100644 --- a/src/org/traccar/protocol/WatchProtocolEncoder.java +++ b/src/org/traccar/protocol/WatchProtocolEncoder.java @@ -30,7 +30,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin @Override public String formatValue(String key, Object value) { if (key.equals(Command.KEY_TIMEZONE)) { - double offset = ((Number) value).longValue() / 60.0; + double offset = ((Number) value).longValue() / 3600.0; DecimalFormat fmt = new DecimalFormat("+#.##;-#.##"); return fmt.format(offset); } diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java index eaf290216..a7c360d7f 100644 --- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java @@ -35,16 +35,16 @@ public class WatchProtocolEncoderTest extends ProtocolTest { command = new Command(); command.setDeviceId(1); command.setType(Command.TYPE_SET_TIMEZONE); - command.set(Command.KEY_TIMEZONE, 60); + command.set(Command.KEY_TIMEZONE, 60 * 60); Assert.assertEquals("[CS*123456789012345*0006*LZ,,+1]", encoder.encodeCommand(command)); - command.set(Command.KEY_TIMEZONE, 90); + command.set(Command.KEY_TIMEZONE, 90 * 60); Assert.assertEquals("[CS*123456789012345*0008*LZ,,+1.5]", encoder.encodeCommand(command)); - command.set(Command.KEY_TIMEZONE, -60); + command.set(Command.KEY_TIMEZONE, -60 * 60); Assert.assertEquals("[CS*123456789012345*0006*LZ,,-1]", encoder.encodeCommand(command)); - command.set(Command.KEY_TIMEZONE, -11 * 60 - 30); + command.set(Command.KEY_TIMEZONE, -11 * 60 * 60 - 30 * 60); Assert.assertEquals("[CS*123456789012345*0009*LZ,,-11.5]", encoder.encodeCommand(command)); } |