[styles] Adding Hungary roadshields

Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>
2025-12-20 13:23:59 +00:00 · 2025-11-07 22:18:30 +01:00
parent 443d24b8d0
commit 325f62d8cb
11 changed files with 134 additions and 2 deletions
--- a/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg
+++ b/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg
@@ -0,0 +1,14 @@
+<svg
+  height="21"
+  viewBox="0 0 37 21"
+  width="37"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/dark/symbols/shield-hungary-blue.svg
+++ b/data/styles/default/dark/symbols/shield-hungary-blue.svg
@@ -0,0 +1,14 @@
+<svg
+  height="15"
+  viewBox="0 0 26 15"
+  width="26"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg
+++ b/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg
@@ -0,0 +1,14 @@
+<svg
+  height="21"
+  viewBox="0 0 37 21"
+  width="37"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/dark/symbols/shield-hungary-green.svg
+++ b/data/styles/default/dark/symbols/shield-hungary-green.svg
@@ -0,0 +1,14 @@
+<svg
+  height="15"
+  viewBox="0 0 26 15"
+  width="26"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg
+++ b/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg
@@ -0,0 +1,14 @@
+<svg
+  height="21"
+  viewBox="0 0 37 21"
+  width="37"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/light/symbols/shield-hungary-blue.svg
+++ b/data/styles/default/light/symbols/shield-hungary-blue.svg
@@ -0,0 +1,14 @@
+<svg
+  height="15"
+  viewBox="0 0 26 15"
+  width="26"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/light/symbols/shield-hungary-green-scaled.svg
+++ b/data/styles/default/light/symbols/shield-hungary-green-scaled.svg
@@ -0,0 +1,14 @@
+<svg
+  height="21"
+  viewBox="0 0 37 21"
+  width="37"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/data/styles/default/light/symbols/shield-hungary-green.svg
+++ b/data/styles/default/light/symbols/shield-hungary-green.svg
@@ -0,0 +1,14 @@
+<svg
+  height="15"
+  viewBox="0 0 26 15"
+  width="26"
+  xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
+    <path
+      d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
+      style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
+    <path
+      d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
+      style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
+    </g>
+  </svg>
--- a/libs/drape_frontend/apply_feature_functors.cpp
+++ b/libs/drape_frontend/apply_feature_functors.cpp
@@ -196,7 +196,7 @@ m2::PointF GetOffset(int offsetX, int offsetY)

 bool IsSymbolRoadShield(ftypes::RoadShield const & shield)
 {
-  return shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Green || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Blue || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Red ||  shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Turkey || shield.m_type == ftypes::RoadShieldType::US_Interstate || shield.m_type == ftypes::RoadShieldType::US_Highway || shield.m_type == ftypes::RoadShieldType::Italy_Autostrada;
+  return shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Green || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Blue || shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Red ||  shield.m_type == ftypes::RoadShieldType::Highway_Hexagon_Turkey || shield.m_type == ftypes::RoadShieldType::US_Interstate || shield.m_type == ftypes::RoadShieldType::US_Highway || shield.m_type == ftypes::RoadShieldType::Italy_Autostrada || shield.m_type == ftypes::RoadShieldType::Hungary_Green || shield.m_type == ftypes::RoadShieldType::Hungary_Blue;
 }

 std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fontScale)
@@ -217,6 +217,10 @@ std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fo
    result = shield.m_name.size() <= 2 ? "shield-us-hw-thin" : "shield-us-hw-wide";
  else if (shield.m_type == ftypes::RoadShieldType::Italy_Autostrada)
    result = "shield-it-a";
+  else if (shield.m_type == ftypes::RoadShieldType::Hungary_Green)
+    result = "shield-hungary-green";
+  else if (shield.m_type == ftypes::RoadShieldType::Hungary_Blue)
+    result = "shield-hungary-blue";
  else
    ASSERT(false, ("This shield type doesn't support symbols:", shield.m_type));

@@ -321,7 +325,9 @@ dp::Color GetRoadShieldTextColor(dp::Color const & baseColor, ftypes::RoadShield
      {RoadShieldType::US_Interstate, kRoadShieldWhiteTextColor},
      {RoadShieldType::US_Highway, kRoadShieldBlackTextColor},
      {RoadShieldType::UK_Highway, kRoadShieldUKYellowTextColor},
-      {RoadShieldType::Italy_Autostrada, kRoadShieldWhiteTextColor}};
+      {RoadShieldType::Italy_Autostrada, kRoadShieldWhiteTextColor},
+      {RoadShieldType::Hungary_Green, kRoadShieldWhiteTextColor},
+      {RoadShieldType::Hungary_Blue, kRoadShieldWhiteTextColor}};

  if (auto const * cl = kColors.Find(shield.m_type); cl)
    return df::GetColorConstant(*cl);
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -558,6 +558,14 @@ public:
  {}
 };

+class HungaryRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit HungaryRoadShieldParser(std::string const & baseRoadNumber)
+  : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Hungary_Blue}}, RoadShieldType::Hungary_Green)
+  {}
+};
+
 class LativaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
@@ -874,6 +882,8 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
    return ItalyRoadShieldParser(roadNumber).GetRoadShields();
  if (mwmName == "Turkey")
    return TurkeyRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Hungary")
+    return HungaryRoadShieldParser(roadNumber).GetRoadShields();
  if (mwmName == "Lativa")
    return LativaRoadShieldParser(roadNumber).GetRoadShields();
  if (mwmName == "Moldova")
@@ -974,6 +984,8 @@ std::string DebugPrint(RoadShieldType shieldType)
  case RoadShieldType::US_Highway: return "US highway";
  case RoadShieldType::UK_Highway: return "UK highway";
  case RoadShieldType::Italy_Autostrada: return "Italy autostrada";
+  case RoadShieldType::Hungary_Green: return "hungary green";
+  case RoadShieldType::Hungary_Blue: return "hungary blue";
  case RoadShieldType::Hidden: return "hidden";
  case RoadShieldType::Count: CHECK(false, ("RoadShieldType::Count is not to be used as a type"));
  }
--- a/libs/indexer/road_shields_parser.hpp
+++ b/libs/indexer/road_shields_parser.hpp
@@ -42,6 +42,8 @@ enum class RoadShieldType
  US_Highway,
  UK_Highway,
  Italy_Autostrada,
+  Hungary_Green,
+  Hungary_Blue,
  Hidden,
  Count
 };