From 8521a8e3130651bcad4c6291f145353a653cfaa7 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Mon, 29 Jun 2015 09:19:33 +0300 Subject: [PATCH] Corrections after colleagues comments. --- routing/osrm2feature_map.cpp | 2 +- routing/osrm2feature_map.hpp | 2 +- routing/turns_generator.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routing/osrm2feature_map.cpp b/routing/osrm2feature_map.cpp index 8d15b9b58d..dd2f61ee4b 100644 --- a/routing/osrm2feature_map.cpp +++ b/routing/osrm2feature_map.cpp @@ -365,7 +365,7 @@ bool OsrmFtSegBackwardIndex::Load(string const & nodesFileName, string const & b return true; } -void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_t maxNodeId, +void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, uint32_t maxNodeId, FilesMappingContainer & routingFile) { Clear(); diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp index 9e3d30e9d9..e24c932444 100644 --- a/routing/osrm2feature_map.hpp +++ b/routing/osrm2feature_map.hpp @@ -109,7 +109,7 @@ class OsrmFtSegBackwardIndex bool Load(string const & nodesFileName, string const & bitsFileName); public: - void Construct(OsrmFtSegMapping & mapping, uint32_t const maxNodeId, + void Construct(OsrmFtSegMapping & mapping, uint32_t maxNodeId, FilesMappingContainer & routingFile); TNodesList const & GetNodeIdByFid(uint32_t fid) const; diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp index 02e1be0e70..93793946db 100644 --- a/routing/turns_generator.cpp +++ b/routing/turns_generator.cpp @@ -111,7 +111,8 @@ public: static CarModel const carModel; if (ft.GetFeatureType() != feature::GEOM_LINE || !carModel.IsRoad(ft)) return; - for (auto const n : m_routingMapping.m_segMapping.GetNodeIdByFid(ft.GetID().m_offset)) + uint32_t const offset = ft.GetID().m_offset; + for (auto const n : m_routingMapping.m_segMapping.GetNodeIdByFid(offset)) n_nodeIds.push_back(n); } @@ -192,8 +193,8 @@ bool KeepTurnByHighwayClass(TurnDirection turn, TTurnCandidates const & possible return true; } -bool RemoveTurnByIngoingAndOutgoingEdges(TurnDirection intermediateDirection, TurnInfo const & turnInfo, - TurnItem const & turn) +bool DiscardTurnByIngoingAndOutgoingEdges(TurnDirection intermediateDirection, TurnInfo const & turnInfo, + TurnItem const & turn) { return !turn.m_keepAnyway && !turnInfo.m_isIngoingEdgeRoundabout && !turnInfo.m_isOutgoingEdgeRoundabout && IsGoStraightOrSlightTurn(intermediateDirection) @@ -375,8 +376,7 @@ void GetPossibleTurns(Index const & index, NodeID node, m2::PointD const & ingoi scales::GetUpperScale(), routingMapping.GetMwmId()); sort(geomNodes.begin(), geomNodes.end()); - auto it = unique(geomNodes.begin(), geomNodes.end()); - geomNodes.erase(it, geomNodes.end()); + geomNodes.erase(unique(geomNodes.begin(), geomNodes.end()), geomNodes.end()); // Filtering virtual edges. vector adjacentNodes; @@ -768,7 +768,7 @@ void GetTurnDirection(Index const & index, TurnInfo & turnInfo, TurnItem & turn) turn.m_turn = TurnDirection::NoTurn; // Early filtering based only on the information about ingoing and outgoing edges. - if (RemoveTurnByIngoingAndOutgoingEdges(intermediateDirection, turnInfo, turn)) + if (DiscardTurnByIngoingAndOutgoingEdges(intermediateDirection, turnInfo, turn)) return; m2::PointD const ingoingPointOneSegment =