Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

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

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-29 11:38:53 +02:00
parent 7300024e13
commit a6f34d2044
9 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataStructures/ImportNode.cpp → DataStructures/ExternalMemoryNode.cpp
View File

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

8
DataStructures/ImportNode.h → DataStructures/ExternalMemoryNode.h
View File

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

1
Extractor/ExtractionWay.h
View File

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

2
Extractor/ExtractorCallbacks.cpp
View File

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

13
Extractor/ExtractorStructs.h
View File

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

2
Extractor/RestrictionParser.cpp
View File

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

2
Extractor/ScriptingEnvironment.cpp
View File

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

2
Server/DataStructures/BaseDataFacade.h
View File

@ -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 // Exposes all data access interfaces to the algorithms via base class ptr
#include "../../DataStructures/EdgeBasedNode.h" #include "../../DataStructures/EdgeBasedNode.h"
#include "../../DataStructures/ImportNode.h" #include "../../DataStructures/ExternalMemoryNode.h"
#include "../../DataStructures/phantom_node.hpp" #include "../../DataStructures/phantom_node.hpp"
#include "../../DataStructures/Range.h" #include "../../DataStructures/Range.h"
#include "../../DataStructures/TurnInstructions.h" #include "../../DataStructures/TurnInstructions.h"

2
Util/GraphLoader.h
View File

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