diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-05-15 13:53:38 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:48:02 +0300 |
commit | 8fd9d2fff3e186a42ae64b41cbc72d55e804897a (patch) | |
tree | 7b86ecae8d064ea0a9654ecf13d73ed7eee0a710 /indexer/ftypes_matcher.cpp | |
parent | 3397cbcfb8f87100d23c7a6d897016ad16b5cdcf (diff) |
git-clang-format
Diffstat (limited to 'indexer/ftypes_matcher.cpp')
-rw-r--r-- | indexer/ftypes_matcher.cpp | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 23d54acb0c..a8c5faa37e 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -306,15 +306,24 @@ string DebugPrint(HighwayClass const cls) out << "[ "; switch (cls) { - case HighwayClass::None: out << "None"; - case HighwayClass::Trunk: out << "Trunk"; - case HighwayClass::Primary: out << "Primary"; - case HighwayClass::Secondary: out << "Secondary"; - case HighwayClass::Tertiary: out << "Tertiary"; - case HighwayClass::LivingStreet: out << "LivingStreet"; - case HighwayClass::Service: out << "Service"; - case HighwayClass::Count: out << "Count"; - default: out << "Unknown value of HighwayClass: " << static_cast<int>(cls); + case HighwayClass::None: + out << "None"; + case HighwayClass::Trunk: + out << "Trunk"; + case HighwayClass::Primary: + out << "Primary"; + case HighwayClass::Secondary: + out << "Secondary"; + case HighwayClass::Tertiary: + out << "Tertiary"; + case HighwayClass::LivingStreet: + out << "LivingStreet"; + case HighwayClass::Service: + out << "Service"; + case HighwayClass::Count: + out << "Count"; + default: + out << "Unknown value of HighwayClass: " << static_cast<int>(cls); } out << " ]"; return out.str(); @@ -324,22 +333,21 @@ HighwayClass GetHighwayClass(feature::TypesHolder const & types) { Classificator const & c = classif(); vector<pair<HighwayClass, uint32_t>> const kHighwayClasses = { - {HighwayClass::Trunk, c.GetTypeByPath({"highway", "motorway"})}, - {HighwayClass::Trunk, c.GetTypeByPath({"highway", "motorway_link"})}, - {HighwayClass::Trunk, c.GetTypeByPath({"highway", "trunk"})}, - {HighwayClass::Trunk, c.GetTypeByPath({"highway", "trunk_link"})}, - {HighwayClass::Primary, c.GetTypeByPath({"highway", "primary"})}, - {HighwayClass::Primary, c.GetTypeByPath({"highway", "primary_link"})}, - {HighwayClass::Secondary, c.GetTypeByPath({"highway", "secondary"})}, - {HighwayClass::Secondary, c.GetTypeByPath({"highway", "secondary_link"})}, - {HighwayClass::Tertiary, c.GetTypeByPath({"highway", "tertiary"})}, - {HighwayClass::Tertiary, c.GetTypeByPath({"highway", "tertiary_link"})}, - {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "unclassified"})}, - {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "residential"})}, - {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "living_street"})}, - {HighwayClass::Service, c.GetTypeByPath({"highway", "service"})}, - {HighwayClass::Service, c.GetTypeByPath({"highway", "track"}) - }}; + {HighwayClass::Trunk, c.GetTypeByPath({"highway", "motorway"})}, + {HighwayClass::Trunk, c.GetTypeByPath({"highway", "motorway_link"})}, + {HighwayClass::Trunk, c.GetTypeByPath({"highway", "trunk"})}, + {HighwayClass::Trunk, c.GetTypeByPath({"highway", "trunk_link"})}, + {HighwayClass::Primary, c.GetTypeByPath({"highway", "primary"})}, + {HighwayClass::Primary, c.GetTypeByPath({"highway", "primary_link"})}, + {HighwayClass::Secondary, c.GetTypeByPath({"highway", "secondary"})}, + {HighwayClass::Secondary, c.GetTypeByPath({"highway", "secondary_link"})}, + {HighwayClass::Tertiary, c.GetTypeByPath({"highway", "tertiary"})}, + {HighwayClass::Tertiary, c.GetTypeByPath({"highway", "tertiary_link"})}, + {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "unclassified"})}, + {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "residential"})}, + {HighwayClass::LivingStreet, c.GetTypeByPath({"highway", "living_street"})}, + {HighwayClass::Service, c.GetTypeByPath({"highway", "service"})}, + {HighwayClass::Service, c.GetTypeByPath({"highway", "track"})}}; uint8_t const kTruncLevel = 2; for (auto t : types) @@ -359,5 +367,4 @@ HighwayClass GetHighwayClass(FeatureType const & ft) { return GetHighwayClass(feature::TypesHolder(ft)); } - } |