mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Using FtSeg::IsValid() method instead of comparison

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-02-20 16:42:51 +03:00 • committed by Alex Zolotarev
parent e64f6e6de4
commit 51b838ba9b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/osrm2feature_map.hpp
View file

@ -101,7 +101,7 @@ public:
while (r.first != r.second)
{
FtSeg s(m_segments[r.first]);
if (s.m_fid != FtSeg::INVALID_FID)
if (s.IsValid())
toDo(s);
++r.first;
}

4
routing/osrm_router.cpp
View file

@ -700,7 +700,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const &
RawRoutingResultT routingResult;
FeatureGraphNodeVecT startTask(1), targetTask(1);
startTask[0] = cross.startNode;
if (cross.startNode.m_seg.m_fid == OsrmFtSegMapping::FtSeg::INVALID_FID)
if (!cross.startNode.m_seg.IsValid())
{
startTask.push_back(cross.startNode);
startTask[0].m_node.reverse_node_id = INVALID_NODE_ID;
@ -708,7 +708,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const &
}
targetTask[0] = cross.targetNode;
if (cross.targetNode.m_seg.m_fid == OsrmFtSegMapping::FtSeg::INVALID_FID)
if (!cross.targetNode.m_seg.IsValid())
{
targetTask.push_back(cross.targetNode);
targetTask[0].m_node.reverse_node_id = INVALID_NODE_ID;