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

Fix crash but leave fixme

Browse source
This commit is contained in:
Victor Shcherb 2020-09-18 17:33:02 +02:00
parent 0c2814671b
commit 01f8a0a7f2
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,17 +337,13 @@ public class RouteCalculationResult {
tunnelAlarm = null; tunnelAlarm = null;
} }
while (true) { while (true) {
if (i == s.getEndPointIndex() && routeInd != list.size() - 1) {
break;
}
Location n = new Location(""); //$NON-NLS-1$ Location n = new Location(""); //$NON-NLS-1$
LatLon point = s.getPoint(i); LatLon point = s.getPoint(i);
n.setLatitude(point.getLatitude()); n.setLatitude(point.getLatitude());
n.setLongitude(point.getLongitude()); n.setLongitude(point.getLongitude());
//FIXME: investigate gpx file
if (s.getObject().getPoint31XTile(i) == 0 && s.getObject().getPoint31YTile(i) == 0){
break;
}
if (i == s.getEndPointIndex() && routeInd != list.size() - 1) {
break;
}
if (vls != null && i * 2 + 1 < vls.length) { if (vls != null && i * 2 + 1 < vls.length) {
float h = vls[2 * i + 1]; float h = vls[2 * i + 1];
n.setAltitude(h); n.setAltitude(h);
@ -360,10 +356,21 @@ public class RouteCalculationResult {
} }
lastHeight = h; lastHeight = h;
} }
// FIXME: investigate gpx file
if (s.getObject().getPoint31XTile(i) == 0 && s.getObject().getPoint31YTile(i) == 0) {
if (locations.size() > 0) {
Location prev = locations.get(locations.size() - 1);
n.setLatitude(prev.getLatitude());
n.setLongitude(prev.getLongitude());
if (prev.hasAltitude()) {
n.setAltitude(prev.getAltitude());
}
}
}
locations.add(n); locations.add(n);
attachAlarmInfo(alarms, s, i, locations.size()); attachAlarmInfo(alarms, s, i, locations.size());
segmentsToPopulate.add(s); segmentsToPopulate.add(s);
if (i == s.getEndPointIndex() ) { if (i == s.getEndPointIndex()) {
break; break;
} }
if (plus) { if (plus) {