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

DataStructures/ExternalMemoryNode.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "ImportNode.h"
+#include "ExternalMemoryNode.h"
 
 #include <limits>
 
@@ -52,13 +52,3 @@ ExternalMemoryNode ExternalMemoryNode::max_value()
                               false,
                               false);
 }
-
-void ImportNode::Clear()
-{
-    keyVals.Clear();
-    lat = 0;
-    lon = 0;
-    node_id = 0;
-    bollard = false;
-    trafficLight = false;
-}

DataStructures/ExternalMemoryNode.h

@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define IMPORTNODE_H_
 
 #include "QueryNode.h"
-#include "../DataStructures/HashTable.h"
 
 #include <string>
 
@@ -47,11 +46,4 @@ struct ExternalMemoryNode : NodeInfo
     bool trafficLight;
 };
 
-struct ImportNode : public ExternalMemoryNode
-{
-    HashTable<std::string, std::string> keyVals;
-
-    inline void Clear();
-};
-
 #endif /* IMPORTNODE_H_ */

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"

Server/DataStructures/BaseDataFacade.h

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Exposes all data access interfaces to the algorithms via base class ptr
 
 #include "../../DataStructures/EdgeBasedNode.h"
-#include "../../DataStructures/ImportNode.h"
+#include "../../DataStructures/ExternalMemoryNode.h"
 #include "../../DataStructures/phantom_node.hpp"
 #include "../../DataStructures/Range.h"
 #include "../../DataStructures/TurnInstructions.h"

Util/GraphLoader.h

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GRAPHLOADER_H
 
 #include "OSRMException.h"
-#include "../DataStructures/ImportNode.h"
+#include "../DataStructures/ExternalMemoryNode.h"
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Restriction.h"