Skip to content

Commit

Permalink
patching expected results refs #21, #12335
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 2, 2024
1 parent d05b99b commit ebdb52e
Show file tree
Hide file tree
Showing 156 changed files with 22,850 additions and 22,850 deletions.
264 changes: 132 additions & 132 deletions tests/complex/netconvert/osm_roundtrip/net.complex
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/netconvert/bugs/ticket850/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 2024-02-29 13:56:12 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
<!-- generated on 2024-04-02 14:11:40 by Eclipse SUMO netconvert Version v1_19_0+1620-8aaf8f08ffd
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 @@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<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="!"/>

<edge id="allows_now" from="1" to="2" priority="-1">
<lane id="allows_now_0" index="0" allow="rail_fast ship custom1 custom2" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/>
<lane id="allows_now_0" index="0" allow="rail_fast ship container cable_car subway aircraft wheelchair scooter drone custom1 custom2" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/>
</edge>

<junction id="1" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 0.00,-3.20"/>
Expand Down
1,012 changes: 506 additions & 506 deletions tests/netconvert/export/openDRIVE/adlershof_dlr/net.netconvert
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions tests/netconvert/export/openDRIVE/from_osm2/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 2024-02-29 13:56:08 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
<!-- generated on 2024-04-02 14:11:35 by Eclipse SUMO netconvert Version v1_19_0+1620-8aaf8f08ffd
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 @@ -38,23 +38,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later

<location netOffset="-353137.24,-3455639.81" convBoundary="0.00,0.00,1103.40,284.53" origBoundary="121.458063,31.225745,121.469606,31.228401" projParameter="+proj=utm +zone=51 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<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" priority="13" numLanes="2" speed="27.78" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" oneway="0"/>

<edge id=":-117529_0" function="internal">
<lane id=":-117529_0_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="0.44" shape="344.83,4.89 344.54,4.91"/>
<lane id=":-117529_0_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="0.44" shape="344.71,1.70 344.27,1.72"/>
<lane id=":-117529_0_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="0.44" shape="344.58,-1.50 344.00,-1.47"/>
<lane id=":-117529_0_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="0.44" shape="344.83,4.89 344.54,4.91"/>
<lane id=":-117529_0_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="0.44" shape="344.71,1.70 344.27,1.72"/>
<lane id=":-117529_0_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="0.44" shape="344.58,-1.50 344.00,-1.47"/>
</edge>

<edge id="-117527" from="-117529" to="-117533" priority="13" type="highway.trunk" spreadType="center" shape="344.49,1.71 276.76,7.44 187.06,16.03 129.56,20.63 0.00,24.72">
<lane id="-117527_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.54,4.91 277.05,10.62 187.34,19.22 129.74,23.83 0.10,27.92"/>
<lane id="-117527_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.27,1.72 276.76,7.44 187.06,16.03 129.56,20.63 -0.00,24.72"/>
<lane id="-117527_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.00,-1.47 276.47,4.25 186.78,12.84 129.39,17.44 -0.10,21.52"/>
<lane id="-117527_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="345.17" shape="344.54,4.91 277.05,10.62 187.34,19.22 129.74,23.83 0.10,27.92"/>
<lane id="-117527_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="345.17" shape="344.27,1.72 276.76,7.44 187.06,16.03 129.56,20.63 -0.00,24.72"/>
<lane id="-117527_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="345.17" shape="344.00,-1.47 276.47,4.25 186.78,12.84 129.39,17.44 -0.10,21.52"/>
</edge>
<edge id="-117528" from="-117534" to="-117529" priority="13" type="highway.trunk" spreadType="center" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.49,1.71">
<lane id="-117528_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1101.87,287.33 1053.49,260.96 677.51,84.84 620.81,57.25 570.15,37.20 512.63,19.54 456.20,8.02 387.29,3.20 344.83,4.89"/>
<lane id="-117528_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.71,1.70"/>
<lane id="-117528_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1104.93,281.72 1056.39,255.24 680.26,79.06 623.39,51.39 572.27,31.15 514.22,13.34 457.07,1.67 387.39,-3.20 344.58,-1.50"/>
<lane id="-117528_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="818.88" shape="1101.87,287.33 1053.49,260.96 677.51,84.84 620.81,57.25 570.15,37.20 512.63,19.54 456.20,8.02 387.29,3.20 344.83,4.89"/>
<lane id="-117528_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="818.88" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.71,1.70"/>
<lane id="-117528_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" speed="27.78" length="818.88" shape="1104.93,281.72 1056.39,255.24 680.26,79.06 623.39,51.39 572.27,31.15 514.22,13.34 457.07,1.67 387.39,-3.20 344.58,-1.50"/>
</edge>

<junction id="-117529" type="priority" x="344.49" y="1.71" incLanes="-117528_0 -117528_1 -117528_2" intLanes=":-117529_0_0 :-117529_0_1 :-117529_0_2" shape="344.90,6.49 344.52,-3.10 343.87,-3.06 344.68,6.51">
Expand Down
28 changes: 14 additions & 14 deletions tests/netconvert/function/ramps/subsequent_offramps/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 2024-03-31 18:26:46 by Eclipse SUMO netconvert Version v1_19_0+1593-2ec46704fe5
<!-- generated on 2024-04-02 14:11:37 by Eclipse SUMO netconvert Version v1_19_0+1620-8aaf8f08ffd
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,29 +44,29 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<location netOffset="-675165.20,2523391.64" convBoundary="0.00,0.00,440.92,636.33" origBoundary="-43.351298,-22.816776,-43.272598,-22.746621" projParameter="+proj=utm +zone=23 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<edge id="13254683" from="2933620868" to="122375446" priority="9" type="highway.motorway_link" spreadType="center" shape="363.75,424.14 376.36,326.43 372.31,311.59 367.09,297.01 349.31,271.59 329.51,253.17 235.94,192.69 209.64,180.27 176.37,172.16 146.20,169.93 112.82,177.90 87.10,187.85 58.77,203.68 29.92,224.22 0.00,242.36">
<lane id="13254683_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="563.91" shape="363.95,422.59 376.36,326.43 372.31,311.59 367.09,297.01 349.31,271.59 329.51,253.17 235.94,192.69 209.64,180.27 176.37,172.16 146.20,169.93 112.82,177.90 87.10,187.85 58.77,203.68 29.92,224.22 0.00,242.36"/>
<lane id="13254683_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="563.91" shape="363.95,422.59 376.36,326.43 372.31,311.59 367.09,297.01 349.31,271.59 329.51,253.17 235.94,192.69 209.64,180.27 176.37,172.16 146.20,169.93 112.82,177.90 87.10,187.85 58.77,203.68 29.92,224.22 0.00,242.36"/>
</edge>
<edge id="13259376" from="122413289" to="122415008" priority="9" type="highway.motorway_link" spreadType="center" shape="387.94,326.94 414.69,165.48 424.14,84.79 429.12,42.26 429.09,27.08 425.04,14.51 416.66,0.00">
<lane id="13259376_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="22.22" length="336.44" shape="388.19,325.42 414.69,165.48 424.14,84.79 429.12,42.26 429.09,27.08 425.04,14.51 416.66,0.00"/>
<lane id="13259376_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="336.44" shape="388.19,325.42 414.69,165.48 424.14,84.79 429.12,42.26 429.09,27.08 425.04,14.51 416.66,0.00"/>
</edge>
<edge id="69902841#1" from="837607525" to="69902841#1-AddedOffRampNode" priority="14" type="highway.motorway" spreadType="center">
<lane id="69902841#1_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="115.09" shape="326.12,636.00 348.79,527.26"/>
<lane id="69902841#1_1" index="1" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="115.09" shape="329.26,636.66 351.92,527.91"/>
<lane id="69902841#1_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="115.09" shape="326.12,636.00 348.79,527.26"/>
<lane id="69902841#1_1" index="1" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="115.09" shape="329.26,636.66 351.92,527.91"/>
</edge>
<edge id="69902841#1-AddedOffRampEdge" from="69902841#1-AddedOffRampNode" to="2933620868" priority="14" type="highway.motorway" spreadType="center" shape="348.04,523.01 368.45,425.12">
<lane id="69902841#1-AddedOffRampEdge_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="103.12" shape="344.16,518.12 363.43,425.67"/>
<lane id="69902841#1-AddedOffRampEdge_1" index="1" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="103.12" shape="347.29,518.77 366.56,426.32"/>
<lane id="69902841#1-AddedOffRampEdge_2" index="2" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="103.12" shape="350.42,519.42 369.69,426.97"/>
<lane id="69902841#1-AddedOffRampEdge_3" index="3" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="103.12" shape="353.56,520.08 372.83,427.63"/>
<lane id="69902841#1-AddedOffRampEdge_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="103.12" shape="344.16,518.12 363.43,425.67"/>
<lane id="69902841#1-AddedOffRampEdge_1" index="1" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="103.12" shape="347.29,518.77 366.56,426.32"/>
<lane id="69902841#1-AddedOffRampEdge_2" index="2" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="103.12" shape="350.42,519.42 369.69,426.97"/>
<lane id="69902841#1-AddedOffRampEdge_3" index="3" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="103.12" shape="353.56,520.08 372.83,427.63"/>
</edge>
<edge id="69902841#2" from="2933620868" to="122413289" priority="14" type="highway.motorway" spreadType="center" shape="370.02,425.43 391.07,327.61">
<lane id="69902841#2_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="101.43" shape="367.21,423.28 387.61,328.44"/>
<lane id="69902841#2_1" index="1" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="101.43" shape="370.33,423.95 390.74,329.12"/>
<lane id="69902841#2_2" index="2" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="101.43" shape="373.46,424.62 393.87,329.79"/>
<lane id="69902841#2_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="101.43" shape="367.21,423.28 387.61,328.44"/>
<lane id="69902841#2_1" index="1" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="101.43" shape="370.33,423.95 390.74,329.12"/>
<lane id="69902841#2_2" index="2" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="101.43" shape="373.46,424.62 393.87,329.79"/>
</edge>
<edge id="69902841#3" from="122413289" to="122280499" priority="14" type="highway.motorway" spreadType="center" shape="392.63,327.95 406.36,272.86 440.92,105.87">
<lane id="69902841#3_0" index="0" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="227.30" shape="391.45,326.06 404.80,272.50 439.35,105.55"/>
<lane id="69902841#3_1" index="1" disallow="pedestrian moped bicycle tram rail_urban rail rail_electric rail_fast ship" speed="39.44" length="227.30" shape="394.56,326.83 407.92,273.22 442.49,106.19"/>
<lane id="69902841#3_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="227.30" shape="391.45,326.06 404.80,272.50 439.35,105.55"/>
<lane id="69902841#3_1" index="1" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="39.44" length="227.30" shape="394.56,326.83 407.92,273.22 442.49,106.19"/>
</edge>

<junction id="122280499" type="dead_end" x="440.92" y="105.87" incLanes="69902841#3_0 69902841#3_1" intLanes="" shape="437.79,105.22 444.05,106.52"/>
Expand Down

0 comments on commit ebdb52e

Please sign in to comment.