Moving DataStructures out of Plugin directory

DataStructures/RawRouteData.h

@@ -21,8 +21,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef RAWROUTEDATA_H_
 #define RAWROUTEDATA_H_
 
+#include "../DataStructures/Coordinate.h"
+#include "../DataStructures/PhantomNodes.h"
 #include "../typedefs.h"
 
+#include <vector>
+
 struct _PathData {
     _PathData(NodeID no, unsigned na, unsigned tu, unsigned dur) : node(no), nameID(na), durationOfSegment(dur), turnInstruction(tu) { }
     NodeID node;

Plugins/BasePlugin.h

@@ -21,9 +21,9 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef BASEPLUGIN_H_
 #define BASEPLUGIN_H_
 
-#include "RouteParameters.h"
 #include "../DataStructures/Coordinate.h"
 #include "../Server/BasicDatastructures.h"
+#include "../Server/DataStructures/RouteParameters.h"
 
 #include <string>
 #include <vector>

Plugins/HelloWorldPlugin.h

@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define HELLOWORLDPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include <sstream>
 

Plugins/LocatePlugin.h

@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define LOCATEPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 #include "../DataStructures/NodeInformationHelpDesk.h"
 #include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/StringUtil.h"

Plugins/NearestPlugin.h

@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define NearestPlugin_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include "../DataStructures/NodeInformationHelpDesk.h"
 #include "../Server/DataStructures/QueryObjectsStorage.h"

Plugins/TimestampPlugin.h

@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define TIMESTAMPPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 class TimestampPlugin : public BasePlugin {
 public:

Plugins/ViaRoutePlugin.h

@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define VIAROUTEPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include "../Algorithms/ObjectToBase64.h"
 #include "../DataStructures/HashTable.h"

RoutingAlgorithms/BasicRoutingInterface.h

@@ -23,7 +23,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef BASICROUTINGINTERFACE_H_
 #define BASICROUTINGINTERFACE_H_
 
-#include "../Plugins/RawRouteData.h"
+#include "../DataStructures/RawRouteData.h"
 #include "../Util/ContainerUtils.h"
 #include "../Util/SimpleLogger.h"
 

Server/DataStructures/RouteParameters.h

@@ -21,8 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef ROUTE_PARAMETERS_H
 #define ROUTE_PARAMETERS_H
 
-#include "../DataStructures/Coordinate.h"
-#include "../DataStructures/HashTable.h"
+#include "../../DataStructures/Coordinate.h"
+#include "../../DataStructures/HashTable.h"
 
 #include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>