fix: rename stopping location to halt to match newest spec

SchweizerischeBundesbahnen · Jan 21, 2025 · 0405ec3 · 0405ec3
1 parent 00d41ef
commit 0405ec3
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/das_client/lib/sfera/src/mapper/sfera_model_mapper.dart b/das_client/lib/sfera/src/mapper/sfera_model_mapper.dart
@@ -119,7 +119,7 @@ class SferaModelMapper {
           order: calculateOrder(segmentIndex, timingPoint.location),
           mandatoryStop: tpConstraint.stoppingPointInformation?.stopType?.mandatoryStop ?? true,
           isStop: tpConstraint.stopSkipPass == StopSkipPass.stoppingPoint,
-          isStation: tafTapLocation.locationType != TafTapLocationType.stoppingLocation,
+          isStation: tafTapLocation.locationType != TafTapLocationType.halt,
           bracketMainStation: _parseBracketMainStation(tafTapLocations, tafTapLocation),
           kilometre: kilometreMap[timingPoint.location] ?? [],
           speedData: _graduatedSpeedDataFromVelocities(tafTapLocation.newLineSpeed?.xmlNewLineSpeed.element.velocities),

diff --git a/das_client/lib/sfera/src/model/enums/taf_tap_location_type.dart b/das_client/lib/sfera/src/model/enums/taf_tap_location_type.dart
@@ -2,7 +2,7 @@ import 'package:das_client/sfera/src/model/enums/xml_enum.dart';
 
 enum TafTapLocationType implements XmlEnum {
   station(xmlValue: 'station'),
-  stoppingLocation(xmlValue: 'stopping location');
+  halt(xmlValue: 'halt');
 
   const TafTapLocationType({
     required this.xmlValue,

diff --git a/das_client/test_resources/T1_track_equipment/SFERA_SP_T1_5.xml b/das_client/test_resources/T1_track_equipment/SFERA_SP_T1_5.xml
@@ -48,7 +48,7 @@
     </SP_Points>
     <SP_Areas>
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/das_client/test_resources/T2_ASR_additional_speed_restrictions/SFERA_SP_T2_3.xml b/das_client/test_resources/T2_ASR_additional_speed_restrictions/SFERA_SP_T2_3.xml
@@ -130,7 +130,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/das_client/test_resources/T3_protection_sections/SFERA_SP_T3_1.xml b/das_client/test_resources/T3_protection_sections/SFERA_SP_T3_1.xml
@@ -346,7 +346,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_3.xml b/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_3.xml
@@ -55,7 +55,7 @@
 
     <SP_Areas>
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="C"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>9993</LocationPrimaryCode>

diff --git a/sfera-mock/src/main/resources/static_sfera_resources/.DS_Store b/sfera-mock/src/main/resources/static_sfera_resources/.DS_Store
diff --git a/sfera-mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_SP_T1_5.xml b/sfera-mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_SP_T1_5.xml
@@ -48,7 +48,7 @@
     </SP_Points>
     <SP_Areas>
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/...n/resources/static_sfera_resources/T2_ASR_additional_speed_restrictions/SFERA_SP_T2_3.xml b/...n/resources/static_sfera_resources/T2_ASR_additional_speed_restrictions/SFERA_SP_T2_3.xml
@@ -130,7 +130,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/...a-mock/src/main/resources/static_sfera_resources/T3_protection_sections/SFERA_SP_T3_1.xml b/...a-mock/src/main/resources/static_sfera_resources/T3_protection_sections/SFERA_SP_T3_1.xml
@@ -346,7 +346,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MLH"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3018</LocationPrimaryCode>

diff --git a/sfera-mock/src/main/resources/static_sfera_resources/T6_TAF_TAP_locations/SFERA_SP_T6_2.xml b/sfera-mock/src/main/resources/static_sfera_resources/T6_TAF_TAP_locations/SFERA_SP_T6_2.xml
@@ -138,7 +138,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="GLA"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3004</LocationPrimaryCode>
@@ -165,7 +165,7 @@
         </TAF_TAP_Location>
 
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="MEL"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>3007</LocationPrimaryCode>

diff --git a/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_3.xml b/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_3.xml
@@ -55,7 +55,7 @@
 
     <SP_Areas>
         <TAF_TAP_Location startEndQualifier="StartsEnds" TAF_TAP_location_abbreviation="C"
-                          TAF_TAP_location_type="stopping location">
+                          TAF_TAP_location_type="halt">
             <TAF_TAP_LocationIdent>
                 <CountryCodeISO>CH</CountryCodeISO>
                 <LocationPrimaryCode>9993</LocationPrimaryCode>