From ceae20d2574c29d59d6c2627a1ceca7bddf53185 Mon Sep 17 00:00:00 2001 From: namdre Date: Wed, 21 Feb 2024 11:14:49 +0100 Subject: [PATCH] restored missing netconvert tests refs #21, #14376 --- tests/netconvert/bugs/testsuite.netconvert | 5 + .../bugs/ticket11737/net.netconvert | 444 +++++++++++++++++- .../bugs/ticket12676/net.netconvert | 184 +++----- .../bugs/ticket55/errors.netconvert | 0 tests/netconvert/bugs/ticket55/net.netconvert | 320 +++++++++++++ .../bugs/ticket55/output.netconvert | 41 ++ .../3_arm_service_entering/net.netconvert | 124 +++-- .../crossings/guessed/testsuite.netconvert | 1 + .../import/OSM/bugs/testsuite.netconvert | 1 + .../OSM/bugs/ticket6503/errors.netconvert | 1 - .../import/OSM/bugs/ticket6503/net.netconvert | 160 +++---- .../import/OSM/crossings/net.netconvert | 116 ++--- .../import/OSM/testsuite.netconvert | 2 + .../import/OSM/width_lane/net.netconvert | 34 +- .../net.netconvert | 50 +- .../import/SUMO/testsuite.netconvert | 1 + .../four_minus_left/net.netconvert | 60 +-- .../net.netconvert | 76 +-- .../four_minus_right/net.netconvert | 60 +-- .../net.netconvert | 76 +-- .../four_minus_two_left/net.netconvert | 50 +- .../four_minus_two_right/net.netconvert | 50 +- .../three_minus_left/net.netconvert | 48 +- .../net.netconvert | 54 ++- .../three_minus_right/net.netconvert | 48 +- .../net.netconvert | 54 ++- .../three_minus_two_left/net.netconvert | 38 +- .../three_minus_two_right/net.netconvert | 38 +- .../two_minus_left/net.netconvert | 36 +- .../two_minus_right/net.netconvert | 36 +- .../two_plus_left/net.netconvert | 56 ++- .../two_plus_left_plus_right/net.netconvert | 92 ++-- .../two_plus_left_right/net.netconvert | 62 +-- .../two_plus_right/net.netconvert | 56 ++- .../two_plus_right_plus_left/net.netconvert | 92 ++-- .../two_plus_two_left/net.netconvert | 66 +-- .../two_plus_two_right/net.netconvert | 66 +-- .../XML/lane_expansion/testsuite.netconvert | 1 + .../node_shape/on_ramp/net.netconvert | 47 +- .../node_shape/testsuite.netconvert | 1 + 40 files changed, 1761 insertions(+), 986 deletions(-) create mode 100644 tests/netconvert/bugs/ticket55/errors.netconvert create mode 100644 tests/netconvert/bugs/ticket55/net.netconvert create mode 100644 tests/netconvert/bugs/ticket55/output.netconvert diff --git a/tests/netconvert/bugs/testsuite.netconvert b/tests/netconvert/bugs/testsuite.netconvert index 37e96afe5c0..715cca51cf0 100644 --- a/tests/netconvert/bugs/testsuite.netconvert +++ b/tests/netconvert/bugs/testsuite.netconvert @@ -195,3 +195,8 @@ ticket13542b # crash ticket13581 +ticket9874 +ticket12676 +ticket11737 +ticket55 +ticket9874b diff --git a/tests/netconvert/bugs/ticket11737/net.netconvert b/tests/netconvert/bugs/ticket11737/net.netconvert index cc5c9b96486..239eecc3265 100644 --- a/tests/netconvert/bugs/ticket11737/net.netconvert +++ b/tests/netconvert/bugs/ticket11737/net.netconvert @@ -1,6 +1,6 @@ - - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/bugs/ticket12676/net.netconvert b/tests/netconvert/bugs/ticket12676/net.netconvert index 21a0983a7d8..c9213d21286 100644 --- a/tests/netconvert/bugs/ticket12676/net.netconvert +++ b/tests/netconvert/bugs/ticket12676/net.netconvert @@ -1,6 +1,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/bugs/ticket55/output.netconvert b/tests/netconvert/bugs/ticket55/output.netconvert new file mode 100644 index 00000000000..c7b5005a0cc --- /dev/null +++ b/tests/netconvert/bugs/ticket55/output.netconvert @@ -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. diff --git a/tests/netconvert/function/crossings/guessed/3_arm_service_entering/net.netconvert b/tests/netconvert/function/crossings/guessed/3_arm_service_entering/net.netconvert index cc46bd4011b..2095bc8d904 100644 --- a/tests/netconvert/function/crossings/guessed/3_arm_service_entering/net.netconvert +++ b/tests/netconvert/function/crossings/guessed/3_arm_service_entering/net.netconvert @@ -1,11 +1,16 @@ - - + - + - + - + - + - - - - + - + - + - - - - + - + - + - + - + - + - - + + - + - - + + - - + + - + - - + + - - - - - - - + + + + + - - - - - - - - - + + + + + + + + - - - + + + - - + - + - - - - - - + + + + + - - diff --git a/tests/netconvert/function/crossings/guessed/testsuite.netconvert b/tests/netconvert/function/crossings/guessed/testsuite.netconvert index f470836a9ce..78151d60fad 100644 --- a/tests/netconvert/function/crossings/guessed/testsuite.netconvert +++ b/tests/netconvert/function/crossings/guessed/testsuite.netconvert @@ -73,3 +73,4 @@ paths_around # create walkingareas that usually should be avoided paths_around_joinAnyway +3_arm_service_entering diff --git a/tests/netconvert/import/OSM/bugs/testsuite.netconvert b/tests/netconvert/import/OSM/bugs/testsuite.netconvert index 3c02b5c9c9a..da20374bffc 100644 --- a/tests/netconvert/import/OSM/bugs/testsuite.netconvert +++ b/tests/netconvert/import/OSM/bugs/testsuite.netconvert @@ -108,3 +108,4 @@ ticket13237 # foot=yes with sidewalk=no ticket14124 +ticket6503 diff --git a/tests/netconvert/import/OSM/bugs/ticket6503/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket6503/errors.netconvert index 8179c2a35b2..221369e3af8 100644 --- a/tests/netconvert/import/OSM/bugs/ticket6503/errors.netconvert +++ b/tests/netconvert/import/OSM/bugs/ticket6503/errors.netconvert @@ -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. diff --git a/tests/netconvert/import/OSM/bugs/ticket6503/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket6503/net.netconvert index 0e915850f20..fb8bc8288f2 100644 --- a/tests/netconvert/import/OSM/bugs/ticket6503/net.netconvert +++ b/tests/netconvert/import/OSM/bugs/ticket6503/net.netconvert @@ -1,11 +1,16 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + + + + - + @@ -109,16 +86,19 @@ SPDX-License-Identifier: EPL-2.0 - + - + - + - - + + + + + @@ -127,16 +107,22 @@ SPDX-License-Identifier: EPL-2.0 - + - + + + + + + + - + @@ -151,7 +137,7 @@ SPDX-License-Identifier: EPL-2.0 - + @@ -167,37 +153,37 @@ SPDX-License-Identifier: EPL-2.0 - - + + - - - - - + + + + + + + - - - - - - + + + + - - - - - + + + + + - - + + @@ -210,14 +196,18 @@ SPDX-License-Identifier: EPL-2.0 - - + + + + + + - - + + - + @@ -228,25 +218,29 @@ SPDX-License-Identifier: EPL-2.0 - + - - - + + + + - - - + + + + - - + + + + diff --git a/tests/netconvert/import/OSM/crossings/net.netconvert b/tests/netconvert/import/OSM/crossings/net.netconvert index 8fcfcc6e3e9..07f7964cb3a 100644 --- a/tests/netconvert/import/OSM/crossings/net.netconvert +++ b/tests/netconvert/import/OSM/crossings/net.netconvert @@ -1,6 +1,6 @@ - - + - - - - - + - + - - - + + + - - - + - + diff --git a/tests/netconvert/import/SUMO/testsuite.netconvert b/tests/netconvert/import/SUMO/testsuite.netconvert index e07ee0a2a6c..6509ee5a99e 100644 --- a/tests/netconvert/import/SUMO/testsuite.netconvert +++ b/tests/netconvert/import/SUMO/testsuite.netconvert @@ -133,3 +133,4 @@ endpoint-shape # load bidi attribute from input network bidi +no_internal_lanes_add_crossings diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left/net.netconvert index 938b7e54b9a..3e881319809 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + - - + + - - + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left_minus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left_minus_right/net.netconvert index 5d9bef087c5..0cde971c01e 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left_minus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_left_minus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - + + - - - - + + + + - - - - + + + + - - + + - - - - - + + + - + - - + + - + - - + + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right/net.netconvert index 690121345f3..38cefb0bf93 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + - - + + - - + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right_minus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right_minus_left/net.netconvert index fc0e6ce0294..89d58075776 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right_minus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_right_minus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - + + - - - - + + + + - - - - + + + + - - + + - - - - - + + + - + - - + + - + - - + + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_left/net.netconvert index 0eded7ec3ce..8ce7ccd424e 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - - - - + + + + - - - + + + - - - - - + + + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_right/net.netconvert index 09538197675..9c443cc7f9b 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/four_minus_two_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - - - - + + + + - - - + + + - - - - - + + + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left/net.netconvert index 160142c1dd9..50a317494d8 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - - - + + + - - - + + + - - - - - + + + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left_minus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left_minus_right/net.netconvert index 9bec37777b3..e579b9b3f11 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left_minus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_left_minus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - + - - - + + + - - - + + + - + - - - - - + + + - + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right/net.netconvert index 7cef8c95955..0f5499b0f23 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - - - + + + - - - + + + - - - - - + + + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right_minus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right_minus_left/net.netconvert index b26f58ae7d2..a1be622e491 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right_minus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_right_minus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - + + - + - - - + + + - - - + + + - + - - - - - + + + - + - + - + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_left/net.netconvert index f3d5a16193e..2a540abbf48 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - + - - - + + + - - + + - - - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_right/net.netconvert index 1ec6af377f6..ab9d91df178 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/three_minus_two_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - + - - - + + + - - + + - - - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_left/net.netconvert index ffc3e02aa50..510aad09409 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - + - - + + - - + + - - - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_right/net.netconvert index f715653c144..5b1df3ee66b 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_minus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - + - - + + - - + + - - - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left/net.netconvert index 99885324689..820672bb1bd 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - + + + - - - + + + - - - - - + + + - - + + - - + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_plus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_plus_right/net.netconvert index 613926ae03b..fe733ec6a46 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_plus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_plus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - - - - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - - + + + - + @@ -79,19 +77,19 @@ SPDX-License-Identifier: EPL-2.0 - - + + - - - + + + - - + + - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_right/net.netconvert index a84b919eb53..bd8d1e635d8 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_left_right/net.netconvert @@ -1,11 +1,16 @@ - - + - - - - - - - - - - + + + + - - + + - - - - + + + + - - - - - + + + @@ -60,13 +62,13 @@ SPDX-License-Identifier: EPL-2.0 - - - + + + - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right/net.netconvert index 22448acaa01..e20ebba4f99 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - + + + - - - + + + - - - - - + + + - - + + - - + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right_plus_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right_plus_left/net.netconvert index 4f7593dfad9..151f0b97067 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right_plus_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_right_plus_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - + + + - - - - - - - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - - + + + - + @@ -79,19 +77,19 @@ SPDX-License-Identifier: EPL-2.0 - - + + - - - + + + - - + + - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_left/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_left/net.netconvert index 48fc1186197..7f0d1940987 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_left/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_left/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + @@ -60,13 +62,13 @@ SPDX-License-Identifier: EPL-2.0 - - - + + + - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_right/net.netconvert b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_right/net.netconvert index 8f09d687fe9..57eef10e9db 100644 --- a/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_right/net.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/center_spread/two_plus_two_right/net.netconvert @@ -1,11 +1,16 @@ - - + - + - - - - - - - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + @@ -60,13 +62,13 @@ SPDX-License-Identifier: EPL-2.0 - - - + + + - - - + + + diff --git a/tests/netconvert/import/XML/lane_expansion/testsuite.netconvert b/tests/netconvert/import/XML/lane_expansion/testsuite.netconvert index 8b4c739933e..8da6c8a24ba 100644 --- a/tests/netconvert/import/XML/lane_expansion/testsuite.netconvert +++ b/tests/netconvert/import/XML/lane_expansion/testsuite.netconvert @@ -5,3 +5,4 @@ right_spread preserve_geometry deprecated errors +center_spread diff --git a/tests/netconvert/node_building/node_shape/on_ramp/net.netconvert b/tests/netconvert/node_building/node_shape/on_ramp/net.netconvert index 57d6b355f36..5bd271378f3 100644 --- a/tests/netconvert/node_building/node_shape/on_ramp/net.netconvert +++ b/tests/netconvert/node_building/node_shape/on_ramp/net.netconvert @@ -1,11 +1,16 @@ - - + - - + + - + - - - + + + - - + + - - - + + + - + - + diff --git a/tests/netconvert/node_building/node_shape/testsuite.netconvert b/tests/netconvert/node_building/node_shape/testsuite.netconvert index 5f80a8a9b5b..7bc4d338ff3 100644 --- a/tests/netconvert/node_building/node_shape/testsuite.netconvert +++ b/tests/netconvert/node_building/node_shape/testsuite.netconvert @@ -42,3 +42,4 @@ minimal-shape # build junctions based on (custom) edge endpoints endpoint-shape +on_ramp