Merge pull request #3258 from Abyss777/archive_attribute

Revert satellites check in wondex and add 'archive' in wialon and granit

1 files changed, 4 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index 8be5e09b8..e27745f38 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -36,7 +36,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN = new PatternBuilder()
-            .number("[^d]*")                     // deader
+            .number("[^d]*")                     // header
             .number("(d+),")                     // device identifier
             .number("(dddd)(dd)(dd)")            // date (yyyymmdd)
             .number("(dd)(dd)(dd),")             // time (hhmmss)
@@ -105,8 +105,9 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
             position.setCourse(parser.nextDouble(0));
             position.setAltitude(parser.nextDouble(0));
 
-            position.setValid(true);
-            position.set(Position.KEY_SATELLITES, parser.nextInt(0));
+            int satellites = parser.nextInt(0);
+            position.setValid(satellites != 0);
+            position.set(Position.KEY_SATELLITES, satellites);
 
             position.set(Position.KEY_EVENT, parser.next());
             position.set(Position.KEY_BATTERY, parser.nextDouble());