rename ImportNode.h/cpp -> ExternalMemoryNode.h/cpp

Extractor/ExtractionWay.h

@@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_WAY_H
 #define EXTRACTION_WAY_H
 
-#include "../DataStructures/HashTable.h"
 #include "../DataStructures/TravelMode.h"
 #include "../typedefs.h"
 

Extractor/ExtractorCallbacks.cpp

@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionNode.h"
 #include "ExtractionWay.h"
 
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../DataStructures/Restriction.h"
-#include "../DataStructures/ImportNode.h"
 #include "../Util/container.hpp"
 #include "../Util/simple_logger.hpp"
 

Extractor/ExtractorStructs.h

@@ -28,23 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTORSTRUCTS_H_
 #define EXTRACTORSTRUCTS_H_
 
-#include "../DataStructures/HashTable.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../typedefs.h"
 
 #include <limits>
 #include <string>
 
-struct ExtractorRelation
-{
-    ExtractorRelation() : type(unknown) {}
-    enum
-    { unknown = 0,
-      ferry,
-      turnRestriction } type;
-    HashTable<std::string, std::string> keyVals;
-};
-
 struct WayIDStartAndEndEdge
 {
     unsigned wayID;

Extractor/RestrictionParser.cpp

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionWay.h"
 #include "ScriptingEnvironment.h"
 
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/OSRMException.h"
 #include "../Util/SimpleLogger.h"

Extractor/ScriptingEnvironment.cpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ExtractionHelperFunctions.h"
 #include "ExtractionNode.h"
 #include "ExtractionWay.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../Util/LuaUtil.h"
 #include "../Util/OSRMException.h"
 #include "../Util/simple_logger.hpp"