From e518116d4b17651d8326ca3ce2cc52cbf64d3766 Mon Sep 17 00:00:00 2001 From: Anton Makouski Date: Wed, 8 Jun 2022 10:19:09 +0300 Subject: [PATCH 1/3] Road shields for Cyprus Signed-off-by: Anton Makouski --- indexer/road_shields_parser.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index fbc91df495..c339274102 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -513,6 +513,27 @@ public: } }; +class CyprusRoadShieldParser : public SimpleRoadShieldParser +{ +public: + explicit CyprusRoadShieldParser(std::string const & baseRoadNumber) + : SimpleRoadShieldParser(baseRoadNumber, {// North Cuprus. + {"D.", RoadShieldType::Generic_Blue}, // White font. + {"GM.", RoadShieldType::Generic_White}, // Blue font. + {"GZ.", RoadShieldType::Generic_White}, // Blue font. + {"GR.", RoadShieldType::Generic_White}, // Blue font. + {"LF.", RoadShieldType::Generic_White}, // Blue font. + {"İK.", RoadShieldType::Generic_White}, // Blue font. + // South Cyprus + {"A", RoadShieldType::Generic_Green}, // Yellow font. Hexagon. + {"B", RoadShieldType::Generic_Blue}, // Yellow font. + {"E", RoadShieldType::Generic_Blue}, // Yellow font. + {"F", RoadShieldType::Generic_Blue}, // Yellow font. + {"U", RoadShieldType::Generic_Blue}}) // Yellow font. + { + } +}; + class MexicoRoadShieldParser : public RoadShieldParser { public: @@ -606,6 +627,8 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & return MalaysiaRoadShieldParser(roadNumber).GetRoadShields(); if (mwmName == "Mexico") return MexicoRoadShieldParser(roadNumber).GetRoadShields(); + if (mwmName == "Cyprus") + return CyprusRoadShieldParser(roadNumber).GetRoadShields(); return SimpleRoadShieldParser(roadNumber, SimpleRoadShieldParser::ShieldTypes()).GetRoadShields(); } -- 2.45.3 From 4b9e14eee75901818efede53248232cfd5792645 Mon Sep 17 00:00:00 2001 From: Anton Makouski Date: Wed, 8 Jun 2022 10:20:00 +0300 Subject: [PATCH 2/3] No prohibitions for speed cameras in Cyprus Signed-off-by: Anton Makouski --- routing/speed_camera_prohibition.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routing/speed_camera_prohibition.cpp b/routing/speed_camera_prohibition.cpp index bf3f26df0c..f221bd7b27 100644 --- a/routing/speed_camera_prohibition.cpp +++ b/routing/speed_camera_prohibition.cpp @@ -9,7 +9,7 @@ namespace { // List of country names where mwm should be generated without speed cameras. std::vector kSpeedCamerasProhibitedCountries = { - "Cyprus", "Macedonia", "Switzerland", "Turkey", + "Macedonia", "Switzerland", "Turkey", }; // List of country names where an end user should be warned about speed cameras. -- 2.45.3 From 2fb2787c97654eb2f9426431f2182d41457a3e95 Mon Sep 17 00:00:00 2001 From: Anton Makouski Date: Wed, 8 Jun 2022 10:25:42 +0300 Subject: [PATCH 3/3] Comment style Signed-off-by: Anton Makouski --- indexer/road_shields_parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index c339274102..f3afe9bdfb 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -524,7 +524,7 @@ public: {"GR.", RoadShieldType::Generic_White}, // Blue font. {"LF.", RoadShieldType::Generic_White}, // Blue font. {"İK.", RoadShieldType::Generic_White}, // Blue font. - // South Cyprus + // South Cyprus. {"A", RoadShieldType::Generic_Green}, // Yellow font. Hexagon. {"B", RoadShieldType::Generic_Blue}, // Yellow font. {"E", RoadShieldType::Generic_Blue}, // Yellow font. -- 2.45.3