diff --git a/tests/netconvert/bugs/0xxx/ticket727/plain_cfg.netconvert b/tests/netconvert/bugs/0xxx/ticket727/plain_cfg.netconvert index 0ac72905c9ca..51ee645a69c5 100644 --- a/tests/netconvert/bugs/0xxx/ticket727/plain_cfg.netconvert +++ b/tests/netconvert/bugs/0xxx/ticket727/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -30,4 +30,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/bugs/0xxx/ticket731/plain_cfg.netconvert b/tests/netconvert/bugs/0xxx/ticket731/plain_cfg.netconvert index 537b495d4cb1..fa5d7af03966 100644 --- a/tests/netconvert/bugs/0xxx/ticket731/plain_cfg.netconvert +++ b/tests/netconvert/bugs/0xxx/ticket731/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -34,4 +34,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/bugs/0xxx/ticket731b/plain_cfg.netconvert b/tests/netconvert/bugs/0xxx/ticket731b/plain_cfg.netconvert index 2b4f0678e82d..51ee645a69c5 100644 --- a/tests/netconvert/bugs/0xxx/ticket731b/plain_cfg.netconvert +++ b/tests/netconvert/bugs/0xxx/ticket731b/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -30,4 +30,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/bugs/0xxx/ticket731c/plain_cfg.netconvert b/tests/netconvert/bugs/0xxx/ticket731c/plain_cfg.netconvert index 537b495d4cb1..fa5d7af03966 100644 --- a/tests/netconvert/bugs/0xxx/ticket731c/plain_cfg.netconvert +++ b/tests/netconvert/bugs/0xxx/ticket731c/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -34,4 +34,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/bugs/10xxx/ticket12086/plain_cfg.netconvert b/tests/netconvert/bugs/10xxx/ticket12086/plain_cfg.netconvert index 722ddb32373b..dc1b2b13cf9f 100644 --- a/tests/netconvert/bugs/10xxx/ticket12086/plain_cfg.netconvert +++ b/tests/netconvert/bugs/10xxx/ticket12086/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,21 +22,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -44,8 +33,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/function/crossings/guessed/2_arm/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/2_arm/plain_cfg.netconvert index c395c562341d..ea97138c3167 100644 --- a/tests/netconvert/function/crossings/guessed/2_arm/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/2_arm/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/2_arm_oneway_EW/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/2_arm_oneway_EW/plain_cfg.netconvert index c395c562341d..b191dc55b76a 100644 --- a/tests/netconvert/function/crossings/guessed/2_arm_oneway_EW/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/2_arm_oneway_EW/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/2_arm_oneway_WE/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/2_arm_oneway_WE/plain_cfg.netconvert index c395c562341d..b191dc55b76a 100644 --- a/tests/netconvert/function/crossings/guessed/2_arm_oneway_WE/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/2_arm_oneway_WE/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/2_arm_path_to_twoway/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/2_arm_path_to_twoway/plain_cfg.netconvert index 9a77743f9b1e..0099edc6ab04 100644 --- a/tests/netconvert/function/crossings/guessed/2_arm_path_to_twoway/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/2_arm_path_to_twoway/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/crossings/guessed/3_arm_sharp_angle/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/3_arm_sharp_angle/plain_cfg.netconvert index 0166825d0105..e5886dd4e1d9 100644 --- a/tests/netconvert/function/crossings/guessed/3_arm_sharp_angle/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/3_arm_sharp_angle/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_3_neightboring_split/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_3_neightboring_split/plain_cfg.netconvert index 0166825d0105..e5886dd4e1d9 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_3_neightboring_split/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_3_neightboring_split/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_complete/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_complete/plain_cfg.netconvert index c395c562341d..b191dc55b76a 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_complete/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_complete/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_complete_default_width/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_complete_default_width/plain_cfg.netconvert index a18ddc9d0b5e..27a7b7ec7ba6 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_complete_default_width/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_complete_default_width/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -26,15 +22,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + + + + + @@ -43,4 +43,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_complete_priority/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_complete_priority/plain_cfg.netconvert index c395c562341d..ea97138c3167 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_complete_priority/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_complete_priority/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_complete_priority_speed_threshold/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_complete_priority_speed_threshold/plain_cfg.netconvert index fbfde3c1c863..f68fcf98947e 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_complete_priority_speed_threshold/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_complete_priority_speed_threshold/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -40,4 +40,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_oneway/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_oneway/plain_cfg.netconvert index c395c562341d..b191dc55b76a 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_oneway/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_oneway/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_parallel_path/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_parallel_path/plain_cfg.netconvert index c395c562341d..b191dc55b76a 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_parallel_path/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_parallel_path/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/4_arm_slanted_complete/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/4_arm_slanted_complete/plain_cfg.netconvert index 0166825d0105..4b413651e78d 100644 --- a/tests/netconvert/function/crossings/guessed/4_arm_slanted_complete/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/4_arm_slanted_complete/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/discard/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/discard/plain_cfg.netconvert index 0166825d0105..4b413651e78d 100644 --- a/tests/netconvert/function/crossings/guessed/discard/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/discard/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/motorway_split/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/motorway_split/plain_cfg.netconvert index 0166825d0105..4b413651e78d 100644 --- a/tests/netconvert/function/crossings/guessed/motorway_split/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/motorway_split/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/patch_tls_from_sumonet/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/patch_tls_from_sumonet/plain_cfg.netconvert index 6e79119c626d..5d2546b7cab6 100644 --- a/tests/netconvert/function/crossings/guessed/patch_tls_from_sumonet/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/patch_tls_from_sumonet/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/crossings/guessed/path_across_1way_street/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/path_across_1way_street/plain_cfg.netconvert index 9e48d60f56ee..3695c5177821 100644 --- a/tests/netconvert/function/crossings/guessed/path_across_1way_street/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/path_across_1way_street/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/path_across_railroad/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/path_across_railroad/plain_cfg.netconvert index d33a0378b8ab..dea9e66a13f4 100644 --- a/tests/netconvert/function/crossings/guessed/path_across_railroad/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/path_across_railroad/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -37,4 +37,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/path_across_street/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/path_across_street/plain_cfg.netconvert index 300990d391e3..055ef463a195 100644 --- a/tests/netconvert/function/crossings/guessed/path_across_street/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/path_across_street/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -34,4 +34,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/path_across_street_split/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/path_across_street_split/plain_cfg.netconvert index 0166825d0105..e5886dd4e1d9 100644 --- a/tests/netconvert/function/crossings/guessed/path_across_street_split/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/path_across_street_split/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/roundabout/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/roundabout/plain_cfg.netconvert index c395c562341d..ea97138c3167 100644 --- a/tests/netconvert/function/crossings/guessed/roundabout/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/roundabout/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/guessed/roundabout_noPriority/plain_cfg.netconvert b/tests/netconvert/function/crossings/guessed/roundabout_noPriority/plain_cfg.netconvert index 107da76450cc..d565260100f0 100644 --- a/tests/netconvert/function/crossings/guessed/roundabout_noPriority/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/guessed/roundabout_noPriority/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,15 +22,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -40,4 +40,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/1_crossing_param/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/1_crossing_param/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/1_crossing_param/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/1_crossing_param/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/1_customshape/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/1_customshape/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/1_customshape/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/1_customshape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/1_customshape_normalized/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/1_customshape_normalized/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/1_customshape_normalized/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/1_customshape_normalized/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customsWidth/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customsWidth/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customsWidth/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customsWidth/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted/plain_cfg.netconvert index 66241e1b4faa..1323c974b513 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted2/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted2/plain_cfg.netconvert index 0cf81375b456..90f64e5b1d9c 100644 --- a/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted2/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/4_arm/3_neighboring_split_customshape_shifted2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,10 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -36,8 +32,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/function/crossings/specified/discard_no_internal/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/discard_no_internal/plain_cfg.netconvert index cb14245e7df4..af37f9bdfd81 100644 --- a/tests/netconvert/function/crossings/specified/discard_no_internal/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/discard_no_internal/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/crossings/specified/discard_no_internal2/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/discard_no_internal2/plain_cfg.netconvert index 66da857eb5aa..377e2bbbf996 100644 --- a/tests/netconvert/function/crossings/specified/discard_no_internal2/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/discard_no_internal2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,18 +22,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + - + diff --git a/tests/netconvert/function/crossings/specified/sumonet_customTLIndex/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/sumonet_customTLIndex/plain_cfg.netconvert index 2e625b4f5454..b559467f783a 100644 --- a/tests/netconvert/function/crossings/specified/sumonet_customTLIndex/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/sumonet_customTLIndex/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/function/crossings/specified/sumonet_customTLIndex2/plain_cfg.netconvert b/tests/netconvert/function/crossings/specified/sumonet_customTLIndex2/plain_cfg.netconvert index 452931d450a2..b559467f783a 100644 --- a/tests/netconvert/function/crossings/specified/sumonet_customTLIndex2/plain_cfg.netconvert +++ b/tests/netconvert/function/crossings/specified/sumonet_customTLIndex2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/function/opposites/disable/plain_cfg.netconvert b/tests/netconvert/function/opposites/disable/plain_cfg.netconvert index 4548df5a65e5..65459e9e53a1 100644 --- a/tests/netconvert/function/opposites/disable/plain_cfg.netconvert +++ b/tests/netconvert/function/opposites/disable/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -47,8 +35,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/opposites/explicit/plain_cfg.netconvert b/tests/netconvert/function/opposites/explicit/plain_cfg.netconvert index fcf02568403d..66a9ee570ed2 100644 --- a/tests/netconvert/function/opposites/explicit/plain_cfg.netconvert +++ b/tests/netconvert/function/opposites/explicit/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/opposites/guess_for_existing/plain_cfg.netconvert b/tests/netconvert/function/opposites/guess_for_existing/plain_cfg.netconvert index 4548df5a65e5..65459e9e53a1 100644 --- a/tests/netconvert/function/opposites/guess_for_existing/plain_cfg.netconvert +++ b/tests/netconvert/function/opposites/guess_for_existing/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -47,8 +35,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/opposites/invalid/plain_cfg.netconvert b/tests/netconvert/function/opposites/invalid/plain_cfg.netconvert index fcf02568403d..66a9ee570ed2 100644 --- a/tests/netconvert/function/opposites/invalid/plain_cfg.netconvert +++ b/tests/netconvert/function/opposites/invalid/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/opposites/no_overwrite/plain_cfg.netconvert b/tests/netconvert/function/opposites/no_overwrite/plain_cfg.netconvert index 32c760a86ce3..65459e9e53a1 100644 --- a/tests/netconvert/function/opposites/no_overwrite/plain_cfg.netconvert +++ b/tests/netconvert/function/opposites/no_overwrite/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -47,8 +35,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/function/projection/plain_geo/plain_cfg.netconvert b/tests/netconvert/function/projection/plain_geo/plain_cfg.netconvert index 0e4c85e379b9..335fc89e6a16 100644 --- a/tests/netconvert/function/projection/plain_geo/plain_cfg.netconvert +++ b/tests/netconvert/function/projection/plain_geo/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,21 +22,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - + + + @@ -45,12 +37,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - + + + + + + + + + + + - + diff --git a/tests/netconvert/function/railway/signals/sharp_angle/plain_cfg.netconvert b/tests/netconvert/function/railway/signals/sharp_angle/plain_cfg.netconvert index 232b8122b1c6..8be984dcd6c0 100644 --- a/tests/netconvert/function/railway/signals/sharp_angle/plain_cfg.netconvert +++ b/tests/netconvert/function/railway/signals/sharp_angle/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/railway/signals/sharp_angle_bidi/plain_cfg.netconvert b/tests/netconvert/function/railway/signals/sharp_angle_bidi/plain_cfg.netconvert index 232b8122b1c6..8be984dcd6c0 100644 --- a/tests/netconvert/function/railway/signals/sharp_angle_bidi/plain_cfg.netconvert +++ b/tests/netconvert/function/railway/signals/sharp_angle_bidi/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/ramps/off_turnaround_noramp/plain_cfg.netconvert b/tests/netconvert/function/ramps/off_turnaround_noramp/plain_cfg.netconvert index e5d6c17cf640..3f62dd6a8f57 100644 --- a/tests/netconvert/function/ramps/off_turnaround_noramp/plain_cfg.netconvert +++ b/tests/netconvert/function/ramps/off_turnaround_noramp/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,10 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -34,8 +30,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/function/ramps/on_turnaround_noramp/plain_cfg.netconvert b/tests/netconvert/function/ramps/on_turnaround_noramp/plain_cfg.netconvert index e5d6c17cf640..3f62dd6a8f57 100644 --- a/tests/netconvert/function/ramps/on_turnaround_noramp/plain_cfg.netconvert +++ b/tests/netconvert/function/ramps/on_turnaround_noramp/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,10 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -34,8 +30,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/function/roundabouts/legacy_visibility/plain_cfg.netconvert b/tests/netconvert/function/roundabouts/legacy_visibility/plain_cfg.netconvert index 007aefb9ebe9..ae95a8c983be 100644 --- a/tests/netconvert/function/roundabouts/legacy_visibility/plain_cfg.netconvert +++ b/tests/netconvert/function/roundabouts/legacy_visibility/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,10 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -36,8 +32,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/function/roundabouts/y1/plain_cfg.netconvert b/tests/netconvert/function/roundabouts/y1/plain_cfg.netconvert index 5b959138419a..2fc840377807 100644 --- a/tests/netconvert/function/roundabouts/y1/plain_cfg.netconvert +++ b/tests/netconvert/function/roundabouts/y1/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,10 +22,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -35,8 +31,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/function/tls_guessing/basic/plain_cfg.netconvert b/tests/netconvert/function/tls_guessing/basic/plain_cfg.netconvert index 700bc02721ac..4d421f943db8 100644 --- a/tests/netconvert/function/tls_guessing/basic/plain_cfg.netconvert +++ b/tests/netconvert/function/tls_guessing/basic/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -27,12 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + diff --git a/tests/netconvert/function/tls_guessing/id_exists/plain_cfg.netconvert b/tests/netconvert/function/tls_guessing/id_exists/plain_cfg.netconvert index 700bc02721ac..4d421f943db8 100644 --- a/tests/netconvert/function/tls_guessing/id_exists/plain_cfg.netconvert +++ b/tests/netconvert/function/tls_guessing/id_exists/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -27,12 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + diff --git a/tests/netconvert/function/tls_guessing/legacy_mode/plain_cfg.netconvert b/tests/netconvert/function/tls_guessing/legacy_mode/plain_cfg.netconvert index dc066f071e10..d1eb1ee9e0fe 100644 --- a/tests/netconvert/function/tls_guessing/legacy_mode/plain_cfg.netconvert +++ b/tests/netconvert/function/tls_guessing/legacy_mode/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -27,13 +27,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + diff --git a/tests/netconvert/function/tls_guessing/specified/plain_cfg.netconvert b/tests/netconvert/function/tls_guessing/specified/plain_cfg.netconvert index a5e2f4ba9740..1cfb7b00422a 100644 --- a/tests/netconvert/function/tls_guessing/specified/plain_cfg.netconvert +++ b/tests/netconvert/function/tls_guessing/specified/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/function/tls_guessing/specified_controlledInner/plain_cfg.netconvert b/tests/netconvert/function/tls_guessing/specified_controlledInner/plain_cfg.netconvert index a5e2f4ba9740..1cfb7b00422a 100644 --- a/tests/netconvert/function/tls_guessing/specified_controlledInner/plain_cfg.netconvert +++ b/tests/netconvert/function/tls_guessing/specified_controlledInner/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/adlershof_dlr/plain_cfg.netconvert b/tests/netconvert/import/OSM/adlershof_dlr/plain_cfg.netconvert index ef5ab47251d4..9b55e9229dd3 100644 --- a/tests/netconvert/import/OSM/adlershof_dlr/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/adlershof_dlr/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -24,10 +24,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -39,13 +35,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + - - - - - + diff --git a/tests/netconvert/import/OSM/key_lanes_non_numerical/plain_cfg.netconvert b/tests/netconvert/import/OSM/key_lanes_non_numerical/plain_cfg.netconvert index 81035d07d34c..8061c03ecbd1 100644 --- a/tests/netconvert/import/OSM/key_lanes_non_numerical/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/key_lanes_non_numerical/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/multimodal_edge/plain_cfg.netconvert b/tests/netconvert/import/OSM/multimodal_edge/plain_cfg.netconvert index b573eb726492..f0b41461a94b 100644 --- a/tests/netconvert/import/OSM/multimodal_edge/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/multimodal_edge/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/numerical_ids/plain_cfg.netconvert b/tests/netconvert/import/OSM/numerical_ids/plain_cfg.netconvert index 579c3c477902..f0327d5361ae 100644 --- a/tests/netconvert/import/OSM/numerical_ids/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/numerical_ids/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -24,10 +24,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - @@ -35,21 +31,25 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + + + + + - + diff --git a/tests/netconvert/import/OSM/recoverable_errors/plain_cfg.netconvert b/tests/netconvert/import/OSM/recoverable_errors/plain_cfg.netconvert index eb58bb829abe..bb5db4c6055c 100644 --- a/tests/netconvert/import/OSM/recoverable_errors/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/recoverable_errors/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -38,4 +38,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/turning_restrictions/plain_cfg.netconvert b/tests/netconvert/import/OSM/turning_restrictions/plain_cfg.netconvert index 43e1f831d0b1..08aaebbc21e6 100644 --- a/tests/netconvert/import/OSM/turning_restrictions/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/turning_restrictions/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -37,4 +37,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/way_with_selfloop/plain_cfg.netconvert b/tests/netconvert/import/OSM/way_with_selfloop/plain_cfg.netconvert index 180f5950f046..5b3e3130e147 100644 --- a/tests/netconvert/import/OSM/way_with_selfloop/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/way_with_selfloop/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -37,4 +37,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/OSM/way_with_with_insufficient_nodes/plain_cfg.netconvert b/tests/netconvert/import/OSM/way_with_with_insufficient_nodes/plain_cfg.netconvert index 180f5950f046..5b3e3130e147 100644 --- a/tests/netconvert/import/OSM/way_with_with_insufficient_nodes/plain_cfg.netconvert +++ b/tests/netconvert/import/OSM/way_with_with_insufficient_nodes/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -37,4 +37,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/SUMO/attributes/plain_cfg.netconvert b/tests/netconvert/import/SUMO/attributes/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/attributes/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/attributes/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/bidi/plain_cfg.netconvert b/tests/netconvert/import/SUMO/bidi/plain_cfg.netconvert index b3b3087ac2f5..4c8015c1ce4c 100644 --- a/tests/netconvert/import/SUMO/bidi/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/bidi/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -47,8 +35,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/connections/reset_all2/plain_cfg.netconvert b/tests/netconvert/import/SUMO/connections/reset_all2/plain_cfg.netconvert index ceb500ff66c3..053eb48e2b77 100644 --- a/tests/netconvert/import/SUMO/connections/reset_all2/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/connections/reset_all2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -46,8 +35,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/discard_params/plain_cfg.netconvert b/tests/netconvert/import/SUMO/discard_params/plain_cfg.netconvert index 9dd90a921fe0..a61726faa838 100644 --- a/tests/netconvert/import/SUMO/discard_params/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/discard_params/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -26,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -49,8 +34,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/dismiss-vclasses/plain_cfg.netconvert b/tests/netconvert/import/SUMO/dismiss-vclasses/plain_cfg.netconvert index 6a36e83b46fb..1d0085c8e04d 100644 --- a/tests/netconvert/import/SUMO/dismiss-vclasses/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/dismiss-vclasses/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -46,8 +35,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/edge_types/plain_cfg.netconvert b/tests/netconvert/import/SUMO/edge_types/plain_cfg.netconvert index 68158bd90870..3e754494f113 100644 --- a/tests/netconvert/import/SUMO/edge_types/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/edge_types/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -23,23 +23,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -47,8 +35,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_cfg.netconvert b/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/junction_name/plain_cfg.netconvert b/tests/netconvert/import/SUMO/junction_name/plain_cfg.netconvert index 4a2c09f72dfd..39433dc1929a 100644 --- a/tests/netconvert/import/SUMO/junction_name/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/junction_name/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,23 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - - @@ -46,8 +34,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/params/plain_cfg.netconvert b/tests/netconvert/import/SUMO/params/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/params/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/params/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/rail_signal/plain_cfg.netconvert b/tests/netconvert/import/SUMO/rail_signal/plain_cfg.netconvert index 72c11adbd489..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/rail_signal/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/rail_signal/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/short_edge/plain_cfg.netconvert b/tests/netconvert/import/SUMO/short_edge/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/short_edge/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/short_edge/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/traffic_light_actuated/plain_cfg.netconvert b/tests/netconvert/import/SUMO/traffic_light_actuated/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/traffic_light_actuated/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/traffic_light_actuated/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/SUMO/traffic_lights-discard/plain_cfg.netconvert b/tests/netconvert/import/SUMO/traffic_lights-discard/plain_cfg.netconvert index 2a27da498d0b..7636b7c7ea72 100644 --- a/tests/netconvert/import/SUMO/traffic_lights-discard/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/traffic_lights-discard/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,12 +34,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/SUMO/traffic_lights/plain_cfg.netconvert b/tests/netconvert/import/SUMO/traffic_lights/plain_cfg.netconvert index 72e3d7026827..78aa8e8131e2 100644 --- a/tests/netconvert/import/SUMO/traffic_lights/plain_cfg.netconvert +++ b/tests/netconvert/import/SUMO/traffic_lights/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/XML/bidi/4edges/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/4edges/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/4edges/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/4edges/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/TWLT/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/TWLT/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/TWLT/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/TWLT/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/TWLT_diagonal/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/TWLT_diagonal/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/TWLT_diagonal/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/TWLT_diagonal/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/TWLT_disconnected_outer/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/TWLT_disconnected_outer/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/TWLT_disconnected_outer/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/TWLT_disconnected_outer/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/curved/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/curved/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/curved/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/curved/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/one_declared/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/one_declared/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/one_declared/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/one_declared/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/bidi/simple/plain_cfg.netconvert b/tests/netconvert/import/XML/bidi/simple/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/bidi/simple/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/bidi/simple/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/contPos/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/contPos/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/contPos/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/contPos/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/delete/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/delete/plain_cfg.netconvert index 37c3aa43c0e7..94b1d841fa1b 100644 --- a/tests/netconvert/import/XML/connections/delete/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/delete/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -34,4 +34,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/edgeType/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/edgeType/plain_cfg.netconvert index ce0323c144c5..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/edgeType/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/edgeType/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/indirect_left/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/indirect_left/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/indirect_left/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/indirect_left/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/indirect_left_priority/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/indirect_left_priority/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/indirect_left_priority/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/indirect_left_priority/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/keepClear_con/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/keepClear_con/plain_cfg.netconvert index 507a45266b27..78596feb184f 100644 --- a/tests/netconvert/import/XML/connections/keepClear_con/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/keepClear_con/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/length/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/length/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/length/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/length/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/length_default/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/length_default/plain_cfg.netconvert index 5b6de8f0a828..1887a4c09961 100644 --- a/tests/netconvert/import/XML/connections/length_default/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/length_default/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -31,8 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/import/XML/connections/permissions/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/permissions/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/permissions/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/permissions/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/prohibit_changing/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/prohibit_changing/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/prohibit_changing/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/prohibit_changing/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/shape/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/shape/plain_cfg.netconvert index ce0323c144c5..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/shape/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/shape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/speed/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/speed/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/speed/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/speed/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/connections/unconnected/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/unconnected/plain_cfg.netconvert index faf16c13051b..b223fa157a8c 100644 --- a/tests/netconvert/import/XML/connections/unconnected/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/unconnected/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - + diff --git a/tests/netconvert/import/XML/connections/visibility/plain_cfg.netconvert b/tests/netconvert/import/XML/connections/visibility/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/connections/visibility/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/connections/visibility/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/diff/lane_specific_settings/plain_cfg.netconvert b/tests/netconvert/import/XML/diff/lane_specific_settings/plain_cfg.netconvert index bfb7e16d06ea..6d4a167e311f 100644 --- a/tests/netconvert/import/XML/diff/lane_specific_settings/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/diff/lane_specific_settings/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/distance/plain_cfg.netconvert b/tests/netconvert/import/XML/distance/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/distance/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/distance/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/edge_overwrite/type_vclass_speeds/plain_cfg.netconvert b/tests/netconvert/import/XML/edge_overwrite/type_vclass_speeds/plain_cfg.netconvert index 9d504a270eaa..71bc1feee008 100644 --- a/tests/netconvert/import/XML/edge_overwrite/type_vclass_speeds/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/edge_overwrite/type_vclass_speeds/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -33,4 +33,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/friction/edge_based/plain_cfg.netconvert b/tests/netconvert/import/XML/friction/edge_based/plain_cfg.netconvert index 447107b2c3cc..bcbef436c81e 100644 --- a/tests/netconvert/import/XML/friction/edge_based/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/friction/edge_based/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/friction/lane_based/plain_cfg.netconvert b/tests/netconvert/import/XML/friction/lane_based/plain_cfg.netconvert index 447107b2c3cc..bcbef436c81e 100644 --- a/tests/netconvert/import/XML/friction/lane_based/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/friction/lane_based/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/junction_name/plain_cfg.netconvert b/tests/netconvert/import/XML/junction_name/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/junction_name/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/junction_name/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/lane_based_speed/plain_cfg.netconvert b/tests/netconvert/import/XML/lane_based_speed/plain_cfg.netconvert index c45ba2ba87a0..01b23db2798f 100644 --- a/tests/netconvert/import/XML/lane_based_speed/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/lane_based_speed/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/lane_based_width/plain_cfg.netconvert b/tests/netconvert/import/XML/lane_based_width/plain_cfg.netconvert index c45ba2ba87a0..a7986c959d34 100644 --- a/tests/netconvert/import/XML/lane_based_width/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/lane_based_width/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/lane_type/plain_cfg.netconvert b/tests/netconvert/import/XML/lane_type/plain_cfg.netconvert index c45ba2ba87a0..01b23db2798f 100644 --- a/tests/netconvert/import/XML/lane_type/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/lane_type/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/loaded_length/plain_cfg.netconvert b/tests/netconvert/import/XML/loaded_length/plain_cfg.netconvert index 1b7cfa60bf4a..2cb3d1cdc0c1 100644 --- a/tests/netconvert/import/XML/loaded_length/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/loaded_length/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/offset/edge_based1/plain_cfg.netconvert b/tests/netconvert/import/XML/offset/edge_based1/plain_cfg.netconvert index 447107b2c3cc..78596feb184f 100644 --- a/tests/netconvert/import/XML/offset/edge_based1/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/offset/edge_based1/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/offset/lane_based1/plain_cfg.netconvert b/tests/netconvert/import/XML/offset/lane_based1/plain_cfg.netconvert index 447107b2c3cc..78596feb184f 100644 --- a/tests/netconvert/import/XML/offset/lane_based1/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/offset/lane_based1/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/plainLanes/plain_cfg.netconvert b/tests/netconvert/import/XML/plainLanes/plain_cfg.netconvert index d126db1dc50a..50847639d710 100644 --- a/tests/netconvert/import/XML/plainLanes/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/plainLanes/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -32,4 +32,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/prohibit_changing/avoid_deadend/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/avoid_deadend/plain_cfg.netconvert index 54467f83e019..a7986c959d34 100644 --- a/tests/netconvert/import/XML/prohibit_changing/avoid_deadend/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/avoid_deadend/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/prohibit_changing/avoid_deadend2/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/avoid_deadend2/plain_cfg.netconvert index 54467f83e019..a7986c959d34 100644 --- a/tests/netconvert/import/XML/prohibit_changing/avoid_deadend2/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/avoid_deadend2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing/plain_cfg.netconvert index 54467f83e019..a7986c959d34 100644 --- a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_discard/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_discard/plain_cfg.netconvert index 21fdc22bf06b..9da03bd14deb 100644 --- a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_discard/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_discard/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -31,8 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify/plain_cfg.netconvert index a170ca08fd7d..927477f7368f 100644 --- a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -31,8 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify2/plain_cfg.netconvert b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify2/plain_cfg.netconvert index f57f2986c329..843938d8f1b0 100644 --- a/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify2/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/prohibit_changing/lane_prohibit_changing_modify2/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -31,8 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/import/XML/shapes/hokkaido/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/hokkaido/plain_cfg.netconvert index f09e735cdd4a..7c2adbf4821a 100644 --- a/tests/netconvert/import/XML/shapes/hokkaido/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/hokkaido/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/shapes/reset_internalShape/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/reset_internalShape/plain_cfg.netconvert index 447a2e337a32..78aa8e8131e2 100644 --- a/tests/netconvert/import/XML/shapes/reset_internalShape/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/reset_internalShape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/XML/shapes/set_internalShape/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_internalShape/plain_cfg.netconvert index 3b0c40f9de94..6d4a167e311f 100644 --- a/tests/netconvert/import/XML/shapes/set_internalShape/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_internalShape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/shapes/set_lane_shape/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_lane_shape/plain_cfg.netconvert index 3b0c40f9de94..5d181af90197 100644 --- a/tests/netconvert/import/XML/shapes/set_lane_shape/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_lane_shape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/shapes/set_lane_shape_1point/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_lane_shape_1point/plain_cfg.netconvert index 3b0c40f9de94..5d181af90197 100644 --- a/tests/netconvert/import/XML/shapes/set_lane_shape_1point/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_lane_shape_1point/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/shapes/set_lane_shape_offset/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_lane_shape_offset/plain_cfg.netconvert index 25de3093eada..01b23db2798f 100644 --- a/tests/netconvert/import/XML/shapes/set_lane_shape_offset/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_lane_shape_offset/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -31,4 +31,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/shapes/set_lane_shape_sumo_net/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_lane_shape_sumo_net/plain_cfg.netconvert index 447a2e337a32..d3b92a3a4c70 100644 --- a/tests/netconvert/import/XML/shapes/set_lane_shape_sumo_net/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_lane_shape_sumo_net/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,22 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - - - - - - @@ -45,8 +34,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + + + + + + + + - + diff --git a/tests/netconvert/import/XML/shapes/set_node_shape/plain_cfg.netconvert b/tests/netconvert/import/XML/shapes/set_node_shape/plain_cfg.netconvert index 3b0c40f9de94..5d181af90197 100644 --- a/tests/netconvert/import/XML/shapes/set_node_shape/plain_cfg.netconvert +++ b/tests/netconvert/import/XML/shapes/set_node_shape/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/dlr_navteq/duplicate_id_ignore/plain_cfg.netconvert b/tests/netconvert/import/dlr_navteq/duplicate_id_ignore/plain_cfg.netconvert index 1943e7a585ff..018f2a6af201 100644 --- a/tests/netconvert/import/dlr_navteq/duplicate_id_ignore/plain_cfg.netconvert +++ b/tests/netconvert/import/dlr_navteq/duplicate_id_ignore/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -36,4 +36,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/dlr_navteq/priority/plain_cfg.netconvert b/tests/netconvert/import/dlr_navteq/priority/plain_cfg.netconvert index 800c0b6167d5..321d4271f635 100644 --- a/tests/netconvert/import/dlr_navteq/priority/plain_cfg.netconvert +++ b/tests/netconvert/import/dlr_navteq/priority/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -35,4 +35,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/dlr_navteq/street_names/plain_cfg.netconvert b/tests/netconvert/import/dlr_navteq/street_names/plain_cfg.netconvert index 2dc978955165..1f84181613f3 100644 --- a/tests/netconvert/import/dlr_navteq/street_names/plain_cfg.netconvert +++ b/tests/netconvert/import/dlr_navteq/street_names/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -36,4 +36,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/dlr_navteq/version_3.1/street_names/plain_cfg.netconvert b/tests/netconvert/import/dlr_navteq/version_3.1/street_names/plain_cfg.netconvert index c3ed08030311..1f84181613f3 100644 --- a/tests/netconvert/import/dlr_navteq/version_3.1/street_names/plain_cfg.netconvert +++ b/tests/netconvert/import/dlr_navteq/version_3.1/street_names/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -36,4 +36,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/vissim/tuMuenchen1/plain_cfg.netconvert b/tests/netconvert/import/vissim/tuMuenchen1/plain_cfg.netconvert index 8ac276d839df..c669e3ab3cac 100644 --- a/tests/netconvert/import/vissim/tuMuenchen1/plain_cfg.netconvert +++ b/tests/netconvert/import/vissim/tuMuenchen1/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -39,4 +39,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/inner_lanes/limit-turn-speed/plain_cfg.netconvert b/tests/netconvert/inner_lanes/limit-turn-speed/plain_cfg.netconvert index 0711d9dd331f..8d039fab3b8f 100644 --- a/tests/netconvert/inner_lanes/limit-turn-speed/plain_cfg.netconvert +++ b/tests/netconvert/inner_lanes/limit-turn-speed/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,18 +22,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - + + + + + - + diff --git a/tests/netconvert/node_building/node_shape/radius/default10/plain_cfg.netconvert b/tests/netconvert/node_building/node_shape/radius/default10/plain_cfg.netconvert index 516d106992c6..55c049d11f9d 100644 --- a/tests/netconvert/node_building/node_shape/radius/default10/plain_cfg.netconvert +++ b/tests/netconvert/node_building/node_shape/radius/default10/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - - - - - + @@ -31,8 +27,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + + + + - + diff --git a/tests/netconvert/node_building/node_shape/radius/radius5/plain_cfg.netconvert b/tests/netconvert/node_building/node_shape/radius/radius5/plain_cfg.netconvert index 6bf06bc488b3..0d0e19aaa8d1 100644 --- a/tests/netconvert/node_building/node_shape/radius/radius5/plain_cfg.netconvert +++ b/tests/netconvert/node_building/node_shape/radius/radius5/plain_cfg.netconvert @@ -1,6 +1,6 @@ - - + @@ -22,17 +22,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + - +