From f09e9b7790f958004e39ed5845507141c79e9065 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Wed, 18 Sep 2013 18:32:50 +0200
Subject: [PATCH] make plugins templates that plug into data facade

---
 Plugins/LocatePlugin.h    | 5 ++++-
 Plugins/NearestPlugin.h   | 9 ++++++---
 Plugins/TimestampPlugin.h | 6 ++++--
 Plugins/ViaRoutePlugin.h  | 5 +++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h
index fdef0cab4..43b43bca2 100644
--- a/Plugins/LocatePlugin.h
+++ b/Plugins/LocatePlugin.h
@@ -36,9 +36,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * This Plugin locates the nearest node in the road network for a given coordinate.
  */
+//TODO: Rework data access to go through facade
+
+template<class DataFacadeT>
 class LocatePlugin : public BasePlugin {
 public:
-    LocatePlugin(QueryObjectsStorage * objects) : descriptor_string("locate") {
+    LocatePlugin(DataFacadeT * objects) : descriptor_string("locate") {
         nodeHelpDesk = objects->nodeHelpDesk;
     }
     const std::string & GetDescriptor() const { return descriptor_string; }
diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h
index 36433a5ce..858d286e9 100644
--- a/Plugins/NearestPlugin.h
+++ b/Plugins/NearestPlugin.h
@@ -31,15 +31,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasePlugin.h"
 
 #include "../DataStructures/NodeInformationHelpDesk.h"
-#include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/StringUtil.h"
 
 /*
  * This Plugin locates the nearest point on a street in the road network for a given coordinate.
  */
+
+//TODO: Rework data access to go through facade
+
+template<class DataFacadeT>
 class NearestPlugin : public BasePlugin {
 public:
-    NearestPlugin(QueryObjectsStorage * objects )
+    NearestPlugin(DataFacadeT * objects )
      :
         m_query_objects(objects),
         descriptor_string("nearest")
@@ -121,7 +124,7 @@ public:
     }
 
 private:
-    QueryObjectsStorage * m_query_objects;
+    DataFacadeT * m_query_objects;
     HashTable<std::string, unsigned> descriptorTable;
     std::string descriptor_string;
 };
diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h
index d778bb71d..ccf188cee 100644
--- a/Plugins/TimestampPlugin.h
+++ b/Plugins/TimestampPlugin.h
@@ -29,10 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TIMESTAMPPLUGIN_H_
 
 #include "BasePlugin.h"
+//TODO: Rework data access to go through facade
 
+template<class DataFacadeT>
 class TimestampPlugin : public BasePlugin {
 public:
-    TimestampPlugin(QueryObjectsStorage * o)
+    TimestampPlugin(DataFacadeT * o)
      : objects(o), descriptor_string("timestamp")
     { }
     const std::string & GetDescriptor() const { return descriptor_string; }
@@ -73,7 +75,7 @@ public:
         reply.headers[0].value = tmp;
     }
 private:
-    QueryObjectsStorage * objects;
+    DataFacadeT * objects;
     std::string descriptor_string;
 };
 
diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
index a4e74184c..6009d5f83 100644
--- a/Plugins/ViaRoutePlugin.h
+++ b/Plugins/ViaRoutePlugin.h
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Descriptors/BaseDescriptor.h"
 #include "../Descriptors/GPXDescriptor.h"
 #include "../Descriptors/JSONDescriptor.h"
-#include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/SimpleLogger.h"
 #include "../Util/StringUtil.h"
 
@@ -48,6 +47,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
+//TODO: Rework data access to go through facade
+template<class DataFacadeT>
 class ViaRoutePlugin : public BasePlugin {
 private:
     NodeInformationHelpDesk * nodeHelpDesk;
@@ -56,7 +57,7 @@ private:
     SearchEngine * searchEnginePtr;
 public:
 
-    ViaRoutePlugin(QueryObjectsStorage * objects)
+    ViaRoutePlugin(DataFacadeT * objects)
      :
         // objects(objects),
         descriptor_string("viaroute")