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

Fix offsets and duplicates in GPX files

Browse source
This commit is contained in:
sonora 2016-08-11 14:53:53 +02:00
parent b2ab2ef3b5
commit 2af29e9cc4
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
View file

@ -513,7 +513,7 @@ public class RouteCalculationResult {
* PREPARATION
* Check points for duplicates (it is very bad for routing) - cloudmade could return it
*/
private void checkForDuplicatePoints(List<Location> locations, List<RouteDirectionInfo> directions) {
public static void checkForDuplicatePoints(List<Location> locations, List<RouteDirectionInfo> directions) {
//
for (int i = 0; i < locations.size() - 1;) {
if (locations.get(i).distanceTo(locations.get(i + 1)) == 0) {
@ -554,6 +554,7 @@ public class RouteCalculationResult {
// info.setDescriptionRoute(ctx.getString( R.string.route_head));//; //$NON-NLS-1$
directions.add(0, info);
}
checkForDuplicatePoints(locations, directions);
}
RouteDirectionInfo lastDirInf = directions.size() > 0 ? directions.get(directions.size() - 1) : null;
if((lastDirInf == null || lastDirInf.routePointOffset < locations.size() - 1) && locations.size() - 1 > 0) {

31
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -1050,17 +1050,21 @@ public class RouteProvider {
int cRoute = currentRoute;
int cDirInfo = currentDirectionInfo;
// Saving start point to gpx file's trkpt section
// The only time the startpoint is missing in trkpts is if "Calculate first and last segment" is selected and start is not the start of the selected GPX file. In all other cases it would be added s duplicate!
// But even in that case, the second route point is included, usually only very few meters away. So this case probably needs no fixing.
// Adding the startpoint here causes all offsets to be wrong by 1 (part of Issue #2906), hence the following code is commented out (causing no practical issue). If we want to fix, all offsets need to be adjusted!
// WptPt startpoint = new WptPt();
// TargetPoint sc = helper.getPointToStart();
// if (sc != null){
// startpoint.lon = sc.getLongitude();
// startpoint.lat = sc.getLatitude();
// trkSegment.points.add(startpoint);
// }
// Save the start point to gpx file's trkpt section unless already contained
WptPt startpoint = new WptPt();
TargetPoint sc = helper.getPointToStart();
int routePointOffsetAdjusted = 0;
if (sc != null && ((float) sc.getLatitude() != (float) routeNodes.get(cRoute).getLatitude() || (float) sc.getLongitude() != (float) routeNodes.get(cRoute).getLongitude())){
startpoint.lat = sc.getLatitude();
startpoint.lon = sc.getLongitude();
trkSegment.points.add(startpoint);
if (directionInfo != null && !directionInfo.isEmpty()) {
for (RouteDirectionInfo i : directionInfo) {
i.routePointOffset++;
}
}
routePointOffsetAdjusted = 1;
}
for (int i = cRoute; i< routeNodes.size(); i++) {
Location loc = routeNodes.get(i);
@ -1078,13 +1082,14 @@ public class RouteProvider {
}
trkSegment.points.add(pt);
}
Route route = new Route();
gpx.routes.add(route);
for (int i = cDirInfo; i < directionInfo.size(); i++) {
RouteDirectionInfo dirInfo = directionInfo.get(i);
if (dirInfo.routePointOffset >= cRoute) {
if (dirInfo.routePointOffset - routePointOffsetAdjusted >= cRoute) {
if (dirInfo.getTurnType() != null && !dirInfo.getTurnType().isSkipToSpeak()) {
Location loc = routeNodes.get(dirInfo.routePointOffset);
Location loc = routeNodes.get(dirInfo.routePointOffset - routePointOffsetAdjusted);
WptPt pt = new WptPt();
pt.lat = loc.getLatitude();
pt.lon = loc.getLongitude();