diff options
| author | Florian <florian@voit.li> | 2017-06-15 13:33:10 +0200 |
|---|---|---|
| committer | Florian <florian@voit.li> | 2017-06-15 13:33:10 +0200 |
| commit | 8f91d8773c9298a93aecfefcc4b12883dc44ea06 (patch) | |
| tree | c2efcea86a2de08cd969da72ee9acd4c1c72979e | |
| parent | 36788f4eb8ef055c8409d744515de3ef4ef037c2 (diff) | |
| download | traccar-server-8f91d8773c9298a93aecfefcc4b12883dc44ea06.tar.gz traccar-server-8f91d8773c9298a93aecfefcc4b12883dc44ea06.tar.bz2 traccar-server-8f91d8773c9298a93aecfefcc4b12883dc44ea06.zip | |
Improved changes
Filter put in parentheses and changed intentation. Removed the no longer
nessesary variable in WondexProtocol
| -rw-r--r-- | src/org/traccar/FilterHandler.java | 9 | ||||
| -rw-r--r-- | src/org/traccar/protocol/WondexProtocolDecoder.java | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/org/traccar/FilterHandler.java b/src/org/traccar/FilterHandler.java index da2562955..f2a80a98f 100644 --- a/src/org/traccar/FilterHandler.java +++ b/src/org/traccar/FilterHandler.java @@ -84,12 +84,9 @@ public class FilterHandler extends BaseDataHandler { } private boolean filterInvalid(Position position) { - if (filterInvalid) { - return !position.getValid() || position.getLatitude() > 90 - || position.getLongitude() > 180 || position.getLatitude() < -90 - || position.getLongitude() < -180; - } - return false; + return filterInvalid && (!position.getValid() + || position.getLatitude() > 90 || position.getLongitude() > 180 + || position.getLatitude() < -90 || position.getLongitude() < -180); } private boolean filterZero(Position position) { diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java index b1e63e154..8be5e09b8 100644 --- a/src/org/traccar/protocol/WondexProtocolDecoder.java +++ b/src/org/traccar/protocol/WondexProtocolDecoder.java @@ -105,9 +105,8 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder { position.setCourse(parser.nextDouble(0)); position.setAltitude(parser.nextDouble(0)); - int satellites = parser.nextInt(0); position.setValid(true); - position.set(Position.KEY_SATELLITES, satellites); + position.set(Position.KEY_SATELLITES, parser.nextInt(0)); position.set(Position.KEY_EVENT, parser.next()); position.set(Position.KEY_BATTERY, parser.nextDouble()); |