Refactoring extraction stuff

Util/GraphLoader.h

@@ -32,9 +32,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include <boost/unordered_map.hpp>
 
-#include "../DataStructures/ExtractorStructs.h"
+#include "../DataStructures/ImportNode.h"
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/NodeCoords.h"
+#include "../DataStructures/Restriction.h"
 #include "../typedefs.h"
 
 typedef boost::unordered_map<NodeID, NodeID> ExternalNodeMap;

Util/OpenMPWrapper.h

@@ -0,0 +1,34 @@
+/*
+    open source routing machine
+    Copyright (C) Dennis Luxen, others 2010
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+
+*/
+
+#ifndef _OPENMPREPLACEMENTY_H
+#define _OPENMPREPLACEMENTY_H
+
+#ifdef _OPENMP
+#include <omp.h>  	
+#else
+inline const int omp_get_num_procs() { return 1; }
+inline const int omp_get_max_threads() { return 1; }
+inline const int omp_get_thread_num() { return 0; }
+inline const void omp_set_num_threads(int i) {}
+#endif
+
+#endif

Util/StringUtil.h

@@ -24,8 +24,9 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <cstdio>
 #include <cstdlib>
 #include <string>
+#include <sstream>
 
-#include "../DataStructures/ExtractorStructs.h"
+#include "../DataStructures/Coordinate.h"
 
 // precision:  position after decimal point
 // length: maximum number of digits including comma and decimals