organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Road shields for Cyprus + No prohibitions for speed cameras #2692

Merged
AntonM030481 merged 3 commits from cyprus into master 2022-06-09 13:40:37 +00:00
Conversation 1 Commits 3 Files changed 2 +24 -1
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
indexer/road_shields_parser.cpp
View file

@ -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
routing/speed_camera_prohibition.cpp
View file

@ -9,7 +9,7 @@ namespace
{
// List of country names where mwm should be generated without speed cameras.
std::vector<std::string> kSpeedCamerasProhibitedCountries = {
"Cyprus", "Macedonia", "Switzerland", "Turkey",
"Macedonia", "Switzerland", "Turkey",
biodranik commented 2022-06-09 13:51:49 +00:00 (Migrated from github.com)
Review
Copy link

Turkey, Switzerland, Cyprus, Macedonia

In these countries all Speed Camera warning systems are illegal. Because of this, TomTom does not offer the Speed Camera service in these countries, and users driving in these countries do not need to manually change the settings of their device.

https://help.tomtom.com/hc/en-us/articles/360013899980-TomTom-Speed-Camera-service-and-the-law

Turkey, Switzerland, Cyprus, Macedonia In these countries all Speed Camera warning systems are illegal. Because of this, TomTom does not offer the Speed Camera service in these countries, and users driving in these countries do not need to manually change the settings of their device. https://help.tomtom.com/hc/en-us/articles/360013899980-TomTom-Speed-Camera-service-and-the-law
};
// List of country names where an end user should be warned about speed cameras.