diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-11-27 10:18:13 +0700 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-11-27 10:18:13 +0700 |
| commit | 5ea4572553a84126b7e9f06c822e1a183413a558 (patch) | |
| tree | 9eecd9f9fbdc3cbc806f6e2d6e680ee96b681074 /src/org | |
| parent | c814f3f3556422d9e7e49d6b958621058293c1ac (diff) | |
| download | trackermap-server-5ea4572553a84126b7e9f06c822e1a183413a558.tar.gz trackermap-server-5ea4572553a84126b7e9f06c822e1a183413a558.tar.bz2 trackermap-server-5ea4572553a84126b7e9f06c822e1a183413a558.zip | |
- Rename function
- Fix formatting
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/geofence/GeofencePolyline.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/helper/DistanceCalculator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/geofence/GeofencePolyline.java b/src/org/traccar/geofence/GeofencePolyline.java index e99987207..cadc69da6 100644 --- a/src/org/traccar/geofence/GeofencePolyline.java +++ b/src/org/traccar/geofence/GeofencePolyline.java @@ -38,7 +38,7 @@ public class GeofencePolyline extends GeofenceGeometry { public boolean containsPoint(double latitude, double longitude) { double longitude360 = longitude + Coordinate.DEGREE360; for (int i = 1; i < coordinates.size(); i++) { - if (DistanceCalculator.distanceToInterval( + if (DistanceCalculator.distanceToLine( latitude, longitude360, coordinates.get(i - 1).getLat(), coordinates.get(i - 1).getLon360(), coordinates.get(i).getLat(), coordinates.get(i).getLon360()) <= distance) { return true; diff --git a/src/org/traccar/helper/DistanceCalculator.java b/src/org/traccar/helper/DistanceCalculator.java index 873e84977..88d4ef8a4 100644 --- a/src/org/traccar/helper/DistanceCalculator.java +++ b/src/org/traccar/helper/DistanceCalculator.java @@ -34,7 +34,7 @@ public final class DistanceCalculator { return d * 1000; } - public static double distanceToInterval( + public static double distanceToLine( double pointLat, double pointLon, double lat1, double lon1, double lat2, double lon2) { double d0 = distance(pointLat, pointLon, lat1, lon1); double d1 = distance(lat1, lon1, lat2, lon2); |