diff options
author | Arsentiy Milchakov <milcars@mapswithme.com> | 2019-04-17 14:12:52 +0300 |
---|---|---|
committer | Tatiana Yan <tatiana.kondakova@gmail.com> | 2019-04-18 16:53:21 +0300 |
commit | 0b9a22ea84872625ef8a5c90cbdf3ae0c51a5e6c (patch) | |
tree | e4766d9b8f96ac02c80b2a395b1024ee70e64c93 /routing | |
parent | 585e1eec5af5b868e958a862724cfedd1b49f1be (diff) |
[indexer] enum feature::EGeomType is changed to enum class feature::GeomType
Diffstat (limited to 'routing')
-rw-r--r-- | routing/features_road_graph.cpp | 6 | ||||
-rw-r--r-- | routing/index_road_graph.cpp | 4 | ||||
-rw-r--r-- | routing/road_graph.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp index 74182c0fff..4a02bc8a56 100644 --- a/routing/features_road_graph.cpp +++ b/routing/features_road_graph.cpp @@ -202,7 +202,7 @@ void FeaturesRoadGraph::GetFeatureTypes(FeatureID const & featureId, feature::Ty if (!ft) return; - ASSERT_EQUAL(ft->GetFeatureType(), feature::GEOM_LINE, ()); + ASSERT_EQUAL(ft->GetGeomType(), feature::GeomType::Line, ()); types = feature::TypesHolder(*ft); } @@ -216,7 +216,7 @@ void FeaturesRoadGraph::GetJunctionTypes(Junction const & junction, feature::Typ if (!types.Empty()) return; - if (ft.GetFeatureType() != feature::GEOM_POINT) + if (ft.GetGeomType() != feature::GeomType::Point) return; if (!base::AlmostEqualAbs(ft.GetCenter(), cross, routing::kPointsEqualEpsilon)) @@ -300,7 +300,7 @@ IRoadGraph::RoadInfo const & FeaturesRoadGraph::GetCachedRoadInfo(FeatureID cons if (!ft) return ri; - ASSERT_EQUAL(ft->GetFeatureType(), feature::GEOM_LINE, ()); + ASSERT_EQUAL(ft->GetGeomType(), feature::GeomType::Line, ()); ExtractRoadInfo(featureId, *ft, GetSpeedKMpHFromFt(*ft, speedParams), ri); return ri; diff --git a/routing/index_road_graph.cpp b/routing/index_road_graph.cpp index 2d5b80f2b8..9ba9600535 100644 --- a/routing/index_road_graph.cpp +++ b/routing/index_road_graph.cpp @@ -54,7 +54,7 @@ void IndexRoadGraph::GetEdgeTypes(Edge const & edge, feature::TypesHolder & type { if (edge.IsFake()) { - types = feature::TypesHolder(feature::GEOM_LINE); + types = feature::TypesHolder(feature::GeomType::Line); return; } @@ -67,7 +67,7 @@ void IndexRoadGraph::GetEdgeTypes(Edge const & edge, feature::TypesHolder & type return; } - ASSERT_EQUAL(ft->GetFeatureType(), feature::GEOM_LINE, ()); + ASSERT_EQUAL(ft->GetGeomType(), feature::GeomType::Line, ()); types = feature::TypesHolder(*ft); } diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp index 65a40dd773..3aefaffcfb 100644 --- a/routing/road_graph.cpp +++ b/routing/road_graph.cpp @@ -302,7 +302,7 @@ double IRoadGraph::GetSpeedKMpH(Edge const & edge, SpeedParams const & speedPara void IRoadGraph::GetEdgeTypes(Edge const & edge, feature::TypesHolder & types) const { if (edge.IsFake()) - types = feature::TypesHolder(feature::GEOM_LINE); + types = feature::TypesHolder(feature::GeomType::Line); else GetFeatureTypes(edge.GetFeatureId(), types); } |