aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/geofence/GeofencePolygon.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-27 16:01:24 +0700
committerAbyss777 <abyss@fox5.ru>2016-11-27 16:01:24 +0700
commitf933147c0cba53df96448a64a2ba58dda4da1659 (patch)
tree4103302744f4ff1cfc5c3ff207aa68b516d7ee8c /src/org/traccar/geofence/GeofencePolygon.java
parent5ea4572553a84126b7e9f06c822e1a183413a558 (diff)
downloadtrackermap-server-f933147c0cba53df96448a64a2ba58dda4da1659.tar.gz
trackermap-server-f933147c0cba53df96448a64a2ba58dda4da1659.tar.bz2
trackermap-server-f933147c0cba53df96448a64a2ba58dda4da1659.zip
- Remove try-catch frome tests
- Fixed longitude normalizing for geofences near 180 longitude - Added more tests - Other fixes
Diffstat (limited to 'src/org/traccar/geofence/GeofencePolygon.java')
-rw-r--r--src/org/traccar/geofence/GeofencePolygon.java44
1 files changed, 32 insertions, 12 deletions
diff --git a/src/org/traccar/geofence/GeofencePolygon.java b/src/org/traccar/geofence/GeofencePolygon.java
index 48326dc10..2048ba26d 100644
--- a/src/org/traccar/geofence/GeofencePolygon.java
+++ b/src/org/traccar/geofence/GeofencePolygon.java
@@ -32,10 +32,13 @@ public class GeofencePolygon extends GeofenceGeometry {
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;
@@ -50,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;