Skip to content

Commit

Permalink
restored missing netconvert tests refs #21, #14376
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 21, 2024
1 parent 5972741 commit ceae20d
Show file tree
Hide file tree
Showing 40 changed files with 1,761 additions and 986 deletions.
5 changes: 5 additions & 0 deletions tests/netconvert/bugs/testsuite.netconvert
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,8 @@ ticket13542b

# crash
ticket13581
ticket9874
ticket12676
ticket11737
ticket55
ticket9874b
444 changes: 421 additions & 23 deletions tests/netconvert/bugs/ticket11737/net.netconvert

Large diffs are not rendered by default.

184 changes: 74 additions & 110 deletions tests/netconvert/bugs/ticket12676/net.netconvert

Large diffs are not rendered by default.

Empty file.
320 changes: 320 additions & 0 deletions tests/netconvert/bugs/ticket55/net.netconvert

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions tests/netconvert/bugs/ticket55/output.netconvert
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Parsing nodes from 'input_nodes.nod.xml' ... done.
Parsing edges from 'input_edges.edg.xml' ... done.
Import done:
20 nodes loaded.
23 edges loaded.
Removing self-loops ... done (0ms).
Removing empty nodes ... done (0ms).
0 nodes removed.
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 (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 (1ms).
Computing approaching lanes ... done (0ms).
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 (0ms).
Computing traffic light logics ... done (0ms).
0 traffic light(s) computed.
Building inner edges ... done (0ms).
-----------------------------------------------------
Summary:
Node type statistics:
Unregulated junctions : 0
Dead-end junctions : 10
Priority junctions : 10
Right-before-left junctions : 0
Network boundaries:
Original boundary : 0.00,0.00,969.87,842.64
Applied offset : 0.00,0.00
Converted boundary : 0.00,0.00,969.87,842.64
-----------------------------------------------------
Writing network ... done (4ms).
Success.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ paths_around

# create walkingareas that usually should be avoided
paths_around_joinAnyway
3_arm_service_entering
1 change: 1 addition & 0 deletions tests/netconvert/import/OSM/bugs/testsuite.netconvert
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,4 @@ ticket13237

# foot=yes with sidewalk=no
ticket14124
ticket6503
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Warning: Discarding unknown compound 'cycleway.opposite' in type 'cycleway.opposite|highway.residential' (first occurrence for edge '155798952').
Warning: No way found for reference '28700329' in relation '8550012'
Warning: Ignoring restriction relation '8550012' with unknown to-way.
160 changes: 77 additions & 83 deletions tests/netconvert/import/OSM/bugs/ticket6503/net.netconvert

Large diffs are not rendered by default.

116 changes: 43 additions & 73 deletions tests/netconvert/import/OSM/crossings/net.netconvert

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/netconvert/import/OSM/testsuite.netconvert
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,5 @@ restrictionException_no
# example network from Zuerich
oerlikon
bugs
width_lane
crossings
34 changes: 1 addition & 33 deletions tests/netconvert/import/OSM/width_lane/net.netconvert
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-11-25 16:09:24 by Eclipse SUMO netconvert Version v1_15_0+0602-b38f846bfb8
<!-- generated on 2024-02-21 11:09:21 by Eclipse SUMO netconvert Version v1_19_0+0931-b4cf38940af
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 @@ -44,39 +44,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later

<location netOffset="-516616.82,-5043246.23" convBoundary="0.00,0.00,5.71,31.24" origBoundary="9.212851,45.542554,9.212925,45.542835" projParameter="+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<type id="highway.bridleway" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.bus_guideway" priority="1" numLanes="1" speed="27.78" allow="bus" oneway="1"/>
<type id="highway.cycleway" priority="1" numLanes="1" speed="5.56" allow="bicycle" oneway="0" width="1.00"/>
<type id="highway.footway" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.ford" priority="1" numLanes="1" speed="2.78" allow="army" oneway="0"/>
<type id="highway.living_street" priority="2" numLanes="1" speed="2.78" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.motorway" priority="14" numLanes="2" speed="39.44" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" oneway="1"/>
<type id="highway.motorway_link" priority="9" numLanes="1" speed="22.22" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" oneway="1"/>
<type id="highway.path" priority="1" numLanes="1" speed="5.56" allow="pedestrian bicycle" oneway="0" width="2.00"/>
<type id="highway.pedestrian" 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.primary_link" priority="7" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.raceway" priority="15" numLanes="2" speed="83.33" allow="vip" 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.secondary" priority="11" numLanes="1" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.secondary_link" priority="6" numLanes="1" speed="22.22" 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.stairs" priority="1" numLanes="1" speed="1.39" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.step" priority="1" numLanes="1" speed="1.39" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.steps" priority="1" numLanes="1" speed="1.39" allow="pedestrian" oneway="1" width="2.00"/>
<type id="highway.tertiary" priority="10" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.tertiary_link" priority="5" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.track" priority="1" numLanes="1" speed="5.56" allow="pedestrian motorcycle moped bicycle" oneway="0"/>
<type id="highway.trunk" priority="13" numLanes="2" speed="27.78" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.trunk_link" priority="8" numLanes="1" speed="22.22" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.unclassified" priority="4" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="highway.unsurfaced" priority="1" numLanes="1" speed="8.33" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
<type id="railway.highspeed" priority="21" numLanes="1" speed="69.44" allow="rail_fast" oneway="1"/>
<type id="railway.light_rail" priority="19" numLanes="1" speed="27.78" allow="rail_urban" oneway="1"/>
<type id="railway.preserved" priority="16" numLanes="1" speed="27.78" allow="rail" oneway="1"/>
<type id="railway.rail" priority="20" numLanes="1" speed="44.44" allow="rail" oneway="1"/>
<type id="railway.subway" priority="18" numLanes="1" speed="27.78" allow="rail_urban" oneway="1"/>
<type id="railway.tram" priority="17" numLanes="1" speed="13.89" allow="tram" oneway="1"/>

<edge id=":-137728_0" function="internal">
<lane id=":-137728_0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="3.63" length="4.75" width="3.50" shape="4.01,-0.53 5.20,-1.38 6.10,-1.48 6.72,-0.81 7.05,0.62"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Apr 16 12:45:36 2015 by SUMO netconvert Version dev-SVN-r18205ID
<!-- generated on 2024-02-21 11:09:13 by Eclipse SUMO netconvert Version v1_19_0+0931-b4cf38940af
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
http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="input_net.net.xml"/>
</input>
<output>
<write-license value="true"/>
<output-file value="net.net.xml"/>
</output>
<processing>
<no-turnarounds value="true"/>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<crossings.guess value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="true"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="0"/>
<junctions.limit-turn-speed value="-1.00"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<crossings.guess value="true"/>
<walkingareas value="0"/>
</pedestrian>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<net version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
<net version="1.16" walkingareas="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="0.00,0.00" convBoundary="0.00,0.00,19.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":gneJ1_0" function="internal">
<lane id=":gneJ1_0_0" index="0" speed="13.89" length="0.10" shape="9.00,-1.65 9.00,-1.65"/>
</edge>

<edge id="gneE0" from="gneJ0" to="gneJ1" priority="1">
<lane id="gneE0_0" index="0" speed="13.89" length="9.00" shape="0.00,-1.65 9.00,-1.65"/>
<lane id="gneE0_0" index="0" speed="13.89" length="9.00" shape="0.00,-1.60 9.00,-1.60"/>
</edge>
<edge id="gneE1" from="gneJ1" to="gneJ3" priority="1">
<lane id="gneE1_0" index="0" speed="13.89" length="10.00" shape="9.00,-1.65 19.00,-1.65"/>
<lane id="gneE1_0" index="0" speed="13.89" length="10.00" shape="9.00,-1.60 19.00,-1.60"/>
</edge>

<junction id="gneJ0" type="unregulated" x="0.00" y="0.00" incLanes="" intLanes="" shape="-0.00,-0.05 -0.00,-3.25"/>
<junction id="gneJ1" type="priority" x="9.00" y="0.00" incLanes="gneE0_0" intLanes=":gneJ1_0_0" shape="9.00,-0.05 9.00,-3.25 9.00,-0.05">
<request index="0" response="0" foes="0" cont="0"/>
<junction id="gneJ0" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 0.00,-3.20"/>
<junction id="gneJ1" type="priority" x="9.00" y="0.00" incLanes="gneE0_0" intLanes="" shape="9.00,0.00 9.00,-3.20 9.00,0.00">
<request index="0" response="0" foes="0"/>
</junction>
<junction id="gneJ3" type="unregulated" x="19.00" y="0.00" incLanes="gneE1_0" intLanes="" shape="19.00,-3.25 19.00,-0.05"/>

<connection from="gneE0" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="M"/>
<junction id="gneJ3" type="dead_end" x="19.00" y="0.00" incLanes="gneE1_0" intLanes="" shape="19.00,-3.20 19.00,0.00"/>

<connection from=":gneJ1_0" to="gneE1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="gneE0" to="gneE1" fromLane="0" toLane="0" dir="s" state="M"/>

</net>
1 change: 1 addition & 0 deletions tests/netconvert/import/SUMO/testsuite.netconvert
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,4 @@ endpoint-shape

# load bidi attribute from input network
bidi
no_internal_lanes_add_crossings
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 05/03/12 12:33:54 by SUMO netconvert Version dev-SVN-r12296
<!-- generated on 2024-02-21 11:09:01 by Eclipse SUMO netconvert Version v1_19_0+0931-b4cf38940af
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
http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
Expand All @@ -14,54 +19,53 @@ SPDX-License-Identifier: EPL-2.0
</input>
<output>
<write-license value="true"/>
<output-file value="net.net.xml"/>
</output>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<net version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
<net version="1.16" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="0.00,0.00" convBoundary="0.00,0.00,100.00,0.00" origBoundary="0.00,0.00,100.00,0.00" projParameter="!"/>
<location netOffset="0.00,1.60" convBoundary="0.00,0.00,100.00,1.60" origBoundary="0.00,0.00,100.00,0.00" projParameter="!"/>

<edge id=":1.50_0" function="internal">
<lane id=":1.50_0_0" index="0" speed="28.00" length="3.00" shape="48.50,-4.95 51.50,-5.00"/>
</edge>
<edge id=":1.50_1" function="internal">
<lane id=":1.50_1_0" index="0" speed="28.00" length="3.00" shape="48.50,-1.65 51.50,-1.70"/>
</edge>
<edge id=":1.50_2" function="internal">
<lane id=":1.50_2_0" index="0" speed="28.00" length="3.00" shape="48.50,1.65 51.50,1.60"/>
<lane id=":1.50_0_0" index="0" speed="28.00" length="8.00" shape="46.00,-3.20 54.00,-3.20"/>
<lane id=":1.50_0_1" index="1" speed="28.00" length="8.00" shape="46.00,0.00 54.00,0.00"/>
<lane id=":1.50_0_2" index="2" speed="28.00" length="8.00" shape="46.00,3.20 54.00,3.20"/>
</edge>

<edge id="1" from="0" to="1.50" priority="-1" spreadType="center">
<lane id="1_0" index="0" speed="28.00" length="48.50" shape="0.00,-4.95 48.50,-4.95"/>
<lane id="1_1" index="1" speed="28.00" length="48.50" shape="0.00,-1.65 48.50,-1.65"/>
<lane id="1_2" index="2" speed="28.00" length="48.50" shape="0.00,1.65 48.50,1.65"/>
<lane id="1_3" index="3" speed="28.00" length="48.50" shape="0.00,4.95 48.50,4.95"/>
<lane id="1_0" index="0" speed="28.00" length="46.00" shape="0.00,-3.20 46.00,-3.20"/>
<lane id="1_1" index="1" speed="28.00" length="46.00" shape="0.00,0.00 46.00,0.00"/>
<lane id="1_2" index="2" speed="28.00" length="46.00" shape="0.00,3.20 46.00,3.20"/>
<lane id="1_3" index="3" speed="28.00" length="46.00" shape="0.00,6.40 46.00,6.40"/>
</edge>
<edge id="1.50" from="1.50" to="1" priority="-1" spreadType="center" shape="50.00,-1.70 100.00,-1.70">
<lane id="1.50_0" index="0" speed="28.00" length="48.50" shape="51.50,-5.00 100.00,-5.00"/>
<lane id="1.50_1" index="1" speed="28.00" length="48.50" shape="51.50,-1.70 100.00,-1.70"/>
<lane id="1.50_2" index="2" speed="28.00" length="48.50" shape="51.50,1.60 100.00,1.60"/>
<edge id="1.50" from="1.50" to="1" priority="-1" spreadType="center" shape="50.00,0.00 100.00,0.00">
<lane id="1.50_0" index="0" speed="28.00" length="46.00" shape="54.00,-3.20 100.00,-3.20"/>
<lane id="1.50_1" index="1" speed="28.00" length="46.00" shape="54.00,0.00 100.00,0.00"/>
<lane id="1.50_2" index="2" speed="28.00" length="46.00" shape="54.00,3.20 100.00,3.20"/>
</edge>

<junction id="0" type="unregulated" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,6.55 -0.00,-6.55">
</junction>
<junction id="1" type="unregulated" x="100.00" y="0.00" incLanes="1.50_0 1.50_1 1.50_2" intLanes="" shape="100.00,-6.60 100.00,3.20">
</junction>
<junction id="1.50" type="priority" x="50.00" y="0.00" incLanes="1_0 1_1 1_2 1_3" intLanes=":1.50_0_0 :1.50_1_0 :1.50_2_0" shape="51.50,3.20 51.50,-6.60 48.50,-6.55 48.50,6.55">
<junction id="0" type="dead_end" x="0.00" y="1.60" incLanes="" intLanes="" shape="0.00,8.00 0.00,-4.80"/>
<junction id="1" type="dead_end" x="100.00" y="1.60" incLanes="1.50_0 1.50_1 1.50_2" intLanes="" shape="100.00,-4.80 100.00,4.80"/>
<junction id="1.50" type="priority" x="50.00" y="1.60" incLanes="1_0 1_1 1_2 1_3" intLanes=":1.50_0_0 :1.50_0_1 :1.50_0_2" shape="54.00,4.80 54.00,-4.80 46.00,-4.80 46.00,8.00 49.03,7.17 50.97,5.63 52.21,5.04">
<request index="0" response="000" foes="000" cont="0"/>
<request index="1" response="000" foes="000" cont="0"/>
<request index="2" response="000" foes="000" cont="0"/>
</junction>

<connection from="1" to="1.50" fromLane="0" toLane="0" via=":1.50_0_0" dir="s" state="M"/>
<connection from="1" to="1.50" fromLane="1" toLane="1" via=":1.50_1_0" dir="s" state="M"/>
<connection from="1" to="1.50" fromLane="2" toLane="2" via=":1.50_2_0" dir="s" state="M"/>
<connection from="1" to="1.50" fromLane="1" toLane="1" via=":1.50_0_1" dir="s" state="M"/>
<connection from="1" to="1.50" fromLane="2" toLane="2" via=":1.50_0_2" dir="s" state="M"/>

<connection from=":1.50_0" to="1.50" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":1.50_1" to="1.50" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":1.50_2" to="1.50" fromLane="0" toLane="2" dir="s" state="M"/>
<connection from=":1.50_0" to="1.50" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":1.50_0" to="1.50" fromLane="2" toLane="2" dir="s" state="M"/>

</net>

0 comments on commit ceae20d

Please sign in to comment.