navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src/data/garmin garmin.c,1.4,1.5

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src/data/garmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20540

Modified Files:
	garmin.c 
Log Message:
Return label as attr_street_name

Index: garmin.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** garmin.c	4 Nov 2007 18:51:43 -0000	1.4
--- garmin.c	19 Nov 2007 10:26:52 -0000	1.5
***************
*** 147,150 ****
--- 147,151 ----
  		if (*mr->label == '@' || *mr->label == '^')
  			cp++;
+ 		/* FIXME: If zoomlevel is high convert ^ in the string to spaces */
  		attr->u.str = cp;
  		return 1;
***************
*** 308,311 ****
--- 309,315 ----
  		attr->type = attr_label;
  		return garmin_object_label(g, attr);
+ 	case attr_street_name:
+ 		attr->type = attr_street_name;
+ 		return garmin_object_label(g, attr);
  	case attr_limit:
  		return 0;

[Navit-cvs-commit] navit/src/script wiki2def,NONE,1.1

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/script
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6497

Added Files:
	wiki2def 
Log Message:
New script to create definitions from wiki page

--- NEW FILE: wiki2def ---
#! /bin/bash
rm -f item_def.h.wiki
rm -f osmmap_def.h.wiki
IFS="|"
type="n"
wget -O - "http://navit.sourceforge.net/wiki/index.php/Item_def.h?action=edit" |
awk '/<textarea/,/<\/textarea/ { print $0 }' | 
grep "^| " |
sed -e 's/^| *//' -e 's/ *$//' -e 's/ *|/|/g' -e 's/| */|/g' -e 's/||/|/g' | 
while read id item description osmtags dummy
do
	if [[ "$id" == colspan=* ]]
	then
		echo "/* $item */" >>item_def.h.wiki
		continue
	fi
	if [[ -z "$id" ]]
	then
		echo "ITEM($item)" >>item_def.h.wiki
	else
		echo "ITEM2($id,$item)" >>item_def.h.wiki
		if [ "$id" == "0x80000000" ]
		then
			type="w"
		fi
	fi
	if [[ -n "$osmtags" ]]
	then
		for osmtag in $(echo "$osmtags" | sed 's/&lt;br\/&gt;/|/g')
		do
			key=${osmtag%%=*}
			value=${osmtag##*=}
			printf '"%s\t%s\t%s\t%s\\n"\n' $type $key $value $item >> osmmap_def.h.wiki
		done
	fi
done
exit 0

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp, 1.28, 1.29 sdl_events.cpp, 1.14, 1.15

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32178

Modified Files:
	gui_sdl_window.cpp sdl_events.cpp 
Log Message:
Some cleanup

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** gui_sdl_window.cpp	5 Nov 2007 21:35:20 -0000	1.28
--- gui_sdl_window.cpp	16 Nov 2007 15:04:07 -0000	1.29
***************
*** 61,67 ****
  #define _(STRING)    gettext(STRING)
  
- 
- // struct navit *sdl_gui_navit;
- 
  static int
  gui_sdl_set_graphics(struct gui_priv *this_, struct graphics *gra)
--- 61,64 ----
***************
*** 89,93 ****
                  glEnd();
                  glDisable(GL_BLEND);
- 
   }
  
--- 86,89 ----
***************
*** 133,138 ****
  		list=navigation_list_new(nav);	
  		while ((item=navigation_list_get_item(list))) {
- 				
- // 			printf("SDL : %s\n", str);
  	 		mcl->addRow();
  			item_attr_get(item, attr_navigation_short, &attr);
--- 129,132 ----
***************
*** 145,150 ****
  	catch (CEGUI::Exception& e)
  	{
! 		fprintf(stderr,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str());
! 		printf("Missing control!...\n");
  	}
  
--- 139,144 ----
  	catch (CEGUI::Exception& e)
  	{
! 		dbg(0,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str());
! 		dbg(0,"Missing control!\n");
  	}
  
***************
*** 171,189 ****
  	transform_set_size(t, 800, 600);	
  	navit_draw(this_->nav);
! /*
!         glNewList(DLid,GL_COMPILE);
!                 int x=400;
!                 int y=400;
!                 float cursor_size=15.0f;
!                 glColor4f(1.0f,0.0f,0.0f,0.75f);
!                 glEnable(GL_BLEND);
!                 glBegin(GL_TRIANGLES);
!                         glVertex3f( x, y-cursor_size, 0.0f);
!                         glVertex3f(x-cursor_size,y+cursor_size, 0.0f);
!                         glVertex3f( x+cursor_size,y+cursor_size, 0.0f);
!                 glEnd();
!                 glDisable(GL_BLEND);
!         glEndList();
! */
  	GLuint cursorDL;
  	cursorDL=glGenLists(1);
--- 165,169 ----
  	transform_set_size(t, 800, 600);	
  	navit_draw(this_->nav);
! 
  	GLuint cursorDL;
  	cursorDL=glGenLists(1);
***************
*** 215,221 ****
   			gluLookAt(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ);
  		}
-   		
  
!  		// FIXME This is to draw a ground. This is ugly and need to be fixed. Without it, we see the color of sky under the roads.
  		glColor4f(0.0f,0.7f,0.35f,1.0f);
  		glBegin(GL_POLYGON);
--- 195,201 ----
   			gluLookAt(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ);
  		}
  
!  		// FIXME This is to draw a ground. This is ugly and need to be fixed.
! 		// Without it, we see the color of sky under the roads.
  		glColor4f(0.0f,0.7f,0.35f,1.0f);
  		glBegin(GL_POLYGON);
***************
*** 231,235 ****
   		if (!g_main_context_iteration (NULL, FALSE))
   			sleep(1);
! // 		profile_timer("main context");
  
  	//	graphics_get_data(this_->gra,DLid);
--- 211,216 ----
   		if (!g_main_context_iteration (NULL, FALSE))
   			sleep(1);
!  		if(enable_timer)
!  			profile(0,"main context");
  
  	//	graphics_get_data(this_->gra,DLid);
***************
*** 268,279 ****
   		WindowManager::getSingleton().getWindow("OSD/Satellites")->setText(fps);
  
- 		/*
- 		glcRenderStyle(GLC_TEXTURE);
- 		glColor3f(1, 0, 0);
- 		glRotatef(180,1,0,0);
- 		glScalef(64, 64, 0);
- 		glcRenderString(fps);
- 		*/
- 
   		if(enable_timer)
   			profile(0,"fps");
--- 249,252 ----
***************
*** 327,331 ****
  
  	dbg(1,"init_GL()\n");
- //  	glClearColor(1.0,0.9,0.7,0);
  
  	// Blue sky
--- 300,303 ----
***************
*** 535,540 ****
  	init_GL();
  	
- // 	sdl_audio_init();
- 
  	try
  	{
--- 507,510 ----

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sdl_events.cpp	16 Nov 2007 09:13:49 -0000	1.14
--- sdl_events.cpp	16 Nov 2007 15:04:07 -0000	1.15
***************
*** 75,79 ****
  	if(SDL_dest.current_search==SRCH_COUNTRY){
  		country_edit->setText(item->getText());
- 		// FIXME Need to record the country here so all searches are made by default in this country
  		twn_edit->activate();
  		SDL_dest.current_search=SRCH_TOWN;
--- 75,78 ----
***************
*** 119,169 ****
  
  
- 		/*
- 		ListboxItem * itemid = mcl->getItemAtGridReference(MCLGridRef(r,1));
- 		int segment_id=atoi(itemid->getText().c_str());
- 		printf("street seg id : %li\n",segment_id);
- 
- 		extern struct container *co;
- 		struct block_info res_blk_inf;
- 		struct street_str *res_str;
- 		street_get_by_id(co->map_data, 33, segment_id,&res_blk_inf,&res_str );
- 
- 		struct street_coord * streetcoord;
- 		streetcoord=street_coord_get(&res_blk_inf,res_str);
- 
- 		printf("Street coordinates : %i,%i\n",streetcoord->c->x,streetcoord->c->y);
- 
- 	 	char xbuff [256];
- 		sprintf(xbuff,"%li",streetcoord->c->x);
- 	 	char ybuff [256];
- 		sprintf(ybuff,"%li",streetcoord->c->y);
- 
- 		Window* Dest_x = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Dest_x"));
- 		Dest_x->setText(xbuff);
- 
- 		Window* Dest_y = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/Dest_y"));
- 		Dest_y->setText(ybuff);
- 
- 		struct street_name name;
- // 		printf("street_name_get_by_id returns : %i\n",street_name_get_by_id(&name, res_blk_inf.mdata, res_str->nameid));
- 		street_name_get_by_id(&name, res_blk_inf.mdata, res_str->nameid);
- // 		printf("name1:%s / name2%s\n",name.name1,name.name2);
- 
- 		struct street_name_number_info num;
- 		struct street_name_info inf;
- 
- 		SDL_dest.current_search=SRCH_NUMBER;
- 		mcl->resetList();
- 
- 		while (street_name_get_info(&inf, &name)) {
- 			while(street_name_get_number_info(&num,&inf)){
- // 				printf(" House Number : %i -> %i\n",num.first,num.last);
- 				for(int i=num.first;i<=num.last;i+=2){
- 					add_number_to_list(i,num.c->x,num.c->y);
- 				}
- 			}
- 		}
- 		*/
- // 		route_to(streetcoord->c->x,streetcoord->c->y);
  	} else if (SDL_dest.current_search==SRCH_NUMBER){
  
--- 118,121 ----
***************
*** 314,318 ****
  			
  				ListboxTextItem* yitem = new ListboxTextItem(y);
- // 				item->setSelectionBrushImage(&ImagesetManager::getSingleton().getImageset("TaharezLook")->getImage("MultiListSelectionBrush"));
  			
  				try
--- 266,269 ----
***************
*** 361,365 ****
  			
  				ListboxTextItem* yitem = new ListboxTextItem(y);
- // 				item->setSelectionBrushImage(&ImagesetManager::getSingleton().getImageset("TaharezLook")->getImage("MultiListSelectionBrush"));
  			
  				try
--- 312,315 ----
***************
*** 399,403 ****
  	if(sdl_gui_navit){	
  	} else {
! 		printf("*** Invalid navit instance in sdl_events\n");
  	}
  
--- 349,353 ----
  	if(sdl_gui_navit){	
  	} else {
! 		dbg(0,"*** Invalid navit instance in sdl_events\n");
  	}
  
***************
*** 529,539 ****
  	extern struct navit *sdl_gui_navit;
  	navit_zoom_in(sdl_gui_navit, 2);
- 	/*
- 	extern struct container *co;
- 	struct transformation *t=co->trans;
- 	if(t->scale>1){
- 		t->scale/=2;
- 	}
- 	*/
  
  }
--- 479,482 ----
***************
*** 543,551 ****
  	extern struct navit *sdl_gui_navit;
  	navit_zoom_out(sdl_gui_navit, 2);
- 	/*
- 	extern struct container *co;
- 	struct transformation *t=co->trans;
- 	t->scale*=2;
- 	*/
  }
  
--- 486,489 ----

[Navit-cvs-commit] navit/src graphics.c, 1.18, 1.19 graphics.h, 1.9, 1.10 navit.c, 1.36, 1.37

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22661

Modified Files:
	graphics.c graphics.h navit.c 
Log Message:
Made support for slippy map

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** graphics.c	17 Oct 2007 13:55:56 -0000	1.18
--- graphics.c	16 Nov 2007 09:27:40 -0000	1.19
***************
*** 545,548 ****
--- 545,566 ----
  		route_draw(route, trans, displaylist);
  	xdisplay_draw(displaylist->dl, gra, layouts, order);
+ 	gra->meth.draw_mode(gra->priv, draw_mode_end);
+ }
+ 
+ void
+ graphics_displaylist_move(struct displaylist *displaylist, int dx, int dy)
+ {
+ 	struct displaylist_handle *dlh;
+ 	struct displayitem *di;
+ 	int i;
+ 
+ 	dlh=graphics_displaylist_open(displaylist);
+ 	while ((di=graphics_displaylist_next(dlh))) {
+ 		for (i = 0 ; i < di->count ; i++) {
+ 			di->pnt[i].x+=dx;
+ 			di->pnt[i].y+=dy;
+ 		}
+ 	}
+ 	graphics_displaylist_close(dlh);
  }
  
***************
*** 575,579 ****
  	profile(0,"end");
    
- 	gra->meth.draw_mode(gra->priv, draw_mode_end);
  #if 0
  	for (i = 0 ; i < data_window_type_end; i++) {
--- 593,596 ----

Index: graphics.h
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** graphics.h	9 Oct 2007 16:44:09 -0000	1.9
--- graphics.h	16 Nov 2007 09:27:40 -0000	1.10
***************
*** 100,104 ****
  struct transformation;
  struct graphics *graphics_new(const char *type, struct attr **attrs);
! struct graphics * graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h);
  void graphics_init(struct graphics *this_);
  void *graphics_get_data(struct graphics *this_, char *type);
--- 100,104 ----
  struct transformation;
  struct graphics *graphics_new(const char *type, struct attr **attrs);
! struct graphics *graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h);
  void graphics_init(struct graphics *this_);
  void *graphics_get_data(struct graphics *this_, char *type);
***************
*** 120,123 ****
--- 120,124 ----
  int graphics_ready(struct graphics *this_);
  void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, GList *layouts, struct route *route);
+ void graphics_displaylist_move(struct displaylist *displaylist, int dx, int dy);
  void graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, GList *layouts, struct route *route);
  struct displaylist_handle *graphics_displaylist_open(struct displaylist *displaylist);

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** navit.c	5 Nov 2007 20:21:27 -0000	1.36
--- navit.c	16 Nov 2007 09:27:40 -0000	1.37
***************
*** 84,87 ****
--- 84,90 ----
  	GHashTable *bookmarks_hash;
  	struct menu *destinations;
+ 	struct point pressed, last, current;
+ 	int button_pressed,moved;
+ 	guint button_timeout, motion_timeout;
  };
  
***************
*** 147,169 ****
  }
  
  static void
  navit_button(void *data, int pressed, int button, struct point *p)
  {
  	struct navit *this_=data;
! 	if (pressed && button == 1) {
! 		int border=16;
! 		if (! transform_within_border(this_->trans, p, border)) {
  			navit_set_center_screen(this_, p);
! 		} else
  			popup(this_, button, p);
  	}
- 	if (pressed && button == 2)
- 		navit_set_center_screen(this_, p);
- 	if (pressed && button == 3)
- 		popup(this_, button, p);
- 	if (pressed && button == 4)
- 		navit_zoom_in(this_, 2);
- 	if (pressed && button == 5)
- 		navit_zoom_out(this_, 2);
  }
  
--- 150,247 ----
  }
  
+ static gboolean
+ navit_popup(void *data)
+ {
+ 	struct navit *this_=data;
+ 	popup(this_, 1, &this_->pressed);
+ 	this_->button_timeout=0;
+ 	return FALSE;
+ }
+ 
  static void
  navit_button(void *data, int pressed, int button, struct point *p)
  {
  	struct navit *this_=data;
! 	int border=16;
! 
! 	if (pressed) {
! 		this_->pressed=*p;
! 		this_->last=*p;
! 		if (button == 1) {
! 			this_->button_pressed=1;
! 			this_->moved=0;
! 			this_->button_timeout=g_timeout_add(500, navit_popup, data);
! 		}
! 		if (button == 2)
  			navit_set_center_screen(this_, p);
! 		if (button == 3)
  			popup(this_, button, p);
+ 		if (button == 4)
+ 			navit_zoom_in(this_, 2);
+ 		if (button == 5)
+ 			navit_zoom_out(this_, 2);
+ 	} else {
+ 		this_->button_pressed=0;
+ 		if (this_->button_timeout) {
+ 			g_source_remove(this_->button_timeout);	
+ 			this_->button_timeout=0;
+ 			if (! this_->moved && ! transform_within_border(this_->trans, p, border))
+ 				navit_set_center_screen(this_, p);
+ 				
+ 		}
+ 		if (this_->motion_timeout) {
+ 			g_source_remove(this_->motion_timeout);	
+ 			this_->motion_timeout=0;
+ 		}
+ 		if (this_->moved) {
+ 			struct point p;
+ 			transform_get_size(this_->trans, &p.x, &p.y);
+ 			p.x/=2;
+ 			p.y/=2;
+ 			p.x-=this_->last.x-this_->pressed.x;
+ 			p.y-=this_->last.y-this_->pressed.y;
+ 			navit_set_center_screen(this_, &p);
+ 		}
+ 	}
+ }
+ 
+ 
+ static gboolean
+ navit_motion_timeout(void *data)
+ {
+ 	struct navit *this_=data;
+ 	int dx, dy;
+ 
+ 	dx=(this_->current.x-this_->last.x);
+ 	dy=(this_->current.y-this_->last.y);
+ 	if (dx || dy) {
+ 		this_->last=this_->current;
+ 		graphics_displaylist_move(this_->displaylist, dx, dy);
+ 		graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layouts, this_->route);
+ 		this_->moved=1;
+ 	}
+ 	this_->motion_timeout=0;
+ 	return FALSE;
+ }
+ 
+ static void
+ navit_motion(void *data, struct point *p)
+ {
+ 	struct navit *this_=data;
+ 	int dx, dy;
+ 
+ 	if (this_->button_pressed) {
+ 		dx=(p->x-this_->pressed.x);
+ 		dy=(p->y-this_->pressed.y);
+ 		if (dx < -4 || dx > 4 || dy < -4 || dy > 4) {
+ 			if (this_->button_timeout) {
+ 				g_source_remove(this_->button_timeout);	
+ 				this_->button_timeout=0;
+ 			}
+ 			this_->current=*p;
+ 			if (! this_->motion_timeout)
+ 				this_->motion_timeout=g_timeout_add(100, navit_motion_timeout, data);
+ 		}
  	}
  }
  
***************
*** 239,242 ****
--- 317,321 ----
  	graphics_register_resize_callback(this_->gra, navit_resize, this_);
  	graphics_register_button_callback(this_->gra, navit_button, this_);
+ 	graphics_register_motion_callback(this_->gra, navit_motion, this_);
  }
  

[Navit-cvs-commit] navit/src/gui/sdl sdl_events.cpp,1.13,1.14

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19039/gui/sdl

Modified Files:
	sdl_events.cpp 
Log Message:
fix bug #19 + search code cleanup

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sdl_events.cpp	15 Nov 2007 16:49:53 -0000	1.13
--- sdl_events.cpp	16 Nov 2007 09:13:49 -0000	1.14
***************
*** 28,41 ****
  
  
- static struct search_param {
- 	struct navit *nav;
- 	struct mapset *ms;
- 	struct search_list *sl;
- 	struct attr attr;
- } search_param;
- 
- // extern "C" struct navit *global_navit;
- // 
- 
  void route_to(int x,int y){
  	struct coord pos;
--- 28,31 ----
***************
*** 252,258 ****
  	extern CEGUI::Window* myRoot;
  
! 	struct search_param *search=&search_param;
  	struct search_list_result *res;
  
  	MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox"));
  
--- 242,262 ----
  	extern CEGUI::Window* myRoot;
  
! 	static struct search_param {
! 		struct navit *nav;
! 		struct mapset *ms;
! 		struct search_list *sl;
! 		struct attr attr;
!  	} search_param;
! 
!  	struct search_param *search=&search_param;
  	struct search_list_result *res;
  
+  	// dbg(1,"search->nav=sdl_gui_navit;\n");
+  	search->nav=sdl_gui_navit;
+  	// dbg(1,"search->ms=navit_get_mapset(sdl_gui_navit);\n");
+  	search->ms=navit_get_mapset(sdl_gui_navit);
+  	// dbg(1,"search->sl=search_list_new(search->ms);\n");
+  	search->sl=search_list_new(search->ms);
+ 
  	MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox"));
  
***************
*** 273,277 ****
  		search_list_search(search->sl, &search->attr, 1);
  		while((res=search_list_get_result(search->sl))) {
! 			ListboxTextItem* itemListbox = new ListboxTextItem(res->country->name);
  			itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
--- 277,281 ----
  		search_list_search(search->sl, &search->attr, 1);
  		while((res=search_list_get_result(search->sl))) {
! 			ListboxTextItem* itemListbox = new ListboxTextItem((CEGUI::utf8*)(res->country->name));
  			itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
***************
*** 297,301 ****
  			search_list_search(search->sl, &search->attr, 1);
  			while((res=search_list_get_result(search->sl))) {
! 				ListboxTextItem* itemListbox = new ListboxTextItem(res->town->name);
  				itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
--- 301,305 ----
  			search_list_search(search->sl, &search->attr, 1);
  			while((res=search_list_get_result(search->sl))) {
! 				ListboxTextItem* itemListbox = new ListboxTextItem((CEGUI::utf8*)(res->town->name));
  				itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
***************
*** 344,348 ****
  			search_list_search(search->sl, &search->attr, 1);
  			while((res=search_list_get_result(search->sl))) {
! 				ListboxTextItem* itemListbox = new ListboxTextItem(res->street->name);
  				itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
--- 348,352 ----
  			search_list_search(search->sl, &search->attr, 1);
  			while((res=search_list_get_result(search->sl))) {
! 				ListboxTextItem* itemListbox = new ListboxTextItem((CEGUI::utf8*)(res->street->name));
  				itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush");
  
***************
*** 397,408 ****
  		printf("*** Invalid navit instance in sdl_events\n");
  	}
- 	struct search_param *search=&search_param;
- 
-  	// dbg(1,"search->nav=sdl_gui_navit;\n");
-  	search->nav=sdl_gui_navit;
-  	// dbg(1,"search->ms=navit_get_mapset(sdl_gui_navit);\n");
-  	search->ms=navit_get_mapset(sdl_gui_navit);
-  	// dbg(1,"search->sl=search_list_new(search->ms);\n");
-  	search->sl=search_list_new(search->ms);
  
  
--- 401,404 ----

[Navit-cvs-commit] navit/src/gui/sdl sdl_events.cpp,1.12,1.13

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16232/gui/sdl

Modified Files:
	sdl_events.cpp 
Log Message:
Fixes bug#3 : Broken default country in SDL

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sdl_events.cpp	5 Nov 2007 21:24:46 -0000	1.12
--- sdl_events.cpp	15 Nov 2007 16:49:53 -0000	1.13
***************
*** 260,268 ****
  	if (SDL_dest.current_search==SRCH_COUNTRY)
  	{	
- 		// dbg(1,"Starting a country search\n");
  		Editbox* country_edit = static_cast<Editbox*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox"));
  		String content=country_edit->getText();
  
  		mcl->resetList();
  
  		search->attr.type=attr_country_all;
--- 260,268 ----
  	if (SDL_dest.current_search==SRCH_COUNTRY)
  	{	
  		Editbox* country_edit = static_cast<Editbox*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox"));
  		String content=country_edit->getText();
  
  		mcl->resetList();
+ 		dbg(0,"Starting a country search : %s\n",content.c_str());
  
  		search->attr.type=attr_country_all;
***************
*** 393,396 ****
--- 393,410 ----
  
  
+ 	if(sdl_gui_navit){	
+ 	} else {
+ 		printf("*** Invalid navit instance in sdl_events\n");
+ 	}
+ 	struct search_param *search=&search_param;
+ 
+  	// dbg(1,"search->nav=sdl_gui_navit;\n");
+  	search->nav=sdl_gui_navit;
+  	// dbg(1,"search->ms=navit_get_mapset(sdl_gui_navit);\n");
+  	search->ms=navit_get_mapset(sdl_gui_navit);
+  	// dbg(1,"search->sl=search_list_new(search->ms);\n");
+  	search->sl=search_list_new(search->ms);
+ 
+ 
  	extern CEGUI::Window* myRoot;
  	const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);
***************
*** 403,406 ****
--- 417,424 ----
  		street_edit->setText("");
  		town_edit->activate();
+ 
+ 		SDL_dest.current_search=SRCH_COUNTRY;
+ 		MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox"));
+ 		mcl->resetList();
  		
  		
***************
*** 420,425 ****
  		cs=country_search_new(country_attr, 0);
  		item=country_search_get_item(cs);
! 		if (item && item_attr_get(item, attr_country_name, &country_name)) 
  			country_edit->setText(country_name.u.str);
  		country_search_destroy(cs);
  
--- 438,445 ----
  		cs=country_search_new(country_attr, 0);
  		item=country_search_get_item(cs);
! 		if (item && item_attr_get(item, attr_country_name, &country_name)){
  			country_edit->setText(country_name.u.str);
+ 			handle_destination_change();
+ 			}
  		country_search_destroy(cs);
  
***************
*** 450,473 ****
  		*/
  
- 		SDL_dest.current_search=SRCH_COUNTRY;
- 		MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox"));
- 		mcl->resetList();
  		we.window->getParent()->getChild("DestinationWindow")->show();
  	}
  
- // 	extern struct navit *sdl_gui_navit;
- 
- 	if(sdl_gui_navit){	
- 	} else {
- 		printf("*** Invalid navit instance in sdl_events\n");
- 	}
- 	struct search_param *search=&search_param;
- 
-  	// dbg(1,"search->nav=sdl_gui_navit;\n");
-  	search->nav=sdl_gui_navit;
-  	// dbg(1,"search->ms=navit_get_mapset(sdl_gui_navit);\n");
-  	search->ms=navit_get_mapset(sdl_gui_navit);
-  	// dbg(1,"search->sl=search_list_new(search->ms);\n");
-  	search->sl=search_list_new(search->ms);
  
  	return true;
--- 470,476 ----

[Navit-cvs-commit] navit configure.in,1.53,1.54

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16665

Modified Files:
	configure.in 
Log Message:
worked on cegui loadtime problems

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure.in	13 Nov 2007 15:56:04 -0000	1.53
--- configure.in	14 Nov 2007 20:53:29 -0000	1.54
***************
*** 163,166 ****
--- 163,242 ----
  AC_SUBST(GLC_LIBS)
  
+ if test x"$cegui" = xyes 	 
+ 	         then 	 
+ 	 # Save the LIBS into a temp var since AC_CHECK_LIB adds the lib into LIBS 	 
+ 	 # and we want just to check and use CEGUI_LIBS 	 
+ 	 libstemp="$LIBS" 	 
+ 	 # For CEGUI, we have to check the presence of some libraries. 	 
+ 	 # The following are mandatory (used by navit) 	 
+ 	 # If the user installed NavIt without, issue a warning and disable CEGUI 	 
+ 	 AC_CHECK_LIB(CEGUIBase, main, 	 
+ 	          [], 	 
+ 	          [ 	 
+ 	         echo "Error! Something is wrong with CEGUIBase. Do you have at least cegui-0.5?" 	 
+ 	         exit -1 	 
+ 	         ]) 	 
+ 	 AC_CHECK_LIB(CEGUIOpenGLRenderer, main, 	 
+ 	          [], 	 
+ 	          [ 	 
+ 	         echo "Error! Something is wrong with CEGUIOpenGLRenderer. Do you have at least cegui-0.5? " 	 
+ 	         exit -1 	 
+ 	         ], $OPENGL_LIBS ) 	 
+ 	 AC_CHECK_LIB(CEGUIFalagardWRBase, main, 	 
+ 	          [], 	 
+ 	          [ 	 
+ 	         echo "Error! Something is wrong with CEGUIFalagardWRBase. Do you have at least cegui-0.5?" 	 
+ 	         exit -1 	 
+ 	         ], $OPENGL_LIBS) 	 
+ 	 CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase" 	 
+ 	  	 
+ 	 # The following are optionnal, but we need to link against them if cegui was built with them 	 
+ 	 libssilly="$OPENGL_LIBS -lpng" 	 
+ 	 AC_CHECK_LIB(CEGUISILLYImageCodec, createImageCodec, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUISILLYImageCodec"], 	 
+ 	          [echo "CEGUISILLYImageCodec not found/not working, disabled."], 	 
+ 	          $libssilly 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUIXercesParser, main, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIXercesParser"], 	 
+ 	          [echo "CEGUIXercesParser not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUIExpatParser, main, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIExpatParser"], 	 
+ 	          [echo "CEGUIExpatParser not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUILibxmlParser, main, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUILibxmlParser"], 	 
+ 	          [echo "CEGUILibxmlParser not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUITinyXMLParser, main, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITinyXMLParser"], 	 
+ 	          [echo "CEGUITinyXMLParser not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUIDevILImageCodec, main, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIDevILImageCodec"], 	 
+ 	          [echo "CEGUIDevILImageCodec not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec, 	 
+ 	          [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec"], 	 
+ 	          [echo "GUITGAImageCodec not found/not working, disabled."], 	 
+ 	          $OPENGL_LIBS 	 
+ 	 ) 	 
+ 	  	 
+ 	 LIBS="$libstemp" 	 
+ 	 echo "LIBS : $CEGUI_LIBS" 	 
+ 	 fi
+ 
  AC_SUBST(CEGUI_CFLAGS)
  AC_SUBST(CEGUI_LIBS)

[Navit-cvs-commit] navit/src/maps Makefile.am,1.2,1.3

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/maps
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16425

Modified Files:
	Makefile.am 
Log Message:
Improved osm2navit to handle points

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/maps/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	5 Nov 2007 21:15:52 -0000	1.2
--- Makefile.am	13 Nov 2007 20:40:18 -0000	1.3
***************
*** 14,18 ****
  $(SAMPLE_MAP).bin: $(SAMPLE_MAP).osm.bz2 $(top_builddir)/src/osm2navit
  	echo "Converting osm sample map"
! 	bzcat $(SAMPLE_MAP).osm.bz2 | $(top_builddir)/src/osm2navit >$(SAMPLE_MAP).bin.tmp
  	mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin
  
--- 14,18 ----
  $(SAMPLE_MAP).bin: $(SAMPLE_MAP).osm.bz2 $(top_builddir)/src/osm2navit
  	echo "Converting osm sample map"
! 	bzcat $(SAMPLE_MAP).osm.bz2 | $(top_builddir)/src/osm2navit --attr-debug-level=5 >$(SAMPLE_MAP).bin.tmp
  	mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin
  

[Navit-cvs-commit] navit/src item_def.h, 1.10, 1.11 navit.xml, 1.15, 1.16 osm2navit.c, 1.8, 1.9

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15971/src

Modified Files:
	item_def.h navit.xml osm2navit.c 
Log Message:
Improved osm2navit to handle points

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** item_def.h	1 Nov 2007 15:16:39 -0000	1.10
--- item_def.h	13 Nov 2007 20:39:57 -0000	1.11
***************
*** 195,198 ****
--- 195,199 ----
  ITEM(poi_wrecker)
  ITEM(poi_zoo)
+ ITEM(point_unkn)
  ITEM2(0x80000000,line)
  ITEM2(0x80000001,line_unspecified)
***************
*** 263,264 ****
--- 264,267 ----
  ITEM(tile)
  ITEM(submap)
+ ITEM(building_poly)
+ ITEM(place_poly)

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** osm2navit.c	8 Nov 2007 09:54:31 -0000	1.8
--- osm2navit.c	13 Nov 2007 20:39:57 -0000	1.9
***************
*** 16,67 ****
  GHashTable *dedupe_ways_hash;
  
  
  static char *attrmap={
! 	"amenity\n"
! 	"building\n"
! 	"highway	cycleway	street_nopass\n"
! 	"highway	footway		street_nopass\n"
! 	"highway	steps		street_nopass\n"
! 	"highway	cyclepath	street_nopass\n"
! 	"highway	track		street_nopass\n"
! 	"highway	service		street_nopass\n"
! 	"highway	pedestrian	street_nopass\n"
! 	"highway	residential	street_1_city\n"
! 	"highway	unclassified	street_1_city\n"
! 	"highway	tertiary	street_2_city\n"
! 	"highway	secondary	street_3_city\n"
! 	"highway	primary		street_4_city\n"
! 	"highway	primary_link	ramp\n"
! 	"highway	trunk		street_4_city\n"
! 	"highway	trunk_link	ramp\n"
! 	"highway	motorway	highway_city\n"
! 	"highway	motorway_link	ramp\n"
! 	"landuse	allotments	wood\n"
! 	"landuse	cemetery	cemetery_poly\n"
! 	"landuse	forest		wood\n"
! 	"leisure	park		park_poly\n"
! 	"natural	wood		wood\n"
! 	"natural	water		water_poly\n"
! 	"place		suburb		town_poly\n"
! 	"railway	rail		rail\n"
! 	"railway	subway		rail\n"
! 	"railway	tram		rail\n"
! 	"waterway	canal		water_line\n"
! 	"waterway	river		water_line\n"
! 	"waterway	weir		water_line\n"
! 	"waterway	stream		water_line\n"
! 	"waterway	drain		water_line\n"
  };
  
! GHashTable *key_hash;
  
  static void
  build_attrmap_line(char *line)
  {
! 	char *k=NULL,*v=NULL,*i=NULL,*p;
  	gpointer *data;
! 	GHashTable *value_hash;
! 	k=line;
! 	p=index(k,'\t');
  	if (p) {
  		while (*p == '\t')
--- 16,85 ----
  GHashTable *dedupe_ways_hash;
  
+ int attr_debug_level=1;
  
  static char *attrmap={
! 	"n	historic\n"
! 	"n	amenity	hospital	poi_hospital\n"
! 	"n	amenity	bank		poi_bank\n"
! 	"n	place	suburb		district_label\n"
! 	"n	place	town		town_label\n"
! 	"w	amenity	place_of_worship	building_poly\n"
! 	"w	building\n"
! 	"w	highway	cycleway	street_nopass\n"
! 	"w	highway	footway		street_nopass\n"
! 	"w	highway	steps		street_nopass\n"
! 	"w	highway	cyclepath	street_nopass\n"
! 	"w	highway	track		street_nopass\n"
! 	"w	highway	service		street_nopass\n"
! 	"w	highway	pedestrian	street_nopass\n"
! 	"w	highway	residential	street_1_city\n"
! 	"w	highway	unclassified	street_1_city\n"
! 	"w	highway	tertiary	street_2_city\n"
! 	"w	highway	secondary	street_3_city\n"
! 	"w	highway	pedestrian	street_nopass\n"
! 	"w	highway	primary		street_4_city\n"
! 	"w	highway	primary_link	ramp\n"
! 	"w	highway	trunk		street_4_city\n"
! 	"w	highway	trunk_link	ramp\n"
! 	"w	highway	motorway	highway_city\n"
! 	"w	highway	motorway_link	ramp\n"
! 	"w	historic	town gate	building_poly\n"
! 	"w	landuse	allotments	wood\n"
! 	"w	landuse	cemetery	cemetery_poly\n"
! 	"w	landuse	forest		wood\n"
! 	"w	landuse	industrial	industry_poly\n"
! 	"w	leisure	park		park_poly\n"
! 	"w	natural	wood		wood\n"
! 	"w	natural	water		water_poly\n"
! 	"w	place		suburb		town_poly\n"
! 	"w	place		town		town_poly\n"
! 	"w	railway	rail		rail\n"
! 	"w	railway	station		building_poly\n"
! 	"w	railway	subway		rail\n"
! 	"w	railway	tram		rail\n"
! 	"w	waterway	canal		water_line\n"
! 	"w	waterway	river		water_line\n"
! 	"w	waterway	weir		water_line\n"
! 	"w	waterway	stream		water_line\n"
! 	"w	waterway	drain		water_line\n"
  };
  
! GHashTable *way_key_hash;
! GHashTable *node_key_hash;
  
  static void
  build_attrmap_line(char *line)
  {
! 	char *t=NULL,*k=NULL,*v=NULL,*i=NULL,*p;
  	gpointer *data;
! 	GHashTable *key_hash,*value_hash;
! 	t=line;
! 	p=index(t,'\t');
! 	if (p) {
! 		while (*p == '\t')
! 			*p++='\0';
! 		k=p;
! 		p=index(k,'\t');
! 	}
  	if (p) {
  		while (*p == '\t')
***************
*** 75,82 ****
  		i=p;
  	}
! 	if (! i)
! 		i="street_unkn";
! 	if (! key_hash)
! 		key_hash=g_hash_table_new(g_str_hash, g_str_equal);
  	value_hash=g_hash_table_lookup(key_hash, k);
  	if (! value_hash) {
--- 93,105 ----
  		i=p;
  	}
! 	if (t[0] == 'w') {
! 		if (! i)
! 			i="street_unkn";
! 		key_hash=way_key_hash;
! 	} else {
! 		if (! i)
! 			i="point_unkn";
! 		key_hash=node_key_hash;
! 	}
  	value_hash=g_hash_table_lookup(key_hash, k);
  	if (! value_hash) {
***************
*** 97,100 ****
--- 120,125 ----
  {
  	char *p;
+ 	way_key_hash=g_hash_table_new(g_str_hash, g_str_equal);
+ 	node_key_hash=g_hash_table_new(g_str_hash, g_str_equal);
  	while (map) {
  		p=index(map,'\n');
***************
*** 178,181 ****
--- 203,207 ----
  }
  
+ static int node_is_tagged;
  
  static void
***************
*** 183,191 ****
  {
  	GHashTable *value_hash;
! 	if (! strcmp(k,"name")) {
! 		strcpy(label_attr_buffer, v);
! 		pad_text_attr(&label_attr, label_attr_buffer);
! 		return;
! 	}
  	if (! strcmp(k,"oneway")) {
  		if (! strcmp(v,"true") || !strcmp(v,"yes")) {
--- 209,220 ----
  {
  	GHashTable *value_hash;
! 	enum item_type type;
! 	int level=2;
! 	if (! strcmp(k,"created_by"))
! 		level=9;
! 	if (! strcmp(k,"converted_by"))
! 		level=8;
! 	if (! strcmp(k,"layer"))
! 		level=7;
  	if (! strcmp(k,"oneway")) {
  		if (! strcmp(v,"true") || !strcmp(v,"yes")) {
***************
*** 197,210 ****
  			limit_attr.len=2;
  		}
! 			
  	}
! 	value_hash=g_hash_table_lookup(key_hash, k);
  	if (! value_hash)
  		return;
! 	item.type=(enum item_type) g_hash_table_lookup(value_hash, v);
! 	if (! item.type) {
! 		item.type=type_street_unkn;
  		g_hash_table_insert(value_hash, v, (gpointer)item.type);
  	}
  }
  
--- 226,255 ----
  			limit_attr.len=2;
  		}
! 		if (!in_way)
! 			level=6;
  	}
! 	if (! strcmp(k,"name")) {
! 		strcpy(label_attr_buffer, v);
! 		pad_text_attr(&label_attr, label_attr_buffer);
! 	}
! 	if (attr_debug_level >= level) {
! 		sprintf(debug_attr_buffer+strlen(debug_attr_buffer), " %s=%s", k, v);
! 		node_is_tagged=1;
! 	}
! 	if (level < 6) 
! 		node_is_tagged=1;
! 	if (in_way) 
! 		value_hash=g_hash_table_lookup(way_key_hash, k);
! 	else
! 		value_hash=g_hash_table_lookup(node_key_hash, k);
  	if (! value_hash)
  		return;
! 	type=(enum item_type) g_hash_table_lookup(value_hash, v);
! 	if (!type) {
! 		type=in_way ? type_street_unkn : type_point_unkn;
  		g_hash_table_insert(value_hash, v, (gpointer)item.type);
  	}
+ 	if (type != type_street_unkn && type != type_point_unkn)
+ 		item.type=type;
  }
  
***************
*** 244,247 ****
--- 289,296 ----
  } coord_buffer[65536];
  
+ #define IS_REF(c) ((c).x & (1 << 31))
+ #define REF(c) ((c).y)
+ #define SET_REF(c,ref) do { (c).x = 1 << 31; (c).y = ref ; } while(0)
+ 
  struct rect {
  	struct coord l,h;
***************
*** 287,296 ****
  }
  
  static void
  add_node(int id, double lat, double lon)
  {
- 	struct node_item *ni;
  	if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced) 
  		extend_buffer(&node_buffer);
  	ni=(struct node_item *)(node_buffer.base+node_buffer.size);
  	ni->id=id;
--- 336,352 ----
  }
  
+ static struct node_item *ni;
+ static int node_id;
+ 
  static void
  add_node(int id, double lat, double lon)
  {
  	if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced) 
  		extend_buffer(&node_buffer);
+ 	node_is_tagged=0;
+ 	node_id=id;
+ 	item.type=type_point_unkn;
+ 	debug_attr.len=0;
+ 	sprintf(debug_attr_buffer,"node_id=%d", node_id);
  	ni=(struct node_item *)(node_buffer.base+node_buffer.size);
  	ni->id=id;
***************
*** 313,318 ****
  		if (!g_hash_table_lookup(node_hash, (gpointer)(ni->id))) 
  			g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base));
! 		else
  			node_buffer.size-=sizeof(struct node_item);
  
  }
--- 369,376 ----
  		if (!g_hash_table_lookup(node_hash, (gpointer)(ni->id))) 
  			g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base));
! 		else {
  			node_buffer.size-=sizeof(struct node_item);
+ 			node_id=0;
+ 		}
  
  }
***************
*** 452,455 ****
--- 510,532 ----
  
  static void
+ end_node(FILE *out)
+ {
+ 	int alen=0;
+ 	if (! node_is_tagged)
+ 		return;
+ 	pad_text_attr(&debug_attr, debug_attr_buffer);
+ 	if (label_attr.len)
+ 		alen+=label_attr.len+1;	
+ 	if (debug_attr.len)
+ 		alen+=debug_attr.len+1;	
+ 	item.clen=2;
+ 	item.len=item.clen+2+alen;
+ 	fwrite(&item, sizeof(item), 1, out);
+ 	fwrite(&ni->c, 1*sizeof(struct coord), 1, out);
+ 	write_attr(out, &label_attr, label_attr_buffer);
+ 	write_attr(out, &debug_attr, debug_attr_buffer);
+ }
+ 
+ static void
  add_nd(char *p, int ref)
  {
***************
*** 461,466 ****
  		coord_buffer[coord_count++]=ni->c;
  #else
! 		coord_buffer[coord_count].y=0;
! 		coord_buffer[coord_count++].x=ref;
  #endif
  		ni->ref_way++;
--- 538,543 ----
  		coord_buffer[coord_count++]=ni->c;
  #else
! 		SET_REF(coord_buffer[coord_count], ref);
! 		coord_count++;
  #endif
  		ni->ref_way++;
***************
*** 552,555 ****
--- 629,633 ----
  		} else if (!strncmp(p, "</node>",7)) {
  			in_node=0;
+ 			end_node(out);
  		} else if (!strncmp(p, "</way>",6)) {
  			in_way=0;
***************
*** 840,849 ****
  		last=0;
  		for (i = 0 ; i < ccount ; i++) {
! 			ndref=c[i].x;
! 			ni=node_item_get(ndref);
! 			c[i]=ni->c;
! 			if (ni->ref_way > 1 && i != 0 && i != ccount-1 && ib->type >= type_street_nopass && ib->type <= type_ferry) {
! 				write_item_part(out, ib, last, i);
! 				last=i;
  			}
  		}
--- 918,929 ----
  		last=0;
  		for (i = 0 ; i < ccount ; i++) {
! 			if (IS_REF(c[i])) {
! 				ndref=REF(c[i]);
! 				ni=node_item_get(ndref);
! 				c[i]=ni->c;
! 				if (ni->ref_way > 1 && i != 0 && i != ccount-1 && ib->type >= type_street_nopass && ib->type <= type_ferry) {
! 					write_item_part(out, ib, last, i);
! 					last=i;
! 				}
  			}
  		}
***************
*** 1172,1175 ****
--- 1252,1256 ----
  		int option_index = 0;
  		static struct option long_options[] = {
+ 			{"attr-debug-level", 1, 0, 'a'},
  			{"dedupe-ways", 0, 0, 'w'},
  			{"keep-tmpfiles", 0, 0, 'k'},
***************
*** 1177,1185 ****
  			{0, 0, 0, 0}
  		};
! 		c = getopt_long (argc, argv, "w", long_options, &option_index);
  		if (c == -1)
  			break;
  		switch (c) {
  		case 'h':
  			printf("\n");
  			printf("osm2navit - parse osm textfile and converts to NavIt binfile format\n\n");
--- 1258,1267 ----
  			{0, 0, 0, 0}
  		};
! 		c = getopt_long (argc, argv, "a:hkw", long_options, &option_index);
  		if (c == -1)
  			break;
  		switch (c) {
  		case 'h':
+ 		case '?':
  			printf("\n");
  			printf("osm2navit - parse osm textfile and converts to NavIt binfile format\n\n");
***************
*** 1187,1197 ****
  			printf("bzcat planet.osm.bz2 | osm2navit >mymap.bin\n");
  			printf("Available switches :\n");
! 			printf("-h (--help)          : this screen\n");
! 			printf("-w (--dedupe-ways)   : ensure no duplicate ways. useful when using several input files\n");
! 			printf("-k (--keep-tmpfiles) : do not delete tmp files after processing. useful to reuse them\n\n");
  			exit(1);
  			break;
! 		case 'w':
! 			dedupe_ways_hash=g_hash_table_new(NULL, NULL);
  			break;
  		case 'k':
--- 1269,1280 ----
  			printf("bzcat planet.osm.bz2 | osm2navit >mymap.bin\n");
  			printf("Available switches :\n");
! 			printf("-h (--help)             : this screen\n");
! 			printf("-a (--attr-debug-level) : control which data is included in the debug attribute\n");
! 			printf("-k (--keep-tmpfiles)    : do not delete tmp files after processing. useful to reuse them\n\n");
! 			printf("-w (--dedupe-ways)      : ensure no duplicate ways or nodes. useful when using several input files\n");
  			exit(1);
  			break;
! 		case 'a':
! 			attr_debug_level=atoi(optarg);
  			break;
  		case 'k':
***************
*** 1199,1204 ****
  			keep_tmpfiles=1;
  			break;
! 		case '?':
! 			exit(1);
  			break;
  		default:
--- 1282,1287 ----
  			keep_tmpfiles=1;
  			break;
! 		case 'w':
! 			dedupe_ways_hash=g_hash_table_new(NULL, NULL);
  			break;
  		default:

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** navit.xml	5 Nov 2007 17:02:45 -0000	1.15
--- navit.xml	13 Nov 2007 20:39:57 -0000	1.16
***************
*** 92,96 ****
  				<polygon color="#4af04f" /> 
  			</item>
! 			<item type="industry_poly" order="0-">
  				<polygon color="#e6e6e6" /> 
  			</item>
--- 92,96 ----
  				<polygon color="#4af04f" /> 
  			</item>
! 			<item type="industry_poly,building_poly,place_poly" order="0-">
  				<polygon color="#e6e6e6" /> 
  			</item>
***************
*** 476,479 ****
--- 476,482 ----
  				<icon src="hospital.xpm" />
  			</item>
+ 			<item type="point_unkn" order="0-">
+ 				<circle color="#8080ff" radius="3" />
+ 			</item>
  		</layer>
  	</layout>

[Navit-cvs-commit] navit configure.in,1.52,1.53

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17811

Modified Files:
	configure.in 
Log Message:
Might have fixed cegui detection for good.

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** configure.in	11 Nov 2007 11:24:38 -0000	1.52
--- configure.in	13 Nov 2007 15:56:04 -0000	1.53
***************
*** 110,124 ****
  AC_SUBST(SDL_LIBS)
  
! #FIXME : the following does not seem to be parsed
! AC_CHECK_HEADER(
! 	CEGUI/CEGUI.h,
! 	AC_DEFINE(
! 		[HAVE_CEGUI],
! 		[],
! 		Define to 1 if you have the <CEGUI/CEGUI.h> header file.
! 		)
! 		CEGUI_CFLAGS="-I /usr/local/include/CEGUI -I /usr/include/CEGUI"
! 		cegui=yes,
! 	AC_MSG_WARN([*** no CEGUI/CEGUI.h -- SDL support disabled])
  )
  
--- 110,124 ----
  AC_SUBST(SDL_LIBS)
  
! PKG_CHECK_MODULES(
!         [CEGUI],
!         [CEGUI-OPENGL >= 0.5.0],
!         [
!                 AC_DEFINE(
!                         [HAVE_CEGUI],
!                         [],
!                         [Define to 1 if you have the @<:@CEGUI/CEGUI.h@:>@ header file.])
!                 cegui=yes
!         ],
!         [AC_MSG_WARN([*** CEGUI not found -- SDL support disabled])]
  )
  
***************
*** 163,242 ****
  AC_SUBST(GLC_LIBS)
  
- if test x"$cegui" = xyes
-         then
- # Save the LIBS into a temp var since AC_CHECK_LIB adds the lib into LIBS
- # and we want just to check and use CEGUI_LIBS
- libstemp="$LIBS" 
- # For CEGUI, we have to check the presence of some libraries.
- # The following are mandatory (used by navit)
- # If the user installed NavIt without, issue a warning and disable CEGUI
- AC_CHECK_LIB(CEGUIBase, main,
- 	 [],
- 	 [
-         echo "Error! Something is wrong with CEGUIBase. Do you have at least cegui-0.5?"
-         exit -1
-         ])
- AC_CHECK_LIB(CEGUIOpenGLRenderer, main,
- 	 [],
- 	 [
-         echo "Error! Something is wrong with CEGUIOpenGLRenderer. Do you have at least cegui-0.5? "
-         exit -1
-         ], $OPENGL_LIBS )
- AC_CHECK_LIB(CEGUIFalagardWRBase, main,
- 	 [],
- 	 [
-         echo "Error! Something is wrong with CEGUIFalagardWRBase. Do you have at least cegui-0.5?"
-         exit -1
-         ], $OPENGL_LIBS)
- CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase"
- 
- # The following are optionnal, but we need to link against them if cegui was built with them
- libssilly="$OPENGL_LIBS -lpng"
- AC_CHECK_LIB(CEGUISILLYImageCodec, createImageCodec,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUISILLYImageCodec"],
- 	 [echo "CEGUISILLYImageCodec not found/not working, disabled."],
- 	 $libssilly
- )
- 
- AC_CHECK_LIB(CEGUIXercesParser, main,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIXercesParser"],
- 	 [echo "CEGUIXercesParser not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- AC_CHECK_LIB(CEGUIExpatParser, main,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIExpatParser"],
- 	 [echo "CEGUIExpatParser not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- AC_CHECK_LIB(CEGUILibxmlParser, main,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUILibxmlParser"],
- 	 [echo "CEGUILibxmlParser not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- AC_CHECK_LIB(CEGUITinyXMLParser, main,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITinyXMLParser"],
- 	 [echo "CEGUITinyXMLParser not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- AC_CHECK_LIB(CEGUIDevILImageCodec, main,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIDevILImageCodec"],
- 	 [echo "CEGUIDevILImageCodec not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec,
- 	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec"],
- 	 [echo "GUITGAImageCodec not found/not working, disabled."],
- 	 $OPENGL_LIBS
- )
- 
- LIBS="$libstemp"
- echo "LIBS : $CEGUI_LIBS"
- fi
- 
  AC_SUBST(CEGUI_CFLAGS)
  AC_SUBST(CEGUI_LIBS)
--- 163,166 ----

[Navit-cvs-commit] navit/src/gui/sdl/datafiles/layouts Mineque.layout, 1.8, 1.9

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9656/gui/sdl/datafiles/layouts

Modified Files:
	Mineque.layout 
Log Message:
Changed slider steps

Index: Mineque.layout
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Mineque.layout	5 Nov 2007 21:35:20 -0000	1.8
--- Mineque.layout	13 Nov 2007 09:51:25 -0000	1.9
***************
*** 75,78 ****
--- 75,79 ----
  			<Property Name="PageSize" Value="0" />
  			<Property Name="OverlapSize" Value="0" />
+ 			<Property Name="StepSize" Value="200" />
  			<Property Name="DocumentSize" Value="2000" />
  			<Property Name="ScrollPosition" Value="400" />

[Navit-cvs-commit] navit/po es.po,1.7,1.8

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/po
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13164

Modified Files:
	es.po 
Log Message:
Added new translations

Index: es.po
===================================================================
RCS file: /cvsroot/navit/navit/po/es.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** es.po	5 Nov 2007 23:54:29 -0000	1.7
--- es.po	12 Nov 2007 21:26:17 -0000	1.8
***************
*** 10,14 ****
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
  "PO-Revision-Date: 2007-07-15 20:44-0600\n"
! "Last-Translator: Chris Eubank <cte...@gm...>\n"
  "Language-Team: Chris Eubank <cte...@gm...>\n"
  "MIME-Version: 1.0\n"
--- 10,14 ----
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
  "PO-Revision-Date: 2007-07-15 20:44-0600\n"
! "Last-Translator: Esteban Dauksis <eda...@gm...>\n"
  "Language-Team: Chris Eubank <cte...@gm...>\n"
  "MIME-Version: 1.0\n"
***************
*** 20,24 ****
  #, c-format
  msgid "Running from source directory\n"
! msgstr "Funcionamiento de directorio de fuente\n"
  
  #: ../src/main.c:110
--- 20,24 ----
  #, c-format
  msgid "Running from source directory\n"
! msgstr "Ejecutando desde el directorio de las fuentes\n"
  
  #: ../src/main.c:110
***************
*** 29,38 ****
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr ""
  
  #: ../src/main.c:172
  #, c-format
  msgid "Error parsing '%s': %s\n"
! msgstr "Hay un Malfuncionamiento cuando leyendo '%s': %s\n"
  
  #: ../src/main.c:174
--- 29,38 ----
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr "No se ha encontrado navit.xml o navit.xml.local\n"
  
  #: ../src/main.c:172
  #, c-format
  msgid "Error parsing '%s': %s\n"
! msgstr "Error leyendo '%s': %s\n"
  
  #: ../src/main.c:174
***************
*** 44,48 ****
  #, c-format
  msgid "No instance has been created, exiting\n"
! msgstr "No ha creado caso. Muriendo.\n"
  
  #: ../src/navigation.c:173
--- 44,48 ----
  #, c-format
  msgid "No instance has been created, exiting\n"
! msgstr "No se ha creado una instancia, saliendo\n"
  
  #: ../src/navigation.c:173
***************
*** 54,58 ****
  #, fuzzy, c-format
  msgid "in %d m"
! msgstr "después de %d metros"
  
  #: ../src/navigation.c:179
--- 54,58 ----
  #, fuzzy, c-format
  msgid "in %d m"
! msgstr "en %d metros"
  
  #: ../src/navigation.c:179
***************
*** 64,68 ****
  #, c-format
  msgid "in %d meters"
! msgstr "después de %d metros"
  
  #: ../src/navigation.c:187
--- 64,68 ----
  #, c-format
  msgid "in %d meters"
! msgstr "en %d metros"
  
  #: ../src/navigation.c:187
***************
*** 74,78 ****
  #, c-format
  msgid "in %d.%d kilometers"
! msgstr "después de %d.%d kilómetros"
  
  #: ../src/navigation.c:195
--- 74,78 ----
  #, c-format
  msgid "in %d.%d kilometers"
! msgstr "en %d.%d kilómetros"
  
  #: ../src/navigation.c:195
***************
*** 82,86 ****
  #: ../src/navigation.c:197
  msgid "in one kilometer"
! msgstr "después de un kilómetro"
  
  #: ../src/navigation.c:200
--- 82,86 ----
  #: ../src/navigation.c:197
  msgid "in one kilometer"
! msgstr "en un kilómetro"
  
  #: ../src/navigation.c:200
***************
*** 90,94 ****
  #: ../src/navigation.c:202
  msgid "in two kilometers"
! msgstr "después de dos kilómetros"
  
  #: ../src/navigation.c:205
--- 90,94 ----
  #: ../src/navigation.c:202
  msgid "in two kilometers"
! msgstr "en dos kilómetros"
  
  #: ../src/navigation.c:205
***************
*** 98,102 ****
  #: ../src/navigation.c:207
  msgid "in three kilometers"
! msgstr "después de tres kilómetro"
  
  #: ../src/navigation.c:210
--- 98,102 ----
  #: ../src/navigation.c:207
  msgid "in three kilometers"
! msgstr "en tres kilómetros"
  
  #: ../src/navigation.c:210
***************
*** 106,110 ****
  #: ../src/navigation.c:212
  msgid "in four kilometers"
! msgstr "después de cuatro kilómetros"
  
  #: ../src/navigation.c:215
--- 106,110 ----
  #: ../src/navigation.c:212
  msgid "in four kilometers"
! msgstr "en cuatro kilómetros"
  
  #: ../src/navigation.c:215
***************
*** 116,120 ****
  #, c-format
  msgid "in %d kilometers"
! msgstr "después de %d kilómetros"
  
  #: ../src/navigation.c:421
--- 116,120 ----
  #, c-format
  msgid "in %d kilometers"
! msgstr "en %d kilómetros"
  
  #: ../src/navigation.c:421
***************
*** 128,136 ****
  #: ../src/navigation.c:433
  msgid "easily "
! msgstr "fácilmente"
  
  #: ../src/navigation.c:437
  msgid "strongly "
! msgstr "fuertemente"
  
  #: ../src/navigation.c:440
--- 128,136 ----
  #: ../src/navigation.c:433
  msgid "easily "
! msgstr "suavemente"
  
  #: ../src/navigation.c:437
  msgid "strongly "
! msgstr "brúscamente"
  
  #: ../src/navigation.c:440
***************
*** 141,150 ****
  #, fuzzy
  msgid "When possible, please turn around"
! msgstr "Cuando es posible, doble a la"
  
  #: ../src/navigation.c:453
  #, c-format
  msgid "Follow the road for the next %s"
! msgstr "Siga la calle para %s"
  
  #: ../src/navigation.c:457
--- 141,150 ----
  #, fuzzy
  msgid "When possible, please turn around"
! msgstr "Cuando sea posible, gire a la"
  
  #: ../src/navigation.c:453
  #, c-format
  msgid "Follow the road for the next %s"
! msgstr "Continue hasta %s"
  
  #: ../src/navigation.c:457
***************
*** 175,184 ****
  #, c-format
  msgid "Turn %s%s %s"
! msgstr "Dobla %s%s %s"
  
  #: ../src/navigation.c:488
  #, c-format
  msgid "You have reached your destination %s"
! msgstr "Has llegado a la destinación %s"
  
  #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180
--- 175,184 ----
  #, c-format
  msgid "Turn %s%s %s"
! msgstr "Gire %s%s %s"
  
  #: ../src/navigation.c:488
  #, c-format
  msgid "You have reached your destination %s"
! msgstr "Ha llegado a su destino %s"
  
  #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180
***************
*** 220,224 ****
  #: ../src/country.c:31
  msgid "Moldova"
! msgstr "Moldova"
  
  #: ../src/country.c:32
--- 220,224 ----
  #: ../src/country.c:31
  msgid "Moldova"
! msgstr "Moldavia"
  
  #: ../src/country.c:32
***************
*** 232,236 ****
  #: ../src/country.c:34
  msgid "Belarus"
! msgstr "Belarús"
  
  #: ../src/country.c:35
--- 232,236 ----
  #: ../src/country.c:34
  msgid "Belarus"
! msgstr "Bielorusia"
  
  #: ../src/country.c:35
***************
*** 356,360 ****
  #: ../src/country.c:65
  msgid "Saudi Arabia"
! msgstr "rabia Saudita"
  
  #: ../src/country.c:66
--- 356,360 ----
  #: ../src/country.c:65
  msgid "Saudi Arabia"
! msgstr "Arabia Saudita"
  
  #: ../src/country.c:66
***************
*** 368,372 ****
  #: ../src/country.c:68
  msgid "Palestinia"
! msgstr "Palestinia"
  
  #: ../src/country.c:69
--- 368,372 ----
  #: ../src/country.c:68
  msgid "Palestinia"
! msgstr "Palestina"
  
  #: ../src/country.c:69
***************
*** 400,408 ****
  #: ../src/country.c:76
  msgid "Slovenia"
! msgstr "CroaEslovenia"
  
  #: ../src/country.c:77
  msgid "Bosnia and Herzegovina"
! msgstr "Bosnia y Herzegovina"
  
  #: ../src/country.c:78
--- 400,408 ----
  #: ../src/country.c:76
  msgid "Slovenia"
! msgstr "Eslovenia"
  
  #: ../src/country.c:77
  msgid "Bosnia and Herzegovina"
! msgstr "Bosnia-Herzegovina"
  
  #: ../src/country.c:78
***************
*** 452,456 ****
  #: ../src/gui/gtk/destination.c:331
  msgid "District/Township"
! msgstr "distrito"
  
  #: ../src/gui/gtk/destination.c:334
--- 452,456 ----
  #: ../src/gui/gtk/destination.c:331
  msgid "District/Township"
! msgstr "Distrito"
  
  #: ../src/gui/gtk/destination.c:334
***************
*** 460,464 ****
  #: ../src/gui/gtk/destination.c:336
  msgid "Number"
! msgstr "Numero"
  
  #: ../src/gui/gtk/gui_gtk_action.c:177
--- 460,464 ----
  #: ../src/gui/gtk/destination.c:336
  msgid "Number"
! msgstr "Número"
  
  #: ../src/gui/gtk/gui_gtk_action.c:177
***************
*** 476,492 ****
  #: ../src/gui/gtk/gui_gtk_action.c:181
  msgid "ZoomOut"
! msgstr "HagaPequeño"
  
  #: ../src/gui/gtk/gui_gtk_action.c:182
  msgid "ZoomIn"
! msgstr "HagaGrande"
  
  #: ../src/gui/gtk/gui_gtk_action.c:183
  msgid "Refresh"
! msgstr "Restaure"
  
  #: ../src/gui/gtk/gui_gtk_action.c:184
  msgid "Roadbook"
! msgstr ""
  
  #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188
--- 476,492 ----
  #: ../src/gui/gtk/gui_gtk_action.c:181
  msgid "ZoomOut"
! msgstr "Alejar"
  
  #: ../src/gui/gtk/gui_gtk_action.c:182
  msgid "ZoomIn"
! msgstr "Aumentar"
  
  #: ../src/gui/gtk/gui_gtk_action.c:183
  msgid "Refresh"
! msgstr "Refrescar"
  
  #: ../src/gui/gtk/gui_gtk_action.c:184
  msgid "Roadbook"
! msgstr "Guía"
  
  #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188
***************
*** 496,504 ****
  #: ../src/gui/gtk/gui_gtk_action.c:190
  msgid "Destination"
! msgstr "Destinación"
  
  #: ../src/gui/gtk/gui_gtk_action.c:191
  msgid "Clear"
! msgstr ""
  
  #: ../src/gui/gtk/gui_gtk_action.c:192
--- 496,504 ----
  #: ../src/gui/gtk/gui_gtk_action.c:190
  msgid "Destination"
! msgstr "Destino"
  
  #: ../src/gui/gtk/gui_gtk_action.c:191
  msgid "Clear"
! msgstr "Limpiar"
  
  #: ../src/gui/gtk/gui_gtk_action.c:192
***************
*** 516,520 ****
  #: ../src/gui/gtk/gui_gtk_action.c:201
  msgid "Tracking"
! msgstr ""
  
  #: ../src/gui/gtk/gui_gtk_action.c:202
--- 516,520 ----
  #: ../src/gui/gtk/gui_gtk_action.c:201
  msgid "Tracking"
! msgstr "Posicionando"
  
  #: ../src/gui/gtk/gui_gtk_action.c:202
***************
*** 524,528 ****
  #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206
  msgid "Fullscreen"
! msgstr ""
  
  #: ../src/gui/gtk/gui_gtk_action.c:214
--- 524,528 ----
  #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206
  msgid "Fullscreen"
! msgstr "Pantalla completa"
  
  #: ../src/gui/gtk/gui_gtk_action.c:214
***************
*** 532,550 ****
  #: ../src/gui/gtk/gui_gtk_action.c:215
  msgid "VisibleBlocks"
! msgstr "BloquesDemostrados"
  
  #: ../src/gui/gtk/gui_gtk_action.c:216
  msgid "VisibleTowns"
! msgstr "CuidadosDemostrados"
  
  #: ../src/gui/gtk/gui_gtk_action.c:217
  msgid "VisiblePolys"
! msgstr "PolysDemostrados"
  
  #: ../src/gui/gtk/gui_gtk_action.c:218
  msgid "VisibleStreets"
! msgstr "CallesDemostrados"
  
  #: ../src/gui/gtk/gui_gtk_action.c:219
  msgid "VisiblePoints"
! msgstr "PuntosDemostrados"
--- 532,550 ----
  #: ../src/gui/gtk/gui_gtk_action.c:215
  msgid "VisibleBlocks"
! msgstr "BloquesVisibles"
  
  #: ../src/gui/gtk/gui_gtk_action.c:216
  msgid "VisibleTowns"
! msgstr "CuidadesVisibles"
  
  #: ../src/gui/gtk/gui_gtk_action.c:217
  msgid "VisiblePolys"
! msgstr "PoligonosVisibles"
  
  #: ../src/gui/gtk/gui_gtk_action.c:218
  msgid "VisibleStreets"
! msgstr "CallesVisibles"
  
  #: ../src/gui/gtk/gui_gtk_action.c:219
  msgid "VisiblePoints"
! msgstr "PuntosVisibles"

[Navit-cvs-commit] navit/src file.c,1.6,1.7 file.h,1.6,1.7

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4579/src

Modified Files:
	file.c file.h 
Log Message:
Changed file to support read(), changed binfile driver to use it

Index: file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** file.c	5 Jul 2007 20:43:59 -0000	1.6
--- file.c	12 Nov 2007 19:25:28 -0000	1.7
***************
*** 15,44 ****
  file_create(char *name)
  {
!         struct stat stat;
  	struct file *file= g_new0(struct file,1);
  
  	if (! file)
  		return file; 
!         file->fd=open(name, O_RDONLY);
  	if (file->fd < 0) {
  		g_free(file);
  		return NULL;
  	}
!         fstat(file->fd, &stat);
!         file->size=stat.st_size;
  	file->name = g_strdup(name);
!         file->begin=mmap(NULL, file->size, PROT_READ|PROT_WRITE, MAP_PRIVATE, file->fd, 0);
  	g_assert(file->begin != NULL);
  	if (file->begin == (void *)0xffffffff) {
  		perror("mmap");
  	}
  	g_assert(file->begin != (void *)0xffffffff);
!         file->end=file->begin+file->size;
! 	file->private=NULL;
  
! 	g_assert(file != NULL); 
! 	file->next=file_list;
! 	file_list=file;
!         return file;
  }
  
--- 15,73 ----
  file_create(char *name)
  {
! 	struct stat stat;
  	struct file *file= g_new0(struct file,1);
  
  	if (! file)
  		return file; 
! 	file->fd=open(name, O_RDONLY);
  	if (file->fd < 0) {
  		g_free(file);
  		return NULL;
  	}
! 	fstat(file->fd, &stat);
! 	file->size=stat.st_size;
  	file->name = g_strdup(name);
! 	g_assert(file != NULL); 
! 	file->next=file_list;
! 	file_list=file;
! 	return file;
! }
! 
! int
! file_mmap(struct file *file)
! {
! 	file->begin=mmap(NULL, file->size, PROT_READ|PROT_WRITE, MAP_PRIVATE, file->fd, 0);
  	g_assert(file->begin != NULL);
  	if (file->begin == (void *)0xffffffff) {
  		perror("mmap");
+ 		return 0;
  	}
  	g_assert(file->begin != (void *)0xffffffff);
! 	file->end=file->begin+file->size;
! 	return 1;
! }
  
! unsigned char *
! file_data_read(struct file *file, long long offset, int size)
! {
! 	void *ret;
! 	if (file->begin)
! 		return file->begin+offset;
! 	ret=g_malloc(size);
! 	lseek(file->fd, offset, SEEK_SET);
! 	if (read(file->fd, ret, size) != size) {
! 		g_free(ret);
! 		ret=NULL;
! 	}
! 	return ret;
! 		
! }
! 
! void
! file_data_free(struct file *file, unsigned char *data)
! {
! 	if (file->begin && data >= file->begin && data < file->end)
! 		return;
! 	g_free(data);
  }
  
***************
*** 57,61 ****
  	void *begin;
  	munmap(f->begin, f->size);
!         begin=mmap(f->begin, f->size, PROT_READ, MAP_PRIVATE, f->fd, 0);
  	if (f->begin != begin)
  		printf("remap failed\n");
--- 86,90 ----
  	void *begin;
  	munmap(f->begin, f->size);
! 	begin=mmap(f->begin, f->size, PROT_READ, MAP_PRIVATE, f->fd, 0);
  	if (f->begin != begin)
  		printf("remap failed\n");
***************
*** 157,161 ****
  file_destroy(struct file *f)
  {
!         close(f->fd);
  	munmap(f->begin, f->size);
  	g_free(f->name);
--- 186,190 ----
  file_destroy(struct file *f)
  {
! 	close(f->fd);
  	munmap(f->begin, f->size);
  	g_free(f->name);

Index: file.h
===================================================================
RCS file: /cvsroot/navit/navit/src/file.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** file.h	9 Oct 2007 16:44:09 -0000	1.6
--- file.h	12 Nov 2007 19:25:28 -0000	1.7
***************
*** 5,13 ****
  
  struct file {
!         unsigned char *begin;
!         unsigned char *end;
!         unsigned long size;
  	char *name;
- 	void *private;
  	int fd;
  	struct file *next;
--- 5,12 ----
  
  struct file {
! 	unsigned char *begin;
! 	unsigned char *end;
! 	unsigned long size;
  	char *name;
  	int fd;
  	struct file *next;
***************
*** 19,22 ****
--- 18,24 ----
  struct param_list;
  struct file *file_create(char *name);
+ int file_mmap(struct file *file);
+ unsigned char *file_data_read(struct file *file, long long offset, int size);
+ void file_data_free(struct file *file, unsigned char *data);
  int file_exists(char *name);
  void file_remap_readonly(struct file *f);

[Navit-cvs-commit] navit/src/data/mg map.c,1.6,1.7 tree.c,1.4,1.5

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/mg
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4579/src/data/mg

Modified Files:
	map.c tree.c 
Log Message:
Changed file to support read(), changed binfile driver to use it

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** map.c	6 Nov 2007 22:43:18 -0000	1.6
--- map.c	12 Nov 2007 19:25:29 -0000	1.7
***************
*** 13,32 ****
  static char *file[]={
  	[file_border_ply]="border.ply",
!         [file_bridge_ply]="bridge.ply",
!         [file_build_ply]="build.ply",
!         [file_golf_ply]="golf.ply",
!         [file_height_ply]="height.ply",
!         [file_natpark_ply]="natpark.ply",
!         [file_nature_ply]="nature.ply",
!         [file_other_ply]="other.ply",
!         [file_rail_ply]="rail.ply",
!         [file_sea_ply]="sea.ply",
!         [file_street_bti]="street.bti",
!         [file_street_str]="street.str",
!         [file_strname_stn]="strname.stn",
!         [file_town_twn]="town.twn",
!         [file_tunnel_ply]="tunnel.ply",
!         [file_water_ply]="water.ply",
!         [file_woodland_ply]="woodland.ply",
  };
  
--- 13,32 ----
  static char *file[]={
  	[file_border_ply]="border.ply",
! 	[file_bridge_ply]="bridge.ply",
! 	[file_build_ply]="build.ply",
! 	[file_golf_ply]="golf.ply",
! 	[file_height_ply]="height.ply",
! 	[file_natpark_ply]="natpark.ply",
! 	[file_nature_ply]="nature.ply",
! 	[file_other_ply]="other.ply",
! 	[file_rail_ply]="rail.ply",
! 	[file_sea_ply]="sea.ply",
! 	[file_street_bti]="street.bti",
! 	[file_street_str]="street.str",
! 	[file_strname_stn]="strname.stn",
! 	[file_town_twn]="town.twn",
! 	[file_tunnel_ply]="tunnel.ply",
! 	[file_water_ply]="water.ply",
! 	[file_woodland_ply]="woodland.ply",
  };
  
***************
*** 286,290 ****
  				if (! maybe_missing)
  					g_warning("Failed to load %s", filename);
! 			}
  			g_free(filename);
  		}
--- 286,291 ----
  				if (! maybe_missing)
  					g_warning("Failed to load %s", filename);
! 			} else
! 				file_mmap(m->file[i]);
  			g_free(filename);
  		}

Index: tree.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/tree.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tree.c	6 Nov 2007 22:43:18 -0000	1.4
--- tree.c	12 Nov 2007 19:25:29 -0000	1.5
***************
*** 108,114 ****
--- 108,122 ----
  	sprintf(buffer, "%s/%s.h1", dirname, filename);
  	f_idx_h=file_create_caseinsensitive(buffer);
+ 	if (! f_idx_h)
+ 		return 0;
+ 	file_mmap(f_idx_h);	
  	sprintf(buffer, "%s/%s.v1", dirname, filename);
  	f_idx_v=file_create_caseinsensitive(buffer);
  	dbg(1,"%p %p\n", f_idx_h, f_idx_v);
+ 	if (! f_idx_v) {
+ 		file_destroy(f_idx_h);
+ 		return 0;
+ 	}
+ 	file_mmap(f_idx_v);
  	if ((h=tree_search_h(f_idx_h, search_h))) {
  		dbg(1,"h=0x%x\n", h);
***************
*** 223,227 ****
  	ts->f=file_create_caseinsensitive(buffer);
  	ts->curr_node=-1;
! 	tree_search_enter(ts, offset);
  }
  
--- 231,238 ----
  	ts->f=file_create_caseinsensitive(buffer);
  	ts->curr_node=-1;
! 	if (ts->f) {
! 		file_mmap(ts->f);
! 		tree_search_enter(ts, offset);
! 	}
  }
  

[Navit-cvs-commit] navit/src/data/binfile binfile.c,1.5,1.6

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/binfile
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4579/src/data/binfile

Modified Files:
	binfile.c 
Log Message:
Changed file to support read(), changed binfile driver to use it

Index: binfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** binfile.c	5 Nov 2007 15:17:18 -0000	1.5
--- binfile.c	12 Nov 2007 19:25:29 -0000	1.6
***************
*** 145,148 ****
--- 145,149 ----
  	if (mr->tile_depth <= 1)
  		return 0;
+ 	file_data_free(mr->m->fi, (unsigned char *)(mr->t->start));
  	mr->t=&mr->tiles[--mr->tile_depth-1];
  	return 1;
***************
*** 155,164 ****
  	char buffer[1024];
  	struct zip_lfh *lfh;
! 	lfh=(struct zip_lfh *)(f->begin+cd->zipofst);
! 	strncpy(buffer, lfh->zipname, lfh->zipfnln);
  	buffer[lfh->zipfnln]='\0';
  	dbg(0,"0x%x '%s' %d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl);
! 	t->start=(int *)(f->begin+cd->zipofst+sizeof(struct zip_lfh)+lfh->zipfnln);
  	t->end=t->start+lfh->zipuncmp/4;
  }
  
--- 156,169 ----
  	char buffer[1024];
  	struct zip_lfh *lfh;
! 	char *zipfn;
! 	lfh=(struct zip_lfh *)(file_data_read(f,cd->zipofst,sizeof(struct zip_lfh)));
! 	zipfn=(char *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh), lfh->zipfnln));
! 	strncpy(buffer, zipfn, lfh->zipfnln);
  	buffer[lfh->zipfnln]='\0';
  	dbg(0,"0x%x '%s' %d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl);
! 	t->start=(int *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh)+lfh->zipfnln, lfh->zipuncmp));
  	t->end=t->start+lfh->zipuncmp/4;
+ 	file_data_free(f, (unsigned char *)zipfn);
+ 	file_data_free(f, (unsigned char *)lfh);
  }
  
***************
*** 169,175 ****
  	struct file *f=m->fi;
  	struct tile t;
! 	struct zip_cd *cd=(struct zip_cd *)(f->begin + m->eoc->zipeofst + zipfile*m->cde_size);
  	t.zipfile_num=zipfile;
  	zipfile_to_tile(f, cd, &t);
  	push_tile(mr, &t);
  }
--- 174,181 ----
  	struct file *f=m->fi;
  	struct tile t;
! 	struct zip_cd *cd=(struct zip_cd *)(file_data_read(f, m->eoc->zipeofst + zipfile*m->cde_size, sizeof(struct zip_cd)));
  	t.zipfile_num=zipfile;
  	zipfile_to_tile(f, cd, &t);
+ 	file_data_free(f, (unsigned char *)cd);
  	push_tile(mr, &t);
  }
***************
*** 190,195 ****
  		push_zipfile_tile(mr, map->eoc->zipecenn-1);
  	else {
! 		t.start=(int *)(map->fi->begin);
! 		t.end=(int *)(map->fi->end);
  		t.zipfile_num=0;
  		push_tile(mr, &t);
--- 196,202 ----
  		push_zipfile_tile(mr, map->eoc->zipecenn-1);
  	else {
! 		unsigned char *d=file_data_read(map->fi, 0, map->fi->size);
! 		t.start=(int *)d;
! 		t.end=(int *)(d+map->fi->size);
  		t.zipfile_num=0;
  		push_tile(mr, &t);
***************
*** 204,207 ****
--- 211,216 ----
  map_rect_destroy_binfile(struct map_rect_priv *mr)
  {
+ 	while (pop_tile(mr));
+ 	file_data_free(mr->m->fi, (unsigned char *)(mr->tiles[0].start));
          g_free(mr);
  }
***************
*** 326,334 ****
  	}
  	file_wordexp_destroy(wexp);
! 	magic=(int *)(m->fi->begin);
  	if (*magic == 0x04034b50) {
  		cde_index_size=sizeof(struct zip_cd)+sizeof("index")-1;
! 		m->eoc=(struct zip_eoc *)(m->fi->end-sizeof(struct zip_eoc));
! 		m->index_cd=(struct zip_cd *)((char *)m->eoc-cde_index_size);
  		printf("length %d\n", m->eoc->zipecsz);
  		printf("entries %d\n", m->eoc->zipecenn);
--- 335,343 ----
  	}
  	file_wordexp_destroy(wexp);
! 	magic=(int *)file_data_read(m->fi, 0, 4);
  	if (*magic == 0x04034b50) {
  		cde_index_size=sizeof(struct zip_cd)+sizeof("index")-1;
! 		m->eoc=(struct zip_eoc *)file_data_read(m->fi,m->fi->size-sizeof(struct zip_eoc), sizeof(struct zip_eoc));
! 		m->index_cd=(struct zip_cd *)file_data_read(m->fi,m->fi->size-sizeof(struct zip_eoc)-cde_index_size, cde_index_size);
  		printf("length %d\n", m->eoc->zipecsz);
  		printf("entries %d\n", m->eoc->zipecenn);
***************
*** 338,342 ****
  		printf("0x%x\n", m->eoc->zipesig);
  		printf("0x%x\n", m->index_cd->zipcensig);
! 	}
  	return m;
  }
--- 347,353 ----
  		printf("0x%x\n", m->eoc->zipesig);
  		printf("0x%x\n", m->index_cd->zipcensig);
! 	} else 
! 		file_mmap(m->fi);
! 	file_data_free(m->fi, (unsigned char *)magic);
  	return m;
  }

[Navit-cvs-commit] navit configure.in,1.51,1.52

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18112

Modified Files:
	configure.in 
Log Message:
Enhanced cegui tests

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** configure.in	5 Nov 2007 23:54:28 -0000	1.51
--- configure.in	11 Nov 2007 11:24:38 -0000	1.52
***************
*** 111,115 ****
  
  #FIXME : the following does not seem to be parsed
! AC_PREPROC_IFELSE(
  	CEGUI/CEGUI.h,
  	AC_DEFINE(
--- 111,115 ----
  
  #FIXME : the following does not seem to be parsed
! AC_CHECK_HEADER(
  	CEGUI/CEGUI.h,
  	AC_DEFINE(
***************
*** 121,125 ****
  		cegui=yes,
  	AC_MSG_WARN([*** no CEGUI/CEGUI.h -- SDL support disabled])
- 	exit 1
  )
  
--- 121,124 ----
***************
*** 164,168 ****
  AC_SUBST(GLC_LIBS)
  
! if test x"$sdl" = xyes
          then
  # Save the LIBS into a temp var since AC_CHECK_LIB adds the lib into LIBS
--- 163,167 ----
  AC_SUBST(GLC_LIBS)
  
! if test x"$cegui" = xyes
          then
  # Save the LIBS into a temp var since AC_CHECK_LIB adds the lib into LIBS
***************
*** 175,192 ****
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIBase."
!         #exit -1
          ])
  AC_CHECK_LIB(CEGUIOpenGLRenderer, main,
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIOpenGLRenderer."
!         #exit -1
          ], $OPENGL_LIBS )
  AC_CHECK_LIB(CEGUIFalagardWRBase, main,
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIFalagardWRBase."
!         #exit -1
          ], $OPENGL_LIBS)
  CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase"
--- 174,191 ----
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIBase. Do you have at least cegui-0.5?"
!         exit -1
          ])
  AC_CHECK_LIB(CEGUIOpenGLRenderer, main,
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIOpenGLRenderer. Do you have at least cegui-0.5? "
!         exit -1
          ], $OPENGL_LIBS )
  AC_CHECK_LIB(CEGUIFalagardWRBase, main,
  	 [],
  	 [
!         echo "Error! Something is wrong with CEGUIFalagardWRBase. Do you have at least cegui-0.5?"
!         exit -1
          ], $OPENGL_LIBS)
  CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase"
***************
*** 244,248 ****
  
  AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" ])
! AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$opengl" = "xyes" -a "x$glc" = "xyes"  -a "x$glut" = "xyes"])
  
  if test x"${USE_LIBGPS}" = xyes
--- 243,248 ----
  
  AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" ])
! AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$opengl" = "xyes" -a "x$glc" = "xyes" ])
! 
  
  if test x"${USE_LIBGPS}" = xyes
***************
*** 412,420 ****
  	echo "GTK gui     : DISABLED : you are missing a dependency"
  fi
  if test x"$sdl" = xyes
  	then
! 	echo "SDL gui     : ENABLED, with $CEGUI_LIBS"
  	else
! 	echo "SDL gui     : DISABLED : you are missing a dependency"
  fi
  if test x"$gpsd" = xyes
--- 412,426 ----
  	echo "GTK gui     : DISABLED : you are missing a dependency"
  fi
+ # FIXME : maybe elaborate missing dependencies
  if test x"$sdl" = xyes
  	then
! 	if test x"$cegui" = xyes
! 	then
! 		echo "SDL gui     : ENABLED, with $CEGUI_LIBS"
! 		else
! 		echo "SDL gui     : DISABLED : you are missing cegui-devel >= 0.5"
! 	fi
  	else
! 	echo "SDL gui     : DISABLED : you are missing a SDL dependency"
  fi
  if test x"$gpsd" = xyes

[Navit-cvs-commit] navit/src vehicle.c,1.25,1.26

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19645

Modified Files:
	vehicle.c 
Log Message:
Fixed some logging issues

Index: vehicle.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** vehicle.c	9 Oct 2007 19:03:06 -0000	1.25
--- vehicle.c	8 Nov 2007 23:07:04 -0000	1.26
***************
*** 738,745 ****
--- 738,750 ----
  	if (!strcmp(type->u.str,"nmea")) {
  		this_->nmea_log=log;
+ 		if (this_->child) 
+ 			this_->child->nmea_log=log;
+ 		
  	} else if (!strcmp(type->u.str,"gpx")) {
  		char *header="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx version=\"1.0\" creator=\"Navit http://navit.sourceforge.net\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.topografix.com/GPX/1/0\" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n<trk>\n<trkseg>\n";
  		char *trailer="</trkseg>\n</trk>\n</gpx>\n";
  		this_->gpx_log=log;
+ 		if (this_->child)
+ 			this_->child->gpx_log=log;
  		log_set_header(log,header,strlen(header));
  		log_set_trailer(log,trailer,strlen(trailer));
***************
*** 747,750 ****
--- 752,757 ----
  		char *header="type=track\n";
  		this_->textfile_log=log;
+ 		if (this_->child)
+ 			this_->child->textfile_log=log;
  		log_set_header(log,header,strlen(header));
  	} else

[Navit-cvs-commit] navit/src zipfile.h,1.1,1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13776

Modified Files:
	zipfile.h 
Log Message:
Fixed a signess bug which occurs with osm maps > 32767 tiles

Index: zipfile.h
===================================================================
RCS file: /cvsroot/navit/navit/src/zipfile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** zipfile.h	1 Nov 2007 15:16:40 -0000	1.1
--- zipfile.h	8 Nov 2007 19:21:13 -0000	1.2
***************
*** 7,14 ****
  	short zipdate;
  	int zipcrc;
! 	int zipsize;
! 	int zipuncmp;
! 	short zipfnln;
! 	short zipxtraln;
  	char zipname[0];
  } __attribute__ ((packed));
--- 7,14 ----
  	short zipdate;
  	int zipcrc;
! 	unsigned int zipsize;
! 	unsigned int zipuncmp;
! 	unsigned short zipfnln;
! 	unsigned short zipxtraln;
  	char zipname[0];
  } __attribute__ ((packed));
***************
*** 25,37 ****
  	short zipdat;
  	int zipccrc;
! 	int zipcsiz;
! 	int zipcunc;
! 	short zipcfnl;
! 	short zipcxtl;
! 	short zipccml;
! 	short zipdsk;
! 	short zipint;
! 	int zipext;
! 	int zipofst;
  	char zipcfn[0];	
  } __attribute__ ((packed));
--- 25,37 ----
  	short zipdat;
  	int zipccrc;
! 	unsigned int zipcsiz;
! 	unsigned int zipcunc;
! 	unsigned short zipcfnl;
! 	unsigned short zipcxtl;
! 	unsigned short zipccml;
! 	unsigned short zipdsk;
! 	unsigned short zipint;
! 	unsigned int zipext;
! 	unsigned int zipofst;
  	char zipcfn[0];	
  } __attribute__ ((packed));
***************
*** 39,48 ****
  struct zip_eoc {
  	int zipesig;
! 	short zipedsk;
! 	short zipecen;
! 	short zipenum;
! 	short zipecenn;
! 	int zipecsz;
! 	int zipeofst;
  	short zipecoml;
  	char zipecom[0];
--- 39,48 ----
  struct zip_eoc {
  	int zipesig;
! 	unsigned short zipedsk;
! 	unsigned short zipecen;
! 	unsigned short zipenum;
! 	unsigned short zipecenn;
! 	unsigned int zipecsz;
! 	unsigned int zipeofst;
  	short zipecoml;
  	char zipecom[0];

[Navit-cvs-commit] navit README,1.8,1.9

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18020

Modified Files:
	README 
Log Message:
Fixed typo in urls

Index: README
===================================================================
RCS file: /cvsroot/navit/navit/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README	8 Nov 2007 16:37:12 -0000	1.8
--- README	8 Nov 2007 16:39:59 -0000	1.9
***************
*** 39,49 ****
  
  - OpenStreetMaps : display, routing, but street name search isn't complete
!  (see http://navit.sourceforge.net/wiki/index.php/OpenStreetMaps)
  
  - Grosser Reiseplaner and compliant maps : full support
!  (see http://navit.sourceforge.net/wiki/index.php/European_maps)
  
  - Garmin maps : display, routing is being worked on
!  (see http://navit.sourceforge.net/wiki/index.php/Garmin_maps)
  
  
--- 39,49 ----
  
  - OpenStreetMaps : display, routing, but street name search isn't complete
!  (see http://navit.sourceforge.net/wiki/index.php/OpenStreetMaps )
  
  - Grosser Reiseplaner and compliant maps : full support
!  (see http://navit.sourceforge.net/wiki/index.php/European_maps )
  
  - Garmin maps : display, routing is being worked on
!  (see http://navit.sourceforge.net/wiki/index.php/Garmin_maps )
  
  

[Navit-cvs-commit] navit README,1.7,1.8

[KaZeR <ka...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16990

Modified Files:
	README 
Log Message:
Updated README

Index: README
===================================================================
RCS file: /cvsroot/navit/navit/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** README	5 Jul 2007 21:05:52 -0000	1.7
--- README	8 Nov 2007 16:37:12 -0000	1.8
***************
*** 2,14 ****
  =====
  
! Navit is a open source (GPL) car navigation software for Linux systems
! based on the GTK+ toolkit.  Navit will display your position on a
! 2D map, or as a 3D visualisation (planned) from GPS sensor data. Navit
! is also capable of providing precise route calculation, touch screen
! functionality and supports Points of Interest (POI).
  
! Unlike other navigation systems, Navit maps are dynamically generated
! in real time from vector data.
  
  
  
--- 2,33 ----
  =====
  
! Navit is a open source (GPL) car navigation system with routing engine.
  
! It's modular design is capable of using vector maps of various formats
! for routing and rendering of the displayed map. It's even possible to
! use multiple maps at a time.
! 
! The GTK+ or SDL user interfaces are designed to work well with touch
! screen displays. Points of Interest of various formats are displayed
! on the map.
  
+ The current vehicle position is either read from gpsd or directly from
+ NMEA GPS sensors.
+ 
+ The routing engine not only calculates an optimal route to your
+ destination, but also generates directions and even speaks to you.
+ 
+ Navit currently speaks 8 languages :
+ - English
+ - German
+ - French
+ - Polish
+ - Italian
+ - Spanish
+ - Norwegian
+ - Czech
+ 
+ For help or more information, please refer to the wiki :
+  http://navit.sourceforge.net/wiki/
  
  
***************
*** 19,41 ****
  are known to work:
  
! 	http://www.amazon.de/exec/obidos/ASIN/3829731280
! 		(Grosser Reiseplaner, detailed map of europe)
! 	http://www.amazon.de/exec/obidos/ASIN/3934073697
! 		(Telefonbuch Deutschland Map+Route,
! 		  detailed map of germany, coarse map of europe)
! 	http://www.amazon.de/exec/obidos/ASIN/3934073719
! 		(Gelbe Seiten Map+Route, detailed map of germany,
! 		  coarse map of europe)
  
! Installing the Maps:
! - Gelbe Seiten and Telefonbuch Deutschland
! unzip karten.zip from the map cd where the map should go (about 1.2 GB)
! export MAP_DATA=<path to where the map has been unzipped>/d7.map
  
! - Grosser Reiseplaner
! Compile unshield from http://synce.sourceforge.net/synce/unshield.php
! run "unshield x <path to your dvd>/travel/data2.cab" where the map
! should go (about 4.3 GB)
! export MAP_DATA=<path to where the map has been unshielded>/DIRMAP_MAP/DIE.map
  
  
--- 38,49 ----
  are known to work:
  
! - OpenStreetMaps : display, routing, but street name search isn't complete
!  (see http://navit.sourceforge.net/wiki/index.php/OpenStreetMaps)
  
! - Grosser Reiseplaner and compliant maps : full support
!  (see http://navit.sourceforge.net/wiki/index.php/European_maps)
  
! - Garmin maps : display, routing is being worked on
!  (see http://navit.sourceforge.net/wiki/index.php/Garmin_maps)
  
  
***************
*** 43,185 ****
  ============
  
! Navit read the current vehicle possition either directly from a file with
! 	export GPSDATA=file:filename
! or from gpsd with
! 	export GPSDATA=gpsd://host[:port]
! [now in navit.xml]
! 
! 
! Subdirectories:
! ===============
! 
! fib-1.0
! 	The library for Fibonacci heaps from 
! 		http://resnet.uoregon.edu/~gurney_j/jmpc/fib.html
! 	The Fibonacci heaps are used in the routing algorithm.
! 
! graphics
! 	The map layout functions.
! 	As of now only the gtk_drawing_area is working.
! 	We'll eventually move to cairo.	
! 
! gui
! 	The user interface. So far there are a lot of files still in
! 	the main directory.
! 
! plugins
! 	Plugable modules. So far there is only one but we hope to
! 	have more in the future.
! 	- poi_geodownloads
! 		Display POIs from www.geodownload.com
! 		(depends on mdbtools.sf.net)
! 
! 
! Files in src:
! =============
! 
! block.c:
! 	Manages the blocks of the map. Each block of the map is
! 	seperated into two sub blocks of half the size.
! 
! command.c
! 	Command line interface.
! 
! compass.c
! 	Displays the compass on the map.
! 
! coord.c
! 	Reads coordinates from the map.
! 
! country.c
! 	Lists all available countries and provides funtions to access
! 	the corresponding data.
! 
! cursor.c
! 	Draws the vehicle possiton on the map.
! 
! data_window.c
! 	Displays informations about visible objects.
! 
! destination.c
! 	The destination selection dialog.
! 
! display.c
! 	Manages the display-list. The graphics driver is called from
! 	here to display the map.
! 
! file.c
! 	Management of map data files.
! 
! graphics.c
! 	Generates the display-list.
! 
! log.c
! 	Logs local changes to the map datas. its possible to modify
! 	the map without changing the original map data. The modified
! 	data are stored in log.txt and reread at program start.
! 
! main.c
! 	Guess what?
! 
! map_data.c
! 	Manages the differnt map sources. There's an overview map of
! 	europe and a detailed map of each country.
! 
! menu.c
! 	Callback functions for the gui menu.
! 
! navigation.c
! 	Generates directions to a destination ( not jet completed )
! 
! param.c
! 	Utility functions for data_window and and popup menu
! 
! phrase.c
! 	Assembles directions for the speech guide.
! 
! plugin.c
! 	Loads available pugins.
! 
! poly.c
! 	Generate display-list for polygons. ( cities, lakes, ... )
! 
! popup.c
! 	Popup-menu dialog
! 
! profile.c
! 	A simple timer for performance analysis.
! 
! route.c
! 	The routing algorithm. ( see below for a more detailed
! 	description )
! 
! search.c
! 	Functions to search a place ( city, street, ... ) by name
! 
! speech.c
! 	Interface to speechd
! 
! street.c
! 	Generates a display-list for streets
! 
! street_name.c
! 	Reads street names from map datas.
! 
! town.c
! 	Generates a display-list for city names.
! 
! transform.c
! 
! 	Coordinate transformation. The map uses a Mercator projection.
! 
! tree.c
! 	Manages search trees.
! 
! util.c
! 	Some utility functions for strings
! 
! vehicle.c
! 	Calculates the current vehicle possistion and direction.
! 	Issues a cursor update if needed.
  
  
--- 51,58 ----
  ============
  
! Navit read the current vehicle position :
! - directly from a file
! - from gpsd (local or remote)
! - from udp server (friends tracking) (experimental)
  
  
***************
*** 187,191 ****
  =================
  
! NavIt uses a dykstra algorithm for routing. The routing starts at the
  destination by assigning a value to each point directly connected to
  destination point. The value represents the estimated time needed to
--- 60,64 ----
  =================
  
! NavIt uses a Dijkstra algorithm for routing. The routing starts at the
  destination by assigning a value to each point directly connected to
  destination point. The value represents the estimated time needed to
***************
*** 201,218 ****
  points with the lowest values to the destination.
  
- 
- 
- Plans:
- ======
- 
- - use ciaro to draw the map
- 
- - get GPS data from gpsd
- 
- - complete speech output (speech.c, phrase.c)
- 
- - complete directions (navigation.c)
- 
- - investigate problem with fib-1.1
- 
- 
--- 74,75 ----

[Navit-cvs-commit] navit/src osm2navit.c,1.7,1.8

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21226

Modified Files:
	osm2navit.c 
Log Message:
Added missing mapping

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** osm2navit.c	5 Nov 2007 17:41:29 -0000	1.7
--- osm2navit.c	8 Nov 2007 09:54:31 -0000	1.8
***************
*** 32,35 ****
--- 32,36 ----
  	"highway	secondary	street_3_city\n"
  	"highway	primary		street_4_city\n"
+ 	"highway	primary_link	ramp\n"
  	"highway	trunk		street_4_city\n"
  	"highway	trunk_link	ramp\n"

[Navit-cvs-commit] navit/src/data/mg street.c,1.9,1.10

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/mg
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19630

Modified Files:
	street.c 
Log Message:
Another search bugfix

Index: street.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/street.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** street.c	6 Nov 2007 22:43:18 -0000	1.9
--- street.c	8 Nov 2007 09:42:00 -0000	1.10
***************
*** 493,505 ****
  {
  	struct street_name_index *i;
  
  	dbg(1,"enter\n");
  	i=(struct street_name_index *)(*p);
  	*p+=sizeof(*i)+strlen(i->name)+1;
- 	mr->search_block=i->block;
  
  	dbg(1,"block 0x%x\n", i->block);
  	
! 	return street_search_compare_do(mr, i->country, i->town_assoc, i->name);
  }
  
--- 493,508 ----
  {
  	struct street_name_index *i;
+ 	int ret;
  
  	dbg(1,"enter\n");
  	i=(struct street_name_index *)(*p);
  	*p+=sizeof(*i)+strlen(i->name)+1;
  
  	dbg(1,"block 0x%x\n", i->block);
  	
! 	ret=street_search_compare_do(mr, i->country, i->town_assoc, i->name);
! 	if (ret <= 0)
! 		mr->search_block=i->block;
! 	return ret;
  }
  
***************
*** 678,683 ****
  		if (mr->search_block == -1)
  			return NULL;
- 		if (dir > 0)
- 			mr->search_block++;
  		mr->search_blk_count=1;
  		block_get_byindex(mr->m->file[file_strname_stn], mr->search_block, &mr->b);
--- 681,684 ----

[Navit-cvs-commit] navit/src/fib-1.1 Makefile.am,1.3,1.4

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/fib-1.1
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24027/src/fib-1.1

Modified Files:
	Makefile.am 
Log Message:
Avoid linking problems with static libraries on x86_64

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/fib-1.1/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	17 Oct 2007 13:27:55 -0000	1.3
--- Makefile.am	7 Nov 2007 18:21:45 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  noinst_LIBRARIES = libfib.a
+ AM_CFLAGS=-shared
  libfib_a_SOURCES = fib.c fib.h fibpriv.h
  EXTRA_DIST=README configure.in fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 fibtest.c fibtest2.c tt.c use.c

[Navit-cvs-commit] navit/src/data/poi_geodownload/libmdb Makefile.am, 1.4, 1.5

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24027/src/data/poi_geodownload/libmdb

Modified Files:
	Makefile.am 
Log Message:
Avoid linking problems with static libraries on x86_64

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	17 Oct 2007 13:27:26 -0000	1.4
--- Makefile.am	7 Nov 2007 18:21:45 -0000	1.5
***************
*** 1,3 ****
--- 1,4 ----
  SUBDIRS=include
+ AM_CFLAGS = -shared
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(srcdir)/include
  noinst_LIBRARIES = libmdb.a

[Navit-cvs-commit] navit/src/data/mg block.c, 1.3, 1.4 map.c, 1.5, 1.6 street.c, 1.8, 1.9 tree.c, 1.3, 1.4

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/mg
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24953/data/mg

Modified Files:
	block.c map.c street.c tree.c 
Log Message:
Bugfixing in Searching


Index: street.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/street.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** street.c	5 Nov 2007 20:21:28 -0000	1.8
--- street.c	6 Nov 2007 22:43:18 -0000	1.9
***************
*** 568,572 ****
  	unsigned char *p=mr->street.name.aux_data;
  
! 	dbg(0,"aux_data=%p\n", p);
  	if (count) {
  		street_name_numbers_get(&snns, &p);
--- 568,572 ----
  	unsigned char *p=mr->street.name.aux_data;
  
! 	dbg(1,"aux_data=%p\n", p);
  	if (count) {
  		street_name_numbers_get(&snns, &p);
***************
*** 675,681 ****
  			dir=street_search_compare(&mr->search_p, mr);
  		}
  		if (mr->search_block == -1)
  			return NULL;
! 		dbg(1,"mr->search_block=0x%x\n", mr->search_block);
  		mr->search_blk_count=1;
  		block_get_byindex(mr->m->file[file_strname_stn], mr->search_block, &mr->b);
--- 675,683 ----
  			dir=street_search_compare(&mr->search_p, mr);
  		}
+ 		dbg(1,"dir=%d mr->search_block=0x%x\n", dir, mr->search_block);
  		if (mr->search_block == -1)
  			return NULL;
! 		if (dir > 0)
! 			mr->search_block++;
  		mr->search_blk_count=1;
  		block_get_byindex(mr->m->file[file_strname_stn], mr->search_block, &mr->b);
***************
*** 685,714 ****
  	if (! mr->search_blk_count)
  		return NULL;
! 	if (mr->b.p >= mr->b.end) {
! 		if (!block_next_lin(mr))
! 			return NULL;
! 		mr->b.p=mr->b.block_start+12;
! 	}
! 	while (mr->b.p < mr->b.end) {
! 		last=mr->b.p;
! 		street_name_get(&mr->street.name, &mr->b.p);
! 		dir=street_search_compare_do(mr, mr->street.name.country, mr->street.name.townassoc, mr->street.name.name2);
! 		dbg(1,"country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir);
! 		if (dir < 0) {
! 			mr->search_blk_count=0;
! 			return NULL;
  		}
! 		if (!dir) {
! 			dbg(0,"result country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d aux_data=%p len=0x%x\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir, mr->street.name.aux_data, mr->street.name.aux_len);
! 			mr->item.type = type_street_name;
! 			mr->item.id_hi=mr->street.name.country | (mr->current_file << 16) | 0x10000000;
! 			mr->item.id_lo=last-mr->m->file[mr->current_file]->begin;
! 			mr->item.meth=&street_name_meth;
! 			mr->item.map=NULL;
! 			mr->item.priv_data=mr;
! 			return &mr->item;
  		}
  	}
- 	return NULL;
  }
   
--- 687,720 ----
  	if (! mr->search_blk_count)
  		return NULL;
! 	for (;;) {
! 		if (mr->b.p >= mr->b.end) {
! 			if (!block_next_lin(mr)) {
! 				dbg(1,"end of blocks in %p, %p\n", mr->m->file[file_strname_stn]->begin, mr->m->file[file_strname_stn]->end);
! 				return NULL;
! 			}
! 			mr->b.p=mr->b.block_start+12;
  		}
! 		while (mr->b.p < mr->b.end) {
! 			last=mr->b.p;
! 			street_name_get(&mr->street.name, &mr->b.p);
! 			dir=street_search_compare_do(mr, mr->street.name.country, mr->street.name.townassoc, mr->street.name.name2);
! 			dbg(1,"country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir);
! 			if (dir < 0) {
! 				dbg(1,"end of data\n");
! 				mr->search_blk_count=0;
! 				return NULL;
! 			}
! 			if (!dir) {
! 				dbg(1,"result country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d aux_data=%p len=0x%x\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir, mr->street.name.aux_data, mr->street.name.aux_len);
! 				mr->item.type = type_street_name;
! 				mr->item.id_hi=mr->street.name.country | (mr->current_file << 16) | 0x10000000;
! 				mr->item.id_lo=last-mr->m->file[mr->current_file]->begin;
! 				mr->item.meth=&street_name_meth;
! 				mr->item.map=NULL;
! 				mr->item.priv_data=mr;
! 				return &mr->item;
! 			}
  		}
  	}
  }
   

Index: block.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/block.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** block.c	9 Aug 2007 15:02:56 -0000	1.3
--- block.c	6 Nov 2007 22:43:18 -0000	1.4
***************
*** 149,165 ****
  		else
  			mr->b.p=mr->b.block_start+mr->b.b->blocks*512;
! 		if (mr->b.p >= mr->file->end)
  			return 0;
  		mr->b.block_start=mr->b.p;
  		mr->b.b=block_get(&mr->b.p);
  		mr->b.p_start=mr->b.p;
  		mr->b.end=mr->b.block_start+mr->b.b->size;
! 		if (mr->b.b->count == -1)
  			return 0;
  		if (!mr->cur_sel || coord_rect_overlap(&mr->cur_sel->rect, &mr->b.b->r)) {
  			block_active_count++;
  			block_active_mem+=mr->b.b->blocks*512-sizeof(struct block *);
  			return 1;
  		}
  	}
  }
--- 149,171 ----
  		else
  			mr->b.p=mr->b.block_start+mr->b.b->blocks*512;
! 		if (mr->b.p >= mr->file->end) {
! 			dbg(1,"end of blocks %p vs %p\n", mr->b.p, mr->file->end);
  			return 0;
+ 		}
  		mr->b.block_start=mr->b.p;
  		mr->b.b=block_get(&mr->b.p);
  		mr->b.p_start=mr->b.p;
  		mr->b.end=mr->b.block_start+mr->b.b->size;
! 		if (mr->b.b->count == -1) {
! 			dbg(1,"empty blocks\n");
  			return 0;
+ 		}
  		if (!mr->cur_sel || coord_rect_overlap(&mr->cur_sel->rect, &mr->b.b->r)) {
  			block_active_count++;
  			block_active_mem+=mr->b.b->blocks*512-sizeof(struct block *);
+ 			dbg(1,"block ok\n");
  			return 1;
  		}
+ 		dbg(2,"block not in cur_sel\n");
  	}
  }

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** map.c	3 Oct 2007 13:47:34 -0000	1.5
--- map.c	6 Nov 2007 22:43:18 -0000	1.6
***************
*** 198,201 ****
--- 198,202 ----
  			return NULL;
  		tree_search_init(map->dirname, "town.b2", &mr->ts, 0x1000);
+ 		mr->current_file=file_town_twn;
  		break;
  	case attr_street_name:
***************
*** 204,207 ****
--- 205,209 ----
  		dbg(1,"street_assoc=0x%x\n", item->id_lo);
  		tree_search_init(map->dirname, "strname.b1", &mr->ts, 0);
+ 		mr->current_file=file_strname_stn;
  		break;
  	default:
***************
*** 214,219 ****
  	mr->search_str=search->u.str;
  	mr->search_partial=partial;
! 	mr->current_file=file_town_twn-1;
! 	file_next(mr);
  	return (struct map_search_priv *)mr;
  }
--- 216,221 ----
  	mr->search_str=search->u.str;
  	mr->search_partial=partial;
! 	mr->file=mr->m->file[mr->current_file];
! 	block_init(mr);
  	return (struct map_search_priv *)mr;
  }

Index: tree.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/tree.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tree.c	18 Jul 2007 22:43:09 -0000	1.3
--- tree.c	6 Nov 2007 22:43:18 -0000	1.4
***************
*** 171,175 ****
  	if (*p < tsn->end)
  		return (tsn->low == 0xffffffff ? 1 : 0);
! 	dbg(1,"end reached\n");
  	if (tsn->low != 0xffffffff) {
  		dbg(1,"low 0x%x\n", tsn->low);
--- 171,175 ----
  	if (*p < tsn->end)
  		return (tsn->low == 0xffffffff ? 1 : 0);
! 	dbg(1,"end reached high=0x%x\n",tsn->high);
  	if (tsn->low != 0xffffffff) {
  		dbg(1,"low 0x%x\n", tsn->low);