reverting test changes. refs #14625, #21

eclipse-sumo · Apr 2, 2024 · 4c9a24b · 4c9a24b
1 parent 0db8a97
commit 4c9a24b
Show file tree

Hide file tree

Showing 204 changed files with 23,976 additions and 23,976 deletions.
diff --git a/tests/complex/netconvert/opendrive_roundtrip/net.complex b/tests/complex/netconvert/opendrive_roundtrip/net.complex
diff --git a/tests/complex/netconvert/osm_roundtrip/net.complex b/tests/complex/netconvert/osm_roundtrip/net.complex
diff --git a/tests/netconvert/bugs/ticket6333/net.netconvert b/tests/netconvert/bugs/ticket6333/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-01 17:38:37 by Eclipse SUMO netconvert Version v1_19_0+1605-f03351e016f
+<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
 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
@@ -57,22 +57,22 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <type id="highway.residential" priority="3" numLanes="1" speed="13.89" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
 
     <edge id="-265838211#4" from="2714576574" to="2714576548" priority="3" type="highway.residential" shape="430.91,1206.62 426.40,1200.85 424.90,1199.73 421.85,1197.69 385.16,1175.25 379.74,1171.98 376.94,1169.57 356.04,1145.35 354.73,1140.83 354.72,1137.72 362.67,1116.81 366.95,1108.22">
-        <lane id="-265838211#4_0" index="0" speed="13.89" length="137.67" shape="427.55,1204.92 425.27,1202.00 423.98,1201.04 420.99,1199.04 384.33,1176.62 378.80,1173.28 375.81,1170.71 354.60,1146.13 353.13,1141.06 353.12,1137.43 361.20,1116.17 365.52,1107.51">
+        <lane id="-265838211#4_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="137.67" shape="427.55,1204.92 425.27,1202.00 423.98,1201.04 420.99,1199.04 384.33,1176.62 378.80,1173.28 375.81,1170.71 354.60,1146.13 353.13,1141.06 353.12,1137.43 361.20,1116.17 365.52,1107.51">
             <param key="origId" value="265838211"/>
         </lane>
     </edge>
     <edge id="265838211#0" from="2714576548" to="2714576574" priority="3" type="highway.residential" shape="366.95,1108.22 362.67,1116.81 354.72,1137.72 354.73,1140.83 356.04,1145.35 376.94,1169.57 379.74,1171.98 385.16,1175.25 421.85,1197.69 424.90,1199.73 426.40,1200.85 430.91,1206.62">
-        <lane id="265838211#0_0" index="0" speed="13.89" length="137.67" shape="368.38,1108.93 364.14,1117.45 356.32,1138.01 356.33,1140.60 357.48,1144.57 378.07,1168.43 380.68,1170.68 385.99,1173.88 422.71,1196.34 425.81,1198.42 427.53,1199.70 430.07,1202.95">
+        <lane id="265838211#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="137.67" shape="368.38,1108.93 364.14,1117.45 356.32,1138.01 356.33,1140.60 357.48,1144.57 378.07,1168.43 380.68,1170.68 385.99,1173.88 422.71,1196.34 425.81,1198.42 427.53,1199.70 430.07,1202.95">
             <param key="origId" value="265838211"/>
         </lane>
     </edge>
     <edge id="265841710#0" from="2714589140" to="2714576574" priority="3" type="highway.residential" spreadType="center" shape="437.34,1206.68 438.54,1207.94 439.23,1209.52 439.35,1211.25 438.86,1212.91 437.84,1214.31 436.54,1215.22 435.02,1215.67 433.43,1215.65 431.92,1215.11 430.66,1214.15 429.76,1212.85 429.32,1211.32 429.37,1209.74 429.92,1208.26 430.91,1206.62">
-        <lane id="265841710#0_0" index="0" speed="13.89" length="24.65" shape="437.53,1206.88 438.54,1207.94 439.23,1209.52 439.35,1211.25 438.86,1212.91 437.84,1214.31 436.54,1215.22 435.02,1215.67 433.43,1215.65 431.92,1215.11 430.66,1214.15 429.76,1212.85 429.48,1211.89">
+        <lane id="265841710#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="24.65" shape="437.53,1206.88 438.54,1207.94 439.23,1209.52 439.35,1211.25 438.86,1212.91 437.84,1214.31 436.54,1215.22 435.02,1215.67 433.43,1215.65 431.92,1215.11 430.66,1214.15 429.76,1212.85 429.48,1211.89">
             <param key="origId" value="265841710"/>
         </lane>
     </edge>
     <edge id="265841710#2" from="2714576574" to="2714589140" priority="3" type="highway.residential" spreadType="center" shape="430.91,1206.62 432.37,1206.08 434.07,1205.70 435.79,1205.90 437.34,1206.68">
-        <lane id="265841710#2_0" index="0" speed="13.89" length="6.54" shape="436.48,1206.25 437.09,1206.56">
+        <lane id="265841710#2_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="6.54" shape="436.48,1206.25 437.09,1206.56">
             <param key="origId" value="265841710"/>
         </lane>
     </edge>

diff --git a/tests/netconvert/bugs/ticket7016/net.netconvert b/tests/netconvert/bugs/ticket7016/net.netconvert
diff --git a/tests/netconvert/bugs/ticket9810/net.netconvert b/tests/netconvert/bugs/ticket9810/net.netconvert
diff --git a/tests/netconvert/export/openDRIVE/adlershof_dlr/net.netconvert b/tests/netconvert/export/openDRIVE/adlershof_dlr/net.netconvert
diff --git a/tests/netconvert/export/openDRIVE/from_osm2/net.netconvert b/tests/netconvert/export/openDRIVE/from_osm2/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-01 17:38:29 by Eclipse SUMO netconvert Version v1_19_0+1605-f03351e016f
+<!-- generated on 2024-02-29 13:56:08 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
 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
@@ -47,14 +47,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </edge>
 
     <edge id="-117527" from="-117529" to="-117533" priority="13" type="highway.trunk" spreadType="center" shape="344.49,1.71 276.76,7.44 187.06,16.03 129.56,20.63 0.00,24.72">
-        <lane id="-117527_0" index="0" speed="27.78" length="345.17" shape="344.54,4.91 277.05,10.62 187.34,19.22 129.74,23.83 0.10,27.92"/>
-        <lane id="-117527_1" index="1" speed="27.78" length="345.17" shape="344.27,1.72 276.76,7.44 187.06,16.03 129.56,20.63 -0.00,24.72"/>
-        <lane id="-117527_2" index="2" speed="27.78" length="345.17" shape="344.00,-1.47 276.47,4.25 186.78,12.84 129.39,17.44 -0.10,21.52"/>
+        <lane id="-117527_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.54,4.91 277.05,10.62 187.34,19.22 129.74,23.83 0.10,27.92"/>
+        <lane id="-117527_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.27,1.72 276.76,7.44 187.06,16.03 129.56,20.63 -0.00,24.72"/>
+        <lane id="-117527_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="345.17" shape="344.00,-1.47 276.47,4.25 186.78,12.84 129.39,17.44 -0.10,21.52"/>
     </edge>
     <edge id="-117528" from="-117534" to="-117529" priority="13" type="highway.trunk" spreadType="center" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.49,1.71">
-        <lane id="-117528_0" index="0" speed="27.78" length="818.88" shape="1101.87,287.33 1053.49,260.96 677.51,84.84 620.81,57.25 570.15,37.20 512.63,19.54 456.20,8.02 387.29,3.20 344.83,4.89"/>
-        <lane id="-117528_1" index="1" speed="27.78" length="818.88" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.71,1.70"/>
-        <lane id="-117528_2" index="2" speed="27.78" length="818.88" shape="1104.93,281.72 1056.39,255.24 680.26,79.06 623.39,51.39 572.27,31.15 514.22,13.34 457.07,1.67 387.39,-3.20 344.58,-1.50"/>
+        <lane id="-117528_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1101.87,287.33 1053.49,260.96 677.51,84.84 620.81,57.25 570.15,37.20 512.63,19.54 456.20,8.02 387.29,3.20 344.83,4.89"/>
+        <lane id="-117528_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1103.40,284.53 1054.94,258.10 678.88,81.95 622.10,54.32 571.21,34.17 513.43,16.44 456.63,4.85 387.34,0.00 344.71,1.70"/>
+        <lane id="-117528_2" index="2" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="27.78" length="818.88" shape="1104.93,281.72 1056.39,255.24 680.26,79.06 623.39,51.39 572.27,31.15 514.22,13.34 457.07,1.67 387.39,-3.20 344.58,-1.50"/>
     </edge>
 
     <junction id="-117529" type="priority" x="344.49" y="1.71" incLanes="-117528_0 -117528_1 -117528_2" intLanes=":-117529_0_0 :-117529_0_1 :-117529_0_2" shape="344.90,6.49 344.52,-3.10 343.87,-3.06 344.68,6.51">

diff --git a/tests/netconvert/function/junctions.join-same/geo/net.netconvert b/tests/netconvert/function/junctions.join-same/geo/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-01 17:38:33 by Eclipse SUMO netconvert Version v1_19_0+1605-f03351e016f
+<!-- generated on 2024-02-29 13:56:10 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
 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
@@ -125,87 +125,87 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </edge>
 
     <edge id="-239924883" from="cluster_56455689_s56455689" to="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" name="Stadionstraße" priority="10" type="highway.tertiary" shape="1919.06,842.49 1914.11,847.01 1906.74,847.81 1898.68,846.48 1891.37,844.20 1797.56,816.60">
-        <lane id="-239924883_0" index="0" speed="13.89" length="117.94" shape="1916.61,846.89 1914.80,848.54 1906.70,849.42 1898.31,848.04 1890.91,845.73 1803.53,820.02">
+        <lane id="-239924883_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="117.94" shape="1916.61,846.89 1914.80,848.54 1906.70,849.42 1898.31,848.04 1890.91,845.73 1803.53,820.02">
             <param key="origId" value="239924883"/>
         </lane>
         <param key="origTo" value="32444587"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="-4930543#0" from="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" to="cluster_56455689_s56455689" name="Heinrich-Heine-Allee" priority="10" type="highway.tertiary" shape="1953.77,776.45 1944.61,786.37 1936.39,798.42 1929.35,814.81 1919.06,842.49">
-        <lane id="-4930543#0_0" index="0" speed="13.89" length="69.90" shape="1954.84,777.65 1945.87,787.37 1937.80,799.19 1930.84,815.40 1922.22,838.57">
+        <lane id="-4930543#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="69.90" shape="1954.84,777.65 1945.87,787.37 1937.80,799.19 1930.84,815.40 1922.22,838.57">
             <param key="origId" value="4930543"/>
         </lane>
         <param key="origFrom" value="32444589"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="239924883" from="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" to="cluster_56455689_s56455689" name="Stadionstraße" priority="10" type="highway.tertiary" shape="1797.56,816.60 1891.37,844.20 1898.68,846.48 1906.74,847.81 1914.11,847.01 1919.06,842.49">
-        <lane id="239924883_0" index="0" speed="13.89" length="114.57" shape="1804.44,816.96 1891.83,842.67 1899.05,844.92 1906.78,846.20 1913.42,845.48 1914.46,844.53">
+        <lane id="239924883_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="114.57" shape="1804.44,816.96 1891.83,842.67 1899.05,844.92 1906.78,846.20 1913.42,845.48 1914.46,844.53">
             <param key="origId" value="239924883"/>
         </lane>
         <param key="origFrom" value="32444587"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="239924889#3" from="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" to="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" priority="1" type="highway.footway" spreadType="center" shape="1801.10,809.17 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1948.91,772.39">
-        <lane id="239924889#3_0" index="0" speed="2.78" length="190.18" width="2.00" shape="1806.31,810.73 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1949.55,771.93">
+        <lane id="239924889#3_0" index="0" allow="pedestrian" speed="2.78" length="190.18" width="2.00" shape="1806.31,810.73 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1949.55,771.93">
             <param key="origId" value="239924889"/>
         </lane>
         <param key="origFrom" value="6273887394"/>
         <param key="origTo" value="4396212913"/>
     </edge>
     <edge id="4930543#0" from="cluster_56455689_s56455689" to="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" name="Heinrich-Heine-Allee" priority="10" type="highway.tertiary" shape="1919.06,842.49 1929.35,814.81 1936.39,798.42 1944.61,786.37 1953.77,776.45">
-        <lane id="4930543#0_0" index="0" speed="13.89" length="71.15" shape="1919.22,837.46 1927.86,814.22 1934.98,797.65 1943.35,785.37 1952.49,775.48">
+        <lane id="4930543#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="71.15" shape="1919.22,837.46 1927.86,814.22 1934.98,797.65 1943.35,785.37 1952.49,775.48">
             <param key="origId" value="4930543"/>
         </lane>
         <param key="origTo" value="32444589"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="4935158#0" from="cluster_56455689_s56455689" to="262875036" name="Heinrich-Heine-Allee" priority="1" type="highway.footway" spreadType="center" shape="1919.06,842.49 1938.93,864.16 1876.49,1059.88">
-        <lane id="4935158#0_0" index="0" speed="2.78" length="230.14" width="2.00" shape="1922.24,845.95 1938.93,864.16 1876.49,1059.88">
+        <lane id="4935158#0_0" index="0" allow="pedestrian" speed="2.78" length="230.14" width="2.00" shape="1922.24,845.95 1938.93,864.16 1876.49,1059.88">
             <param key="origId" value="4935158"/>
         </lane>
     </edge>
     <edge id="s-239924883" from="cluster_56455689_s56455689" to="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" name="Stadionstraße" priority="10" type="highway.tertiary" shape="1919.06,842.49 1914.11,847.01 1906.74,847.81 1898.68,846.49 1891.37,844.20 1797.56,816.60">
-        <lane id="s-239924883_0" index="0" speed="13.89" length="117.95" shape="1916.61,846.89 1914.80,848.54 1906.70,849.42 1898.31,848.05 1890.91,845.73 1803.53,820.02">
+        <lane id="s-239924883_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="117.95" shape="1916.61,846.89 1914.80,848.54 1906.70,849.42 1898.31,848.05 1890.91,845.73 1803.53,820.02">
             <param key="origId" value="239924883"/>
         </lane>
         <param key="origTo" value="32444587"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="s-304426109#0" from="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" to="s32444585" name="Gerhart-Hauptmann-Allee" priority="3" type="highway.residential" shape="1797.56,816.60 1723.51,1012.91">
-        <lane id="s-304426109#0_0" index="0" speed="8.33" length="203.13" shape="1796.70,823.42 1725.01,1013.47">
+        <lane id="s-304426109#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="203.13" shape="1796.70,823.42 1725.01,1013.47">
             <param key="origId" value="304426109"/>
         </lane>
         <param key="origFrom" value="32444587"/>
     </edge>
     <edge id="s-4930543#0" from="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" to="cluster_56455689_s56455689" name="Heinrich-Heine-Allee" priority="10" type="highway.tertiary" shape="1953.76,776.45 1944.61,786.37 1936.39,798.42 1929.35,814.81 1919.06,842.49">
-        <lane id="s-4930543#0_0" index="0" speed="13.89" length="69.90" shape="1954.83,777.65 1945.87,787.37 1937.80,799.19 1930.84,815.40 1922.22,838.57">
+        <lane id="s-4930543#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="69.90" shape="1954.83,777.65 1945.87,787.37 1937.80,799.19 1930.84,815.40 1922.22,838.57">
             <param key="origId" value="4930543"/>
         </lane>
         <param key="origFrom" value="32444589"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="s239924883" from="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" to="cluster_56455689_s56455689" name="Stadionstraße" priority="10" type="highway.tertiary" shape="1797.56,816.60 1891.37,844.20 1898.68,846.49 1906.74,847.81 1914.11,847.01 1919.06,842.49">
-        <lane id="s239924883_0" index="0" speed="13.89" length="114.57" shape="1804.44,816.96 1891.83,842.67 1899.05,844.93 1906.78,846.20 1913.42,845.48 1914.46,844.53">
+        <lane id="s239924883_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="114.57" shape="1804.44,816.96 1891.83,842.67 1899.05,844.93 1906.78,846.20 1913.42,845.48 1914.46,844.53">
             <param key="origId" value="239924883"/>
         </lane>
         <param key="origFrom" value="32444587"/>
         <param key="ref" value="K 6161"/>
     </edge>
     <edge id="s239924889#3" from="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" to="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" priority="1" type="highway.footway" spreadType="center" shape="1801.10,809.17 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1948.91,772.39">
-        <lane id="s239924889#3_0" index="0" speed="2.78" length="190.18" width="2.00" shape="1806.31,810.73 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1949.55,771.93">
+        <lane id="s239924889#3_0" index="0" allow="pedestrian" speed="2.78" length="190.18" width="2.00" shape="1806.31,810.73 1904.79,840.18 1911.80,836.87 1936.75,776.13 1944.61,775.48 1949.55,771.93">
             <param key="origId" value="239924889"/>
         </lane>
         <param key="origFrom" value="6273887394"/>
         <param key="origTo" value="4396212913"/>
     </edge>
     <edge id="s304426109#0" from="s32444585" to="cluster_cluster_32444587_6273887394_scluster_32444587_6273887394" name="Gerhart-Hauptmann-Allee" priority="3" type="highway.residential" shape="1723.51,1012.91 1797.56,816.60">
-        <lane id="s304426109#0_0" index="0" speed="8.33" length="203.13" shape="1722.01,1012.35 1793.70,822.29">
+        <lane id="s304426109#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="203.13" shape="1722.01,1012.35 1793.70,822.29">
             <param key="origId" value="304426109"/>
         </lane>
         <param key="origTo" value="32444587"/>
     </edge>
     <edge id="s4930543#0" from="cluster_56455689_s56455689" to="cluster_cluster_32444589_4396212913_scluster_32444589_4396212913" name="Heinrich-Heine-Allee" priority="10" type="highway.tertiary" shape="1919.06,842.49 1929.35,814.81 1936.39,798.42 1944.61,786.37 1953.76,776.45">
-        <lane id="s4930543#0_0" index="0" speed="13.89" length="71.15" shape="1919.22,837.46 1927.86,814.22 1934.98,797.65 1943.35,785.37 1952.48,775.48">
+        <lane id="s4930543#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="71.15" shape="1919.22,837.46 1927.86,814.22 1934.98,797.65 1943.35,785.37 1952.48,775.48">
             <param key="origId" value="4930543"/>
         </lane>
         <param key="origTo" value="32444589"/>