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

Recalculate for online

Browse source
This commit is contained in:
vshcherb 2014-04-01 01:29:07 +02:00
parent 870f337f0d
commit 7c7216963a
2 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package net.osmand.plus.routing;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.StringReader; import java.io.StringReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
@ -330,6 +331,22 @@ public class RouteProvider {
} }
public RouteCalculationResult recalculatePartOfflineRoute(RouteCalculationResult res, RouteCalculationParams params) {
RouteCalculationResult rcr = params.previousToRecalculate;
List<Location> locs = new ArrayList<Location>(rcr.getRouteLocations());
try {
int[] startI = new int[]{0};
int[] endI = new int[]{locs.size()};
locs = findStartAndEndLocationsFromRoute(locs, params.start, params.end, startI, endI);
List<RouteDirectionInfo> directions = calcDirections(startI, endI, rcr.getRouteDirections());
insertInitialSegment(params, locs, directions, true);
res = new RouteCalculationResult(locs, directions, params, null);
} catch (RuntimeException e) {
e.printStackTrace();
}
return res;
}
private RouteCalculationResult calculateGpxRoute(RouteCalculationParams routeParams) { private RouteCalculationResult calculateGpxRoute(RouteCalculationParams routeParams) {
// get the closest point to start and to end // get the closest point to start and to end
GPXRouteParams gpxParams = routeParams.gpxRoute; GPXRouteParams gpxParams = routeParams.gpxRoute;
@ -342,17 +359,8 @@ public class RouteProvider {
gpxRoute = findStartAndEndLocationsFromRoute(gpxParams.points, gpxRoute = findStartAndEndLocationsFromRoute(gpxParams.points,
routeParams.start, routeParams.end, startI, endI); routeParams.start, routeParams.end, startI, endI);
} }
List<RouteDirectionInfo> gpxDirections = new ArrayList<RouteDirectionInfo>(); final List<RouteDirectionInfo> inputDirections = gpxParams.directions;
if (gpxParams.directions != null) { List<RouteDirectionInfo> gpxDirections = calcDirections(startI, endI, inputDirections);
for (RouteDirectionInfo info : gpxParams.directions) {
if (info.routePointOffset >= startI[0] && info.routePointOffset < endI[0]) {
RouteDirectionInfo ch = new RouteDirectionInfo(info.getAverageSpeed(), info.getTurnType());
ch.routePointOffset = info.routePointOffset - startI[0];
ch.setDescriptionRoute(info.getDescriptionRoutePart());
gpxDirections.add(ch);
}
}
}
boolean calculateOsmAndRouteParts = gpxParams.calculateOsmAndRouteParts; boolean calculateOsmAndRouteParts = gpxParams.calculateOsmAndRouteParts;
insertInitialSegment(routeParams, gpxRoute, gpxDirections, calculateOsmAndRouteParts); insertInitialSegment(routeParams, gpxRoute, gpxDirections, calculateOsmAndRouteParts);
insertFinalSegment(routeParams, gpxRoute, gpxDirections, calculateOsmAndRouteParts); insertFinalSegment(routeParams, gpxRoute, gpxDirections, calculateOsmAndRouteParts);
@ -369,6 +377,25 @@ public class RouteProvider {
private List<RouteDirectionInfo> calcDirections(int[] startI, int[] endI,
final List<RouteDirectionInfo> inputDirections) {
List<RouteDirectionInfo> directions = new ArrayList<RouteDirectionInfo>();
if (inputDirections != null) {
for (RouteDirectionInfo info : inputDirections) {
if (info.routePointOffset >= startI[0] && info.routePointOffset < endI[0]) {
RouteDirectionInfo ch = new RouteDirectionInfo(info.getAverageSpeed(), info.getTurnType());
ch.routePointOffset = info.routePointOffset - startI[0];
ch.setDescriptionRoute(info.getDescriptionRoutePart());
directions.add(ch);
}
}
}
return directions;
}
private void insertFinalSegment(RouteCalculationParams routeParams, List<Location> points, private void insertFinalSegment(RouteCalculationParams routeParams, List<Location> points,
List<RouteDirectionInfo> directions, boolean calculateOsmAndRouteParts) { List<RouteDirectionInfo> directions, boolean calculateOsmAndRouteParts) {
if(points.size() > 0) { if(points.size() > 0) {
@ -1045,7 +1072,12 @@ public class RouteProvider {
// content.append(s); // content.append(s);
// } // }
// JSONObject obj = new JSONObject(content.toString()); // JSONObject obj = new JSONObject(content.toString());
GPXFile gpxFile = GPXUtilities.loadGPXFile(params.ctx, connection.getInputStream()); final InputStream inputStream = connection.getInputStream();
GPXFile gpxFile = GPXUtilities.loadGPXFile(params.ctx, inputStream);
try {
inputStream.close();
} catch(IOException e){
}
if(gpxFile.routes.isEmpty()) { if(gpxFile.routes.isEmpty()) {
return new RouteCalculationResult("Route is empty"); return new RouteCalculationResult("Route is empty");
} }

9
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -753,14 +753,7 @@ public class RoutingHelper {
final boolean onlineSourceWithoutInternet = !res.isCalculated() && params.type.isOnline() && !settings.isInternetConnectionAvailable(); final boolean onlineSourceWithoutInternet = !res.isCalculated() && params.type.isOnline() && !settings.isInternetConnectionAvailable();
if (onlineSourceWithoutInternet && settings.ROUTE_CALC_OSMAND_PARTS.get()) { if (onlineSourceWithoutInternet && settings.ROUTE_CALC_OSMAND_PARTS.get()) {
if (params.previousToRecalculate != null && params.previousToRecalculate.isCalculated()) { if (params.previousToRecalculate != null && params.previousToRecalculate.isCalculated()) {
RouteCalculationResult rcr = params.previousToRecalculate; res = provider.recalculatePartOfflineRoute(res, params);
List<Location> locs = rcr.getRouteLocations();
List<RouteDirectionInfo> routeDirections = rcr.getRouteDirections();
try {
provider.insertInitialSegment(params, locs, routeDirections, true);
} catch (RuntimeException e) {
e.printStackTrace();
}
} }
} }