patch tests ref #21 #13970

Signed-off-by: m-kro <m.barthauer@t-online.de>
eclipse-sumo · Jan 10, 2024 · fbc280e · fbc280e
1 parent 4bab120
commit fbc280e
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 109 deletions.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert
@@ -1,47 +1,45 @@
-Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing types from 'D:\Repos\sumo\/data/typemap/osmNetconvert.typ.xml' ... done.
 Parsing types from 'input_types.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (41ms).
-Parsing edges from osm-file 'osm.xml' ... done (45ms).
+Parsing nodes from osm-file 'osm.xml' ... done (542ms).
+Parsing edges from osm-file 'osm.xml' ... done (613ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (27ms).
+done (233ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
    34 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 (3ms).
+Processing public transport stops ... done (18ms).
 Revising public transport stops based on pt lines ... 
-done (1ms).
+done (27ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
 Joining junction clusters ... 
-done (3ms).
+done (170ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (3ms).
+Removing empty nodes and geometry nodes ... done (120ms).
    81 nodes removed.
-Moving network to origin ... done (14ms).
-Computing turning directions ... done (1ms).
-Assigning nodes to traffic lights ... done (1ms).
-Sorting nodes' edges ... done (1ms).
-Computing node shapes ... done (17ms).
-Computing edge shapes ... done (10ms).
-Computing node types ... done (0ms).
-Computing priorities ... done (1ms).
-Computing approached edges ... done (0ms).
-Guessing and setting roundabouts ... 
- Guessed 1 roundabout(s).
-done (0ms).
-Computing approaching lanes ... done (4ms).
-Dividing of lanes on approached lanes ... done (2ms).
-Processing turnarounds ... done (1ms).
-Rechecking of lane endings ... done (0ms).
-Computing traffic light control information ... done (0ms).
-Computing node logics ... done (5ms).
-Computing traffic light logics ... done (1ms).
+Moving network to origin ... done (1448ms).
+Computing turning directions ... done (27ms).
+Assigning nodes to traffic lights ... done (67ms).
+Sorting nodes' edges ... done (49ms).
+Computing node shapes ... done (1360ms).
+Computing edge shapes ... done (631ms).
+Computing node types ... done (26ms).
+Computing priorities ... done (25ms).
+Computing approached edges ... done (49ms).
+Guessing and setting roundabouts ... done (2ms).
+Computing approaching lanes ... done (352ms).
+Dividing of lanes on approached lanes ... done (173ms).
+Processing turnarounds ... done (30ms).
+Rechecking of lane endings ... done (16ms).
+Computing traffic light control information ... done (8ms).
+Computing node logics ... done (981ms).
+Computing traffic light logics ... done (39ms).
  4 traffic light(s) computed.
-Find accesses for pt rail stops ... done (1ms).
+Find accesses for pt rail stops ... done (26ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -57,5 +55,5 @@ Summary:
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
 Writing network ... 
-done (66ms).
+done (1499ms).
 Success.
diff --git a/tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/output.netconvert b/tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/output.netconvert
@@ -1,46 +1,44 @@
-Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (43ms).
-Parsing edges from osm-file 'osm.xml' ... done (60ms).
+Parsing types from 'D:\Repos\sumo\/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'osm.xml' ... done (499ms).
+Parsing edges from osm-file 'osm.xml' ... done (599ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (24ms).
+done (224ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
    33 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).
+Removing self-loops ... done (3ms).
+Processing public transport stops ... done (19ms).
 Revising public transport stops based on pt lines ... 
-done (1ms).
+done (31ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
 Joining junction clusters ... 
-done (3ms).
+done (170ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (3ms).
+Removing empty nodes and geometry nodes ... done (146ms).
    96 nodes removed.
-Moving network to origin ... done (17ms).
-Computing turning directions ... done (1ms).
-Assigning nodes to traffic lights ... done (1ms).
-Sorting nodes' edges ... done (0ms).
-Computing node shapes ... done (14ms).
-Computing edge shapes ... done (11ms).
-Computing node types ... done (1ms).
-Computing priorities ... done (1ms).
-Computing approached edges ... done (1ms).
-Guessing and setting roundabouts ... 
- Guessed 1 roundabout(s).
-done (0ms).
-Computing approaching lanes ... done (5ms).
-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 (10ms).
-Computing traffic light logics ... done (1ms).
+Moving network to origin ... done (1440ms).
+Computing turning directions ... done (44ms).
+Assigning nodes to traffic lights ... done (62ms).
+Sorting nodes' edges ... done (26ms).
+Computing node shapes ... done (1350ms).
+Computing edge shapes ... done (631ms).
+Computing node types ... done (25ms).
+Computing priorities ... done (24ms).
+Computing approached edges ... done (63ms).
+Guessing and setting roundabouts ... done (3ms).
+Computing approaching lanes ... done (414ms).
+Dividing of lanes on approached lanes ... done (213ms).
+Processing turnarounds ... done (35ms).
+Rechecking of lane endings ... done (15ms).
+Computing traffic light control information ... done (14ms).
+Computing node logics ... done (1452ms).
+Computing traffic light logics ... done (110ms).
  4 traffic light(s) computed.
-Find accesses for pt rail stops ... done (1ms).
+Find accesses for pt rail stops ... done (28ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -55,5 +53,5 @@ Summary:
   Applied offset     : -395408.93,-5809112.45
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
-Writing network ... done (76ms).
+Writing network ... done (1659ms).
 Success.
diff --git a/tests/netconvert/import/OSM/bugs/ticket6482/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket6482/errors.netconvert
@@ -16,5 +16,6 @@ Warning: Speed of straight connection '132406507#0_0->132406507#1_0' reduced by
 Warning: Speed of straight connection '132406507#0_1->132406507#1_1' reduced by 11.74 due to turning radius of 46.79 (length=1.41, angle=16.75).
 Warning: Speed of straight connection '132406504#1_1->132406495#0_0' reduced by 9.59 due to turning radius of 60.17 (length=4.85, angle=19.68).
 Warning: Speed of straight connection '132406504#1_2->132406495#0_1' reduced by 13.39 due to turning radius of 37.67 (length=3.01, angle=19.68).
+Warning: Writing incomplete roundabout. Edges: '157285910#0 157285910#1' no longer exist'
 Warning: 16 total messages of type: Converting invalid rail_crossing to priority junction '%'.
 Warning: 8 total messages of type: Speed of % connection '%' reduced by % due to turning radius of % (length=%, angle=%).
diff --git a/tests/netconvert/import/OSM/bugs/ticket6482/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket6482/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-05-12 11:25:52 by Eclipse SUMO netconvert Version v1_17_0+0239-789d1ff
+<!-- generated on 2024-01-10 10:47:31 by Eclipse SUMO netconvert Version v1_14_1+11326-3c868dac230
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -1039,9 +1039,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="3" response="10000" foes="10000" cont="1"/>
         <request index="4" response="00000" foes="01000" cont="0"/>
     </junction>
-    <junction id="1694971659" type="right_before_left" x="242.08" y="194.41" incLanes="157285910#2_0 132406483#1_0" intLanes=":1694971659_0_0 :1694971659_1_0" shape="241.50,198.76 244.86,198.09 243.90,195.93 243.72,194.87 243.75,193.81 243.98,192.77 244.41,191.74 241.08,191.20 240.17,192.85 239.75,193.39 239.24,193.82 238.54,194.23 237.58,194.69 238.90,197.60 239.84,197.44 240.28,197.56 240.71,197.82 241.11,198.22">
-        <request index="0" response="10" foes="10" cont="0"/>
-        <request index="1" response="00" foes="01" cont="0"/>
+    <junction id="1694971659" type="priority" x="242.08" y="194.41" incLanes="157285910#2_0 132406483#1_0" intLanes=":1694971659_0_0 :1694971659_1_0" shape="241.50,198.76 244.86,198.09 243.90,195.93 243.72,194.87 243.75,193.81 243.98,192.77 244.41,191.74 241.08,191.20 240.17,192.85 239.75,193.39 239.24,193.82 238.54,194.23 237.58,194.69 238.90,197.60 239.84,197.44 240.28,197.56 240.71,197.82 241.11,198.22">
+        <request index="0" response="00" foes="10" cont="0"/>
+        <request index="1" response="01" foes="01" cont="0"/>
     </junction>
     <junction id="1694971689" type="priority" x="244.31" y="200.23" incLanes="157285910#3_0" intLanes=":1694971689_0_0 :1694971689_1_0" shape="245.67,203.29 247.76,200.69 245.95,199.55 245.24,198.77 244.67,197.85 244.23,196.79 243.93,195.60 241.01,197.38 241.05,198.59 240.90,199.06 240.64,199.45 240.28,199.74 239.80,199.95 240.75,203.01 242.57,202.54 243.24,202.52 243.91,202.63 244.68,202.89">
         <request index="0" response="00" foes="00" cont="0"/>
@@ -1120,7 +1120,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="2" response="0000" foes="0000" cont="0"/>
         <request index="3" response="0000" foes="0000" cont="0"/>
     </junction>
-    <junction id="287097883" type="priority" x="65.79" y="0.00" incLanes="234422324_0" intLanes=":287097883_0_0" shape="65.79,-0.00 64.30,2.83 65.79,0.00">
+    <junction id="287097883" type="priority" x="65.79" y="0.00" incLanes="234422324_0" intLanes=":287097883_0_0" shape="65.79,0.00 64.30,2.83 65.79,-0.00">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
     <junction id="3199817687" type="priority" x="79.83" y="251.48" incLanes="423345354_0 423345354_1 423345354_2" intLanes=":3199817687_0_0 :3199817687_1_0 :3199817687_1_1 :3199817687_1_2" shape="88.26,269.85 96.47,264.42 97.22,263.34 98.79,260.54 84.66,250.15 76.50,255.22 78.62,258.62 80.25,261.11 81.70,263.09 83.30,264.94 85.38,267.06">
@@ -1268,7 +1268,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="-260192803#4" to="-260192803#3" fromLane="0" toLane="0" via=":5264747518_0_0" tl="5264747518" linkIndex="0" dir="s" state="O"/>
     <connection from="132406481" to="132406483#1" fromLane="0" toLane="0" via=":2119644452_2_0" dir="r" state="M"/>
     <connection from="132406481" to="234422324" fromLane="0" toLane="0" via=":2119644452_3_0" dir="t" state="="/>
-    <connection from="132406483#1" to="157285910#3" fromLane="0" toLane="0" via=":1694971659_1_0" dir="r" state="M"/>
+    <connection from="132406483#1" to="157285910#3" fromLane="0" toLane="0" via=":1694971659_1_0" dir="r" state="m" visibility="9.00"/>
     <connection from="132406484#0" to="559018231" fromLane="0" toLane="0" via=":2119644444_0_0" dir="s" state="M"/>
     <connection from="132406484#0" to="559018231" fromLane="1" toLane="1" via=":2119644444_0_1" dir="s" state="M"/>
     <connection from="132406484#0" to="234422325" fromLane="1" toLane="0" via=":2119644444_2_0" dir="l" state="M"/>
@@ -1369,7 +1369,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="147053177#3" to="159527130" fromLane="0" toLane="0" via=":1716378056_0_0" dir="s" state="M"/>
     <connection from="147053177#3" to="159527130" fromLane="1" toLane="1" via=":1716378056_0_1" dir="s" state="M"/>
     <connection from="147053177#3" to="205792984" fromLane="2" toLane="0" via=":1716378056_2_0" dir="L" state="M"/>
-    <connection from="157285910#2" to="157285910#3" fromLane="0" toLane="0" via=":1694971659_0_0" dir="s" state="="/>
+    <connection from="157285910#2" to="157285910#3" fromLane="0" toLane="0" via=":1694971659_0_0" dir="s" state="M"/>
     <connection from="157285910#3" to="558858826#0" fromLane="0" toLane="0" via=":1694971689_0_0" dir="r" state="M"/>
     <connection from="157285910#3" to="157285910#2" fromLane="0" toLane="0" via=":1694971689_1_0" dir="s" state="M"/>
     <connection from="159527130" to="132406494#0" fromLane="0" toLane="0" via=":1716378034_0_0" dir="s" state="M"/>
@@ -1624,4 +1624,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from=":988657955_0" to="559018229" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":988657955_0" to="559018229" fromLane="1" toLane="1" dir="s" state="M"/>
 
+    <roundabout nodes="1694971659 1694971689" edges="157285910#2 157285910#3"/>
+
 </net>
diff --git a/tests/netconvert/import/OSM/bugs/ticket9701/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket9701/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-05-09 15:52:34 by Eclipse SUMO netconvert Version v1_17_0+0192-02ed9c7dd44
+<!-- generated on 2024-01-10 10:47:38 by Eclipse SUMO netconvert Version v1_14_1+11326-3c868dac230
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -3749,4 +3749,5 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from=":921128156_w1" to=":921128156_c0" fromLane="0" toLane="0" dir="s" state="m"/>
     <connection from=":921128156_w1" to="78488918#0" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="284801757#0" to=":921128156_w1" fromLane="0" toLane="0" dir="s" state="M"/>
+
 </net>
diff --git a/tests/netconvert/import/OSM/geo_from_osm/errors.netconvert b/tests/netconvert/import/OSM/geo_from_osm/errors.netconvert
@@ -1 +1,2 @@
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.cycleway' (first occurrence for edge '101954979').
+Warning: Replacing loaded roundabout '3221374 491781400#0 491781400#1 491894864#0 491894864#1 491894864#2 491894867' with '3221374 491781400#0 491894864#0 491894864#1 491894864#2 491894867'.