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

misplaced assertion

Browse Source
This commit is contained in:
Dennis Luxen 2010-09-17 15:33:11 +00:00
parent 53aa2f54e5
commit 27ff707d54
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataStructures/ExtractorStructs.h
View File

@ -198,7 +198,7 @@ _Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) {
way.type = -1; way.type = -1;
way.usefull = false; way.usefull = false;
way.access = true; way.access = true;
// cout << "new way" << endl; // cout << "new way" << endl;
if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) { if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) {
const int depth = xmlTextReaderDepth( inputReader ); const int depth = xmlTextReaderDepth( inputReader );
while ( xmlTextReaderRead( inputReader ) == 1 ) { while ( xmlTextReaderRead( inputReader ) == 1 ) {
@ -222,7 +222,7 @@ _Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) {
if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) { if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) {
xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" ); xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" );
xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" ); xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" );
// cout << "->k=" << k << ", v=" << value << endl; // cout << "->k=" << k << ", v=" << value << endl;
if ( k != NULL && value != NULL ) { if ( k != NULL && value != NULL ) {
if ( xmlStrEqual( k, ( const xmlChar* ) "name" ) == 1 ) { if ( xmlStrEqual( k, ( const xmlChar* ) "name" ) == 1 ) {
@ -371,7 +371,6 @@ _Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) {
xmlFree( childName ); xmlFree( childName );
} }
} }
assert(way.type > -1 || way.maximumSpeed != -1);
return way; return way;
} }