drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-30 09:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted Austria and Germany to Simpleroadshieldparser and corrected minor things

Browse Source 
Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>
This commit is contained in:
vikiawv
2025-12-29 08:04:16 +01:00
committed by Konstantin Pastbin
parent f477d9bb49
commit 7c384b91c5
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libs/indexer/road_shields_parser.cpp
View File

@@ -507,16 +507,16 @@ private:
// Implementations of "ref" parses for some countries.
class AustriaRoadShieldParser : public HighwayClassRoadShieldParser
class AustriaRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit AustriaRoadShieldParser(std::string const & baseRoadNumber, HighwayClass const & highwayClass)
: HighwayClassRoadShieldParser(baseRoadNumber, highwayClass,
{{"A", HighwayClass::Motorway, RoadShieldType::Generic_Blue_Bordered},
{"S", HighwayClass::Trunk, RoadShieldType::Generic_Blue_Bordered},
{"B", HighwayClass::Primary, RoadShieldType::Generic_Blue},
{"L", HighwayClass::Secondary, RoadShieldType::Generic_Pill_White_Bordered},
{"L", HighwayClass::Tertiary, RoadShieldType::Generic_Pill_White_Bordered}})
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}})
{}
};
@@ -554,9 +554,9 @@ class ItalyRoadShieldParser : public SimpleRoadShieldParser
public:
explicit ItalyRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Italy_Autostrada},
{"SS", RoadShieldType::Generic_Blue},
{"SR", RoadShieldType::Generic_Blue},
{"SP", RoadShieldType::Generic_Blue}})
{"SS", RoadShieldType::Generic_Blue_Bordered},
{"SR", RoadShieldType::Generic_Blue_Bordered},
{"SP", RoadShieldType::Generic_Blue_Bordered}})
{}
};
@@ -601,11 +601,24 @@ public:
{"N", RoadShieldType::Generic_White_Bordered},
{"EN", RoadShieldType::Generic_White_Bordered},
{"R", RoadShieldType::Generic_Orange},
{"IP", RoadShieldType::Generic_Red},
{"IC", RoadShieldType::Generic_White_Bordered},
{"EM", RoadShieldType::Generic_Orange},
{"CM", RoadShieldType::Generic_Orange}})
{}
};
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:
@@ -698,17 +711,16 @@ public:
{}
};
class GermanyRoadShieldParser : public HighwayClassRoadShieldParser
class GermanyRoadShieldParser : public SimpleRoadShieldParser
{
public:
explicit GermanyRoadShieldParser(std::string const & baseRoadNumber, HighwayClass const & highwayClass)
: HighwayClassRoadShieldParser(baseRoadNumber, highwayClass,
{{"A", HighwayClass::Motorway, RoadShieldType::Highway_Hexagon_Blue, false, true},
{"D", HighwayClass::Motorway, RoadShieldType::Hidden},
{"B", HighwayClass::Trunk, RoadShieldType::Generic_Orange_Bordered},
{"B", HighwayClass::Primary, RoadShieldType::Generic_Orange_Bordered},
{"L", HighwayClass::Secondary, RoadShieldType::Generic_White_Bordered},
{"K", HighwayClass::Secondary, RoadShieldType::Generic_White_Bordered}})
explicit GermanyRoadShieldParser(std::string const & baseRoadNumber)
: SimpleRoadShieldParser(baseRoadNumber,
{{"A", RoadShieldType::Highway_Hexagon_Blue, false, true},
{"D", RoadShieldType::Hidden},
{"B", RoadShieldType::Generic_Orange_Bordered},
{"K", RoadShieldType::Generic_White_Bordered},
{"L", RoadShieldType::Generic_White_Bordered}})
{}
};
@@ -901,6 +913,8 @@ 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")