fix: use nsp value for bracket station text (#508) (#509)

SchweizerischeBundesbahnen · Jan 27, 2025 · 04d1034 · 04d1034
1 parent 7cdbac0
commit 04d1034
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/das_client/lib/sfera/src/mapper/segment_profile_mapper.dart b/das_client/lib/sfera/src/mapper/segment_profile_mapper.dart
@@ -38,6 +38,7 @@ class SegmentProfileMapper {
 
   static const String _bracketStationNspName = 'bracketStation';
   static const String _bracketStationMainStationNspName = 'mainStation';
+  static const String _bracketStationTextNspName = 'text';
   static const String _protectionSectionNspFacultativeName = 'facultative';
   static const String _protectionSectionNspLengthTypeName = 'lengthType';
 
@@ -161,6 +162,7 @@ class SegmentProfileMapper {
     for (final tafTapLocationNsp in tafTapLocation.nsp) {
       if (tafTapLocationNsp.name == _bracketStationNspName) {
         final mainStationNsp = tafTapLocationNsp.parameters.withName(_bracketStationMainStationNspName);
+        final textNsp = tafTapLocationNsp.parameters.withName(_bracketStationTextNspName);
         if (mainStationNsp == null) {
           Fimber.w('Encountered bracket station without main station NSP declaration: $tafTapLocation');
         } else {
@@ -172,10 +174,10 @@ class SegmentProfileMapper {
               .firstOrNull;
           if (mainStation == null) {
             Fimber.w('Failed to resolve main station for bracket station: $tafTapLocation');
-          } else {
-            return BracketMainStation(
-                abbreviation: mainStation.abbreviation, countryCode: countryCode, primaryCode: primaryCode);
           }
+
+          return BracketMainStation(
+              abbreviation: textNsp?.nspValue ?? '', countryCode: countryCode, primaryCode: primaryCode);
         }
       }
     }

diff --git a/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml b/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml
@@ -52,6 +52,7 @@
             <TAF_TAP_LocationName language="de" messageString="Klammerbahnhof D"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH9994"/>
+                <NetworkSpecificParameter name="text" value="D" />
             </TAF_TAP_Location_NSP>
             <TAF_TAP_Location_NSP name="newLineSpeed">
                 <NetworkSpecificParameter name="xmlNewLineSpeed" value="

diff --git a/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_5.xml b/das_client/test_resources/T9999_mixed_journey/SFERA_SP_T9999_5.xml
@@ -39,6 +39,7 @@
             <TAF_TAP_LocationName language="de" messageString="Klammerbahnhof D1"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH9994"/>
+                <NetworkSpecificParameter name="text" value="D" />
             </TAF_TAP_Location_NSP>
             <TAF_TAP_Location_NSP name="newLineSpeed">
                 <NetworkSpecificParameter name="xmlNewLineSpeed" value="

diff --git a/sfera-mock/src/main/resources/static_sfera_resources/T4_Stop_on_demand/SFERA_SP_T4_1.xml b/sfera-mock/src/main/resources/static_sfera_resources/T4_Stop_on_demand/SFERA_SP_T4_1.xml
@@ -65,6 +65,7 @@
             <TAF_TAP_LocationName language="de" messageString="Solothurn"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH0207"/>
+                <NetworkSpecificParameter name="text" value="SO" />
             </TAF_TAP_Location_NSP>
         </TAF_TAP_Location>
 
@@ -77,6 +78,7 @@
             <TAF_TAP_LocationName language="de" messageString="Solothurn West"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH0207"/>
+                <NetworkSpecificParameter name="text" value="SO" />
             </TAF_TAP_Location_NSP>
         </TAF_TAP_Location>
 

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
@@ -236,6 +236,7 @@
             <TAF_TAP_LocationName language="de" messageString="Aarau GB"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH3015"/>
+                <NetworkSpecificParameter name="text" value="AA" />
             </TAF_TAP_Location_NSP>
         </TAF_TAP_Location>
 
@@ -248,6 +249,7 @@
             <TAF_TAP_LocationName language="de" messageString="Aarau"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH3015"/>
+                <NetworkSpecificParameter name="text" value="AAR" />
             </TAF_TAP_Location_NSP>
         </TAF_TAP_Location>
     </SP_Areas>

diff --git a/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml b/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml
@@ -52,6 +52,7 @@
             <TAF_TAP_LocationName language="de" messageString="Klammerbahnhof D"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH9994"/>
+                <NetworkSpecificParameter name="text" value="D" />
             </TAF_TAP_Location_NSP>
             <TAF_TAP_Location_NSP name="newLineSpeed">
                 <NetworkSpecificParameter name="xmlNewLineSpeed" value="

diff --git a/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_5.xml b/...a-mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_5.xml
@@ -39,6 +39,7 @@
             <TAF_TAP_LocationName language="de" messageString="Klammerbahnhof D1"/>
             <TAF_TAP_Location_NSP name="bracketStation">
                 <NetworkSpecificParameter name="mainStation" value="CH9994"/>
+                <NetworkSpecificParameter name="text" value="D" />
             </TAF_TAP_Location_NSP>
             <TAF_TAP_Location_NSP name="newLineSpeed">
                 <NetworkSpecificParameter name="xmlNewLineSpeed" value="