Skip to content

Commit

Permalink
patching expected results refs #21, #14512
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 15, 2024
1 parent 008f6de commit eab0d46
Show file tree
Hide file tree
Showing 7 changed files with 620 additions and 620 deletions.
288 changes: 144 additions & 144 deletions tests/netconvert/import/OSM/railway/S42/net.netconvert
View file

Large diffs are not rendered by default.

632 changes: 316 additions & 316 deletions tests/netconvert/import/OSM/railway/S42_all_signals/net.netconvert
View file

Large diffs are not rendered by default.

288 changes: 144 additions & 144 deletions tests/netconvert/import/OSM/railway/S42_custom_signals/net.netconvert
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/netconvert/import/OSM/railway/inconsistent_directions/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-15 11:03:47 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
<!-- generated on 2024-03-15 11:53:49 by Eclipse SUMO netconvert Version v1_19_0+1309-44a02eea0cc
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 @@ -333,7 +333,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<connection from="-231224788" to="-231224790#1" fromLane="0" toLane="0" via=":2396316667_1_0" dir="s" state="M"/>
<connection from="-231224789" to="-304099841" fromLane="0" toLane="0" via=":1871829683_1_0" dir="s" state="M"/>
<connection from="-231224790#0" to="-231224789" fromLane="0" toLane="0" via=":1921502460_1_0" dir="s" state="M"/>
<connection from="-231224790#1" to="-231224790#0" fromLane="0" toLane="0" via=":5221601527_1_0" tl="5221601527" linkIndex="1" dir="s" state="O"/>
<connection from="-231224790#1" to="-231224790#0" fromLane="0" toLane="0" via=":5221601527_1_0" dir="s" state="M"/>
<connection from="-231225970" to="231225970" fromLane="0" toLane="0" speed="0.10" via=":4087943590_0_0" dir="t" state="M"/>
<connection from="-26806067" to="-26806068" fromLane="0" toLane="0" via=":294061704_0_0" dir="s" state="M"/>
<connection from="-26806068" to="-142541378" fromLane="0" toLane="0" via=":294061705_0_0" dir="s" state="M"/>
Expand Down
12 changes: 6 additions & 6 deletions tests/netconvert/import/OSM/railway/inconsistent_directions2/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-15 11:03:47 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
<!-- generated on 2024-03-15 11:44:09 by Eclipse SUMO netconvert Version v1_19_0+1309-44a02eea0cc
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 @@ -430,12 +430,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<connection from="-28983423" to="-28983946" fromLane="0" toLane="0" via=":318701322_0_0" dir="s" state="M"/>
<connection from="-28983424#0" to="-28983423" fromLane="0" toLane="0" via=":318701321_0_0" dir="s" state="M"/>
<connection from="-28983424#1" to="-28983424#0" fromLane="0" toLane="0" via=":2705527811_0_0" tl="2705527811" linkIndex="0" dir="s" state="O"/>
<connection from="-28983424#2" to="-28983424#1" fromLane="0" toLane="0" via=":2705527816_0_0" tl="2705527816" linkIndex="0" dir="s" state="O"/>
<connection from="-28983424#2" to="-28983424#1" fromLane="0" toLane="0" via=":2705527816_0_0" dir="s" state="M"/>
<connection from="-28983945" to="-28983419" fromLane="0" toLane="0" via=":318708196_0_0" dir="s" state="M"/>
<connection from="-28983946" to="-28983945" fromLane="0" toLane="0" via=":318701323_0_0" dir="s" state="M"/>
<connection from="-28983947" to="28983419" fromLane="0" toLane="0" via=":318708198_1_0" dir="s" state="M"/>
<connection from="-28984028#0" to="-32501483" fromLane="0" toLane="0" via=":313443820_1_0" dir="s" state="M"/>
<connection from="-28984028#1" to="-28984028#0" fromLane="0" toLane="0" via=":1727196818_1_0" tl="1727196818" linkIndex="1" dir="s" state="O"/>
<connection from="-28984028#1" to="-28984028#0" fromLane="0" toLane="0" via=":1727196818_1_0" tl="1727196818" linkIndex="0" dir="s" state="O"/>
<connection from="-28984029" to="4863604" fromLane="0" toLane="0" via=":318700411_1_0" dir="s" state="M"/>
<connection from="-32501482" to="-28983947" fromLane="0" toLane="0" via=":30232712_1_0" dir="s" state="M"/>
<connection from="-32501483" to="-686680743" fromLane="0" toLane="0" via=":6153143049_1_0" dir="s" state="M"/>
Expand All @@ -451,13 +451,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<connection from="28983421" to="28983422" fromLane="0" toLane="0" via=":318701318_1_0" dir="s" state="M"/>
<connection from="28983422" to="-4777580" fromLane="0" toLane="0" via=":318701316_1_0" dir="s" state="M"/>
<connection from="28983423" to="28983424#0" fromLane="0" toLane="0" via=":318701321_1_0" dir="s" state="M"/>
<connection from="28983424#0" to="28983424#1" fromLane="0" toLane="0" via=":2705527811_1_0" tl="2705527811" linkIndex="1" dir="s" state="O"/>
<connection from="28983424#1" to="28983424#2" fromLane="0" toLane="0" via=":2705527816_1_0" tl="2705527816" linkIndex="1" dir="s" state="O"/>
<connection from="28983424#0" to="28983424#1" fromLane="0" toLane="0" via=":2705527811_1_0" dir="s" state="M"/>
<connection from="28983424#1" to="28983424#2" fromLane="0" toLane="0" via=":2705527816_1_0" tl="2705527816" linkIndex="0" dir="s" state="O"/>
<connection from="28983424#2" to="28983421" fromLane="0" toLane="0" via=":318701319_1_0" dir="s" state="M"/>
<connection from="28983945" to="28983946" fromLane="0" toLane="0" via=":318701323_1_0" dir="s" state="M"/>
<connection from="28983946" to="28983423" fromLane="0" toLane="0" via=":318701322_1_0" dir="s" state="M"/>
<connection from="28983947" to="32501482" fromLane="0" toLane="0" via=":30232712_0_0" dir="s" state="M"/>
<connection from="28984028#0" to="28984028#1" fromLane="0" toLane="0" via=":1727196818_0_0" tl="1727196818" linkIndex="0" dir="s" state="O"/>
<connection from="28984028#0" to="28984028#1" fromLane="0" toLane="0" via=":1727196818_0_0" dir="s" state="M"/>
<connection from="28984028#1" to="-28984028#1" fromLane="0" toLane="0" speed="0.10" via=":2514016658_0_0" dir="t" state="M"/>
<connection from="28984029" to="4906398" fromLane="0" toLane="0" via=":27318382_0_0" dir="s" state="M"/>
<connection from="32501482" to="686680743" fromLane="0" toLane="0" via=":318703758_0_0" dir="s" state="M"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/netconvert/import/OSM/railway/rail_highspeed/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-15 11:03:47 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
<!-- generated on 2024-03-15 11:44:09 by Eclipse SUMO netconvert Version v1_19_0+1309-44a02eea0cc
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 @@ -155,13 +155,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</junction>

<connection from="-254196868#0" to="254196868#0" fromLane="0" toLane="0" speed="0.10" via=":2599996809_0_0" dir="t" state="M"/>
<connection from="-254196868#1" to="-254196868#0" fromLane="0" toLane="0" via=":3674101754_1_0" tl="3674101754" linkIndex="1" dir="s" state="O"/>
<connection from="-254196868#1" to="-254196868#0" fromLane="0" toLane="0" via=":3674101754_1_0" tl="3674101754" linkIndex="0" dir="s" state="O"/>
<connection from="-482129448#0" to="-254196868#1" fromLane="0" toLane="0" via=":387766209_1_0" dir="s" state="M"/>
<connection from="-482129448#1" to="-482129448#0" fromLane="0" toLane="0" via=":670470893_2_0" dir="s" state="M"/>
<connection from="254196862#0" to="254196862#1" fromLane="0" toLane="0" via=":670470857_0_0" dir="s" state="M"/>
<connection from="254196862#0" to="52893619" fromLane="0" toLane="0" via=":670470857_1_0" dir="s" state="M"/>
<connection from="254196862#1" to="254196862#2" fromLane="0" toLane="0" via=":3674101751_0_0" tl="3674101751" linkIndex="0" dir="s" state="O"/>
<connection from="254196868#0" to="254196868#1" fromLane="0" toLane="0" via=":3674101754_0_0" tl="3674101754" linkIndex="0" dir="s" state="O"/>
<connection from="254196868#0" to="254196868#1" fromLane="0" toLane="0" via=":3674101754_0_0" dir="s" state="M"/>
<connection from="254196868#1" to="482129448#0" fromLane="0" toLane="0" via=":387766209_0_0" dir="s" state="M"/>
<connection from="482129448#0" to="482129448#1" fromLane="0" toLane="0" via=":670470893_0_0" dir="s" state="M"/>
<connection from="482129448#1" to="-482129448#1" fromLane="0" toLane="0" speed="0.10" via=":672294435_0_0" dir="t" state="M"/>
Expand Down
10 changes: 5 additions & 5 deletions tests/netconvert/import/OSM/railway/railway_usage/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-15 11:03:47 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
<!-- generated on 2024-03-15 11:44:09 by Eclipse SUMO netconvert Version v1_19_0+1309-44a02eea0cc
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 @@ -297,9 +297,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</junction>

<connection from="-294730183#0" to="294730183#0" fromLane="0" toLane="0" speed="0.10" via=":293605248_2_0" dir="t" state="M"/>
<connection from="-294730183#1" to="-294730183#0" fromLane="0" toLane="0" via=":4395826730_1_0" tl="4395826730" linkIndex="1" dir="s" state="O"/>
<connection from="-294730183#1" to="-294730183#0" fromLane="0" toLane="0" via=":4395826730_1_0" tl="4395826730" linkIndex="0" dir="s" state="O"/>
<connection from="-78766917#0" to="33142249" fromLane="0" toLane="0" keepClear="0" via=":374388207_1_0" dir="s" state="M"/>
<connection from="-78766917#1" to="-78766917#0" fromLane="0" toLane="0" via=":4395826741_1_0" tl="4395826741" linkIndex="1" dir="s" state="O"/>
<connection from="-78766917#1" to="-78766917#0" fromLane="0" toLane="0" via=":4395826741_1_0" tl="4395826741" linkIndex="0" dir="s" state="O"/>
<connection from="121902849" to="22955562" fromLane="0" toLane="0" via=":42145788_0_0" dir="s" state="M"/>
<connection from="121902853#0" to="121902854" fromLane="0" toLane="0" via=":1363480439_0_0" dir="s" state="M"/>
<connection from="121902853#0" to="121902853#1" fromLane="0" toLane="0" via=":1363480439_1_0" dir="s" state="M"/>
Expand All @@ -309,7 +309,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<connection from="26609053" to="294730187" fromLane="0" toLane="0" via=":292133755_0_0" dir="s" state="M"/>
<connection from="26927036" to="294730182" fromLane="0" toLane="0" via=":293604102_1_0" dir="s" state="M"/>
<connection from="294730182" to="154203996" fromLane="0" toLane="0" via=":293605247_0_0" dir="r" state="M"/>
<connection from="294730183#0" to="294730183#1" fromLane="0" toLane="0" via=":4395826730_0_0" tl="4395826730" linkIndex="0" dir="s" state="O"/>
<connection from="294730183#0" to="294730183#1" fromLane="0" toLane="0" via=":4395826730_0_0" dir="s" state="M"/>
<connection from="294730183#1" to="-294730183#1" fromLane="0" toLane="0" speed="0.10" via=":428760212_0_0" dir="t" state="M"/>
<connection from="294730185" to="23369316" fromLane="0" toLane="0" via=":253036059_0_0" dir="s" state="M"/>
<connection from="294730187" to="294730182" fromLane="0" toLane="0" via=":293604102_0_0" dir="s" state="M"/>
Expand All @@ -319,7 +319,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<connection from="347977090" to="294730187" fromLane="0" toLane="0" via=":292133755_1_0" dir="s" state="M"/>
<connection from="441886700" to="441888109" fromLane="0" toLane="0" via=":293605248_1_0" dir="s" state="M"/>
<connection from="441888109" to="294730188" fromLane="0" toLane="0" via=":4395839471_0_0" dir="s" state="M"/>
<connection from="78766917#0" to="78766917#1" fromLane="0" toLane="0" via=":4395826741_0_0" tl="4395826741" linkIndex="0" dir="s" state="O"/>
<connection from="78766917#0" to="78766917#1" fromLane="0" toLane="0" via=":4395826741_0_0" dir="s" state="M"/>
<connection from="78766917#1" to="-78766917#1" fromLane="0" toLane="0" speed="0.10" via=":42132938_0_0" dir="t" state="M"/>
<connection from="8602141" to="121902849" fromLane="0" toLane="0" via=":1363480437_0_0" dir="s" state="M"/>

Expand Down

0 comments on commit eab0d46

Please sign in to comment.