diff options
| author | Добрый Ээх <bukharaev@gmail.com> | 2016-11-24 12:27:18 +0300 |
|---|---|---|
| committer | Добрый Ээх <bukharaev@gmail.com> | 2016-11-24 20:11:22 +0300 |
| commit | eb1c85bce50a6d98fa92b1cec278643b26b59946 (patch) | |
| tree | 824cdf2c3530a9aea58c2df51f5bbcb6eb5d527e /routing/index_graph.cpp | |
| parent | 1d992e43bd6791135fdf02c273f3584e646bb82b (diff) | |
Pull request #4672 review fixes
Diffstat (limited to 'routing/index_graph.cpp')
| -rw-r--r-- | routing/index_graph.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp index 6e3e0136c3..f2c8131298 100644 --- a/routing/index_graph.cpp +++ b/routing/index_graph.cpp @@ -14,7 +14,7 @@ IndexGraph::IndexGraph(unique_ptr<GeometryLoader> loader, shared_ptr<EdgeEstimat void IndexGraph::GetEdgesList(Joint::Id jointId, bool isOutgoing, vector<JointEdge> & edges) const { m_jointIndex.ForEachPoint(jointId, [this, &edges, isOutgoing](RoadPoint const & rp) { - AddNeighboringEdges(rp, isOutgoing, edges); + GetNeighboringEdges(rp, isOutgoing, edges); }); } @@ -40,7 +40,7 @@ Joint::Id IndexGraph::InsertJoint(RoadPoint const & rp) return jointId; } -bool IndexGraph::JointLaysOnRoad(Joint::Id jointId, uint32_t featureId) const +bool IndexGraph::JointLiesOnRoad(Joint::Id jointId, uint32_t featureId) const { bool result = false; m_jointIndex.ForEachPoint(jointId, [&result, featureId](RoadPoint const & rp) { @@ -51,7 +51,7 @@ bool IndexGraph::JointLaysOnRoad(Joint::Id jointId, uint32_t featureId) const return result; } -inline void IndexGraph::AddNeighboringEdges(RoadPoint rp, bool isOutgoing, +inline void IndexGraph::GetNeighboringEdges(RoadPoint rp, bool isOutgoing, vector<JointEdge> & edges) const { RoadGeometry const & road = m_geometry.GetRoad(rp.GetFeatureId()); @@ -60,13 +60,13 @@ inline void IndexGraph::AddNeighboringEdges(RoadPoint rp, bool isOutgoing, bool const bidirectional = !road.IsOneWay(); if (!isOutgoing || bidirectional) - AddNeighboringEdge(road, rp, false /* forward */, edges); + GetNeighboringEdge(road, rp, false /* forward */, edges); if (isOutgoing || bidirectional) - AddNeighboringEdge(road, rp, true /* forward */, edges); + GetNeighboringEdge(road, rp, true /* forward */, edges); } -inline void IndexGraph::AddNeighboringEdge(RoadGeometry const & road, RoadPoint rp, bool forward, +inline void IndexGraph::GetNeighboringEdge(RoadGeometry const & road, RoadPoint rp, bool forward, vector<JointEdge> & edges) const { pair<Joint::Id, uint32_t> const & neighbor = m_roadIndex.FindNeighbor(rp, forward); @@ -77,8 +77,8 @@ inline void IndexGraph::AddNeighboringEdge(RoadGeometry const & road, RoadPoint } } -void IndexGraph::AddDirectEdge(uint32_t featureId, uint32_t pointFrom, uint32_t pointTo, - Joint::Id target, bool forward, vector<JointEdge> & edges) const +void IndexGraph::GetDirectedEdge(uint32_t featureId, uint32_t pointFrom, uint32_t pointTo, + Joint::Id target, bool forward, vector<JointEdge> & edges) const { RoadGeometry const & road = m_geometry.GetRoad(featureId); if (!road.IsRoad()) |