Removing Adress data type that is not needed during extraction
This commit is contained in:
parent
1412c5db42
commit
87df312a9d
@ -32,7 +32,6 @@ public:
|
|||||||
typedef stxxl::vector<NodeID> STXXLNodeIDVector;
|
typedef stxxl::vector<NodeID> STXXLNodeIDVector;
|
||||||
typedef stxxl::vector<_Node> STXXLNodeVector;
|
typedef stxxl::vector<_Node> STXXLNodeVector;
|
||||||
typedef stxxl::vector<_Edge> STXXLEdgeVector;
|
typedef stxxl::vector<_Edge> STXXLEdgeVector;
|
||||||
typedef stxxl::vector<_Address> STXXLAddressVector;
|
|
||||||
typedef stxxl::vector<std::string> STXXLStringVector;
|
typedef stxxl::vector<std::string> STXXLStringVector;
|
||||||
typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector;
|
typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector;
|
||||||
typedef stxxl::vector<_WayIDStartAndEndEdge> STXXLWayIDStartEndVector;
|
typedef stxxl::vector<_WayIDStartAndEndEdge> STXXLWayIDStartEndVector;
|
||||||
@ -42,7 +41,6 @@ public:
|
|||||||
usedNodeIDs.clear();
|
usedNodeIDs.clear();
|
||||||
allNodes.clear();
|
allNodes.clear();
|
||||||
allEdges.clear();
|
allEdges.clear();
|
||||||
adressVector.clear();
|
|
||||||
nameVector.clear();
|
nameVector.clear();
|
||||||
restrictionsVector.clear();
|
restrictionsVector.clear();
|
||||||
wayStartEndVector.clear();
|
wayStartEndVector.clear();
|
||||||
@ -53,7 +51,6 @@ public:
|
|||||||
STXXLNodeIDVector usedNodeIDs;
|
STXXLNodeIDVector usedNodeIDs;
|
||||||
STXXLNodeVector allNodes;
|
STXXLNodeVector allNodes;
|
||||||
STXXLEdgeVector allEdges;
|
STXXLEdgeVector allEdges;
|
||||||
STXXLAddressVector adressVector;
|
|
||||||
STXXLStringVector nameVector;
|
STXXLStringVector nameVector;
|
||||||
STXXLRestrictionsVector restrictionsVector;
|
STXXLRestrictionsVector restrictionsVector;
|
||||||
STXXLWayIDStartEndVector wayStartEndVector;
|
STXXLWayIDStartEndVector wayStartEndVector;
|
||||||
|
@ -65,26 +65,6 @@ struct _Way {
|
|||||||
HashTable<std::string, std::string> keyVals;
|
HashTable<std::string, std::string> keyVals;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _Address {
|
|
||||||
_Address() {}
|
|
||||||
_Address(_Node n, std::string h, std::string str, std::string sta, std::string p, std::string ci, std::string co) {
|
|
||||||
node = n;
|
|
||||||
housenumber = h;
|
|
||||||
street = str;
|
|
||||||
state = sta;
|
|
||||||
postcode = p;
|
|
||||||
city = ci;
|
|
||||||
country = co;
|
|
||||||
}
|
|
||||||
_Node node;
|
|
||||||
std::string housenumber;
|
|
||||||
std::string street;
|
|
||||||
std::string state;
|
|
||||||
std::string postcode;
|
|
||||||
std::string city;
|
|
||||||
std::string country;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _Relation {
|
struct _Relation {
|
||||||
_Relation() : type(unknown){}
|
_Relation() : type(unknown){}
|
||||||
enum {
|
enum {
|
||||||
|
Loading…
Reference in New Issue
Block a user