Fix:Core:Fixed some navigation issues

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

diff --git a/navit/src/navigation.c b/navit/src/navigation.c
index 2a14c61..55417e5 100644 (file)
--- a/navit/src/navigation.c
+++ b/navit/src/navigation.c
@@ -189,7 +189,9 @@ navigation_destroy_itms_cmds(struct navigation *this_, struct navigation_itm *en
 {
        struct navigation_itm *itm;
        struct navigation_command *cmd;
-       dbg(2,"enter this_=%p end=%p\n", this_, end);
+       dbg(2,"enter this_=%p this_->first=%p this_->cmd_first=%p end=%p\n", this_, this_->first, this_->cmd_first, end);
+       if (this_->cmd_first)
+               dbg(2,"this_->cmd_first->itm=%p\n", this_->cmd_first->itm);
        while (this_->first && this_->first != end) {
                itm=this_->first;
                dbg(3,"destroying %p\n", itm);
@@ -197,7 +199,7 @@ navigation_destroy_itms_cmds(struct navigation *this_, struct navigation_itm *en
                this_->first=itm->next;
                if (this_->first)
                        this_->first->prev=NULL;
-               if (this_->cmd_first && this_->cmd_first->itm == itm) {
+               if (this_->cmd_first && this_->cmd_first->itm == itm->next) {
                        cmd=this_->cmd_first;
                        this_->cmd_first=cmd->next;
                        g_free(cmd);
@@ -208,7 +210,7 @@ navigation_destroy_itms_cmds(struct navigation *this_, struct navigation_itm *en
                this_->last=NULL;
        if (! this_->first && end) 
                dbg(0,"end wrong\n");
-       dbg(2,"ret\n");
+       dbg(2,"ret this_->first=%p this_->cmd_first=%p\n",this_->first, this_->cmd_first);
 }
 
 static void
@@ -333,14 +335,13 @@ static int
 maneuver_required2(struct navigation_itm *old, struct navigation_itm *new, int *delta)
 {
        dbg(1,"enter %p %p %p\n",old, new, delta);
-       if (new->item.type != old->item.type && (new->item.type == type_ramp || old->item.type == type_ramp)) {
+       if (new->item.type == old->item.type || (new->item.type != type_ramp && old->item.type != type_ramp)) {
+               if (is_same_street2(old, new)) {
+                       dbg(1, "maneuver_required: is_same_street: no\n");
+                       return 0;
+               }
+       } else
                dbg(1, "maneuver_required: old or new is ramp\n");
-               return 1;
-       }
-       if (is_same_street2(old, new)) {
-               dbg(1, "maneuver_required: is_same_street: no\n");
-               return 0;
-       }
 #if 0
        if (old->crossings_end == 2) {
                dbg(1, "maneuver_required: only 2 connections: no\n");
@@ -365,6 +366,7 @@ static struct navigation_command *
 command_new(struct navigation *this_, struct navigation_itm *itm, int delta)
 {
        struct navigation_command *ret=g_new0(struct navigation_command, 1);
+       dbg(1,"enter this_=%p itm=%p delta=%d\n", this_, itm, delta);
        ret->delta=delta;
        ret->itm=itm;
        if (this_->cmd_last)

diff --git a/navit/src/osd/core/osd_core.c b/navit/src/osd/core/osd_core.c
index ea2da1e..54c7f8f 100644 (file)
--- a/navit/src/osd/core/osd_core.c
+++ b/navit/src/osd/core/osd_core.c
@@ -359,7 +359,7 @@ osd_navigation_draw(struct osd_navigation *this, struct navit *navit, struct veh
                 item=map_rect_get_item(mr);
         if (item) {
                name=item_to_name(item->type);
-               dbg(0,"name=%s\n", name);
+               dbg(1,"name=%s\n", name);
                 if (item_attr_get(item, attr_length, &attr)) {
                         format_distance(distance, attr.u.num);
                }
@@ -379,7 +379,7 @@ osd_navigation_draw(struct osd_navigation *this, struct navit *navit, struct veh
                        image=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/xpm/unknown.xpm", NULL);
                        gr_image=graphics_image_new(this->gr, image);
                }
-               dbg(0,"gr_image=%p\n", gr_image);
+               dbg(1,"gr_image=%p\n", gr_image);
                if (gr_image) {
                        p.x=(this->w-gr_image->width)/2;
                        p.y=(46-gr_image->height)/2;