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

Update RouteProvider.java

Browse source
This commit is contained in:
vodie 2019-06-11 00:20:05 +02:00 committed by GitHub
parent b009439d3f
commit fcc9723aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1139,7 +1139,6 @@ public class RouteProvider {
double[] lons = new double[numpoints]; double[] lons = new double[numpoints];
int index = 0; int index = 0;
String mode; String mode;
float defSpeed;
boolean addMissingTurns = true; boolean addMissingTurns = true;
lats[index] = params.start.getLatitude(); lats[index] = params.start.getLatitude();
lons[index] = params.start.getLongitude(); lons[index] = params.start.getLongitude();
@ -1155,13 +1154,10 @@ public class RouteProvider {
lons[index] = params.end.getLongitude(); lons[index] = params.end.getLongitude();
if (ApplicationMode.PEDESTRIAN == params.mode) { if (ApplicationMode.PEDESTRIAN == params.mode) {
mode = "foot"; //$NON-NLS-1$ mode = "foot"; //$NON-NLS-1$
defSpeed = (float) (5/3.6);
} else if (ApplicationMode.BICYCLE == params.mode) { } else if (ApplicationMode.BICYCLE == params.mode) {
mode = "bicycle"; //$NON-NLS-1$ mode = "bicycle"; //$NON-NLS-1$
defSpeed = (float) (20/3.6);
} else { } else {
mode = "motorcar"; //$NON-NLS-1$ mode = "motorcar"; //$NON-NLS-1$
defSpeed = (float) (60/3.6);
} }
Bundle bpars = new Bundle(); Bundle bpars = new Bundle();
bpars.putDoubleArray("lats", lats); bpars.putDoubleArray("lats", lats);
@ -1189,7 +1185,7 @@ public class RouteProvider {
GPXFile gpxFile = GPXUtilities.loadGPXFile(new ByteArrayInputStream(gpxMessage.getBytes("UTF-8"))); GPXFile gpxFile = GPXUtilities.loadGPXFile(new ByteArrayInputStream(gpxMessage.getBytes("UTF-8")));
dir = parseOsmAndGPXRoute(res, gpxFile, true, params.leftSide, defSpeed); dir = parseOsmAndGPXRoute(res, gpxFile, true, params.leftSide, params.mode.getDefaultSpeed());
if (dir != null) { if (dir != null) {
addMissingTurns = false; addMissingTurns = false;