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

Adding tracks if they are tagged with access=yes

Browse Source
This commit is contained in:
DennisOSRM 2012-03-17 19:54:31 +01:00
parent 4d19793d69
commit e43019a1df
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/ExtractorCallBacks.h
View File

@ -175,7 +175,7 @@ public:
} }
//Is the highway tag listed as usable way? //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(!w.isDurationSet) {
if(0 < settings[highway]) { if(0 < settings[highway]) {
if(0 < maxspeed) if(0 < maxspeed)
@ -254,7 +254,7 @@ public:
} }
for(vector< NodeID >::size_type n = 0; n < w.path.size()-1; ++n) { 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[n]);
} }
externalMemory->usedNodeIDs.push_back(w.path[w.path.size()-1]); externalMemory->usedNodeIDs.push_back(w.path[w.path.size()-1]);

2
DataStructures/PBFParser.h
View File

@ -64,7 +64,7 @@ class PBFParser : public BaseParser<_Node, _RawRestrictionContainer, _Way> {
public: public:
PBFParser(const char * fileName) { /* Max 25 items in queue */ PBFParser(const char * fileName) { /* Max 25 items in queue */
GOOGLE_PROTOBUF_VERIFY_VERSION; 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); input.open(fileName, std::ios::in | std::ios::binary);
if (!input) { if (!input) {

2
speedprofile.ini
View File

@ -10,7 +10,7 @@
tertiary = 40 tertiary = 40
tertiary_link = 30 tertiary_link = 30
unclassified = 25 unclassified = 25
residential = 35 residential = 25
living_street = 10 living_street = 10
service = 15 service = 15
track = 5 track = 5