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

fix inverted logic

Browse Source
This commit is contained in:
Dennis Luxen 2014-04-28 13:03:20 +02:00
parent 5d6b05979d
commit 1b257f7547
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
extractor.cpp
View File

@ -162,24 +162,32 @@ int main (int argc, char *argv[]) {
file_has_pbf_format = true; file_has_pbf_format = true;
} }
} }
if(pos==std::string::npos) { if (pos==std::string::npos)
{
pos = output_file_name.find(".pbf"); pos = output_file_name.find(".pbf");
if(pos!=std::string::npos) { if (pos!=std::string::npos)
{
file_has_pbf_format = true; file_has_pbf_format = true;
} }
} }
if(pos!=std::string::npos) { if (pos == std::string::npos)
output_file_name.replace(pos, 8, ".osrm"); {
restrictionsFileName.replace(pos, 8, ".osrm.restrictions"); pos = output_file_name.find(".osm");
} else { if (pos == std::string::npos)
pos=output_file_name.find(".osm"); {
if(pos!=std::string::npos) {
output_file_name.replace(pos, 5, ".osrm");
restrictionsFileName.replace(pos, 5, ".osrm.restrictions");
} else {
output_file_name.append(".osrm"); output_file_name.append(".osrm");
restrictionsFileName.append(".osrm.restrictions"); restrictionsFileName.append(".osrm.restrictions");
} }
else
{
output_file_name.replace(pos, 5, ".osrm");
restrictionsFileName.replace(pos, 5, ".osrm.restrictions");
}
}
else
{
output_file_name.replace(pos, 8, ".osrm");
restrictionsFileName.replace(pos, 8, ".osrm.restrictions");
} }
boost::unordered_map<std::string, NodeID> stringMap; boost::unordered_map<std::string, NodeID> stringMap;