patching expected results. refs #21, #16090

tests/netconvert/export/openDRIVE/adlershof_dlr/output.netconvert

@@ -1,37 +1,37 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (6ms).
-Parsing edges from osm-file 'osm.xml' ... done (4ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (19ms).
+Parsing edges from osm-file 'osm.xml' ... done (5ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
  done (1ms).
  Import done:
    94 nodes loaded.
-   35 types loaded.
+   36 types loaded.
    190 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
 Removing empty nodes ... done (0ms).
    7 nodes removed.
-Moving network to origin ... done (1ms).
+Moving network to origin ... done (0ms).
 Computing turning directions ... done (0ms).
 Assigning nodes to traffic lights ... done (0ms).
 Sorting nodes' edges ... done (0ms).
 Computing node shapes ... done (4ms).
-Computing edge shapes ... done (2ms).
+Computing edge shapes ... done (1ms).
 Computing node types ... done (0ms).
-Computing priorities ... done (0ms).
-Computing approached edges ... done (1ms).
+Computing priorities ... done (1ms).
+Computing approached edges ... done (0ms).
 Guessing and setting roundabouts ... done (0ms).
-Computing approaching lanes ... done (0ms).
-Dividing of lanes on approached lanes ... done (1ms).
+Computing approaching lanes ... done (1ms).
+Dividing of lanes on approached lanes ... done (0ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
 Computing traffic light control information ... done (0ms).
-Computing node logics ... done (1ms).
+Computing node logics ... done (2ms).
 Computing traffic light logics ...
  done (0ms).
  3 traffic light(s) computed.
-Building inner edges ... done (4ms).
+Building inner edges ... done (5ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -46,5 +46,5 @@ Summary:
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
 Writing network ...
- done (47ms).
+ done (178ms).
 Success.

tests/netconvert/import/OSM/adlershof_dlr/output.netconvert

@@ -1,32 +1,32 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (6ms).
-Parsing edges from osm-file 'osm.xml' ... done (4ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (14ms).
+Parsing edges from osm-file 'osm.xml' ... done (5ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
  done (2ms).
  Import done:
    94 nodes loaded.
-   35 types loaded.
+   36 types loaded.
    190 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
 Removing empty nodes ... done (0ms).
    7 nodes removed.
 Moving network to origin ... done (0ms).
-Computing turning directions ... done (0ms).
-Assigning nodes to traffic lights ... done (1ms).
+Computing turning directions ... done (1ms).
+Assigning nodes to traffic lights ... done (0ms).
 Sorting nodes' edges ... done (0ms).
-Computing node shapes ... done (3ms).
+Computing node shapes ... done (4ms).
 Computing edge shapes ... done (2ms).
 Computing node types ... done (0ms).
-Computing priorities ... done (1ms).
+Computing priorities ... done (0ms).
 Computing approached edges ... done (0ms).
 Guessing and setting roundabouts ... done (0ms).
-Computing approaching lanes ... done (0ms).
-Dividing of lanes on approached lanes ... done (1ms).
+Computing approaching lanes ... done (1ms).
+Dividing of lanes on approached lanes ... done (0ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
-Computing traffic light control information ... done (0ms).
+Computing traffic light control information ... done (1ms).
 Computing node logics ... done (1ms).
 Computing traffic light logics ...
  done (0ms).
@@ -44,5 +44,5 @@ Summary:
   Applied offset     : -399345.66,-5809365.64
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
-Writing network ... done (13ms).
+Writing network ... done (12ms).
 Success.

tests/netconvert/import/OSM/adlershof_dlr_discard-tls/output.netconvert

@@ -1,29 +1,29 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (7ms).
-Parsing edges from osm-file 'osm.xml' ... done (4ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (23ms).
+Parsing edges from osm-file 'osm.xml' ... done (5ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
  done (1ms).
  Removed 3 traffic lights before loading plain-XML
  Import done:
    94 nodes loaded.
-   35 types loaded.
+   36 types loaded.
    190 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
-Removing empty nodes ... done (0ms).
+Removing empty nodes ... done (1ms).
    7 nodes removed.
-Moving network to origin ... done (1ms).
+Moving network to origin ... done (0ms).
 Computing turning directions ... done (0ms).
 Assigning nodes to traffic lights ... done (0ms).
 Sorting nodes' edges ... done (0ms).
 Computing node shapes ... done (4ms).
 Computing edge shapes ... done (2ms).
 Computing node types ... done (0ms).
-Computing priorities ... done (1ms).
+Computing priorities ... done (0ms).
 Computing approached edges ... done (0ms).
 Guessing and setting roundabouts ... done (0ms).
-Computing approaching lanes ... done (0ms).
+Computing approaching lanes ... done (1ms).
 Dividing of lanes on approached lanes ... done (1ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
@@ -43,5 +43,5 @@ Summary:
   Applied offset     : -399345.66,-5809365.64
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
-Writing network ... done (7ms).
+Writing network ... done (10ms).
 Success.

tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert

@@ -1,45 +1,45 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
 Parsing types from 'input_types.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (45ms).
-Parsing edges from osm-file 'osm.xml' ... done (43ms).
+Parsing nodes from osm-file 'osm.xml' ... done (133ms).
+Parsing edges from osm-file 'osm.xml' ... done (120ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
- done (22ms).
+ done (72ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
-   36 types loaded.
+   37 types loaded.
    882 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
-Removing self-loops ... done (0ms).
-Processing public transport stops ... done (1ms).
+Removing self-loops ... done (1ms).
+Processing public transport stops ... done (0ms).
 Revising public transport stops based on pt lines ...
- done (0ms).
+ done (1ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
-Joining junction clusters ... done (3ms).
+Joining junction clusters ... done (10ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (2ms).
+Removing empty nodes and geometry nodes ... done (40ms).
    79 nodes removed.
-Moving network to origin ... done (14ms).
+Moving network to origin ... done (72ms).
 Computing turning directions ... done (1ms).
 Assigning nodes to traffic lights ... done (1ms).
-Sorting nodes' edges ... done (1ms).
+Sorting nodes' edges ... done (4ms).
 Computing node shapes ...
- done (18ms).
-Computing edge shapes ... done (10ms).
+ done (19ms).
+Computing edge shapes ... done (14ms).
 Computing node types ... done (0ms).
 Computing priorities ... done (1ms).
-Computing approached edges ... done (0ms).
+Computing approached edges ... done (1ms).
 Guessing and setting roundabouts ... done (0ms).
 Computing approaching lanes ... done (3ms).
-Dividing of lanes on approached lanes ... done (3ms).
-Processing turnarounds ... done (0ms).
-Rechecking of lane endings ... done (1ms).
-Computing traffic light control information ... done (0ms).
-Computing node logics ... done (7ms).
+Dividing of lanes on approached lanes ... done (2ms).
+Processing turnarounds ... done (1ms).
+Rechecking of lane endings ... done (0ms).
+Computing traffic light control information ... done (3ms).
+Computing node logics ... done (8ms).
 Computing traffic light logics ... done (0ms).
  4 traffic light(s) computed.
-Find accesses for pt rail stops ... done (0ms).
+Find accesses for pt rail stops ... done (11ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -55,5 +55,5 @@ Summary:
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
 Writing network ...
- done (40ms).
+ done (185ms).
 Success.

tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/output.netconvert

@@ -1,44 +1,44 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (47ms).
-Parsing edges from osm-file 'osm.xml' ... done (41ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (71ms).
+Parsing edges from osm-file 'osm.xml' ... done (119ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
- done (20ms).
+ done (23ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
-   35 types loaded.
+   36 types loaded.
    944 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
-Processing public transport stops ... done (1ms).
+Processing public transport stops ... done (0ms).
 Revising public transport stops based on pt lines ...
- done (0ms).
+ done (2ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
-Joining junction clusters ... done (3ms).
+Joining junction clusters ... done (4ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (2ms).
+Removing empty nodes and geometry nodes ... done (18ms).
    94 nodes removed.
-Moving network to origin ... done (14ms).
+Moving network to origin ... done (43ms).
 Computing turning directions ... done (1ms).
-Assigning nodes to traffic lights ... done (0ms).
-Sorting nodes' edges ... done (0ms).
+Assigning nodes to traffic lights ... done (1ms).
+Sorting nodes' edges ... done (1ms).
 Computing node shapes ...
- done (15ms).
-Computing edge shapes ... done (8ms).
+ done (23ms).
+Computing edge shapes ... done (16ms).
 Computing node types ... done (1ms).
-Computing priorities ... done (0ms).
-Computing approached edges ... done (1ms).
+Computing priorities ... done (1ms).
+Computing approached edges ... done (0ms).
 Guessing and setting roundabouts ... done (0ms).
-Computing approaching lanes ... done (3ms).
-Dividing of lanes on approached lanes ... done (3ms).
-Processing turnarounds ... done (0ms).
+Computing approaching lanes ... done (15ms).
+Dividing of lanes on approached lanes ... done (4ms).
+Processing turnarounds ... done (1ms).
 Rechecking of lane endings ... done (0ms).
-Computing traffic light control information ... done (1ms).
-Computing node logics ... done (8ms).
-Computing traffic light logics ... done (1ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (50ms).
+Computing traffic light logics ... done (2ms).
  4 traffic light(s) computed.
-Find accesses for pt rail stops ... done (0ms).
+Find accesses for pt rail stops ... done (2ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -53,5 +53,5 @@ Summary:
   Applied offset     : -395408.93,-5809112.45
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
-Writing network ... done (37ms).
+Writing network ... done (71ms).
 Success.

tests/netconvert/import/OSM/adlershof_orig_names/output.netconvert

@@ -1,29 +1,29 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (8ms).
-Parsing edges from osm-file 'osm.xml' ... done (4ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (16ms).
+Parsing edges from osm-file 'osm.xml' ... done (5ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ...
  done (1ms).
  Import done:
    94 nodes loaded.
-   35 types loaded.
+   36 types loaded.
    190 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
 Removing empty nodes and geometry nodes ... done (0ms).
    11 nodes removed.
-Moving network to origin ... done (1ms).
+Moving network to origin ... done (0ms).
 Computing turning directions ... done (0ms).
 Assigning nodes to traffic lights ... done (0ms).
 Sorting nodes' edges ... done (1ms).
 Computing node shapes ... done (3ms).
 Computing edge shapes ... done (2ms).
 Computing node types ... done (0ms).
-Computing priorities ... done (0ms).
+Computing priorities ... done (1ms).
 Computing approached edges ... done (0ms).
 Guessing and setting roundabouts ... done (0ms).
 Computing approaching lanes ... done (0ms).
-Dividing of lanes on approached lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (1ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
 Computing traffic light control information ... done (0ms).

tests/netconvert/import/OSM/bugs/ticket10589/output.netconvert

@@ -1,21 +1,21 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (6ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (7ms).
 Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (5ms).
 Removing duplicate edges ... done.
-Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (10ms).
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (30ms).
  Removed 1 traffic lights before loading plain-XML
  Import done:
    64 nodes loaded.
-   35 types loaded.
+   36 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 (1ms).
+ done (0ms).
 Joining junction clusters ...
  done (0ms).
-Removing empty nodes and geometry nodes ... done (1ms).
+Removing empty nodes and geometry nodes ... done (0ms).
    56 nodes removed.
 Moving network to origin ... done (0ms).
 Computing turning directions ... done (0ms).
@@ -28,7 +28,7 @@ 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).
+Computing approaching lanes ... done (29ms).
 Dividing of lanes on approached lanes ... done (0ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
@@ -50,5 +50,5 @@ Summary:
   Applied offset     : -603780.39,-5791997.35
   Converted boundary : 0.00,0.00,209.80,240.71
 -----------------------------------------------------
-Writing network ... done (2ms).
+Writing network ... done (11ms).
 Success.