From e43019a1df462990a92349f031f833b8084b290d Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 17 Mar 2012 19:54:31 +0100 Subject: [PATCH] Adding tracks if they are tagged with access=yes --- DataStructures/ExtractorCallBacks.h | 4 ++-- DataStructures/PBFParser.h | 2 +- speedprofile.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DataStructures/ExtractorCallBacks.h b/DataStructures/ExtractorCallBacks.h index d30225a70..211c6b1a9 100644 --- a/DataStructures/ExtractorCallBacks.h +++ b/DataStructures/ExtractorCallBacks.h @@ -175,7 +175,7 @@ public: } //Is the highway tag listed as usable way? - if(0 < settings[highway] || "yes" == accessTag || "designated" == accessTag) { + if(("track" == highway && ("yes" == access || "yes" == accessTag)) || (0 < settings[highway] || "yes" == accessTag || "designated" == accessTag)) { if(!w.isDurationSet) { if(0 < settings[highway]) { if(0 < maxspeed) @@ -254,7 +254,7 @@ public: } for(vector< NodeID >::size_type n = 0; n < w.path.size()-1; ++n) { - externalMemory->allEdges.push_back(_Edge(w.path[n], w.path[n+1], w.type, w.direction, w.speed, w.nameID, w.roundabout, highway == settings.excludeFromGrid, w.isDurationSet)); + externalMemory->allEdges.push_back(_Edge(w.path[n], w.path[n+1], w.type, w.direction, w.speed, w.nameID, w.roundabout, highway == settings.excludeFromGrid || "pier" == highway, w.isDurationSet)); externalMemory->usedNodeIDs.push_back(w.path[n]); } externalMemory->usedNodeIDs.push_back(w.path[w.path.size()-1]); diff --git a/DataStructures/PBFParser.h b/DataStructures/PBFParser.h index 5af3672e2..966b94d51 100644 --- a/DataStructures/PBFParser.h +++ b/DataStructures/PBFParser.h @@ -64,7 +64,7 @@ class PBFParser : public BaseParser<_Node, _RawRestrictionContainer, _Way> { public: PBFParser(const char * fileName) { /* Max 25 items in queue */ GOOGLE_PROTOBUF_VERIFY_VERSION; - threadDataQueue.reset( new ConcurrentQueue<_ThreadData*>(25) ); + threadDataQueue.reset( new ConcurrentQueue<_ThreadData*>(250) ); input.open(fileName, std::ios::in | std::ios::binary); if (!input) { diff --git a/speedprofile.ini b/speedprofile.ini index f679d55f6..0942d900b 100644 --- a/speedprofile.ini +++ b/speedprofile.ini @@ -10,7 +10,7 @@ tertiary = 40 tertiary_link = 30 unclassified = 25 - residential = 35 + residential = 25 living_street = 10 service = 15 track = 5