plugging in base facade ptr

This commit is contained in:
Dennis Luxen 2013-09-17 18:55:53 +02:00
parent 8753dbdb0f
commit f844e9e702
2 changed files with 7 additions and 5 deletions

View File

@ -29,6 +29,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../Plugins/NearestPlugin.h" #include "../Plugins/NearestPlugin.h"
#include "../Plugins/TimestampPlugin.h" #include "../Plugins/TimestampPlugin.h"
#include "../Plugins/ViaRoutePlugin.h" #include "../Plugins/ViaRoutePlugin.h"
#include "../Server/DataStructures/BaseDataFacade.h"
#include "../Server/DataStructures/RouteParameters.h" #include "../Server/DataStructures/RouteParameters.h"
#include "../Util/IniFile.h" #include "../Util/IniFile.h"
#include "../Util/InputFileUtil.h" #include "../Util/InputFileUtil.h"
@ -44,8 +45,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <vector> #include <vector>
class OSRM : boost::noncopyable { class OSRM : boost::noncopyable {
private:
typedef boost::unordered_map<std::string, BasePlugin *> PluginMap; typedef boost::unordered_map<std::string, BasePlugin *> PluginMap;
QueryObjectsStorage * objects; QueryObjectsStorage * objects;
BaseDataFacade<QueryEdge::EdgeData> * query_data_facade;
public: public:
OSRM(const char * server_ini_path, const bool use_shared_memory = false); OSRM(const char * server_ini_path, const bool use_shared_memory = false);
~OSRM(); ~OSRM();

View File

@ -31,10 +31,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <string> #include <string>
template<class EdgeDataT> template<class EdgeDataT>
class QueryDataFacade { class BaseDataFacade {
public: public:
QueryDataFacade() { } BaseDataFacade() { }
virtual ~QueryDataFacade() { } virtual ~BaseDataFacade() { }
//search graph access //search graph access
virtual unsigned GetNumberOfNodes() const = 0; virtual unsigned GetNumberOfNodes() const = 0;
@ -67,7 +67,6 @@ public:
bool & result bool & result
) const = 0; ) const = 0;
//node and edge information access //node and edge information access
virtual FixedPointCoordinate GetCoordinateOfNode( virtual FixedPointCoordinate GetCoordinateOfNode(
const unsigned id const unsigned id
@ -96,7 +95,6 @@ public:
const unsigned name_id, const unsigned name_id,
std::string & result std::string & result
) const = 0; ) const = 0;
}; };