diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-24 10:12:29 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-24 10:12:29 +0300 |
| commit | efb18afb3bc265e0d3525ad66ee0e0558d95f478 (patch) | |
| tree | f5d4cc82a144072a8eec0d25f9fb592422285e1f /src/org/traccar/protocol/EasyTrackProtocolDecoder.java | |
| parent | fd3a695813f511d1b94775bd4e8a4c57053fc66d (diff) | |
| parent | 0c61dddb5f875e34c819f6d936fcb5e7f45d88ed (diff) | |
| download | trackermap-server-efb18afb3bc265e0d3525ad66ee0e0558d95f478.tar.gz trackermap-server-efb18afb3bc265e0d3525ad66ee0e0558d95f478.tar.bz2 trackermap-server-efb18afb3bc265e0d3525ad66ee0e0558d95f478.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
# Conflicts:
# tools/test-generator.py
Diffstat (limited to 'src/org/traccar/protocol/EasyTrackProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/EasyTrackProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java index fa792d7b5..41f395fd9 100644 --- a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java +++ b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java @@ -86,13 +86,13 @@ public class EasyTrackProtocolDecoder extends BaseProtocolDecoder { .setTime(parser.nextInt(16), parser.nextInt(16), parser.nextInt(16)); position.setTime(dateBuilder.getDate()); - if (BitUtil.check(parser.nextInt(16), 7)) { + if (BitUtil.check(parser.nextInt(16), 3)) { position.setLatitude(-parser.nextInt(16) / 600000.0); } else { position.setLatitude(parser.nextInt(16) / 600000.0); } - if (BitUtil.check(parser.nextInt(16), 7)) { + if (BitUtil.check(parser.nextInt(16), 3)) { position.setLongitude(-parser.nextInt(16) / 600000.0); } else { position.setLongitude(parser.nextInt(16) / 600000.0); |