Merge remote-tracking branch 'upstream/master'

4 files changed, 164 insertions, 44 deletions

diff --git a/src/org/traccar/geofence/GeofenceCircle.java b/src/org/traccar/geofence/GeofenceCircle.java
index a36620aec..d78734714 100644
--- a/src/org/traccar/geofence/GeofenceCircle.java
+++ b/src/org/traccar/geofence/GeofenceCircle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/org/traccar/geofence/GeofenceGeometry.java b/src/org/traccar/geofence/GeofenceGeometry.java
index e717ede0b..857ba3414 100644
--- a/src/org/traccar/geofence/GeofenceGeometry.java
+++ b/src/org/traccar/geofence/GeofenceGeometry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +25,26 @@ public abstract class GeofenceGeometry {
 
     public abstract void fromWkt(String wkt) throws ParseException;
 
+    public static class Coordinate {
+
+        private double lat;
+        private double lon;
+
+        public double getLat() {
+            return lat;
+        }
+
+        public void setLat(double lat) {
+            this.lat = lat;
+        }
+
+        public double getLon() {
+            return lon;
+        }
+
+        public void setLon(double lon) {
+            this.lon = lon;
+        }
+    }
+
 }
diff --git a/src/org/traccar/geofence/GeofencePolygon.java b/src/org/traccar/geofence/GeofencePolygon.java
index 33d91c0ff..2048ba26d 100644
--- a/src/org/traccar/geofence/GeofencePolygon.java
+++ b/src/org/traccar/geofence/GeofencePolygon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,44 +27,18 @@ public class GeofencePolygon extends GeofenceGeometry {
         fromWkt(wkt);
     }
 
-    private static class Coordinate {
-
-        public static final double DEGREE360 = 360;
-
-        private double lat;
-        private double lon;
-
-        public double getLat() {
-            return lat;
-        }
-
-        public void setLat(double lat) {
-            this.lat = lat;
-        }
-
-        public double getLon() {
-            return lon;
-        }
-
-        // Need not to confuse algorithm by the abrupt reset of longitude
-        public double getLon360() {
-            return lon + DEGREE360;
-        }
-
-        public void setLon(double lon) {
-            this.lon = lon;
-        }
-    }
-
     private ArrayList<Coordinate> coordinates;
 
     private double[] constant;
     private double[] multiple;
 
+    private boolean needNormalize = false;
+
     private void precalc() {
         if (coordinates == null) {
             return;
         }
+
         int polyCorners = coordinates.size();
         int i;
         int j = polyCorners - 1;
@@ -79,38 +53,55 @@ public class GeofencePolygon extends GeofenceGeometry {
         constant = new double[polyCorners];
         multiple = new double[polyCorners];
 
+        boolean hasNegative = false;
+        boolean hasPositive = false;
+        for (i = 0; i < polyCorners; i++) {
+            if (coordinates.get(i).getLon() > 90) {
+                hasPositive = true;
+            } else if (coordinates.get(i).getLon() < -90) {
+                hasNegative = true;
+            }
+        }
+        needNormalize = hasPositive && hasNegative;
 
         for (i = 0; i < polyCorners; j = i++) {
-            if (coordinates.get(j).getLon360() == coordinates.get(i).getLon360()) {
+            if (normalizeLon(coordinates.get(j).getLon()) == normalizeLon(coordinates.get(i).getLon())) {
                 constant[i] = coordinates.get(i).getLat();
                 multiple[i] = 0;
             } else {
                 constant[i] = coordinates.get(i).getLat()
-                        - (coordinates.get(i).getLon360() * coordinates.get(j).getLat())
-                        / (coordinates.get(j).getLon360() - coordinates.get(i).getLon360())
-                        + (coordinates.get(i).getLon360() * coordinates.get(i).getLat())
-                        / (coordinates.get(j).getLon360() - coordinates.get(i).getLon360());
+                        - (normalizeLon(coordinates.get(i).getLon()) * coordinates.get(j).getLat())
+                        / (normalizeLon(coordinates.get(j).getLon()) - normalizeLon(coordinates.get(i).getLon()))
+                        + (normalizeLon(coordinates.get(i).getLon()) * coordinates.get(i).getLat())
+                        / (normalizeLon(coordinates.get(j).getLon()) - normalizeLon(coordinates.get(i).getLon()));
                 multiple[i] = (coordinates.get(j).getLat() - coordinates.get(i).getLat())
-                        / (coordinates.get(j).getLon360() - coordinates.get(i).getLon360());
+                        / (normalizeLon(coordinates.get(j).getLon()) - normalizeLon(coordinates.get(i).getLon()));
             }
         }
     }
 
+    private double normalizeLon(double lon) {
+        if (needNormalize && lon < -90) {
+            return lon + 360;
+        }
+        return lon;
+    }
+
     @Override
     public boolean containsPoint(double latitude, double longitude) {
 
         int polyCorners = coordinates.size();
         int i;
         int j = polyCorners - 1;
-        double longitude360 = longitude + Coordinate.DEGREE360;
+        double longitudeNorm = normalizeLon(longitude);
         boolean oddNodes = false;
 
         for (i = 0; i < polyCorners; j = i++) {
-            if (coordinates.get(i).getLon360() < longitude360
-                    && coordinates.get(j).getLon360() >= longitude360
-                    || coordinates.get(j).getLon360() < longitude360
-                    && coordinates.get(i).getLon360() >= longitude360) {
-                oddNodes ^= longitude360 * multiple[i] + constant[i] < latitude;
+            if (normalizeLon(coordinates.get(i).getLon()) < longitudeNorm
+                    && normalizeLon(coordinates.get(j).getLon()) >= longitudeNorm
+                    || normalizeLon(coordinates.get(j).getLon()) < longitudeNorm
+                    && normalizeLon(coordinates.get(i).getLon()) >= longitudeNorm) {
+                oddNodes ^= longitudeNorm * multiple[i] + constant[i] < latitude;
             }
         }
         return oddNodes;
diff --git a/src/org/traccar/geofence/GeofencePolyline.java b/src/org/traccar/geofence/GeofencePolyline.java
new file mode 100644
index 000000000..d84f512e3
--- /dev/null
+++ b/src/org/traccar/geofence/GeofencePolyline.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * 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.geofence;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+
+import org.traccar.helper.DistanceCalculator;
+
+public class GeofencePolyline extends GeofenceGeometry {
+
+    private ArrayList<Coordinate> coordinates;
+    private double distance;
+
+    public GeofencePolyline() {
+    }
+
+    public GeofencePolyline(String wkt, double distance) throws ParseException {
+        fromWkt(wkt);
+        this.distance = distance;
+    }
+
+    @Override
+    public boolean containsPoint(double latitude, double longitude) {
+        for (int i = 1; i < coordinates.size(); i++) {
+            if (DistanceCalculator.distanceToLine(
+                    latitude, longitude, coordinates.get(i - 1).getLat(), coordinates.get(i - 1).getLon(),
+                    coordinates.get(i).getLat(), coordinates.get(i).getLon()) <= distance) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toWkt() {
+        StringBuilder buf = new StringBuilder();
+        buf.append("LINESTRING (");
+        for (Coordinate coordinate : coordinates) {
+            buf.append(String.valueOf(coordinate.getLat()));
+            buf.append(" ");
+            buf.append(String.valueOf(coordinate.getLon()));
+            buf.append(", ");
+        }
+        return buf.substring(0, buf.length() - 2) + ")";
+    }
+
+    @Override
+    public void fromWkt(String wkt) throws ParseException {
+        if (coordinates == null) {
+            coordinates = new ArrayList<>();
+        } else {
+            coordinates.clear();
+        }
+
+        if (!wkt.startsWith("LINESTRING")) {
+            throw new ParseException("Mismatch geometry type", 0);
+        }
+        String content = wkt.substring(wkt.indexOf("(") + 1, wkt.indexOf(")"));
+        if (content.isEmpty()) {
+            throw new ParseException("No content", 0);
+        }
+        String[] commaTokens = content.split(",");
+        if (commaTokens.length < 2) {
+            throw new ParseException("Not valid content", 0);
+        }
+
+        for (String commaToken : commaTokens) {
+            String[] tokens = commaToken.trim().split("\\s");
+            if (tokens.length != 2) {
+                throw new ParseException("Here must be two coordinates: " + commaToken, 0);
+            }
+            Coordinate coordinate = new Coordinate();
+            try {
+                coordinate.setLat(Double.parseDouble(tokens[0]));
+            } catch (NumberFormatException e) {
+                throw new ParseException(tokens[0] + " is not a double", 0);
+            }
+            try {
+                coordinate.setLon(Double.parseDouble(tokens[1]));
+            } catch (NumberFormatException e) {
+                throw new ParseException(tokens[1] + " is not a double", 0);
+            }
+            coordinates.add(coordinate);
+        }
+
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+}