diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2019-03-10 08:26:28 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2019-03-10 08:30:31 +0300 |
commit | 4744a3dba498bc11d91c577464dbc9cdd957c2e0 (patch) | |
tree | 7eb3ed5b35013883b7da4d0bd568ca1501450656 /openlr/road_info_getter.cpp | |
parent | 186b4cea4a2dcfb0a8bb903d1d017afb5e300452 (diff) |
Gathering matching openlr to osm edge to single place of code.
Diffstat (limited to 'openlr/road_info_getter.cpp')
-rw-r--r-- | openlr/road_info_getter.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/openlr/road_info_getter.cpp b/openlr/road_info_getter.cpp index 49d96330d3..498478be9f 100644 --- a/openlr/road_info_getter.cpp +++ b/openlr/road_info_getter.cpp @@ -6,23 +6,6 @@ #include "base/assert.hpp" -namespace -{ -openlr::FunctionalRoadClass HighwayClassToFunctionalRoadClass(ftypes::HighwayClass const & hwClass) -{ - switch (hwClass) - { - case ftypes::HighwayClass::Trunk: return openlr::FunctionalRoadClass::FRC0; - case ftypes::HighwayClass::Primary: return openlr::FunctionalRoadClass::FRC1; - case ftypes::HighwayClass::Secondary: return openlr::FunctionalRoadClass::FRC2; - case ftypes::HighwayClass::Tertiary: return openlr::FunctionalRoadClass::FRC3; - case ftypes::HighwayClass::LivingStreet: return openlr::FunctionalRoadClass::FRC4; - case ftypes::HighwayClass::Service: return openlr::FunctionalRoadClass::FRC5; - default: return openlr::FunctionalRoadClass::FRC7; - } -} -} // namespace - namespace openlr { RoadInfoGetter::RoadInfoGetter(DataSource const & dataSource) @@ -41,26 +24,12 @@ RoadInfoGetter::RoadInfo RoadInfoGetter::Get(FeatureID const & fid) CHECK(g.GetOriginalFeatureByIndex(fid.m_index, ft), ()); RoadInfo info; - info.m_fow = GetFormOfWay(feature::TypesHolder(ft)); info.m_hwClass = ftypes::GetHighwayClass(feature::TypesHolder(ft)); info.m_link = ftypes::IsLinkChecker::Instance()(ft); info.m_oneWay = ftypes::IsOneWayChecker::Instance()(ft); - info.m_frc = HighwayClassToFunctionalRoadClass(info.m_hwClass); it = m_cache.emplace(fid, info).first; return it->second; } - -FormOfWay RoadInfoGetter::GetFormOfWay(feature::TypesHolder const & types) const -{ - auto const hwClass = ftypes::GetHighwayClass(feature::TypesHolder(types)); - if (hwClass == ftypes::HighwayClass::Trunk) - return FormOfWay::Motorway; - - if (hwClass == ftypes::HighwayClass::Primary) - return FormOfWay::MultipleCarriageway; - - return FormOfWay::SingleCarriageway; -} } // namespace openlr |