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

Finish algorith to load for transport router

Browse source
This commit is contained in:
Victor Shcherb 2019-07-29 16:27:23 +02:00
parent e5e2829137
commit 464778d336
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
View file

@ -804,13 +804,18 @@ public class TransportRoutePlanner {
if (multifileStop == stop) {
// clear up so it won't be used as it is multi file stop
stop.setReferencesToRoutes(null);
} else {
// add other routes
stop.setReferencesToRoutes(null);
}
if(rrs != null && !multifileStop.isDeleted()) {
for(int i = 0; i < rrs.length; i++) {
TransportRoute route = localFileRoutes.get(rrs[i]);
if(route == null) {
System.err.println(String.format("Something went wrong by loading route %d for stop %s", rrs[i], stop));
} else {
} else if(multifileStop == stop ||
(!multifileStop.hasRoute(route.getId()) &&
!multifileStop.isRouteDeleted(route.getId()))){
// duplicates won't be added
multifileStop.addRouteId(route.getId());
multifileStop.addRoute(route);
@ -874,7 +879,7 @@ public class TransportRoutePlanner {
private void loadTransportSegments(Collection<TransportStop> stops, List<TransportRouteSegment> lst) throws IOException {
for(TransportStop s : stops) {
if (s.isDeleted()) {
if (s.isDeleted() || s.getRoutes() == null) {
continue;
}
for (TransportRoute route : s.getRoutes()) {