diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs index a776fdd60b8e4b72b1824cf56c08323260ded58c..28bf5152c5e1266cad717e473d170738852286b6 100644 --- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs +++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs @@ -136,7 +136,8 @@ namespace TUGraz.VectoCore.Models.Declaration PassengerDensity = row.ParseDouble(missionType.ToString()).SI<PerSquareMeter>(), AirDragMeasurementAllowed = row.ParseBoolean("airdragmeasurement"), VehicleEquipment = GetVehicleEquipment(row), - DoubleDecker = VehicleCodeHelper.Parse(row.Field<string>("vehiclecode")).IsDoubleDeckBus() + DoubleDecker = VehicleCodeHelper.Parse(row.Field<string>("vehiclecode")).IsDoubleDeckBus(), + DeltaHeight = row.ParseDouble("deltaheight").SI<Meter>() } }; diff --git a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv index 3eda833ed96847718458b4b042840e1af08a4a41..4b5c864d92ff8a6991dcd935b02c5cd5e6eb98af 100644 --- a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv +++ b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv @@ -1,52 +1,52 @@ -Num Axles , Articulated , Vehicle Code , Registration Classes , Low entry , Passengers Lower Deck , Body Height , Vehicle Parameter Group , .vacc file , Cross Wind Correction , Heavy Urban , Urban , Suburban , Interurban , Coach , Air Drag Measurement , CdxA Standard , Axle load distribution , External displays , Internal displays , Fridge , Kitchen Standard , Is Valid -2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 -2 , 0 , CE , I/I+II/II/A , 1 , - , - , 31b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 -2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1 -2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1 -2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 31e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1 -2 , 0 , CA , II , - , - , - , 32a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 -2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 -2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 -2 , 0 , CA , III/B , - , - , - , 32d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 -2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 -2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 -3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 -3 , 0 , CE , I/I+II/II/A , 1 , - , - , 33b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 -3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1 -3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1 -3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 33e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1 -3 , 0 , CA , II , - , - , - , 34a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 -3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 -3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 -3 , 0 , CA , III/B , - , - , - , 34d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 -3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1 -3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1 -3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 -3 , 1 , CG , I/I+II/II/A , 1 , - , - , 35b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 -3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CC , II , - , - , - , 36a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CC , III/B , - , - , - , 36d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CE , I/I+II/II/A , 1 , - , - , 37b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 37e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CA , II , - , - , - , 38a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CA , III/B , - , - , - , 38d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 -4 , 1 , CG , I/I+II/II/A , 1 , - , - , 39b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 -4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CC , II , - , - , - , 40a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CC , III/B , - , - , - , 40d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 -4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 \ No newline at end of file +Num Axles , Articulated , Vehicle Code , Registration Classes , Low entry , Passengers Lower Deck , Body Height , Vehicle Parameter Group , .vacc file , Cross Wind Correction , Heavy Urban , Urban , Suburban , Interurban , Coach , Air Drag Measurement , CdxA Standard , Axle load distribution , External displays , Internal displays , Fridge , Kitchen Standard , Is Valid , Delta Height +2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30 +2 , 0 , CE , I/I+II/II/A , 1 , - , - , 31b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30 +2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1 , 0.30 +2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1 , 0.30 +2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 31e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1 , 0.30 +2 , 0 , CA , II , - , - , - , 32a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30 +2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30 +2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30 +2 , 0 , CA , III/B , - , - , - , 32d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30 +2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30 +2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30 +3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30 +3 , 0 , CE , I/I+II/II/A , 1 , - , - , 33b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30 +3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1 , 0.30 +3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1 , 0.30 +3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 33e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1 , 0.30 +3 , 0 , CA , II , - , - , - , 34a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30 +3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30 +3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30 +3 , 0 , CA , III/B , - , - , - , 34d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30 +3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1 , 0.30 +3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1 , 0.30 +3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30 +3 , 1 , CG , I/I+II/II/A , 1 , - , - , 35b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30 +3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CC , II , - , - , - , 36a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CC , III/B , - , - , - , 36d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CE , I/I+II/II/A , 1 , - , - , 37b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 37e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CA , II , - , - , - , 38a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CA , III/B , - , - , - , 38d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30 +4 , 1 , CG , I/I+II/II/A , 1 , - , - , 39b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30 +4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CC , II , - , - , - , 40a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CC , III/B , - , - , - , 40d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 +4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs index a2d04218911b364664e49a2510230fc41e1dd8f0..0db45ab507fbcfd171f45b7981b8eb6b23a0e7dc 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs @@ -417,6 +417,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration } Assert.AreEqual(airDragAllowed, busParameters.AirDragMeasurementAllowed); Assert.AreEqual(doubleDecker, busParameters.DoubleDecker); + Assert.AreEqual(0.30.SI<Meter>(), busParameters.DeltaHeight); } diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs index 85dfaf017edb2939497f73a149d1ac5b2dc47269..026c21eb12ec18c740dcf2d26d79acf6bf03079b 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs @@ -490,6 +490,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration } Assert.AreEqual(airDragAllowed, busParameters.AirDragMeasurementAllowed); Assert.AreEqual(doubleDecker, busParameters.DoubleDecker); + Assert.AreEqual(0.30.SI<Meter>(), busParameters.DeltaHeight); } diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs index 2c55e93512c49e911f42d489a86e954d3cb7a03f..8f81e8404256486e6cea8d7b68e213cca668cf3d 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs @@ -136,6 +136,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration } Assert.AreEqual(airDragAllowed, busParameters.AirDragMeasurementAllowed); Assert.AreEqual(doubleDecker, busParameters.DoubleDecker); + Assert.AreEqual(0.30.SI<Meter>(), busParameters.DeltaHeight); }