patching expected results refs #21

eclipse-sumo · Mar 18, 2024 · a75f9ed · a75f9ed
1 parent 3bf5c84
commit a75f9ed
Show file tree

Hide file tree

Showing 31 changed files with 271 additions and 287 deletions.
diff --git a/tests/netconvert/bugs/ticket10589/output.netconvert b/tests/netconvert/bugs/ticket10589/output.netconvert
@@ -1,12 +1,12 @@
 Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
 Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (3ms).
-Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (50ms).
+Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (26ms).
 Removing duplicate edges ... done.
-Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (5ms).
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (24ms).
  Removed 1 traffic lights before loading plain-XML
  Import done:
    64 nodes loaded.
-   33 types loaded.
+   35 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).
@@ -17,7 +17,7 @@ Joining junction clusters ...
 done (0ms).
 Removing empty nodes and geometry nodes ... done (0ms).
    56 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).
 Guessing and setting on-/off-ramps ... done (0ms).
@@ -29,7 +29,7 @@ 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 (0ms).
+Dividing of lanes on approached lanes ... done (1ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
 Joining traffic light nodes ... done (0ms).

diff --git a/tests/netconvert/bugs/ticket10777/output.netconvert b/tests/netconvert/bugs/ticket10777/output.netconvert
@@ -1,12 +1,12 @@
 Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (1ms).
-Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (2ms).
+Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (2ms).
+Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (1ms).
 Removing duplicate edges ... done.
-Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (28ms).
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (19ms).
  Removed 6 traffic lights before loading plain-XML
  Import done:
    48 nodes loaded.
-   33 types loaded.
+   35 types loaded.
    58 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
 Removing self-loops ... done (0ms).
@@ -17,13 +17,13 @@ Joining junction clusters ... done (0ms).
  Joined 2 junction cluster(s).
 Removing empty nodes and geometry nodes ... done (0ms).
    12 nodes removed.
-Moving network to origin ... done (1ms).
+Moving network to origin ... done (10ms).
 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 (22ms).
+Computing edge shapes ... done (1ms).
 Computing node types ... 
 done (0ms).
 Computing priorities ... done (0ms).
@@ -35,12 +35,12 @@ 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 (1ms).
+Computing node logics ... done (0ms).
 Computing traffic light logics ... 
-done (0ms).
+done (1ms).
  2 traffic light(s) computed.
-Building inner edges ... done (1ms).
-Find accesses for pt rail stops ... done (1ms).
+Building inner edges ... done (0ms).
+Find accesses for pt rail stops ... done (0ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -55,5 +55,5 @@ Summary:
   Applied offset     : -605011.17,-5790381.46
   Converted boundary : 0.00,0.00,145.39,312.65
 -----------------------------------------------------
-Writing network ... done (12ms).
+Writing network ... done (3ms).
 Success.
diff --git a/tests/netconvert/export/openDRIVE/adlershof_dlr/errors.netconvert b/tests/netconvert/export/openDRIVE/adlershof_dlr/errors.netconvert
@@ -1,8 +1,6 @@
 Warning: Discarding unusable type 'waterway.riverbank' (first occurrence for edge '4616435').
 Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '5363708').
 Warning: Discarding unknown compound 'cycleway.opposite_track' in type 'cycleway.opposite_track|highway.primary' (first occurrence for edge '7216737').
-Warning: Discarding unusable type 'railway.construction' (first occurrence for edge '11390634').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '24154002').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.primary' (first occurrence for edge '24214693').
 Warning: PT line in relation 35040 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 35055 with no stops ignored. Probably OSM file is incomplete.

diff --git a/tests/netconvert/export/openDRIVE/adlershof_dlr/output.netconvert b/tests/netconvert/export/openDRIVE/adlershof_dlr/output.netconvert
@@ -1,12 +1,12 @@
-Parsing types from '/home/behr_mi/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (3ms).
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (20ms).
 Parsing edges from osm-file 'osm.xml' ... done (2ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
 done (1ms).
  Import done:
    94 nodes loaded.
-   33 types loaded.
+   35 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).
@@ -23,13 +23,13 @@ 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 (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).
-Computing node logics ... done (1ms).
+Computing node logics ... done (0ms).
 Computing traffic light logics ... 
-done (0ms).
+done (1ms).
  3 traffic light(s) computed.
 Building inner edges ... done (2ms).
 -----------------------------------------------------
@@ -41,10 +41,10 @@ Summary:
   Right-before-left junctions : 6
   Traffic light junctions      : 3
  Network boundaries:
-  Original boundary  : 13.36,52.42,13.57,52.46
+  Original boundary  : 13.36,52.43,13.57,52.46
   Applied offset     : -399345.66,-5809365.64
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
 Writing network ... 
-done (33ms).
+done (23ms).
 Success.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr/errors.netconvert b/tests/netconvert/import/OSM/adlershof_dlr/errors.netconvert
@@ -1,8 +1,6 @@
 Warning: Discarding unusable type 'waterway.riverbank' (first occurrence for edge '4616435').
 Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '5363708').
 Warning: Discarding unknown compound 'cycleway.opposite_track' in type 'cycleway.opposite_track|highway.primary' (first occurrence for edge '7216737').
-Warning: Discarding unusable type 'railway.construction' (first occurrence for edge '11390634').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '24154002').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.primary' (first occurrence for edge '24214693').
 Warning: PT line in relation 35040 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 35055 with no stops ignored. Probably OSM file is incomplete.

diff --git a/tests/netconvert/import/OSM/adlershof_dlr/output.netconvert b/tests/netconvert/import/OSM/adlershof_dlr/output.netconvert
@@ -1,33 +1,33 @@
-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 (4ms).
+Parsing edges from osm-file 'osm.xml' ... done (24ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (1ms).
+done (27ms).
  Import done:
    94 nodes loaded.
-   33 types loaded.
+   35 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 (1ms).
-Computing node shapes ... done (3ms).
-Computing edge shapes ... done (2ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (1ms).
+Computing edge shapes ... done (1ms).
 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 (1ms).
-Dividing of lanes on approached lanes ... done (0ms).
+Computing approaching lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (27ms).
 Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
 Computing traffic light control information ... done (0ms).
-Computing node logics ... done (2ms).
+Computing node logics ... done (1ms).
 Computing traffic light logics ... 
 done (0ms).
  3 traffic light(s) computed.
@@ -40,9 +40,9 @@ Summary:
   Right-before-left junctions : 6
   Traffic light junctions      : 3
  Network boundaries:
-  Original boundary  : 13.36,52.42,13.57,52.46
+  Original boundary  : 13.36,52.43,13.57,52.46
   Applied offset     : -399345.66,-5809365.64
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
-Writing network ... done (19ms).
+Writing network ... done (24ms).
 Success.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr_discard-tls/errors.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_discard-tls/errors.netconvert
@@ -1,8 +1,6 @@
 Warning: Discarding unusable type 'waterway.riverbank' (first occurrence for edge '4616435').
 Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '5363708').
 Warning: Discarding unknown compound 'cycleway.opposite_track' in type 'cycleway.opposite_track|highway.primary' (first occurrence for edge '7216737').
-Warning: Discarding unusable type 'railway.construction' (first occurrence for edge '11390634').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '24154002').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.primary' (first occurrence for edge '24214693').
 Warning: PT line in relation 35040 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 35055 with no stops ignored. Probably OSM file is incomplete.

diff --git a/tests/netconvert/import/OSM/adlershof_dlr_discard-tls/output.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_discard-tls/output.netconvert
@@ -1,30 +1,30 @@
-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 (3ms).
+Parsing edges from osm-file 'osm.xml' ... done (2ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (1ms).
+done (12ms).
  Removed 3 traffic lights before loading plain-XML
  Import done:
    94 nodes loaded.
-   33 types loaded.
+   35 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 (1ms).
+Moving network to origin ... done (1ms).
+Computing turning directions ... done (0ms).
 Assigning nodes to traffic lights ... done (0ms).
 Sorting nodes' edges ... done (0ms).
-Computing node shapes ... done (3ms).
-Computing edge shapes ... done (2ms).
+Computing node shapes ... done (2ms).
+Computing edge shapes ... done (1ms).
 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 (16ms).
+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).
@@ -39,9 +39,9 @@ Summary:
   Priority junctions          : 67
   Right-before-left junctions : 6
  Network boundaries:
-  Original boundary  : 13.36,52.42,13.57,52.46
+  Original boundary  : 13.36,52.43,13.57,52.46
   Applied offset     : -399345.66,-5809365.64
   Converted boundary : 0.00,0.00,1737.68,767.39
 -----------------------------------------------------
-Writing network ... done (17ms).
+Writing network ... done (13ms).
 Success.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/errors.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/errors.netconvert
@@ -5,7 +5,6 @@ Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|hi
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.residential' (first occurrence for edge '52460499').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.unclassified' (first occurrence for edge '81096583').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.unclassified' (first occurrence for edge '135777010').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '190461577').
 Warning: Discarding unusable type 'railway.abandoned' (first occurrence for edge '219832513').
 Warning: PT line 'Buslinie N60: Flughafen Schönefeld Terminal => S Adlershof' in relation 35040 seems to be split, only keeping first part.
 Warning: PT line 'Buslinie 164: S Flughafen Berlin-Schönefeld => S Kaulsdorf' in relation 228027 seems to be split, only keeping first part.

diff --git a/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert
@@ -1,46 +1,46 @@
 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 (54ms).
-Parsing edges from osm-file 'osm.xml' ... done (52ms).
+Parsing nodes from osm-file 'osm.xml' ... done (110ms).
+Parsing edges from osm-file 'osm.xml' ... done (67ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (24ms).
+done (53ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
-   34 types loaded.
+   36 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).
+Processing public transport stops ... done (0ms).
 Revising public transport stops based on pt lines ... 
 done (0ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
 Joining junction clusters ... 
-done (4ms).
+done (2ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (2ms).
+Removing empty nodes and geometry nodes ... done (27ms).
    79 nodes removed.
-Moving network to origin ... done (15ms).
-Computing turning directions ... done (1ms).
+Moving network to origin ... done (28ms).
+Computing turning directions ... done (0ms).
 Assigning nodes to traffic lights ... done (1ms).
 Sorting nodes' edges ... done (1ms).
 Computing node shapes ... 
-done (16ms).
-Computing edge shapes ... done (9ms).
-Computing node types ... done (1ms).
-Computing priorities ... done (0ms).
+done (26ms).
+Computing edge shapes ... done (4ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (1ms).
 Computing approached edges ... done (0ms).
-Guessing and setting roundabouts ... done (1ms).
-Computing approaching lanes ... done (3ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (2ms).
 Dividing of lanes on approached lanes ... done (1ms).
-Processing turnarounds ... done (1ms).
+Processing turnarounds ... done (0ms).
 Rechecking of lane endings ... done (0ms).
 Computing traffic light control information ... done (0ms).
-Computing node logics ... done (7ms).
-Computing traffic light logics ... done (1ms).
+Computing node logics ... done (13ms).
+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 (1ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -56,5 +56,5 @@ Summary:
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
 Writing network ... 
-done (55ms).
+done (48ms).
 Success.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/errors.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/errors.netconvert
@@ -5,7 +5,6 @@ Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|hi
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.residential' (first occurrence for edge '52460499').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.unclassified' (first occurrence for edge '81096583').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.unclassified' (first occurrence for edge '135777010').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '190461577').
 Warning: Discarding unusable type 'railway.abandoned' (first occurrence for edge '219832513').
 Warning: PT line 'Buslinie N60: Flughafen Schönefeld Terminal => S Adlershof' in relation 35040 seems to be split, only keeping first part.
 Warning: PT line 'Buslinie 164: S Flughafen Berlin-Schönefeld => S Kaulsdorf' in relation 228027 seems to be split, only keeping first part.