patching expected results refs #21, #10589

tests/netconvert/bugs/ticket10589/errors.netconvert

@@ -0,0 +1,18 @@
+Warning: Removing pt stop '3214057380' on non existing edge '317671621#0'.
+Warning: Removing pt stop '3239586702' on non existing edge '887901759#1'.
+Warning: Cannot revise pt stop localization for pt line '10082594', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3239586702' from line '10082594'.
+Warning: Cannot revise pt stop localization for pt line '10082595', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '10082595'.
+Warning: Cannot revise pt stop localization for pt line '2752852', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3239586702' from line '2752852'.
+Warning: Cannot revise pt stop localization for pt line '2770412', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '2770412'.
+Warning: Cannot revise pt stop localization for pt line '2770413', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '2770413'.
+Warning: Removing pt stop '3214057380' on non existing edge ''.
+Warning: Removing pt stop '3239586702' on non existing edge ''.
+Warning: Removed 2 pt stops because they could not be assigned to the network
+Warning: Not joining junctions 35651824,35651826,56456270,56456273 (parallel outgoing 6146263#1,7745712#0).
+Warning: 14 total messages of type: Cannot revise pt stop localization for pt line '%', which has no route edges. Ignoring!
+Warning: 14 total messages of type: Removed invalid stop '%' from line '%'.

tests/netconvert/bugs/ticket10589/output.netconvert

@@ -1 +1,54 @@
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (5ms).
+Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (6ms).
+Removing duplicate edges ... done.
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (8ms).
+ Removed 1 traffic lights before loading plain-XML
+ Import done:
+   61 nodes loaded.
+   33 types loaded.
+   25 edges loaded.
+Proj projection parameters used: '+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
+Removing self-loops ... done (0ms).
+Processing public transport stops ... done (0ms).
+Revising public transport stops based on pt lines ... 
+done (0ms).
+Joining junction clusters ... 
+done (0ms).
+Removing empty nodes and geometry nodes ... done (0ms).
+   53 nodes removed.
+Moving network to origin ... done (1ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (0ms).
+Guessing and setting on-/off-ramps ... done (0ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (0ms).
+Computing edge shapes ... done (0ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (1ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... done (0ms).
+Joining traffic light nodes ... done (0ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (0ms).
+ 0 traffic light(s) computed.
+Building inner edges ... done (0ms).
+-----------------------------------------------------
+Summary:
+ Node type statistics:
+  Unregulated junctions       : 0
+  Dead-end junctions          : 3
+  Priority junctions          : 3
+  Right-before-left junctions : 2
+ Network boundaries:
+  Original boundary  : 10.52,52.27,10.52,52.27
+  Applied offset     : -603780.39,-5791997.36
+  Converted boundary : 0.00,0.00,209.80,240.71
+-----------------------------------------------------
+Writing network ... done (3ms).
 Success.

tests/netconvert/import/OSM/bugs/ticket5513/errors.netconvert

@@ -7,12 +7,12 @@ Warning: Discarding unusable type 'waterway.dam' (first occurence for edge '2346
 Warning: Discarding unusable type 'highway.footway' (first occurence for edge '615359756').
 Warning: Not joining junctions 201158128,201158137,201158163,5819001494 (not compact (maxEdge=47795936#2 length=8.36)).
 Warning: Not joining junctions 201583479,3649519965 (only 1 exit node).
+Warning: Not joining junctions 201220801,201589322,3645231524,3645231555,5819001482 (parallel incoming -615359751#0,19386227#0).
+Warning: Not joining junctions 201221330,201588819 (parallel outgoing 19358290#0,47795936#0).
 Warning: Not joining junctions 201221373,5819001427 (parallel incoming -615359726#1,19358290#1).
-Warning: Not joining junctions 201221409,3645240254,5996484329 (slip lane).
 Warning: Reducing junction cluster 3645200026,5819001456,5819001459 (parallel incoming -615359739#1,94669185#2).
 Warning: Reducing junction cluster 5819001430,5819001435,5819001672 (5 incoming edges).
-Warning: Not joining junctions 5819001429,5819001431 (parallel incoming -615359732,615359729#1).
 Warning: Ambiguity in turnarounds computation at junction '5819001479'.
 Warning: The traffic light '201221451' does not control any links; it will not be build.
 Warning: Could not build program '0' for traffic light '201221451'
-Warning: 8 total messages of type: Not joining junctions % (%).
+Warning: 10 total messages of type: Not joining junctions % (%).