From 3b77bf8f27b5f2e2acc40bcf068062408c80830b Mon Sep 17 00:00:00 2001 From: Ahmet <63475369+ahmetlii@users.noreply.github.com> Date: Fri, 12 Jan 2024 20:00:26 +0300 Subject: [PATCH 1/4] Update road_shields_parser.cpp Signed-off-by: Ahmet <63475369+ahmetlii@users.noreply.github.com> --- indexer/road_shields_parser.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index d89d6dc326..4459bfa727 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -72,6 +72,9 @@ std::unordered_map const kRoadNetworkShields = { {"pl:national", RoadShieldType::Generic_Red}, {"pl:regional", RoadShieldType::Generic_Orange}, {"pl:local", RoadShieldType::Generic_White}, + {"tr:motorway", RoadShieldType::Generic_Orange}, + {"tr:road", RoadShieldType::Generic_Blue}, + {"tr:provincial", RoadShieldType::Generic_White} {"ua:national", RoadShieldType::Generic_Blue}, {"ua:regional", RoadShieldType::Generic_Blue}, {"ua:territorial", RoadShieldType::Generic_White}, @@ -548,7 +551,7 @@ class CyprusRoadShieldParser : public SimpleRoadShieldParser { public: explicit CyprusRoadShieldParser(std::string const & baseRoadNumber) - : SimpleRoadShieldParser(baseRoadNumber, {// North Cuprus. + : SimpleRoadShieldParser(baseRoadNumber, {// North Cyprus. {"D.", RoadShieldType::Generic_Blue}, // White font. {"GM.", RoadShieldType::Generic_White}, // Blue font. {"GZ.", RoadShieldType::Generic_White}, // Blue font. @@ -565,6 +568,21 @@ public: } }; +class TurkeyRoadShieldParser : public SimpleRoadShieldParser +// TODO: Add provincial road parser, formatted as (number)-(number) +{ +public: + explicit TurkeyRoadShieldParser(std::string const & baseRoadNumber) + : SimpleRoadShieldParser(baseRoadNumber, { + {"O-", RoadShieldType::Generic_Orange}, // Black font. Hexagon. + {"D.", RoadShieldType::Generic_Blue}, // White font. + {"D-", RoadShieldType::Generic_Blue}, // White font. + {"D", RoadShieldType::Generic_Blue}, // White font. + {"D ", RoadShieldType::Generic_Blue}, // White font. + { + } +}; + class MexicoRoadShieldParser : public RoadShieldParser { public: @@ -658,6 +676,8 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & return MexicoRoadShieldParser(roadNumber).GetRoadShields(); if (mwmName == "Cyprus") return CyprusRoadShieldParser(roadNumber).GetRoadShields(); + if (mwmName == "Turkey") + return CyprusRoadShieldParser(roadNumber).GetRoadShields(); return SimpleRoadShieldParser(roadNumber, SimpleRoadShieldParser::ShieldTypes()).GetRoadShields(); } -- 2.45.3 From 92ae2eec6f50ad9b10942e32f52b2a437ddbf624 Mon Sep 17 00:00:00 2001 From: Ahmet <63475369+ahmetlii@users.noreply.github.com> Date: Fri, 12 Jan 2024 23:16:48 +0300 Subject: [PATCH 2/4] fix copy-paste errors Signed-off-by: Ahmet <63475369+ahmetlii@users.noreply.github.com> --- indexer/road_shields_parser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index 4459bfa727..f02bb2683a 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -74,7 +74,7 @@ std::unordered_map const kRoadNetworkShields = { {"pl:local", RoadShieldType::Generic_White}, {"tr:motorway", RoadShieldType::Generic_Orange}, {"tr:road", RoadShieldType::Generic_Blue}, - {"tr:provincial", RoadShieldType::Generic_White} + {"tr:provincial", RoadShieldType::Generic_White}, {"ua:national", RoadShieldType::Generic_Blue}, {"ua:regional", RoadShieldType::Generic_Blue}, {"ua:territorial", RoadShieldType::Generic_White}, @@ -677,7 +677,7 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & if (mwmName == "Cyprus") return CyprusRoadShieldParser(roadNumber).GetRoadShields(); if (mwmName == "Turkey") - return CyprusRoadShieldParser(roadNumber).GetRoadShields(); + return TurkeyRoadShieldParser(roadNumber).GetRoadShields(); return SimpleRoadShieldParser(roadNumber, SimpleRoadShieldParser::ShieldTypes()).GetRoadShields(); } -- 2.45.3 From 7d1b298dd73e5130f383a0900eab06bafca9d08a Mon Sep 17 00:00:00 2001 From: Ahmet <63475369+ahmetlii@users.noreply.github.com> Date: Fri, 12 Jan 2024 23:31:11 +0300 Subject: [PATCH 3/4] Provincial road parsing Signed-off-by: Ahmet <63475369+ahmetlii@users.noreply.github.com> --- indexer/road_shields_parser.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index f02bb2683a..cc973a460a 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -569,7 +569,6 @@ public: }; class TurkeyRoadShieldParser : public SimpleRoadShieldParser -// TODO: Add provincial road parser, formatted as (number)-(number) { public: explicit TurkeyRoadShieldParser(std::string const & baseRoadNumber) @@ -578,7 +577,10 @@ public: {"D.", RoadShieldType::Generic_Blue}, // White font. {"D-", RoadShieldType::Generic_Blue}, // White font. {"D", RoadShieldType::Generic_Blue}, // White font. - {"D ", RoadShieldType::Generic_Blue}, // White font. + {"D ", RoadShieldType::Generic_Blue}}) // White font. + { + } + : NumericRoadShieldParser(baseRoadNumber, {{01, 81, RoadShieldType::Generic_White} }}) //Blue font. { } }; -- 2.45.3 From 6aaa1bb19c967eed830c93fa652511c0c91f1553 Mon Sep 17 00:00:00 2001 From: Ahmet <63475369+ahmetlii@users.noreply.github.com> Date: Sat, 13 Jan 2024 14:41:49 +0300 Subject: [PATCH 4/4] Update road_shields_parser.cpp Signed-off-by: Ahmet <63475369+ahmetlii@users.noreply.github.com> --- indexer/road_shields_parser.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index cc973a460a..c5f3f4f03e 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -569,6 +569,7 @@ public: }; class TurkeyRoadShieldParser : public SimpleRoadShieldParser +//TODO: Implement provincial road shields, formatted as (province number, between 01-81)-(two digit number) { public: explicit TurkeyRoadShieldParser(std::string const & baseRoadNumber) @@ -579,9 +580,6 @@ public: {"D", RoadShieldType::Generic_Blue}, // White font. {"D ", RoadShieldType::Generic_Blue}}) // White font. { - } - : NumericRoadShieldParser(baseRoadNumber, {{01, 81, RoadShieldType::Generic_White} }}) //Blue font. - { } }; -- 2.45.3