Fix:Core:Fixing roundabout's maneuvers

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1829 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navigation.c b/navit/navigation.c
index 947f326..538dcdb 100644 (file)
--- a/navit/navigation.c
+++ b/navit/navigation.c
@@ -892,11 +892,6 @@ maneuver_required2(struct navigation_itm *old, struct navigation_itm *new, int *
                /* TODO: check for one way in wrong direction */
                r="no: Only ramp";
        }
-       if (!r && abs(d) > 75) {
-               /* always make an announcement if you have to make a sharp turn */
-               r="yes: delta over 75";
-               ret=1;
-       }
        if (! r) {
                if ((old->flags & AF_ROUNDABOUT) && ! (new->flags & AF_ROUNDABOUT)) {
                        r="yes: leaving roundabout";
@@ -906,6 +901,11 @@ maneuver_required2(struct navigation_itm *old, struct navigation_itm *new, int *
                else if ((old->flags & AF_ROUNDABOUT) && (new->flags & AF_ROUNDABOUT)) 
                        r="no: staying in roundabout";
        }
+       if (!r && abs(d) > 75) {
+               /* always make an announcement if you have to make a sharp turn */
+               r="yes: delta over 75";
+               ret=1;
+       }
        cat=maneuver_category(old->item.type);
        ncat=maneuver_category(new->item.type);
        if (!r) {