diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-05 16:04:53 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 16:04:53 +1200 |
| commit | 2a49efdd97bb44c78afb27b00b57d14ed0f403ae (patch) | |
| tree | 7f954059b508b4fd96d6976d3cd81ed2728a73f6 /src/org/traccar/protocol/MiniFinderProtocolEncoder.java | |
| parent | 99fd421c76c8e7491095a91630516f6d2db27034 (diff) | |
| parent | 158071c9ff74c5435b8f51ea82215240acb69551 (diff) | |
| download | trackermap-server-2a49efdd97bb44c78afb27b00b57d14ed0f403ae.tar.gz trackermap-server-2a49efdd97bb44c78afb27b00b57d14ed0f403ae.tar.bz2 trackermap-server-2a49efdd97bb44c78afb27b00b57d14ed0f403ae.zip | |
Merge pull request #3502 from Abyss777/command_timezone
Accept timezone id instead of offset in commands
Diffstat (limited to 'src/org/traccar/protocol/MiniFinderProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MiniFinderProtocolEncoder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java index e5c43e29a..486f406a5 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.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. @@ -15,6 +15,8 @@ */ package org.traccar.protocol; +import java.util.TimeZone; + import org.traccar.StringProtocolEncoder; import org.traccar.helper.Log; import org.traccar.model.Command; @@ -27,7 +29,7 @@ public class MiniFinderProtocolEncoder extends StringProtocolEncoder implements if (key.equals(Command.KEY_ENABLE)) { return (Boolean) value ? "1" : "0"; } else if (key.equals(Command.KEY_TIMEZONE)) { - return String.format("%+03d", ((Number) value).longValue() / 3600); + return String.format("%+03d", TimeZone.getTimeZone((String) value).getRawOffset() / 3600000); } else if (key.equals(Command.KEY_INDEX)) { switch (((Number) value).intValue()) { case 0: |