Added API for querying route path coordinates

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

diff --git a/navit/src/route.c b/navit/src/route.c
index e797d3a..db9d848 100644 (file)
--- a/navit/src/route.c
+++ b/navit/src/route.c
@@ -496,6 +496,108 @@ route_path_close(struct route_path_handle *h)
        g_free(h);
 }
 
+struct route_path_coord_handle {
+       struct route *route;
+       int pos;        /* -1 = Begin, 0 = Middle, 1 = End */
+       int dir;
+       int spos;
+       struct coord last;
+       struct route_info_handle *ri;
+       struct route_path_handle *rp;
+       struct street_data *street_data;
+};
+
+struct route_path_coord_handle *
+route_path_coord_open(struct route *this)
+{
+       struct route_path_coord_handle *ret;
+
+       if (! route_get_pos(this) || ! route_get_dst(this))
+               return NULL;
+
+       ret=g_new0(struct route_path_coord_handle, 1);
+       ret->route=this;
+       ret->ri=route_info_open(route_get_pos(this), route_get_dst(this), 0);
+       if (!ret->ri) {
+               ret->ri=route_info_open(route_get_pos(this), NULL, 0);
+               ret->pos=-1;
+       }
+       else
+               ret->pos=1;
+       return ret;
+}
+
+struct coord *
+route_path_coord_get(struct route_path_coord_handle *h)
+{
+       struct coord *c;
+       struct route_path_segment *seg;
+       struct item *item, *item2;
+       struct map_rect *mr;
+
+       switch(h->pos) {
+       case -1:
+               c=route_info_get(h->ri);
+               if (c) {
+                       h->last=*c;
+                       return c;
+               }
+               h->pos=0;
+               h->rp=route_path_open(h->route);
+       case 0:
+               if (! h->street_data) {
+                       seg=route_path_get_segment(h->rp);
+                       if (seg) {
+                               item=route_path_segment_get_item(seg);
+                               mr=map_rect_new(item->map,NULL);
+                               item2=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
+                               h->street_data=street_get_data(item2);
+                               map_rect_destroy(mr);
+                               if (h->street_data->c[0].x == h->last.x && h->street_data->c[0].y == h->last.y) {
+                                       h->spos=1;
+                                       h->dir=1;
+                               } else {
+                                       h->spos=h->street_data->count-2;
+                                       h->dir=-1;
+                               }
+                       }
+               }
+               if (h->street_data) {
+                       c=&h->street_data->c[h->spos];
+                       h->last=*c;
+                       h->spos+=h->dir;
+                       if (h->spos < 0 || h->spos >= h->street_data->count) {
+                               street_data_free(h->street_data);
+                               h->street_data=NULL;
+                       }
+                       return c;
+               }
+               h->pos=1;
+       case 1: 
+               c=route_info_get(h->ri);
+               if (c) {
+                       h->last=*c;
+                       return c;
+               }
+               h->pos=2;
+       default:
+               return NULL;
+       }
+
+}
+
+void
+route_path_coord_close(struct route_path_coord_handle *h)
+{
+       if (h->street_data)
+               street_data_free(h->street_data);       
+       if (h->rp)
+               route_path_close(h->rp);
+       if (h->ri)
+               route_info_close(h->ri);
+       g_free(h);
+}
+
 
 static void
 route_graph_free_segments(struct route_graph *this)

diff --git a/navit/src/route.h b/navit/src/route.h
index 6ac7685..794c7c7 100644 (file)
--- a/navit/src/route.h
+++ b/navit/src/route.h
@@ -11,6 +11,13 @@ struct route_crossings {
        struct route_crossing crossing[0];
 };
 
+struct street_data {
+       struct item item;
+       int count;
+       int limit;
+       struct coord c[0];
+};
+
 #define route_item_first type_street_0
 #define route_item_last type_ferry
 
@@ -19,22 +26,12 @@ enum item_type;
 struct coord;
 struct displaylist;
 struct item;
-
-#ifndef STREETDATA 
-#define STREETDATA 
-struct street_data {
-       struct item item;
-       int count;
-       int limit;
-       struct coord c[0];
-};
-#endif
-
 struct map_selection;
 struct mapset;
 struct route;
 struct route_info;
 struct route_info_handle;
+struct route_path_coord_handle;
 struct route_path_handle;
 struct route_path_segment;
 struct street_data;
@@ -60,6 +57,9 @@ struct item *route_path_segment_get_item(struct route_path_segment *s);
 int route_path_segment_get_length(struct route_path_segment *s);
 int route_path_segment_get_time(struct route_path_segment *s);
 void route_path_close(struct route_path_handle *h);
+struct route_path_coord_handle *route_path_coord_open(struct route *this);
+struct coord *route_path_coord_get(struct route_path_coord_handle *h);
+void route_path_coord_close(struct route_path_coord_handle *h);
 int route_time(int *speedlist, struct item *item, int len);
 int route_info_length(struct route_info *pos, struct route_info *dst, int dir);
 struct street_data *street_get_data(struct item *item);

diff --git a/navit/src/vehicle.c b/navit/src/vehicle.c
index 87ec119..a616ab3 100644 (file)
--- a/navit/src/vehicle.c
+++ b/navit/src/vehicle.c
@@ -519,6 +519,8 @@ vehicle_udp_open(struct vehicle *this_)
 static int
 vehicle_demo_timer (struct vehicle *this)
 {
+       struct route_path_coord_handle *h;
+       struct coord *c;
        dbg(1,"###### Entering simulation loop\n");
        if(!this->navit){
                dbg(1,"vehicle->navit is not set. Can't simulate\n");
@@ -532,106 +534,21 @@ vehicle_demo_timer (struct vehicle *this)
                return 1;
        }
 
-       struct route_info_handle *h;
-       struct route_info *pos;
-       dbg(2,"calling route_get_pos\n");
-       pos=route_get_pos(vehicle_route);
-
-       struct coord *current_pos=vehicle_pos_get(this);
-       dbg(1,"vehicle is at %lx,%lx\n",current_pos->x,current_pos->y);
-       if(!pos){
-               dbg(1,"Pos is NULL, can't continue\n");
-               return 1;
-       }
-       dbg(2,"opening the handle\n");
-       // Obtain end coordinates of current segment
-       h=route_info_open(NULL, pos, 0);
-       dbg(2,"handle opened\n");
-
-       if (! h) {
-               dbg(1,"route_info_handle is null\n");
+       h=route_path_coord_open(vehicle_route);
+       if (!h) {
+               dbg(1,"navit_path_coord_open NOK\n");
                return 1;
        }
-
-       struct coord *c,*target;
-       int i=0;
-       target=0;
-       while ((c=route_info_get(h))) {
-               i++;
-               dbg(1,"#%i: c=%lx,%lx\n", i,c->x,c->y);
-               if(!target){
-                       target=c;
-                       dbg(1,"moving toward #%i\n",i);
-               } else {
-                       dbg(1,"target is not null, i keep the last destination choice\n");
-               }
-       }
-
-       if((target->x==current_pos->x)&&(target->y==current_pos->y)){
-               dbg(1,"Looks like we are already at the end of the segment\n"); 
-               // There was only one point left on the segment.
-               // We have to find the next segment.
-               struct route_path_handle *rp=route_path_open(vehicle_route);
-               if(!rp){
-                       dbg(1,"** rp is null!\n");
-                       return 1;
-               }
-
-               struct route_path_segment *seg=route_path_get_segment(rp);
-               if(!seg){
-                       dbg(1,"********************** seg is null!\n");
-                       return 1;
-               }
-               dbg(1,"seg=%p\n",seg);
-               // FIXME : following block can probably be removed
-               /*
-               seg=route_path_get_segment(rp);
-               if(!seg){
-                       dbg(1,"******************* seg2 is null!\n");
-                       return 1;
-               }
-               dbg(1,"seg (2) =%p\n",seg);
-               */
-               struct item *item=route_path_segment_get_item(seg);
-               if(!item){
-                       dbg(2,"** item is null!\n");
-                       return 1;
-               } else {
-                       dbg(2,"item->id_hi = %lx &  item->id_lo = %lx item = %lx and item->type = %lx\n",item->id_hi,item->id_lo,item,item->type);
-               }
-
-
-               struct map_rect *mr=map_rect_new(item->map,NULL);
-               struct item *item2=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
-
-               struct street_data *street=street_get_data(item2);
-               if(!street){
-                       dbg(1,"** street_data is null!\n");
-                       return 1;
-               }
-               
-
-               if(street->count){
-                       dbg(1,"vehicle is at %lx,%lx (2)\n",current_pos->x,current_pos->y);
-                       dbg(1,"street->c[0] = %lx,%lx, street->c[street->count-1]= %lx,%lx count=%d\n",street->c[0].x,street->c[0].y, street->c[street->count-1].x, street->c[street->count-1].y, street->count);
-                       if((current_pos->x==street->c[0].x)&&(current_pos->y==street->c[0].y)){
-                               target->x=street->c[1].x;
-                               target->y=street->c[1].y;
-                               dbg(1,"Moving to : street->c[1]  (%lx,%lx)\n",street->c[1].x,street->c[1].y);
-                       } else {
-                               target->x=street->c[street->count-2].x;
-                               target->y=street->c[street->count-2].y;
-                               dbg(1,"Moving to : street->c[street->count-2]  (%lx,%lx)\n",street->c[street->count-2].x,street->c[street->count-2].y);
-                       }
-                       vehicle_set_position(this,target);
-               } else {
-                       dbg(1,"BAD ! street->count = %i\n",street->count);
-               }
-       } else {        
-               dbg(1,"Looks like we can move\n");      
-               vehicle_set_position(this,target);
+       c=route_path_coord_get(h);
+       dbg(1,"current pos=%p\n", c);
+       if (c) 
+               dbg(1,"current pos=0x%x,0x%x\n", c->x, c->y);
+       c=route_path_coord_get(h);
+       dbg(1,"next pos=%p\n", c);
+       if (c) {
+               dbg(1,"next pos=0x%x,0x%x\n", c->x, c->y);
+               vehicle_set_position(this,c);
        }
-               
        return 1;
 }