drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-12 07:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Found mistake in Germany/Austria implementation

Browse Source 
Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>
This commit is contained in:
vikiawv
2026-01-04 10:36:51 +01:00
committed by Yannik Bloscheck
parent b231f2de6e
commit 67f27482b8
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/indexer/road_shields_parser.cpp
View File

@@ -513,9 +513,9 @@ public:
explicit AustriaRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Blue_Bordered},
{"S", RoadShieldType::Generic_Blue_Bordered},
{"B", RoadShieldType::Generic_Blue, false, true},
{"P", RoadShieldType::Generic_Pill_Red, false, true},
{"L", RoadShieldType::Generic_Pill_White_Bordered, false, true}})
{"B", RoadShieldType::Generic_Blue},
{"P", RoadShieldType::Generic_Pill_Red_Bordered},
{"L", RoadShieldType::Generic_Pill_White_Bordered}})
{}
};
@@ -607,17 +607,6 @@ public:
{}
};
class AlbaniaRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit AlbaniaRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Italy_Autostrada},
{"SH", RoadShieldType::Generic_Blue_Bordered},
{"RR", RoadShieldType::Generic_Blue_Bordered},
{"E", RoadShieldType::Generic_Green_Bordered}})
{}
};
class RomaniaRoadShieldParser : public SimpleRoadShieldParser
{
public:
@@ -714,11 +703,11 @@ class GermanyRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit GermanyRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Blue, false, true},
: SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Highway_Hexagon_Blue},
{"D", RoadShieldType::Hidden},
{"B", RoadShieldType::Generic_Orange_Bordered},
{"K", RoadShieldType::Generic_White_Bordered},
{"L", RoadShieldType::Generic_White_Bordered}})
{"L", RoadShieldType::Generic_White_Bordered},
{"K", RoadShieldType::Generic_White_Bordered}})
{}
};
@@ -892,7 +881,7 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
if (mwmName == "India")
return IndiaRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Austria")
return AustriaRoadShieldParser(roadNumber, highwayClass).GetRoadShields();
return AustriaRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Belgium")
return BelgiumRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Greece")
@@ -911,8 +900,6 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
return MoldovaRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Portugal")
return PortugalRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Albania")
return AlbaniaRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Romania")
return RomaniaRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Serbia")
@@ -930,7 +917,7 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
if (mwmName == "France")
return FranceRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Germany")
return GermanyRoadShieldParser(roadNumber, highwayClass).GetRoadShields();
return GermanyRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Spain")
return SpainRoadShieldParser(roadNumber).GetRoadShields();
if (mwmName == "Ukraine")