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

Fix public transport routing from my location

Browse source
This commit is contained in:
crimean 2018-12-17 17:55:58 +03:00
parent 2c53ffd598
commit 28d9289956
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,8 @@ public class RoutingHelper {
private Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation,
RouteCalculationResult previousRoute, boolean targetPointsChanged) {
Location locationProjection = currentLocation;
if (isPublicTransportMode() && currentLocation != null) {
if (isPublicTransportMode() && currentLocation != null && finalLocation != null &&
(targetPointsChanged || transportRoutingHelper.getRoutes() == null)) {
transportRoutingHelper.setFinalAndCurrentLocation(finalLocation,
new LatLon(currentLocation.getLatitude(), currentLocation.getLongitude()));
}

8
OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
View file

@ -466,6 +466,10 @@ public class TransportRoutingHelper {
} catch (InterruptedException e) {
// ignore
}
if (params.calculationProgress.isCancelled) {
walkingSegmentsToCalculate.clear();
walkingSegmentsCalculated = true;
}
}
}
}
@ -493,10 +497,10 @@ public class TransportRoutingHelper {
String error = null;
try {
res = calculateRouteImpl(params);
if (res != null) {
if (res != null && !params.calculationProgress.isCancelled) {
calculateWalkingRoutes(res);
}
} catch (IOException e) {
} catch (Exception e) {
error = e.getMessage();
log.error(e);
}