From 861dbd5977bdfd983e12ae09df536363c6c55422 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 17 Sep 2013 18:55:53 +0200 Subject: [PATCH] plugging in base facade ptr --- Library/OSRM.h | 4 ++++ Server/DataStructures/BaseDataFacade.h | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Library/OSRM.h b/Library/OSRM.h index 63a0672bb..0015f6203 100644 --- a/Library/OSRM.h +++ b/Library/OSRM.h @@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Plugins/NearestPlugin.h" #include "../Plugins/TimestampPlugin.h" #include "../Plugins/ViaRoutePlugin.h" +#include "../Server/DataStructures/BaseDataFacade.h" #include "../Server/DataStructures/RouteParameters.h" #include "../Util/InputFileUtil.h" #include "../Util/OSRMException.h" @@ -51,8 +52,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include class OSRM : boost::noncopyable { +private: typedef boost::unordered_map PluginMap; QueryObjectsStorage * objects; + BaseDataFacade * query_data_facade; + public: OSRM( boost::unordered_map template -class QueryDataFacade { +class BaseDataFacade { public: - QueryDataFacade() { } - virtual ~QueryDataFacade() { } + BaseDataFacade() { } + virtual ~BaseDataFacade() { } //search graph access virtual unsigned GetNumberOfNodes() const = 0; @@ -67,7 +67,6 @@ public: bool & result ) const = 0; - //node and edge information access virtual FixedPointCoordinate GetCoordinateOfNode( const unsigned id @@ -96,7 +95,6 @@ public: const unsigned name_id, std::string & result ) const = 0; - };