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

[routing] Fixed bug in features loader graph - check for features from the same MWM.

Browse source
This commit is contained in:
vng 2014-07-13 11:42:03 +02:00 • committed by Alex Zolotarev
parent ac74cc675d
commit 8b88ff514c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
routing/features_road_graph.cpp
View file

@ -50,8 +50,8 @@ public:
void operator()(FeatureType const & ft)
{
FeatureID fID = ft.GetID();
if (m_featureID == fID.m_offset)
FeatureID const fID = ft.GetID();
if (m_featureID == fID.m_offset || fID.m_mwm != m_graph.GetMwmID())
return;
feature::TypesHolder types(ft);
@ -89,7 +89,6 @@ public:
m_turns.push_back(t);
}
}
}
};
@ -104,6 +103,9 @@ void FeatureRoadGraph::LoadFeature(uint32_t id, FeatureType & ft)
Index::FeaturesLoaderGuard loader(*m_pIndex, m_mwmID);
loader.GetFeature(id, ft);
ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
ASSERT_EQUAL(ft.GetFeatureType(), feature::GEOM_LINE, (id));
ASSERT_GREATER(ft.GetPointsCount(), 1, (id));
}
void FeatureRoadGraph::GetPossibleTurns(RoadPos const & pos, vector<PossibleTurn> & turns)

2
routing/features_road_graph.hpp
View file

@ -23,6 +23,8 @@ public:
static uint32_t GetStreetReadScale();
inline size_t GetMwmID() const { return m_mwmID; }
private:
friend class CrossFeaturesLoader;