map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] Rename FeatureRoadGraph -> FeaturesRoadGraph.

Browse source
This commit is contained in:
Denis Koronchik 2014-07-13 22:15:25 +02:00 • committed by Alex Zolotarev
parent b85a425045
commit f6c8d375cc
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
routing/features_road_graph.cpp
View file

@ -18,12 +18,12 @@ double const READ_CROSS_RADIUS = 10.0;
double const DEFAULT_SPEED_MS = 15.0;
FeatureRoadGraph::FeatureRoadGraph(Index const * pIndex, size_t mwmID)
FeaturesRoadGraph::FeaturesRoadGraph(Index const * pIndex, size_t mwmID)
: m_pIndex(pIndex), m_mwmID(mwmID)
{
}
uint32_t FeatureRoadGraph::GetStreetReadScale()
uint32_t FeaturesRoadGraph::GetStreetReadScale()
{
return READ_ROAD_SCALE;
}
@ -31,13 +31,13 @@ uint32_t FeatureRoadGraph::GetStreetReadScale()
class CrossFeaturesLoader
{
uint32_t m_featureID;
FeatureRoadGraph & m_graph;
FeaturesRoadGraph & m_graph;
m2::PointD m_point;
IRoadGraph::TurnsVectorT & m_turns;
size_t m_count;
public:
CrossFeaturesLoader(uint32_t fID, FeatureRoadGraph & graph,
CrossFeaturesLoader(uint32_t fID, FeaturesRoadGraph & graph,
m2::PointD const & pt, IRoadGraph::TurnsVectorT & turns)
: m_featureID(fID), m_graph(graph), m_point(pt), m_turns(turns), m_count(0)
{
@ -98,7 +98,7 @@ double CalcDistanceMeters(m2::PointD const & p1, m2::PointD const & p2)
MercatorBounds::YToLat(p2.y), MercatorBounds::XToLon(p2.x));
}
void FeatureRoadGraph::LoadFeature(uint32_t id, FeatureType & ft)
void FeaturesRoadGraph::LoadFeature(uint32_t id, FeatureType & ft)
{
Index::FeaturesLoaderGuard loader(*m_pIndex, m_mwmID);
loader.GetFeature(id, ft);
@ -108,7 +108,7 @@ void FeatureRoadGraph::LoadFeature(uint32_t id, FeatureType & ft)
ASSERT_GREATER(ft.GetPointsCount(), 1, (id));
}
void FeatureRoadGraph::GetPossibleTurns(RoadPos const & pos, vector<PossibleTurn> & turns, bool noOptimize /*= true*/)
void FeaturesRoadGraph::GetPossibleTurns(RoadPos const & pos, vector<PossibleTurn> & turns, bool noOptimize /*= true*/)
{
uint32_t const ftId = pos.GetFeatureId();
FeatureType ft;
@ -208,7 +208,7 @@ void FeatureRoadGraph::GetPossibleTurns(RoadPos const & pos, vector<PossibleTurn
}
}
void FeatureRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route & route)
void FeaturesRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route & route)
{
size_t count = positions.size();
if (count < 2)
@ -261,13 +261,13 @@ void FeatureRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route &
route.SetGeometry(poly.rbegin(), poly.rend());
}
bool FeatureRoadGraph::IsStreet(feature::TypesHolder const & types) const
bool FeaturesRoadGraph::IsStreet(feature::TypesHolder const & types) const
{
return (types.GetGeoType() == feature::GEOM_LINE &&
ftypes::IsStreetChecker::Instance()(types));
}
bool FeatureRoadGraph::IsOneway(feature::TypesHolder const & types) const
bool FeaturesRoadGraph::IsOneway(feature::TypesHolder const & types) const
{
return ftypes::IsStreetChecker::Instance().IsOneway(types);
}

4
routing/features_road_graph.hpp
View file

@ -13,10 +13,10 @@ namespace feature
namespace routing
{
class FeatureRoadGraph : public IRoadGraph
class FeaturesRoadGraph : public IRoadGraph
{
public:
FeatureRoadGraph(Index const * pIndex, size_t mwmID);
FeaturesRoadGraph(Index const * pIndex, size_t mwmID);
virtual void GetPossibleTurns(RoadPos const & pos, vector<PossibleTurn> & turns, bool noOptimize = true);
virtual void ReconstructPath(RoadPosVectorT const & positions, Route & route);

6
routing/road_graph_router.cpp
View file

@ -71,7 +71,7 @@ size_t RoadGraphRouter::GetRoadPos(m2::PointD const & pt, vector<RoadPos> & pos)
Point2RoadPos getter(pt);
m_pIndex->ForEachInRect(getter,
MercatorBounds::RectByCenterXYAndSizeInMeters(pt, 100.0),
FeatureRoadGraph::GetStreetReadScale());
FeaturesRoadGraph::GetStreetReadScale());
getter.GetResults(pos);
return getter.GetMwmID();
@ -79,7 +79,7 @@ size_t RoadGraphRouter::GetRoadPos(m2::PointD const & pt, vector<RoadPos> & pos)
bool RoadGraphRouter::IsMyMWM(size_t mwmID) const
{
return (m_pRoadGraph && dynamic_cast<FeatureRoadGraph const *>(m_pRoadGraph.get())->GetMwmID() == mwmID);
return (m_pRoadGraph && dynamic_cast<FeaturesRoadGraph const *>(m_pRoadGraph.get())->GetMwmID() == mwmID);
}
void RoadGraphRouter::SetFinalPoint(m2::PointD const & finalPt)
@ -90,7 +90,7 @@ void RoadGraphRouter::SetFinalPoint(m2::PointD const & finalPt)
if (!finalPos.empty())
{
if (!IsMyMWM(mwmID))
m_pRoadGraph.reset(new FeatureRoadGraph(m_pIndex, mwmID));
m_pRoadGraph.reset(new FeaturesRoadGraph(m_pIndex, mwmID));
SetFinalRoadPos(finalPos);
}

2
routing/routing_tests/features_road_graph_test.cpp
View file

@ -71,7 +71,7 @@ FeatureRoadGraphTester::FeatureRoadGraphTester(string const & name)
return;
}
m_graph = new FeatureRoadGraph(&m_index, 0);
m_graph = new FeaturesRoadGraph(&m_index, 0);
m_index.ForEachInRect(m_mapping, MercatorBounds::FullRect(), m_graph->GetStreetReadScale());
}

4
routing/routing_tests/features_road_graph_test.hpp
View file

@ -24,7 +24,7 @@ public:
class FeatureRoadGraphTester
{
routing::FeatureRoadGraph * m_graph;
routing::FeaturesRoadGraph * m_graph;
Name2IdMapping m_mapping;
Index m_index;
@ -33,7 +33,7 @@ class FeatureRoadGraphTester
public:
FeatureRoadGraphTester(string const & name);
routing::FeatureRoadGraph * GetGraph() { return m_graph; }
routing::FeaturesRoadGraph * GetGraph() { return m_graph; }
void FeatureID2Name(routing::IRoadGraph::TurnsVectorT & vec);
void FeatureID2Name(vector<routing::RoadPos> & vec);