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

Merge branch 'straight_to'

Browse source
This commit is contained in:
Victor Shcherb 2020-02-18 16:46:17 +01:00
commit 1428148a07
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ public class RouteProvider {
private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(RouteProvider.class);
private static final String OSMAND_ROUTER = "OsmAndRouter";
private static final int MIN_DISTANCE_FOR_INSERTING_ROUTE_SEGMENT = 60;
private static final int MIN_STRAIGHT_DIST = 50000;
private static final int MIN_STRAIGHT_DIST = 150;
public enum RouteService {
OSMAND("OsmAnd (offline)"),
@ -1245,23 +1245,31 @@ public class RouteProvider {
points.add(params.start);
if(params.intermediates != null) {
for (LatLon l : params.intermediates) {
points.add(new Location("", l.getLatitude(), l.getLongitude()));
points.add(new Location("pnt", l.getLatitude(), l.getLongitude()));
}
}
points.add(new Location("", params.end.getLatitude(), params.end.getLongitude()));
Location lastAdded = points.poll();
segments.add(lastAdded);
float speed = params.mode.getDefaultSpeed();
List<RouteDirectionInfo> computeDirections = new ArrayList<RouteDirectionInfo>();
while(!points.isEmpty()) {
Location pl = points.peek();
if (lastAdded.distanceTo(pl) < MIN_STRAIGHT_DIST) {
lastAdded = points.poll();
if(lastAdded.getProvider().equals("pnt")) {
RouteDirectionInfo previousInfo = new RouteDirectionInfo(speed, TurnType.straight());
previousInfo.routePointOffset = segments.size();
previousInfo.setDescriptionRoute(params.ctx.getString(R.string.route_head));
computeDirections.add(previousInfo);
}
segments.add(lastAdded);
} else {
Location mp = MapUtils.calculateMidPoint(lastAdded, pl);
points.add(0, mp);
}
}
return new RouteCalculationResult(segments, null, params, null, false);
return new RouteCalculationResult(segments, computeDirections, params, null, false);
}