diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
| commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
| tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /src/net/cbaines/suma/POIDistanceComparator.java | |
| parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
| parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
| download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz | |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'src/net/cbaines/suma/POIDistanceComparator.java')
| -rw-r--r-- | src/net/cbaines/suma/POIDistanceComparator.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/net/cbaines/suma/POIDistanceComparator.java b/src/net/cbaines/suma/POIDistanceComparator.java index ef35112..c342d3d 100644 --- a/src/net/cbaines/suma/POIDistanceComparator.java +++ b/src/net/cbaines/suma/POIDistanceComparator.java @@ -24,27 +24,27 @@ import java.util.Comparator; import org.osmdroid.util.GeoPoint; public class POIDistanceComparator implements Comparator<POI> { - private final GeoPoint userLocation; - private final boolean useExistingData; - - public POIDistanceComparator(GeoPoint userLocation) { - this(userLocation, false); - } - - public POIDistanceComparator(GeoPoint userLocation, boolean useData) { - super(); - this.userLocation = userLocation; - this.useExistingData = useData; - } - - public int compare(POI poi1, POI poi2) { - if (poi1.distTo == -1 || !useExistingData) { - poi1.distTo = userLocation.distanceTo(poi1.point); + private final GeoPoint userLocation; + private final boolean useExistingData; + + public POIDistanceComparator(GeoPoint userLocation) { + this(userLocation, false); + } + + public POIDistanceComparator(GeoPoint userLocation, boolean useData) { + super(); + this.userLocation = userLocation; + this.useExistingData = useData; } - if (poi2.distTo == -1 || !useExistingData) { - poi2.distTo = userLocation.distanceTo(poi2.point); + + public int compare(POI poi1, POI poi2) { + if (poi1.distTo == -1 || !useExistingData) { + poi1.distTo = userLocation.distanceTo(poi1.point); + } + if (poi2.distTo == -1 || !useExistingData) { + poi2.distTo = userLocation.distanceTo(poi2.point); + } + return poi1.distTo - poi2.distTo; } - return poi1.distTo - poi2.distTo; - } } |