diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp index 8c5b3855a1..5a8a0e0101 100644 --- a/routing/index_graph.cpp +++ b/routing/index_graph.cpp @@ -64,7 +64,7 @@ bool IndexGraph::IsJointOrEnd(Segment const & segment, bool fromStart) } void IndexGraph::GetEdgeList(Segment const & segment, bool isOutgoing, bool useRoutingOptions, - vector & edges, Parents & parents) + vector & edges, Parents const & parents) { RoadPoint const roadPoint = segment.GetRoadPoint(isOutgoing); Joint::Id const jointId = m_roadIndex.GetJointId(roadPoint); @@ -140,13 +140,13 @@ optional IndexGraph::GetJointEdgeByLastPoint(Segment const & parent, Segment const & firstChild, bool isOutgoing, uint32_t lastPoint) { - vector const possibleChilds = {firstChild}; + vector const possibleChildren = {firstChild}; vector const lastPoints = {lastPoint}; vector edges; vector parentWeights; Parents emptyParents; - ReconstructJointSegment({} /* parentJoint */, parent, possibleChilds, lastPoints, + ReconstructJointSegment({} /* parentJoint */, parent, possibleChildren, lastPoints, isOutgoing, edges, parentWeights, emptyParents); CHECK_LESS_OR_EQUAL(edges.size(), 1, ()); @@ -203,7 +203,7 @@ void IndexGraph::SetRoadAccess(RoadAccess && roadAccess) { m_roadAccess = move(r void IndexGraph::GetNeighboringEdges(Segment const & from, RoadPoint const & rp, bool isOutgoing, bool useRoutingOptions, vector & edges, - Parents & parents) + Parents const & parents) { RoadGeometry const & road = m_geometry->GetRoad(rp.GetFeatureId()); @@ -266,7 +266,7 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg /// \brief Prolongs segments from |parent| to |firstChildren| directions in order to /// create JointSegments. -/// \param |firstChildren| - vecotor of neigbouring segments from parent. +/// \param |firstChildren| - vector of neighbouring segments from parent. /// \param |lastPointIds| - vector of the end numbers of road points for |firstChildren|. /// \param |jointEdges| - the result vector with JointEdges. /// \param |parentWeights| - see |IndexGraphStarterJoints::GetEdgeList| method about this argument. @@ -279,7 +279,7 @@ void IndexGraph::ReconstructJointSegment(JointSegment const & parentJoint, bool isOutgoing, vector & jointEdges, vector & parentWeights, - Parents & parents) + Parents const & parents) { CHECK_EQUAL(firstChildren.size(), lastPointIds.size(), ()); @@ -359,7 +359,7 @@ void IndexGraph::ReconstructJointSegment(JointSegment const & parentJoint, } void IndexGraph::GetNeighboringEdge(Segment const & from, Segment const & to, bool isOutgoing, - vector & edges, Parents & parents) + vector & edges, Parents const & parents) { if (IsUTurn(from, to) && IsUTurnAndRestricted(from, to, isOutgoing)) return; diff --git a/routing/index_graph.hpp b/routing/index_graph.hpp index 24e515e1b3..0a7c727005 100644 --- a/routing/index_graph.hpp +++ b/routing/index_graph.hpp @@ -52,7 +52,7 @@ public: // Put outgoing (or ingoing) egdes for segment to the 'edges' vector. void GetEdgeList(Segment const & segment, bool isOutgoing, bool useRoutingOptions, std::vector & edges, - Parents & parents = kEmptyParentsSegments); + Parents const & parents = kEmptyParentsSegments); void GetEdgeList(JointSegment const & parentJoint, Segment const & parent, bool isOutgoing, std::vector & edges, @@ -119,7 +119,7 @@ public: bool IsRestricted(ParentVertex const & parent, uint32_t parentFeatureId, uint32_t currentFeatureId, bool isOutgoing, - Parents & parents) const; + Parents const & parents) const; bool IsUTurnAndRestricted(Segment const & parent, Segment const & child, bool isOutgoing) const; @@ -129,9 +129,9 @@ public: private: void GetNeighboringEdges(Segment const & from, RoadPoint const & rp, bool isOutgoing, bool useRoutingOptions, std::vector & edges, - Parents & parents); + Parents const & parents); void GetNeighboringEdge(Segment const & from, Segment const & to, bool isOutgoing, - std::vector & edges, Parents & parents); + std::vector & edges, Parents const & parents); struct PenaltyData { @@ -156,7 +156,7 @@ private: bool isOutgoing, std::vector & jointEdges, std::vector & parentWeights, - Parents & parents); + Parents const & parents); std::shared_ptr m_geometry; std::shared_ptr m_estimator; @@ -188,7 +188,7 @@ bool IndexGraph::IsRestricted(ParentVertex const & parent, uint32_t parentFeatureId, uint32_t currentFeatureId, bool isOutgoing, - Parents & parents) const + Parents const & parents) const { if (parentFeatureId == currentFeatureId) return false;