From 87df312a9d7d5fa92f371f59dcc55177b8603d1a Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Wed, 29 Aug 2012 18:43:08 +0200 Subject: [PATCH] Removing Adress data type that is not needed during extraction --- Extractor/ExtractionContainers.h | 3 --- Extractor/ExtractorStructs.h | 20 -------------------- 2 files changed, 23 deletions(-) diff --git a/Extractor/ExtractionContainers.h b/Extractor/ExtractionContainers.h index 62e4a9717..d66115c88 100644 --- a/Extractor/ExtractionContainers.h +++ b/Extractor/ExtractionContainers.h @@ -32,7 +32,6 @@ public: typedef stxxl::vector STXXLNodeIDVector; typedef stxxl::vector<_Node> STXXLNodeVector; typedef stxxl::vector<_Edge> STXXLEdgeVector; - typedef stxxl::vector<_Address> STXXLAddressVector; typedef stxxl::vector STXXLStringVector; typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector; typedef stxxl::vector<_WayIDStartAndEndEdge> STXXLWayIDStartEndVector; @@ -42,7 +41,6 @@ public: usedNodeIDs.clear(); allNodes.clear(); allEdges.clear(); - adressVector.clear(); nameVector.clear(); restrictionsVector.clear(); wayStartEndVector.clear(); @@ -53,7 +51,6 @@ public: STXXLNodeIDVector usedNodeIDs; STXXLNodeVector allNodes; STXXLEdgeVector allEdges; - STXXLAddressVector adressVector; STXXLStringVector nameVector; STXXLRestrictionsVector restrictionsVector; STXXLWayIDStartEndVector wayStartEndVector; diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h index 5578e6080..7e7890a60 100644 --- a/Extractor/ExtractorStructs.h +++ b/Extractor/ExtractorStructs.h @@ -65,26 +65,6 @@ struct _Way { HashTable 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 { _Relation() : type(unknown){} enum {