From 6cefcf568b17a2f0f573e9a317012626e364aa36 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 16 Sep 2010 13:02:38 +0000 Subject: [PATCH] Fixed a bug related to roundabouts. Thanks to twain47 for reporting. --- DataStructures/ExtractorStructs.h | 2 -- extractLargeNetwork.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DataStructures/ExtractorStructs.h b/DataStructures/ExtractorStructs.h index 83af87367..56e11610d 100644 --- a/DataStructures/ExtractorStructs.h +++ b/DataStructures/ExtractorStructs.h @@ -217,8 +217,6 @@ _Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) { if ( way.direction == _Way::notSure ) { way.direction = _Way::oneway; } - if ( way.maximumSpeed == -1 ) - way.maximumSpeed = 10; way.usefull = true; } } else if ( xmlStrEqual( k, ( const xmlChar* ) "route" ) == 1 ) { diff --git a/extractLargeNetwork.cpp b/extractLargeNetwork.cpp index 9b49da3c8..371786113 100644 --- a/extractLargeNetwork.cpp +++ b/extractLargeNetwork.cpp @@ -107,6 +107,9 @@ int main (int argc, char *argv[]) assert(way.type > -1 || way.maximumSpeed != -1); assert(path.size()>0); + if(way.maximumSpeed == -1) + way.maximumSpeed = settings.speedProfile.speed[way.type]; + for(vector< NodeID >::size_type n = 0; n < path.size()-1; n++) { _Edge e;