Add filter/replace substrings in direction name due changes to its sc…

…heme
MG-5 · Apr 28, 2024 · fa2a6fb · fa2a6fb
1 parent eb57430
commit fa2a6fb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 22 deletions.
diff --git a/main/dfi/Dfi.cxx b/main/dfi/Dfi.cxx
@@ -109,20 +109,9 @@ void Dfi::parseXml()
         if (!isArrivalTimeInFuture(newVehicle))
             continue; // reject it
 
-        bool directionIsInBlocklist = false;
-        for (auto &blocklistStation : blocklist)
-        {
-            if (blocklistStation == "")
-                break;
-
-            if (newVehicle.directionName == blocklistStation)
-            {
-                directionIsInBlocklist = true;
-                break;
-            }
-        }
+        replaceSubstringsInDirectionName(newVehicle.directionName);
 
-        if (directionIsInBlocklist)
+        if (isDirectionInBlacklist(newVehicle.directionName))
             // tram is in blacklist, reject this
             continue;
 
@@ -155,6 +144,41 @@ void Dfi::parseXml()
     std::sort(vehicleArray.begin(), vehicleArray.end(), &localTransportVehicleSorter);
 }
 
+//--------------------------------------------------------------------------------------------------
+bool Dfi::isDirectionInBlacklist(const std::string &directionName)
+{
+    for (auto &blocklistStation : blocklist)
+    {
+        if (blocklistStation == "")
+            break;
+
+        if (directionName == blocklistStation)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+void Dfi::replaceSubstringsInDirectionName(std::string &directionName)
+{
+    std::array<std::pair<std::string, std::string>, 4> substringsToReplace{
+        std::make_pair("Magdeburg, ", ""),                      //
+        std::make_pair(", Kroatenweg", ""),                     //
+        std::make_pair("Elbauenpark", "Elbp."),                 //
+        std::make_pair("Klinikum Olvenstedt", "Kl. Olvenstedt") //
+    };
+
+    for (auto &substring : substringsToReplace)
+    {
+        auto findResult = directionName.find(substring.first);
+        if (findResult != std::string::npos)
+            directionName.replace(findResult, substring.first.length(), substring.second);
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 Time Dfi::getCurrentLocalTime()
 {

diff --git a/main/dfi/Dfi.hpp b/main/dfi/Dfi.hpp
@@ -82,6 +82,9 @@ class Dfi : public util::wrappers::TaskWithMemberFunctionBase
     bool loadXmlFromBuffer();
     void parseXml();
 
+    bool isDirectionInBlacklist(const std::string &directionName);
+    void replaceSubstringsInDirectionName(std::string &directionName);
+
     [[nodiscard]] Time getCurrentLocalTime();
     [[nodiscard]] bool isArrivalTimeInFuture(LocalTransportVehicle &vehicle);
     [[nodiscard]] int calculateArrivalTime(LocalTransportVehicle &vehicle);

diff --git a/main/led/RenderTask.cxx b/main/led/RenderTask.cxx
@@ -128,13 +128,7 @@ void RenderTask::renderVehicles(bool showCurrentVehicle)
         // print line direction, blinking when train is at station
         if (!IsTrainAtStation || showCurrentVehicle)
         {
-            std::string directionName = "";
-            if (vehicle.directionName == "Klinikum Olvenstedt")
-                directionName = "Kl. Olvenstedt";
-            else
-                directionName = vehicle.directionName;
-
-            renderer.print({lineNumberPixelWidth, pageCounter}, directionName.data());
+            renderer.print({lineNumberPixelWidth, pageCounter}, vehicle.directionName.data());
         }
 
         if (!IsTrainAtStation)

diff --git a/main/nvm/Settings.hpp b/main/nvm/Settings.hpp
@@ -23,8 +23,7 @@ class Settings : public TaskWithMemberFunctionBase
     static constexpr auto StationNameDefault = "Ambrosiusplatz";
 
     static constexpr auto StationBlocklistName = "stationBlcklst";
-    static constexpr auto StationBlocklistDefault =
-        "Sudenburg;Reform;Friedenshöhe;Magdeburg, Sudenburg, Braunlager Str.";
+    static constexpr auto StationBlocklistDefault = "Sudenburg;Reform;Friedenshöhe;Bördepark West";
 
     static constexpr auto PwmResolution = LEDC_TIMER_10_BIT;
     static constexpr auto PwmMaximumDuty = (1 << PwmResolution) - 1;