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

Adding CarModelFactory and using it in CreateCarAStarBidirectionalRouter

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-10-14 17:39:47 +03:00
parent f4da573250
commit 5daa09c9fd
6 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/generator_tests/osm_type_test.cpp
View file

@ -593,7 +593,7 @@ UNIT_TEST(OsmType_Surface)
UNIT_TEST(OsmType_Ferry)
{
routing::CarModel const & carModel = routing::CarModel::Instance();
routing::CarModel const & carModel = routing::CarModel::AllLimitsInstance();
char const * arr[][2] = {
{ "motorcar", "yes" },

16
routing/car_model.cpp
View file

@ -75,10 +75,24 @@ CarModel::CarModel()
}
// static
CarModel const & CarModel::Instance()
CarModel const & CarModel::AllLimitsInstance()
{
static CarModel const instance;
return instance;
}
CarModelFactory::CarModelFactory()
{
m_model = make_shared<CarModel>();
}
shared_ptr<IVehicleModel> CarModelFactory::GetVehicleModel() const
{
return m_model;
}
shared_ptr<IVehicleModel> CarModelFactory::GetVehicleModelForCountry(string const & /* country */) const
{
return m_model;
}
} // namespace routing

19
routing/car_model.hpp
View file

@ -1,16 +1,29 @@
#pragma once
#include "vehicle_model.hpp"
#include "std/shared_ptr.hpp"
namespace routing
{
class CarModel : public VehicleModel
{
public:
CarModel();
public:
static CarModel const & Instance();
static CarModel const & AllLimitsInstance();
};
class CarModelFactory : public IVehicleModelFactory
{
public:
CarModelFactory();
// IVehicleModelFactory overrides:
shared_ptr<IVehicleModel> GetVehicleModel() const override;
shared_ptr<IVehicleModel> GetVehicleModelForCountry(string const & country) const override;
private:
shared_ptr<IVehicleModel> m_model;
};
} // namespace routing

4
routing/osrm_helpers.cpp
View file

@ -38,7 +38,7 @@ void Point2PhantomNode::FindNearestSegment(FeatureType const & ft, m2::PointD co
void Point2PhantomNode::operator()(FeatureType const & ft)
{
if (!CarModel::Instance().IsRoad(ft))
if (!CarModel::AllLimitsInstance().IsRoad(ft))
return;
Candidate res;
@ -280,7 +280,7 @@ void Point2PhantomNode::CalculateWeights(FeatureGraphNode & node) const
void Point2Node::operator()(FeatureType const & ft)
{
if (!CarModel::Instance().IsRoad(ft))
if (!CarModel::AllLimitsInstance().IsRoad(ft))
return;
uint32_t const featureId = ft.GetID().m_index;
for (auto const & n : m_routingMapping.m_segMapping.GetNodeIdByFid(featureId))

3
routing/road_graph_router.cpp
View file

@ -1,5 +1,6 @@
#include "routing/bicycle_directions.hpp"
#include "routing/bicycle_model.hpp"
#include "routing/car_model.hpp"
#include "routing/features_road_graph.hpp"
#include "routing/nearest_edge_finder.hpp"
#include "routing/pedestrian_directions.hpp"
@ -314,7 +315,7 @@ unique_ptr<IRouter> CreateBicycleAStarBidirectionalRouter(Index & index, TCountr
unique_ptr<RoadGraphRouter> CreateCarAStarBidirectionalRouter(Index & index, TCountryFileFn const & countryFileFn)
{
// @TODO It's necessary to use car classes instead of bicycle ones.
unique_ptr<IVehicleModelFactory> vehicleModelFactory = make_unique<BicycleModelFactory>();
unique_ptr<IVehicleModelFactory> vehicleModelFactory = make_unique<CarModelFactory>();
unique_ptr<IRoutingAlgorithm> algorithm = make_unique<AStarBidirectionalRoutingAlgorithm>();
unique_ptr<IDirectionsEngine> directionsEngine = make_unique<BicycleDirectionsEngine>(index);
unique_ptr<RoadGraphRouter> router = make_unique<RoadGraphRouter>(

2
routing/routing_helpers.hpp
View file

@ -10,7 +10,7 @@ namespace routing
template <class TTypes>
bool IsRoad(TTypes const & types)
{
return CarModel::Instance().HasRoadType(types) ||
return CarModel::AllLimitsInstance().HasRoadType(types) ||
PedestrianModel::AllLimitsInstance().HasRoadType(types) ||
BicycleModel::AllLimitsInstance().HasRoadType(types);
}