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

check for empty input in extractor, same msg in prepare

Browse Source
This commit is contained in:
Emil Tin 2014-03-19 18:03:38 +01:00 committed by Emil Tin
parent 775627473a
commit 72f41c5b4f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extractor.cpp
View File

@ -193,6 +193,11 @@ int main (int argc, char *argv[]) {
(get_timestamp() - parsing_start_time) << (get_timestamp() - parsing_start_time) <<
" seconds"; " seconds";
if( externalMemory.all_edges_list.empty() ) {
SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
return -1;
}
externalMemory.PrepareData(output_file_name, restrictionsFileName); externalMemory.PrepareData(output_file_name, restrictionsFileName);
delete parser; delete parser;

12
prepare.cpp
View File

@ -236,17 +236,17 @@ int main (int argc, char *argv[]) {
std::vector<ImportEdge> edgeList; std::vector<ImportEdge> edgeList;
NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions); NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions);
in.close(); in.close();
if( edgeList.empty() ) {
SimpleLogger().Write(logWARNING) << "The input data is empty, exiting.";
return -1;
}
SimpleLogger().Write() << SimpleLogger().Write() <<
inputRestrictions.size() << " restrictions, " << inputRestrictions.size() << " restrictions, " <<
bollardNodes.size() << " bollard nodes, " << bollardNodes.size() << " bollard nodes, " <<
trafficLightNodes.size() << " traffic lights"; trafficLightNodes.size() << " traffic lights";
if( edgeList.empty() ) {
SimpleLogger().Write(logWARNING) << "The input data is broken. "
"It is impossible to do any turns in this graph";
return -1;
}
/*** /***
* Building an edge-expanded graph from node-based input an turn restrictions * Building an edge-expanded graph from node-based input an turn restrictions
*/ */