From: <mar...@us...> - 2011-01-26 14:51:36
|
Revision: 4043 http://navit.svn.sourceforge.net/navit/?rev=4043&view=rev Author: martin-s Date: 2011-01-26 14:51:30 +0000 (Wed, 26 Jan 2011) Log Message: ----------- Fix:Core:Consider vehicleprofile when counting streets or roundabout exits Modified Paths: -------------- trunk/navit/navit/navigation.c Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2011-01-26 14:50:58 UTC (rev 4042) +++ trunk/navit/navit/navigation.c 2011-01-26 14:51:30 UTC (rev 4043) @@ -36,6 +36,7 @@ #include "navit.h" #include "callback.h" #include "speech.h" +#include "vehicleprofile.h" #include "plugin.h" #include "navit_nls.h" @@ -1067,14 +1068,9 @@ static int is_way_allowed(struct navigation *nav, struct navigation_way *way, int mode) { - if (way->dir > 0) { - if (way->flags & AF_ONEWAYREV) - return 0; - } else { - if (way->flags & AF_ONEWAY) - return 0; - } - return 1; + if (!nav->vehicleprofile) + return 1; + return (((way->dir >= 0 ? nav->vehicleprofile->flags_forward_mask : nav->vehicleprofile->flags_reverse_mask)) == nav->vehicleprofile->flags); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |