Skip to content

Commit

Permalink
adapting tests #21 #13425
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Jun 15, 2023
1 parent 4cbf353 commit 0461bb7
Show file tree
Hide file tree
Showing 36 changed files with 2,359 additions and 2,411 deletions.
2 changes: 0 additions & 2 deletions tests/netconvert/bugs/ticket10777/errors.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Warning: Found angle of 141.12 degrees at edge '26184171', segment 0.
Warning: Found sharp turn with radius 7.03 at the start of edge '26184171'.
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'
590 changes: 277 additions & 313 deletions tests/netconvert/bugs/ticket10777/net.netconvert
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions tests/netconvert/bugs/ticket10777/output.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
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 (2ms).
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 (2ms).
Removing duplicate edges ... done.
Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (15ms).
Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (17ms).
Removed 6 traffic lights before loading plain-XML
Import done:
47 nodes loaded.
33 types loaded.
57 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 (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 (1ms).
Joined 3 junction cluster(s).
Removing empty nodes and geometry nodes ... done (0ms).
14 nodes removed.
Joining junction clusters ... done (0ms).
Joined 2 junction cluster(s).
Removing empty nodes and geometry nodes ... done (1ms).
13 nodes removed.
Moving network to origin ... done (0ms).
Computing turning directions ... done (0ms).
Assigning nodes to traffic lights ... done (0ms).
Expand All @@ -30,25 +30,25 @@ 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).
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 traffic light control information ... done (1ms).
Computing node logics ... done (0ms).
Computing traffic light logics ...
done (1ms).
2 traffic light(s) computed.
Building inner edges ... done (1ms).
Find accesses for pt rail stops ... done (0ms).
Find accesses for pt rail stops ... done (1ms).
-----------------------------------------------------
Summary:
Node type statistics:
Unregulated junctions : 0
Dead-end junctions : 15
Priority junctions : 6
Priority junctions : 7
Right-before-left junctions : 0
Traffic light junctions : 3
Traffic light junctions : 2
Network boundaries:
Original boundary : 10.54,52.25,10.54,52.26
Applied offset : -605011.17,-5790381.46
Expand Down
442 changes: 221 additions & 221 deletions tests/netconvert/export/openDRIVE/adlershof_dlr/foreign.netconvert
View file

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions tests/netconvert/export/openDRIVE/adlershof_dlr/net.netconvert
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions tests/netconvert/import/OSM/adlershof_dlr/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-05-09 15:52:28 by Eclipse SUMO netconvert Version v1_17_0+0192-02ed9c7dd44
<!-- generated on 2023-06-15 14:12:50 by Eclipse SUMO netconvert Version v1_17_0+0949-cba0d01c7a8
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
Expand Down Expand Up @@ -49,15 +49,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later

<location netOffset="-399345.66,-5809365.64" convBoundary="0.00,0.00,1737.68,767.39" origBoundary="13.364829,52.425528,13.574263,52.459607" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<type id="highway.cycleway" priority="1" numLanes="1" speed="5.56" allow="bicycle" oneway="0" width="1.00"/>
<type id="highway.cycleway" priority="1" numLanes="1" speed="5.56" allow="bicycle" oneway="0" width="2.00"/>
<type id="highway.footway" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.primary" priority="12" numLanes="2" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.residential" priority="3" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.service" priority="1" numLanes="1" speed="5.56" allow="pedestrian delivery bicycle" oneway="0"/>
<type id="highway.tertiary" priority="10" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>

<edge id="-22917251" from="32266936" to="32266938" name="Teltowkanalbrücke" priority="10" type="highway.tertiary">
<lane id="-22917251_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="58.42" shape="474.36,48.87 479.18,104.72"/>
<lane id="-22917251_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="58.42" shape="474.36,48.87 479.10,103.72"/>
</edge>
<edge id="-24214693#0" from="261599791" to="32266935" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" shape="33.97,176.57 202.12,155.05 478.98,121.02">
<lane id="-24214693#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="448.47" shape="33.51,171.79 201.52,150.29 471.02,117.17"/>
Expand All @@ -68,10 +68,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id="-24214693#1_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="19.32" shape="14.62,177.72 33.60,175.01"/>
</edge>
<edge id="-24214694" from="32266938" to="32266935" name="Wegedornstraße" priority="10" type="highway.tertiary">
<lane id="-24214694_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="13.87" shape="479.61,109.70 479.68,110.51"/>
<lane id="-24214694_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="13.87" shape="479.68,110.51 479.70,110.70"/>
</edge>
<edge id="-25951490" from="32266938" to="175648134" priority="1" type="highway.cycleway">
<lane id="-25951490_0" index="0" allow="bicycle" speed="5.56" length="466.10" width="1.00" shape="473.15,108.32 15.74,168.56"/>
<lane id="-25951490_0" index="0" allow="bicycle" speed="5.56" length="466.10" width="2.00" shape="473.17,108.82 15.81,169.06"/>
</edge>
<edge id="-26816413#0" from="294168710" to="56231597" priority="1" type="highway.service">
<lane id="-26816413#0_0" index="0" allow="pedestrian delivery bicycle" speed="5.56" length="65.21" shape="588.85,339.99 631.42,378.95"/>
Expand Down Expand Up @@ -276,7 +276,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id="20430080_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="497.45" shape="1.94,345.92 4.55,342.53 12.54,333.63 32.95,332.62 190.22,343.97 304.73,350.90 387.65,360.32 481.46,381.17"/>
</edge>
<edge id="22917251" from="32266938" to="32266936" name="Teltowkanalbrücke" priority="10" type="highway.tertiary">
<lane id="22917251_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="58.42" shape="475.99,104.99 471.17,49.14"/>
<lane id="22917251_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="58.42" shape="475.91,104.00 471.17,49.14"/>
</edge>
<edge id="24152812#0" from="36268421" to="261636677" name="Havestadtplatz" priority="3" type="highway.residential" spreadType="center" shape="1144.91,50.46 1148.46,112.43 1119.89,114.18">
<lane id="24152812#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="90.69" shape="1145.49,60.70 1148.46,112.43 1125.26,113.85"/>
Expand All @@ -293,7 +293,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id="24214693#1_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="19.32" shape="34.06,178.17 15.07,180.89"/>
</edge>
<edge id="24214694" from="32266935" to="32266938" name="Wegedornstraße" priority="10" type="highway.tertiary">
<lane id="24214694_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="13.87" shape="476.49,110.78 476.42,109.98"/>
<lane id="24214694_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="13.87" shape="476.51,110.98 476.49,110.78"/>
</edge>
<edge id="25944590#0" from="283018817" to="283018841" priority="1" type="highway.footway" spreadType="center" shape="613.50,547.70 551.31,539.77 529.63,536.13 520.23,532.83">
<lane id="25944590#0_0" index="0" allow="pedestrian" speed="2.78" length="94.64" width="2.00" shape="609.85,547.23 551.31,539.77 529.63,536.13 523.25,533.89"/>
Expand Down Expand Up @@ -326,7 +326,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id="25944605_0" index="0" allow="pedestrian" speed="2.78" length="38.43" width="2.00" shape="504.79,548.53 494.62,536.85 484.29,525.67"/>
</edge>
<edge id="25951490" from="175648134" to="32266938" priority="1" type="highway.cycleway">
<lane id="25951490_0" index="0" allow="bicycle" speed="5.56" length="466.10" width="1.00" shape="15.61,167.57 473.02,107.33"/>
<lane id="25951490_0" index="0" allow="bicycle" speed="5.56" length="466.10" width="2.00" shape="15.55,167.07 472.91,106.84"/>
</edge>
<edge id="26004787#0" from="283719736" to="283721344" priority="1" type="highway.footway" spreadType="center">
<lane id="26004787#0_0" index="0" allow="pedestrian" speed="2.78" length="35.21" width="2.00" shape="1047.36,522.62 1021.93,530.68"/>
Expand Down Expand Up @@ -656,7 +656,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<phase duration="10" state="r"/>
</tlLogic>

<junction id="175648134" type="priority" x="15.68" y="168.06" incLanes="-25951490_0" intLanes="" shape="15.68,168.06 15.81,169.06 15.68,168.06">
<junction id="175648134" type="priority" x="15.68" y="168.06" incLanes="-25951490_0" intLanes="" shape="15.68,168.06 15.94,170.05 15.68,168.06">
<request index="0" response="0" foes="0"/>
</junction>
<junction id="261599791" type="traffic_light" x="33.97" y="176.57" incLanes="24214693#0_0 24214693#0_1 -24214693#1_0 -24214693#1_1" intLanes="" shape="34.93,182.90 33.30,170.20 32.92,170.25 34.74,182.93">
Expand Down Expand Up @@ -883,7 +883,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<junction id="32266936" type="priority" x="472.77" y="49.00" incLanes="22917251_0" intLanes="" shape="472.77,49.00 469.58,49.28 472.77,49.00">
<request index="0" response="0" foes="0"/>
</junction>
<junction id="32266938" type="priority" x="477.79" y="107.21" incLanes="24214694_0 -22917251_0 25951490_0" intLanes="" shape="474.83,110.12 481.21,109.57 480.78,104.58 474.40,105.13 474.30,105.99 474.10,106.31 473.81,106.55 473.43,106.73 472.95,106.83 473.21,108.82 474.06,108.87 474.36,109.04 474.59,109.31 474.75,109.66">
<junction id="32266938" type="priority" x="477.79" y="107.21" incLanes="24214694_0 -22917251_0 25951490_0" intLanes="" shape="474.92,111.11 481.29,110.56 480.69,103.58 474.31,104.14 474.20,104.99 473.99,105.31 473.69,105.56 473.28,105.74 472.78,105.85 473.30,109.81 474.14,109.87 474.45,110.04 474.68,110.30 474.84,110.66">
<request index="0" response="0000000" foes="1001000"/>
<request index="1" response="0000000" foes="0111000"/>
<request index="2" response="0000000" foes="0100000"/>
Expand Down
10 changes: 5 additions & 5 deletions tests/netconvert/import/OSM/adlershof_dlr/plain_edges.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-06-22 08:14:27 by Eclipse SUMO netconvert Version v1_13_0+1094-d2dab2e946c
<!-- generated on 2023-06-15 14:12:50 by Eclipse SUMO netconvert Version v1_17_0+0949-cba0d01c7a8
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
Expand Down Expand Up @@ -50,7 +50,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<edge id="-24214693#0" from="261599791" to="32266935" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" shape="13.520154,52.426821 13.522632,52.426659 13.526713,52.426404" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-24214693#1" from="57343510" to="261599791" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-24214694" from="32266938" to="32266935" name="Wegedornstraße" priority="10" type="highway.tertiary" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-25951490" from="32266938" to="175648134" priority="1" type="highway.cycleway" numLanes="1" speed="5.56" width="1.00" allow="bicycle"/>
<edge id="-25951490" from="32266938" to="175648134" priority="1" type="highway.cycleway" numLanes="1" speed="5.56" width="2.00" allow="bicycle"/>
<edge id="-26816413#0" from="294168710" to="56231597" priority="1" type="highway.service" numLanes="1" speed="5.56" allow="pedestrian delivery bicycle"/>
<edge id="-26816413#1" from="294168098" to="294168710" priority="1" type="highway.service" numLanes="1" speed="5.56" allow="pedestrian delivery bicycle"/>
<edge id="-26816553" from="294168972" to="294168098" priority="1" type="highway.service" numLanes="1" speed="5.56" shape="13.530151,52.427391 13.530020,52.427475 13.529661,52.427706 13.528957,52.427350 13.528011,52.428054 13.527902,52.428135 13.527938,52.428223" allow="pedestrian delivery bicycle"/>
Expand Down Expand Up @@ -106,7 +106,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<edge id="-6137239#1" from="38919841" to="38919854" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-6137239#2" from="38919808" to="38919841" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.528423,52.430401 13.527250,52.430411 13.527061,52.430390 13.526923,52.430362" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-6137239#3" from="38919652" to="38919808" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-6137239#4" from="38919605" to="38919652" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.531044,52.430547 13.530872,52.430437 13.530726,52.430390 13.530580,52.430375 13.528606,52.430390" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-6137239#4" from="38919605" to="38919652" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.531043,52.430547 13.530872,52.430437 13.530726,52.430390 13.530580,52.430375 13.528606,52.430390" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-7216737#0" from="36268421" to="94487954" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" shape="13.536524,52.425891 13.541888,52.425601 13.543313,52.425528 13.543819,52.425528 13.544411,52.425559 13.544647,52.425591 13.544999,52.425643 13.545248,52.425722" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-7216737#1" from="261636678" to="36268421" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="-7216737#2" from="36268369" to="261636678" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" shape="13.529100,52.426299 13.531039,52.426132 13.533400,52.426001 13.535048,52.425928 13.536086,52.425910" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
Expand All @@ -133,7 +133,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<edge id="25944603#1" from="283018841" to="283018937" priority="1" type="highway.footway" numLanes="1" speed="2.78" spreadType="center" width="2.00" allow="pedestrian"/>
<edge id="25944603#2" from="283018937" to="38919841" priority="1" type="highway.footway" numLanes="1" speed="2.78" spreadType="center" width="2.00" allow="pedestrian"/>
<edge id="25944605" from="283018937" to="283018842" priority="1" type="highway.footway" numLanes="1" speed="2.78" shape="13.526990,52.430269 13.526818,52.430144 13.526621,52.430008" spreadType="center" width="2.00" allow="pedestrian"/>
<edge id="25951490" from="175648134" to="32266938" priority="1" type="highway.cycleway" numLanes="1" speed="5.56" width="1.00" allow="bicycle"/>
<edge id="25951490" from="175648134" to="32266938" priority="1" type="highway.cycleway" numLanes="1" speed="5.56" width="2.00" allow="bicycle"/>
<edge id="26004787#0" from="283719736" to="283721344" priority="1" type="highway.footway" numLanes="1" speed="2.78" spreadType="center" width="2.00" allow="pedestrian"/>
<edge id="26004787#1" from="283721344" to="283722837" priority="1" type="highway.footway" numLanes="1" speed="2.78" spreadType="center" width="2.00" allow="pedestrian"/>
<edge id="26004787#2" from="283722837" to="283719904" priority="1" type="highway.footway" numLanes="1" speed="2.78" spreadType="center" width="2.00" allow="pedestrian"/>
Expand Down Expand Up @@ -223,7 +223,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<edge id="6137239#1" from="38919854" to="38919841" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="6137239#2" from="38919841" to="38919808" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.526923,52.430362 13.527061,52.430390 13.527250,52.430411 13.528423,52.430401" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="6137239#3" from="38919808" to="38919652" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="6137239#4" from="38919652" to="38919605" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.528606,52.430390 13.530580,52.430375 13.530726,52.430390 13.530872,52.430437 13.531044,52.430547" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="6137239#4" from="38919652" to="38919605" name="Carl-Scheele-Straße" priority="3" type="highway.residential" numLanes="1" speed="13.89" shape="13.528606,52.430390 13.530580,52.430375 13.530726,52.430390 13.530872,52.430437 13.531043,52.430547" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="6137245" from="38919945" to="59993001" name="Wegedornstraße" priority="10" type="highway.tertiary" numLanes="1" speed="22.22" spreadType="center" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="7216737#0" from="94487954" to="36268421" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" shape="13.545248,52.425722 13.544999,52.425643 13.544647,52.425591 13.544411,52.425559 13.543819,52.425528 13.543313,52.425528 13.541888,52.425601 13.536524,52.425891" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
<edge id="7216737#1" from="36268421" to="261636678" name="Ernst-Ruska-Ufer" priority="12" type="highway.primary" numLanes="2" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship"/>
Expand Down

0 comments on commit 0461bb7

Please sign in to comment.