patching expected results refs #21, #14786

eclipse-sumo · Apr 28, 2024 · ccf1df1 · ccf1df1
1 parent 676541f
commit ccf1df1
Show file tree

Hide file tree

Showing 28 changed files with 980 additions and 915 deletions.
diff --git a/tests/netconvert/import/OSM/bugs/ticket10777/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket10777/errors.netconvert
@@ -1,3 +1,2 @@
-Warning: Converting invalid rail_crossing to traffic_light at junction 'cluster_28114806_286726503_2952513732_2952513733_#2more'.
 Warning: The traffic light '256574415' does not control any links; it will not be build.
 Warning: Could not build program '0' for traffic light '256574415'
diff --git a/tests/netconvert/import/OSM/bugs/ticket10777/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket10777/net.netconvert
diff --git a/tests/netconvert/import/OSM/bugs/ticket10777/output.netconvert b/tests/netconvert/import/OSM/bugs/ticket10777/output.netconvert
@@ -1,8 +1,8 @@
 Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
-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).
+Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (25ms).
+Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (2ms).
 Removing duplicate edges ... done.
-Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (19ms).
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (75ms).
  Removed 6 traffic lights before loading plain-XML
  Import done:
    48 nodes loaded.
@@ -13,19 +13,18 @@ Removing self-loops ... done (0ms).
 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 (0ms).
+Joining junction clusters ... done (36ms).
  Joined 2 junction cluster(s).
 Removing empty nodes and geometry nodes ... done (0ms).
    12 nodes removed.
-Moving network to origin ... done (10ms).
+Moving network to origin ... done (0ms).
 Computing turning directions ... done (0ms).
-Assigning nodes to traffic lights ... done (0ms).
+Assigning nodes to traffic lights ... done (2ms).
 Guessing and setting on-/off-ramps ... done (0ms).
 Sorting nodes' edges ... done (0ms).
-Computing node shapes ... done (0ms).
-Computing edge shapes ... done (1ms).
-Computing node types ... 
-done (0ms).
+Computing node shapes ... done (1ms).
+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).
@@ -39,8 +38,8 @@ Computing node logics ... done (0ms).
 Computing traffic light logics ... 
 done (1ms).
  2 traffic light(s) computed.
-Building inner edges ... done (0ms).
-Find accesses for pt rail stops ... done (0ms).
+Building inner edges ... done (1ms).
+Find accesses for pt rail stops ... done (1ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -55,5 +54,5 @@ Summary:
   Applied offset     : -605011.17,-5790381.46
   Converted boundary : 0.00,0.00,145.39,312.65
 -----------------------------------------------------
-Writing network ... done (3ms).
+Writing network ... done (26ms).
 Success.
diff --git a/tests/netconvert/import/OSM/bugs/ticket12223/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket12223/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-02 14:11:35 by Eclipse SUMO netconvert Version v1_19_0+1620-8aaf8f08ffd
+<!-- generated on 2024-04-28 22:49:40 by Eclipse SUMO netconvert Version v1_19_0+1959-e51fd22bc0f
 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
@@ -460,7 +460,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="7" response="000001000" foes="000011100"/>
         <request index="8" response="000001000" foes="000001001"/>
     </junction>
-    <junction id="3263667182" type="dead_end" x="91.27" y="3.29" incLanes="176244741_0 46733382#0_0" intLanes="" shape="90.52,6.24 93.57,5.28 93.48,4.44 93.60,4.11 93.81,3.84 94.14,3.63 94.57,3.47 94.07,1.53 91.96,2.07 91.21,2.22 90.46,2.33 89.54,2.42 88.29,2.52 88.44,4.51 89.34,4.65 89.71,4.89 90.03,5.23 90.30,5.68"/>
+    <junction id="3263667182" type="dead_end" x="91.27" y="3.29" incLanes="176244741_0 46733382#0_0" intLanes="" shape="90.52,6.24 93.57,5.28 93.48,4.44 93.60,4.11 93.81,3.84 94.14,3.63 94.57,3.47 94.07,1.53 91.96,2.07 91.21,2.22 90.46,2.33 89.54,2.42 88.29,2.52 88.44,4.51 89.34,4.65 89.71,4.89 90.03,5.23 90.30,5.68">
+        <param key="crossing:light" value="no"/>
+    </junction>
     <junction id="3363880857" type="traffic_light" x="101.81" y="15.90" incLanes="-176072020#1_0 -176072020#1_1 176072020#0_0 176072020#0_1 176072020#0_2" intLanes="" shape="97.33,17.31 109.43,13.80 109.30,13.37 97.30,17.21">
         <request index="0" response="00000" foes="00000"/>
         <request index="1" response="00000" foes="00000"/>

diff --git a/tests/netconvert/import/OSM/bugs/ticket6470/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket6470/errors.netconvert
@@ -4,8 +4,6 @@ Warning: Discarding unknown compound 'railway.crossing' in type 'highway.footway
 Warning: Ignoring join-cluster 'cluster_3151786679' because it has size '1'.
 Warning: Could not find corresponding edge or compatible lane for pt stop '3151780943' (Am Magnitor). Thus, it will be removed!
 Warning: Could not find corresponding edge or compatible lane for pt stop '34672434' (Am Magnitor). Thus, it will be removed!
-Warning: Converting invalid rail_crossing to priority junction '3151786679'.
-Warning: Converting invalid rail_crossing to priority junction '3151786680'.
 Warning: Converting invalid rail_crossing to priority junction '5653296833'.
 Warning: Converting invalid rail_crossing to priority junction '5789925951'.
 Warning: The traffic light '34672430' does not control any links; it will not be build.

diff --git a/tests/netconvert/import/OSM/bugs/ticket6482/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket6482/errors.netconvert
@@ -8,14 +8,14 @@ Warning: Could not find corresponding edge or compatible lane for free-floating
 Warning: Converting invalid rail_crossing to priority junction '143456953'.
 Warning: Converting invalid rail_crossing to priority junction '1716377947'.
 Warning: Converting invalid rail_crossing to priority junction '1716377951'.
-Warning: Converting invalid rail_crossing to priority junction '1716377983'.
-Warning: Converting invalid rail_crossing to priority junction '2547316939'.
+Warning: Converting invalid rail_crossing to priority junction '2547316940'.
+Warning: Converting invalid rail_crossing to priority junction '2547316975'.
 Warning: Found sharp turn with radius 5.62 at the start of edge '20832138'.
 Warning: Speed of straight connection '411043475#0_0->132406503_0' reduced by 10.54 due to turning radius of 38.00 (length=18.65, angle=43.72).
 Warning: Speed of straight connection '132406507#0_0->132406507#1_0' reduced by 7.14 due to turning radius of 77.45 (length=2.35, angle=16.75).
 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: 12 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/ticket8039/additional.netconvert b/tests/netconvert/import/OSM/bugs/ticket8039/additional.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-14 16:51:37 by Eclipse SUMO netconvert Version v1_19_0+1300-b92ca839bda
+<!-- generated on 2024-04-28 22:49:39 by Eclipse SUMO netconvert Version v1_19_0+1959-e51fd22bc0f
 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
@@ -49,7 +49,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <busStop id="4539420388" name="Veltenhöfer Straße" lane="4747816#1_0" startPos="39.41" endPos="54.41" friendlyPos="true"/>
+    <busStop id="4539420388" name="Veltenhöfer Straße" lane="4747816#1_0" startPos="39.86" endPos="54.86" friendlyPos="true"/>
     <busStop id="4539421789" name="Brandenburgstraße" lane="4747816#7_0" startPos="110.00" endPos="125.00" friendlyPos="true"/>
     <busStop id="54142977" name="Heideblick" lane="859066434#3_0" startPos="44.98" endPos="69.98" friendlyPos="true" lines="1">
         <access lane="172186756#0_0" pos="0.00" length="17.11" friendlyPos="1"/>
@@ -59,18 +59,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <access lane="595002498#1_0" pos="0.00" length="15.10" friendlyPos="1"/>
     </busStop>
     <busStop id="54143009" name="Veltenhöfer Straße" lane="859066431#1_0" startPos="24.19" endPos="49.19" friendlyPos="true" lines="1">
-        <access lane="-10425592#1_0" pos="51.76" length="14.40" friendlyPos="1"/>
-        <access lane="-32433933#1_0" pos="55.50" length="7.91" friendlyPos="1"/>
-        <access lane="10425592#1_0" pos="1.87" length="19.20" friendlyPos="1"/>
-        <access lane="32433933#1_0" pos="1.45" length="10.91" friendlyPos="1"/>
-        <access lane="394007640#2_0" pos="8.59" length="17.14" friendlyPos="1"/>
+        <access lane="-10425592#1_0" pos="54.04" length="14.40" friendlyPos="1"/>
+        <access lane="-32433933#1_0" pos="57.64" length="7.91" friendlyPos="1"/>
+        <access lane="32433933#1_0" pos="1.50" length="10.91" friendlyPos="1"/>
+        <access lane="394007640#1_0" pos="3.20" length="18.08" friendlyPos="1"/>
+        <access lane="394007640#2_0" pos="8.93" length="17.14" friendlyPos="1"/>
     </busStop>
     <busStop id="54143012" name="Veltenhöfer Straße" lane="859066429#0_0" startPos="19.63" endPos="44.63" friendlyPos="true" lines="1">
-        <access lane="-32548182#1_0" pos="16.20" length="0.16" friendlyPos="1"/>
-        <access lane="32548182#1_0" pos="33.43" length="2.84" friendlyPos="1"/>
-        <access lane="388933682#1_0" pos="57.30" length="19.89" friendlyPos="1"/>
-        <access lane="388933682#3_0" pos="0.00" length="21.89" friendlyPos="1"/>
-        <access lane="4747816#1_0" pos="64.63" length="26.33" friendlyPos="1"/>
+        <access lane="-32548182#1_0" pos="13.81" length="0.16" friendlyPos="1"/>
+        <access lane="-4747816#1_0" pos="0.00" length="31.17" friendlyPos="1"/>
+        <access lane="32548182#1_0" pos="33.56" length="2.84" friendlyPos="1"/>
+        <access lane="388933682#1_0" pos="64.82" length="19.89" friendlyPos="1"/>
+        <access lane="4747816#1_0" pos="63.76" length="26.37" friendlyPos="1"/>
     </busStop>
     <busStop id="5672130288" name="Heideblick" lane="40020450#0_0" startPos="127.52" endPos="152.52" friendlyPos="true">
         <access lane="172186756#0_0" pos="0.00" length="25.10" friendlyPos="1"/>
@@ -80,5 +80,5 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <access lane="595002498#1_0" pos="0.00" length="23.57" friendlyPos="1"/>
     </busStop>
     <busStop id="91556880" name="Brandenburgstraße" lane="4747816#7_0" startPos="118.91" endPos="133.91" friendlyPos="true"/>
-    <busStop id="91556885" name="Veltenhöfer Straße" lane="4747816#1_0" startPos="46.62" endPos="61.62" friendlyPos="true"/>
+    <busStop id="91556885" name="Veltenhöfer Straße" lane="4747816#1_0" startPos="47.14" endPos="62.14" friendlyPos="true"/>
 </additional>
diff --git a/tests/netconvert/import/OSM/bugs/ticket8039/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket8039/errors.netconvert
@@ -32,18 +32,13 @@ Warning: Removing pt stop '250749715' on non existing edge ''.
 Warning: Removing pt stop '4103427181' on non existing edge ''.
 Warning: Removing pt stop '4539421794' on non existing edge ''.
 Warning: Removed 3 pt stops because they could not be assigned to the network
-Warning: Converting invalid rail_crossing to priority junction '1100375051'.
-Warning: Converting invalid rail_crossing to priority junction '1100375067'.
-Warning: Converting invalid rail_crossing to priority junction '1100375072'.
 Warning: Ambiguity in turnarounds computation at junction '344918064'.
 Warning: Ambiguity in turnarounds computation at junction '506075298'.
 Warning: Found sharp turn with radius 7.88 at the start of edge '-10426716#0'.
 Warning: Found sharp turn with radius 7.88 at the end of edge '10426716#0'.
 Warning: The rail crossing '1882498697' does not have any roads.
 Warning: The rail crossing '54142974' does not have any roads.
 Warning: The rail crossing 'cluster_2525484869_366041397' does not have any roads.
-Warning: The rail crossing 'cluster_3921110414_3921110415' does not have any roads.
-Warning: The rail crossing 'cluster_5672130262_5672130263' does not have any roads.
 Warning: 7 total messages of type: Cannot revise pt stop localization for pt line '%', which consist of one way only. Ignoring!
 Warning: 8 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 '%'.