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

Small refactoring transport

Browse source
This commit is contained in:
Victor Shcherb 2020-05-19 18:40:48 +02:00
parent 68d334e838
commit ca5448286a
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -834,13 +834,17 @@ public class TransportRoutePlanner {
// could be global ? // could be global ?
TLongObjectHashMap<TransportStop> loadedTransportStops = new TLongObjectHashMap<TransportStop>(); TLongObjectHashMap<TransportStop> loadedTransportStops = new TLongObjectHashMap<TransportStop>();
TIntObjectHashMap<TransportRoute> localFileRoutes = new TIntObjectHashMap<>(); //reference, route
for (BinaryMapIndexReader r : routeMap.keySet()) { for (BinaryMapIndexReader r : routeMap.keySet()) {
sr.clearSearchResults(); sr.clearSearchResults();
List<TransportStop> stops = r.searchTransportIndex(sr); List<TransportStop> stops = r.searchTransportIndex(sr);
localFileRoutes.clear(); TIntArrayList routesToLoad = mergeTransportStops(r, loadedTransportStops, stops);
mergeTransportStops(r, loadedTransportStops, stops, localFileRoutes, routeMap.get(r));
TIntObjectHashMap<TransportRoute> loadedRoutes = routeMap.get(r);
// localFileRoutes.clear();
TIntObjectHashMap<TransportRoute> localFileRoutes = new TIntObjectHashMap<>(); //reference, route
loadRoutes(r, localFileRoutes, loadedRoutes, routesToLoad);
for (TransportStop stop : stops) { for (TransportStop stop : stops) {
// skip missing stops // skip missing stops
@ -850,7 +854,7 @@ public class TransportRoutePlanner {
long stopId = stop.getId(); long stopId = stop.getId();
TransportStop multifileStop = loadedTransportStops.get(stopId); TransportStop multifileStop = loadedTransportStops.get(stopId);
int[] rrs = stop.getReferencesToRoutes(); int[] rrs = stop.getReferencesToRoutes();
// clear up so it won't be used as it is multi file stop // clear up so it won't be used because there is multi file stop
stop.setReferencesToRoutes(null); stop.setReferencesToRoutes(null);
if (rrs != null && !multifileStop.isDeleted()) { if (rrs != null && !multifileStop.isDeleted()) {
for (int rr : rrs) { for (int rr : rrs) {
@ -880,15 +884,11 @@ public class TransportRoutePlanner {
} }
public static List<TransportStop> mergeTransportStops(BinaryMapIndexReader reader, public TIntArrayList mergeTransportStops(BinaryMapIndexReader reader, TLongObjectHashMap<TransportStop> loadedTransportStops,
TLongObjectHashMap<TransportStop> loadedTransportStops, List<TransportStop> stops) throws IOException {
List<TransportStop> stops,
TIntObjectHashMap<TransportRoute> localFileRoutes,
TIntObjectHashMap<TransportRoute> loadedRoutes
) throws IOException {
TIntArrayList routesToLoad = new TIntArrayList(); TIntArrayList routesToLoad = new TIntArrayList();
TIntArrayList localRoutesToLoad = new TIntArrayList();
Iterator<TransportStop> it = stops.iterator(); Iterator<TransportStop> it = stops.iterator();
TIntArrayList localRoutesToLoad = new TIntArrayList();
while (it.hasNext()) { while (it.hasNext()) {
TransportStop stop = it.next(); TransportStop stop = it.next();
long stopId = stop.getId(); long stopId = stop.getId();
@ -899,7 +899,7 @@ public class TransportRoutePlanner {
if (multifileStop == null) { if (multifileStop == null) {
loadedTransportStops.put(stopId, stop); loadedTransportStops.put(stopId, stop);
multifileStop = stop; multifileStop = stop;
if(!stop.isDeleted()) { if (!stop.isDeleted()) {
localRoutesToLoad.addAll(stop.getReferencesToRoutes()); localRoutesToLoad.addAll(stop.getReferencesToRoutes());
} }
} else if (multifileStop.isDeleted()){ } else if (multifileStop.isDeleted()){
@ -932,7 +932,11 @@ public class TransportRoutePlanner {
routesToLoad.addAll(localRoutesToLoad); routesToLoad.addAll(localRoutesToLoad);
multifileStop.putReferencesToRoutes(reader.getFile().getName(), localRoutesToLoad.toArray()); //add valid stop and references to routes multifileStop.putReferencesToRoutes(reader.getFile().getName(), localRoutesToLoad.toArray()); //add valid stop and references to routes
} }
return routesToLoad;
}
private void loadRoutes(BinaryMapIndexReader reader, TIntObjectHashMap<TransportRoute> localFileRoutes,
TIntObjectHashMap<TransportRoute> loadedRoutes, TIntArrayList routesToLoad) throws IOException {
// load/combine routes // load/combine routes
if (routesToLoad.size() > 0) { if (routesToLoad.size() > 0) {
routesToLoad.sort(); routesToLoad.sort();
@ -954,8 +958,6 @@ public class TransportRoutePlanner {
loadedRoutes.putAll(localFileRoutes); loadedRoutes.putAll(localFileRoutes);
} }
} }
return stops;
} }
private TransportRoute getCombinedRoute(TransportRoute route) throws IOException { private TransportRoute getCombinedRoute(TransportRoute route) throws IOException {