Merge remote-tracking branch 'refs/remotes/tananaev/master'

13 files changed, 193 insertions, 32 deletions

diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/org/traccar/api/resource/GroupResource.java
index 49f839499..e22796645 100644
--- a/src/org/traccar/api/resource/GroupResource.java
+++ b/src/org/traccar/api/resource/GroupResource.java
@@ -17,7 +17,6 @@ package org.traccar.api.resource;
 
 import org.traccar.Context;
 import org.traccar.api.BaseResource;
-import org.traccar.model.Device;
 import org.traccar.model.Group;
 
 import javax.ws.rs.Consumes;
diff --git a/src/org/traccar/database/GroupTree.java b/src/org/traccar/database/GroupTree.java
index b383b1501..4a2321f58 100644
--- a/src/org/traccar/database/GroupTree.java
+++ b/src/org/traccar/database/GroupTree.java
@@ -33,11 +33,11 @@ public class GroupTree {
         private Device device;
         private Collection<TreeNode> children = new HashSet<>();
 
-        public TreeNode(Group group) {
+        TreeNode(Group group) {
             this.group = group;
         }
 
-        public TreeNode(Device device) {
+        TreeNode(Device device) {
             this.device = device;
         }
 
@@ -59,14 +59,10 @@ public class GroupTree {
             if (other == this) {
                 return true;
             }
-            if (group != null) {
-                if (other.group != null) {
-                    return group.getId() == other.group.getId();
-                }
-            } else if (device != null) {
-                if (other.device != null) {
-                    return device.getId() == other.device.getId();
-                }
+            if (group != null && other.group != null) {
+                return group.getId() == other.group.getId();
+            } else if (device != null && other.device != null) {
+                return device.getId() == other.device.getId();
             }
             return false;
         }
diff --git a/src/org/traccar/geocode/BingMapsReverseGeocoder.java b/src/org/traccar/geocode/BingMapsReverseGeocoder.java
index a5ebbd420..69148875a 100644
--- a/src/org/traccar/geocode/BingMapsReverseGeocoder.java
+++ b/src/org/traccar/geocode/BingMapsReverseGeocoder.java
@@ -20,10 +20,6 @@ import javax.json.JsonObject;
 
 public class BingMapsReverseGeocoder extends JsonReverseGeocoder {
 
-    public BingMapsReverseGeocoder() {
-        this("http://dev.virtualearth.net/REST/v1", "ABCDE", 0);
-    }
-
     public BingMapsReverseGeocoder(String url, String key, int cacheSize) {
         super(url + "/Locations/%f,%f?key=" + key + "&include=ciso2", cacheSize);
     }
diff --git a/src/org/traccar/geocode/FactualReverseGeocoder.java b/src/org/traccar/geocode/FactualReverseGeocoder.java
index 6e5a48423..15211f74a 100644
--- a/src/org/traccar/geocode/FactualReverseGeocoder.java
+++ b/src/org/traccar/geocode/FactualReverseGeocoder.java
@@ -19,10 +19,6 @@ import javax.json.JsonObject;
 
 public class FactualReverseGeocoder extends JsonReverseGeocoder {
 
-    public FactualReverseGeocoder() {
-        this("https://api.factual.com/geotag", "ABCDE", 0);
-    }
-
     public FactualReverseGeocoder(String url, String key, int cacheSize) {
         super(url + "?latitude=%f&longitude=%f&KEY=" + key, cacheSize);
     }
diff --git a/src/org/traccar/geocode/MapQuestReverseGeocoder.java b/src/org/traccar/geocode/MapQuestReverseGeocoder.java
index be3f51b04..93edfdd09 100644
--- a/src/org/traccar/geocode/MapQuestReverseGeocoder.java
+++ b/src/org/traccar/geocode/MapQuestReverseGeocoder.java
@@ -20,10 +20,6 @@ import javax.json.JsonObject;
 
 public class MapQuestReverseGeocoder extends JsonReverseGeocoder {
 
-    public MapQuestReverseGeocoder() {
-        this("http://www.mapquestapi.com/geocoding/v1/reverse", "ABCDE", 0);
-    }
-
     public MapQuestReverseGeocoder(String url, String key, int cacheSize) {
         super(url + "?key=" + key + "&location=%f,%f", cacheSize);
     }
diff --git a/src/org/traccar/geocode/OpenCageReverseGeocoder.java b/src/org/traccar/geocode/OpenCageReverseGeocoder.java
index 3104cb56a..b5b31179e 100644
--- a/src/org/traccar/geocode/OpenCageReverseGeocoder.java
+++ b/src/org/traccar/geocode/OpenCageReverseGeocoder.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 - 2015 Stefaan Van Dooren (stefaan.vandooren@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +21,6 @@ import javax.json.JsonObject;
 
 public class OpenCageReverseGeocoder extends JsonReverseGeocoder {
 
-    public OpenCageReverseGeocoder() {
-        this("https://api.opencagedata.com/geocode/v1", "ABCDE", 0);
-    }
-
     public OpenCageReverseGeocoder(String url, String key, int cacheSize) {
         super(url + "/json?q=%f,%f&key=" + key, cacheSize);
     }
@@ -36,12 +33,21 @@ public class OpenCageReverseGeocoder extends JsonReverseGeocoder {
             if (location != null) {
                 Address address = new Address();
 
+                if (location.containsKey("building")) {
+                    address.setHouse(location.getString("building"));
+                }
                 if (location.containsKey("house_number")) {
                     address.setHouse(location.getString("house_number"));
                 }
                 if (location.containsKey("road")) {
                     address.setStreet(location.getString("road"));
                 }
+                if (location.containsKey("suburb")) {
+                    address.setSuburb(location.getString("suburb"));
+                }
+                if (location.containsKey("city")) {
+                    address.setSettlement(location.getString("city"));
+                }
                 if (location.containsKey("city_district")) {
                     address.setSettlement(location.getString("city_district"));
                 }
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 00b1f60d0..f03a0aa60 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -137,4 +137,14 @@ public class Server {
         this.zoom = zoom;
     }
 
+    private boolean twelveHourFormat;
+
+    public boolean getTwelveHourFormat() {
+        return twelveHourFormat;
+    }
+
+    public void setTwelveHourFormat(boolean twelveHourFormat) {
+        this.twelveHourFormat = twelveHourFormat;
+    }
+
 }
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 1531ba9e4..e58311834 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -140,6 +140,16 @@ public class User {
         this.zoom = zoom;
     }
 
+    private boolean twelveHourFormat;
+
+    public boolean getTwelveHourFormat() {
+        return twelveHourFormat;
+    }
+
+    public void setTwelveHourFormat(boolean twelveHourFormat) {
+        this.twelveHourFormat = twelveHourFormat;
+    }
+
     private String password;
 
     public String getPassword() {
diff --git a/src/org/traccar/protocol/FoxProtocol.java b/src/org/traccar/protocol/FoxProtocol.java
new file mode 100644
index 000000000..cc069692b
--- /dev/null
+++ b/src/org/traccar/protocol/FoxProtocol.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class FoxProtocol extends BaseProtocol {
+
+    public FoxProtocol() {
+        super("fox");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, "</fox>"));
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new FoxProtocolDecoder(FoxProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/FoxProtocolDecoder.java b/src/org/traccar/protocol/FoxProtocolDecoder.java
new file mode 100644
index 000000000..b88da573f
--- /dev/null
+++ b/src/org/traccar/protocol/FoxProtocolDecoder.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class FoxProtocolDecoder extends BaseProtocolDecoder {
+
+    public FoxProtocolDecoder(FoxProtocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .number("d+,")                       // status id
+            .expression("([AV]),")               // validity
+            .number("(dd)(dd)(dd),")             // date
+            .number("(dd)(dd)(dd),")             // time
+            .number("(dd)(dd.d+),")              // latitude
+            .expression("([NS]),")
+            .number("(ddd)(dd.d+),")             // longitude
+            .expression("([EW]),")
+            .number("(d+.?d*)?,")                // speed
+            .number("(d+.?d*)?,")                // course
+            .any()
+            .compile();
+
+    private String getAttribute(String xml, String key) {
+        int start = xml.indexOf(key + "=\"");
+        if (start != -1) {
+            start += key.length() + 2;
+            int end = xml.indexOf("\"", start);
+            if (end != -1) {
+                return xml.substring(start, end);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        String xml = (String) msg;
+        String id = getAttribute(xml, "id");
+        String data = getAttribute(xml, "data");
+
+        if (id != null && data != null) {
+
+            if (!identify(id, channel, remoteAddress)) {
+                return null;
+            }
+
+            Parser parser = new Parser(PATTERN, data);
+            if (!parser.matches()) {
+                return null;
+            }
+
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+            position.setDeviceId(getDeviceId());
+
+            position.setValid(parser.next().equals("A"));
+
+            DateBuilder dateBuilder = new DateBuilder()
+                    .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+                    .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+            position.setTime(dateBuilder.getDate());
+
+            position.setLatitude(parser.nextCoordinate());
+            position.setLongitude(parser.nextCoordinate());
+            position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+            position.setCourse(parser.nextDouble());
+
+            return position;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
index 729c57573..e5762f5dd 100644
--- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
+++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
@@ -21,8 +21,6 @@ import org.traccar.model.Command;
 
 public class MiniFinderProtocolEncoder extends StringProtocolEncoder {
 
-    private static final String prefix = "123456";
-
     @Override
     protected Object encodeCommand(Command command) {
 
diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java
index 10bab3d6c..1fd427ecf 100644
--- a/src/org/traccar/protocol/TramigoProtocolDecoder.java
+++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2014 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,6 +130,12 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder {
             position.setTime(DateUtil.correctYear(
                     dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR))));
 
+            if (sentence.contains("Ignition on detected")) {
+                position.set(Event.KEY_IGNITION, true);
+            } else if (sentence.contains("Ignition off detected")) {
+                position.set(Event.KEY_IGNITION, false);
+            }
+
             return position;
 
         }
diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java
index 6b5d47023..0c35ef3a0 100644
--- a/src/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/org/traccar/protocol/WatchProtocolDecoder.java
@@ -47,9 +47,9 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
             .number("(dd)(dd)(dd),")             // date (ddmmyy)
             .number("(dd)(dd)(dd),")             // time
             .expression("([AV]),")               // validity
-            .number("-?(d+.d+),")                // latitude
+            .number(" *-?(d+.d+),")              // latitude
             .expression("([NS]),")
-            .number("-?(d+.d+),")                // longitude
+            .number(" *-?(d+.d+),")              // longitude
             .expression("([EW])?,")
             .number("(d+.d+),")                  // speed
             .number("(d+.?d*),")                 // course