From 36788f4eb8ef055c8409d744515de3ef4ef037c2 Mon Sep 17 00:00:00 2001 From: Florian Date: Wed, 14 Jun 2017 20:59:05 +0200 Subject: Filter Invalid upgrade and Wondex fix Filter invalid filters now impossible positions. And in Wondex protocol answers to messages are no longer marked as invalid and Sat over 2 check removed. Wondex decoder test changed because of the removed Sat over 2 check --- src/org/traccar/protocol/WondexProtocolDecoder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/org/traccar/protocol/WondexProtocolDecoder.java') diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java index 8249d2c68..b1e63e154 100644 --- a/src/org/traccar/protocol/WondexProtocolDecoder.java +++ b/src/org/traccar/protocol/WondexProtocolDecoder.java @@ -78,7 +78,6 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); getLastLocation(position, new Date()); - position.setValid(false); position.set(Position.KEY_RESULT, buf.toString(StandardCharsets.US_ASCII)); return position; @@ -107,7 +106,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder { position.setAltitude(parser.nextDouble(0)); int satellites = parser.nextInt(0); - position.setValid(satellites >= 3); + position.setValid(true); position.set(Position.KEY_SATELLITES, satellites); position.set(Position.KEY_EVENT, parser.next()); -- cgit v1.2.3 From 8f91d8773c9298a93aecfefcc4b12883dc44ea06 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 15 Jun 2017 13:33:10 +0200 Subject: Improved changes Filter put in parentheses and changed intentation. Removed the no longer nessesary variable in WondexProtocol --- src/org/traccar/FilterHandler.java | 9 +++------ src/org/traccar/protocol/WondexProtocolDecoder.java | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/org/traccar/protocol/WondexProtocolDecoder.java') 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()); -- cgit v1.2.3