refined verbose output #16326

Author: namdre

tools/import/gtfs/gtfs2pt.py

@@ -213,8 +213,10 @@ def traceMap(options, typedNets, fixedStops, stopLookup, invEdgeMap, radius=150)
         if options.verbose:
             print("mapping", mode)
         net = sumolib.net.readNet(os.path.join(options.network_split, mode + ".net.xml"))
+        mode_edges = set([e.getID() for e in net.getEdges()])
         netBox = net.getBBoxXY()
         numTraces = 0
+        numRoutes = 0
         filePath = os.path.join(options.fcd, mode + ".fcd.xml")
         if not os.path.exists(filePath):
             return []
@@ -229,7 +231,8 @@ def traceMap(options, typedNets, fixedStops, stopLookup, invEdgeMap, radius=150)
                     for idx, xy in enumerate(trace):
                         candidates = stopLookup.getCandidates(xy)
                         if candidates:
-                            vias[idx] = [invEdgeMap[lane2edge(stop.lane)] for stop in candidates]
+                            all_edges = [invEdgeMap[lane2edge(stop.lane)] for stop in candidates]
+                            vias[idx] = [e for e in all_edges if e in mode_edges]
                 for idx in range(len(trace)):
                     fixed = fixedStops.get("%s.%s" % (tid, idx))
                     if fixed:
@@ -238,9 +241,10 @@ def traceMap(options, typedNets, fixedStops, stopLookup, invEdgeMap, radius=150)
                                                      fillGaps=options.fill_gaps, gapPenalty=5000., vias=vias,
                                                      reversalPenalty=1000.)
                 if mappedRoute:
+                    numRoutes += 1
                     routes[tid] = [e.getID() for e in mappedRoute]
         if options.verbose:
-            print("mapped", numTraces, "traces to", len(routes), "routes.")
+            print("mapped", numTraces, "traces to", numRoutes, "routes.")
     return routes
 
 

tools/sumolib/route.py

@@ -94,24 +94,30 @@ def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapP
     result = ()
     paths = {}  # maps a path stub to a pair of current cost and the last mapping position on the last edge
     lastPos = None
+    nPathCalls = 0
+    nNoCandidates = 0
     if verbose:
-        print("mapping trace with %s points" % len(trace))
+        print("mapping trace with %s points ... " % len(trace), end="", flush=True)
     for idx, pos in enumerate(trace):
+        x, y = pos
         newPaths = {}
         if vias and idx in vias:
             candidates = []
             for edgeID in vias[idx]:
                 if net.hasEdge(edgeID):
                     candidates.append((net.getEdge(edgeID), 0.))
                 else:
-                    print("Unknown via edge %s for %s,%s" % (edgeID, pos[0], pos[1]))
+                    print("Unknown via edge %s for %s,%s" % (edgeID, x, y))
         else:
-            candidates = net.getNeighboringEdges(pos[0], pos[1], delta, not net.hasInternal)
+            candidates = net.getNeighboringEdges(x, y, delta, not net.hasInternal)
         if debug:
-            print("\n\npos:%s, %s" % (pos[0], pos[1]))
+            print("\n\npos:%s, %s" % (x, y))
             print("candidates:%s\n" % [(e.getID(), c) for e, c in candidates])
         if verbose and not candidates:
-            print("Found no candidate edges for %s,%s" % pos)
+            if nNoCandidates == 0:
+                print()
+            print("   Found no candidate edges for %s,%s (index %s) " % (x, y, idx))
+            nNoCandidates += 1
 
         for edge, d in candidates:
             if vClass is not None and not edge.allows(vClass):
@@ -139,6 +145,7 @@ def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapP
                             extension, cost = net.getOptimalPath(path[-1], edge, maxCost=maxGap,
                                                                  reversalPenalty=reversalPenalty,
                                                                  fromPos=lastBase, toPos=base)
+                            nPathCalls += 1
                             if extension is None:
                                 airLineDist = euclidean(
                                     path[-1].getToNode().getCoord(),
@@ -176,6 +183,10 @@ def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapP
                 result += minPath
         paths = newPaths
         lastPos = pos
+    if verbose:
+        if nNoCandidates > 0:
+            print("%s Points had no candidates. " % nNoCandidates, end="")
+        print("(%s router calls)" % nPathCalls)
     if paths:
         if debug:
             print("**************** result:")