Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix order

Browse source
This commit is contained in:
Victor Shcherb 2014-06-19 15:11:40 +02:00
parent b0afbeb678
commit e3dbd574d0
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
View file

@ -3,6 +3,7 @@ package net.osmand.plus.routepointsnavigation;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -139,7 +140,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
} }
public class RoutePoint implements Comparable<RoutePoint> { public class RoutePoint {
boolean isNextNavigate; boolean isNextNavigate;
int gpxOrder; int gpxOrder;
long visitedTime; // 0 not visited long visitedTime; // 0 not visited
@ -184,28 +185,6 @@ public class RoutePointsPlugin extends OsmandPlugin {
return dateString; return dateString;
} }
@Override
public int compareTo(RoutePoint another) {
if(isNextNavigate) {
return -1;
}
// this point is not visited
if(!isVisited()) {
if(another.isNextNavigate) {
return 1;
}
if(another.isVisited()) {
return -1;
}
return Integer.compare(gpxOrder, another.gpxOrder);
}
// this point is visited
if(!another.isVisited()) {
return 1;
}
return -Long.compare(visitedTime, another.visitedTime);
}
public LatLon getPoint() { public LatLon getPoint() {
return new LatLon(wpt.lat, wpt.lon); return new LatLon(wpt.lat, wpt.lon);
} }
@ -288,7 +267,25 @@ public class RoutePointsPlugin extends OsmandPlugin {
} }
private void sortPoints() { private void sortPoints() {
Collections.sort(currentPoints); Collections.sort(currentPoints, new Comparator<RoutePoint>() {
@Override
public int compare(RoutePoint lhs, RoutePoint rhs) {
if(lhs.isNextNavigate || rhs.isNextNavigate) {
return lhs.isNextNavigate? -1 : 1;
}
if(!lhs.isVisited() || !rhs.isVisited()) {
if(lhs.isVisited()) {
return 1;
}
if(rhs.isVisited()) {
return -1;
}
return Integer.compare(lhs.gpxOrder, rhs.gpxOrder);
}
return -Long.compare(lhs.visitedTime, rhs.visitedTime);
}
});
} }