navit-cvs-commit — CVS commit mailing list

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

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

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

Modified Files:
	binfile.c 
Log Message:
Fixed a bug

Index: binfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** binfile.c	4 Nov 2007 17:33:30 -0000	1.4
--- binfile.c	5 Nov 2007 15:17:18 -0000	1.5
***************
*** 179,183 ****
  {
  	struct map_rect_priv *mr;
! 	struct tile *t;
  
  	dbg(1,"map_rect_new_binfile\n");
--- 179,183 ----
  {
  	struct map_rect_priv *mr;
! 	struct tile t;
  
  	dbg(1,"map_rect_new_binfile\n");
***************
*** 190,197 ****
  		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);
  	}
  	mr->item.meth=&methods_binfile;
--- 190,197 ----
  		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);
  	}
  	mr->item.meth=&methods_binfile;

[Navit-cvs-commit] navit/src Makefile.am,1.25,1.26

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

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

Modified Files:
	Makefile.am 
Log Message:
When SUBDIRS are dynamic we need to keep all of them in DIST_SUBDIRS

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Makefile.am	5 Nov 2007 11:06:17 -0000	1.25
--- Makefile.am	5 Nov 2007 14:43:17 -0000	1.26
***************
*** 1,9 ****
  include $(top_srcdir)/Makefile.inc
! SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
  
  SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
  
  AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
! 
  bin_PROGRAMS = navit osm2navit
  
--- 1,11 ----
  include $(top_srcdir)/Makefile.inc
! SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
! 
! DIST_SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
  
  SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
  
  AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
! BUILT_SOURCES=osm2navit
  bin_PROGRAMS = navit osm2navit
  

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

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

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

Modified Files:
	Makefile.am 
Log Message:
When SUBDIRS are dynamic we need to keep all of them in DIST_SUBDIRS

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	8 Jul 2007 16:42:14 -0000	1.2
--- Makefile.am	5 Nov 2007 14:42:45 -0000	1.3
***************
*** 3,4 ****
--- 3,7 ----
    SUBDIRS+=python
  endif
+ 
+ DIST_SUBDIRS=python
+ 

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Sources are in top_srcdir/.... 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	29 Oct 2007 09:52:44 -0000	1.2
--- Makefile.am	5 Nov 2007 14:40:31 -0000	1.3
***************
*** 3,10 ****
--- 3,14 ----
  AM_CPPFLAGS+= @LIBGARMIN_CFLAGS@
  INCLUDES=-I$(top_srcdir)/src/data/garmin/libgarmin
+ AM_CPPFLAGS+=-I$(top_srcdir)/src/data/garmin/libgarmin
+ AM_CPPFLAGS+=-I$(srcdir)
+ 
  moduledata_LTLIBRARIES = libdata_garmin.la
  libdata_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h
  libdata_garmin_la_LIBADD = @LIBGARMIN_LIBS@
  nodist_libdata_garmin_la_SOURCES = g2nbuiltin.h
+ builddir = @builddir@
  
  gar2navit.l$(OBJEXT): g2nbuiltin.h
***************
*** 16,20 ****
  
  g2nbuiltin.h: gentypes garmintypes.txt
! 	./gentypes garmintypes.txt g2nbuiltin.h
  
  EXTRA_DIST = garmintypes.txt
--- 20,24 ----
  
  g2nbuiltin.h: gentypes garmintypes.txt
! 	./gentypes $(top_srcdir)/src/data/garmin/garmintypes.txt $@
  
  EXTRA_DIST = garmintypes.txt

[Navit-cvs-commit] navit/src/data/garmin gentypes.c,1.1,1.2

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

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

Modified Files:
	gentypes.c 
Log Message:
Exit -1 when can not build the g2nbuiltins.c

Index: gentypes.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/gentypes.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gentypes.c	29 Oct 2007 09:52:45 -0000	1.1
--- gentypes.c	5 Nov 2007 14:38:43 -0000	1.2
***************
*** 188,193 ****
  		return -1;
  	}
! 	if (load_types_file(argv[1], argv[2]) < 0)
  		unlink(argv[2]);
  	return 0;
  }
--- 188,195 ----
  		return -1;
  	}
! 	if (load_types_file(argv[1], argv[2]) < 0) {
  		unlink(argv[2]);
+ 		return -1;
+ 	}
  	return 0;
  }

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp,1.24,1.25

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

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

Modified Files:
	gui_sdl_window.cpp 
Log Message:
Sleep in SDL GUI when no event, allows using the GUI w/ GPS

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** gui_sdl_window.cpp	31 Oct 2007 16:43:35 -0000	1.24
--- gui_sdl_window.cpp	5 Nov 2007 14:35:57 -0000	1.25
***************
*** 227,231 ****
   		if(enable_timer)
   			profile(0,"graphics_redraw");
!  		g_main_context_iteration (NULL, FALSE);
  // 		profile_timer("main context");
  
--- 227,232 ----
   		if(enable_timer)
   			profile(0,"graphics_redraw");
!  		if (!g_main_context_iteration (NULL, FALSE))
!  			sleep(1);
  // 		profile_timer("main context");
  

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

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

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

Modified Files:
	osm2navit.c 
Log Message:
Added help and keep-tmpfiles switches

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** osm2navit.c	4 Nov 2007 17:24:48 -0000	1.5
--- osm2navit.c	5 Nov 2007 11:07:56 -0000	1.6
***************
*** 1161,1165 ****
  	char *map=g_strdup(attrmap);
  	int c;
! 
  	while (1) {
  #if 0
--- 1161,1165 ----
  	char *map=g_strdup(attrmap);
  	int c;
! 	int keep_tmpfiles=0;
  	while (1) {
  #if 0
***************
*** 1169,1172 ****
--- 1169,1174 ----
  		static struct option long_options[] = {
  			{"dedupe-ways", 0, 0, 'w'},
+ 			{"keep-tmpfiles", 0, 0, 'k'},
+ 			{"help", 0, 0, 'h'},
  			{0, 0, 0, 0}
  		};
***************
*** 1175,1181 ****
--- 1177,1198 ----
  			break;
  		switch (c) {
+ 		case 'h':
+ 			printf("\n");
+ 			printf("osm2navit - parse osm textfile and converts to NavIt binfile format\n\n");
+ 			printf("Usage :\n");
+ 			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':
+ 			printf("I will KEEP tmp files\n");
+ 			keep_tmpfiles=1;
+ 			break;
  		case '?':
  			exit(1);
***************
*** 1206,1209 ****
--- 1223,1228 ----
  	fclose(tmp2);
  	fclose(tmp1);
+ 	if(!keep_tmpfiles)
+ 		remove(tmp1);
  	free(node_buffer.base);
  	node_buffer.base=NULL;
***************
*** 1214,1217 ****
--- 1233,1238 ----
  	phase3(tmp2);
  	fclose(tmp2);
+ 	if(!keep_tmpfiles)
+ 		remove(tmp2);
  	fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
  	phase4(stdout);

[Navit-cvs-commit] navit/src Makefile.am,1.24,1.25

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

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

Modified Files:
	Makefile.am 
Log Message:
Bugfix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.am	5 Nov 2007 10:56:43 -0000	1.24
--- Makefile.am	5 Nov 2007 11:06:17 -0000	1.25
***************
*** 1,4 ****
  include $(top_srcdir)/Makefile.inc
! SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
  
  SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
--- 1,4 ----
  include $(top_srcdir)/Makefile.inc
! SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
  
  SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2

[Navit-cvs-commit] navit configure.in, 1.47, 1.48 Makefile.am, 1.5, 1.6

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

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

Modified Files:
	configure.in Makefile.am 
Log Message:
Add installsamplemap target and use maps as a subdir

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	31 Oct 2007 11:57:25 -0000	1.5
--- Makefile.am	5 Nov 2007 10:56:43 -0000	1.6
***************
*** 9,14 ****
--- 9,20 ----
  	@echo To build the sample map:
  	@echo make samplemap
+ 	@echo To install the sample map:
+ 	@echo make installsamplemap
  	@echo ------------------------
  
  samplemap:
  	make -C src samplemap
+ 
+ installsamplemap:
+ 	make -C src installsamplemap
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure.in	4 Nov 2007 02:05:19 -0000	1.47
--- configure.in	5 Nov 2007 10:56:43 -0000	1.48
***************
*** 226,230 ****
  )
  
! AC_CHECK_LIB(CEGUITGAImageCodec, main,
  	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec"],
  	 [echo "GUITGAImageCodec not found/not working, disabled."],
--- 226,230 ----
  )
  
! AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec,
  	 [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec"],
  	 [echo "GUITGAImageCodec not found/not working, disabled."],
***************
*** 391,394 ****
--- 391,395 ----
  src/vehicle/gpsd/Makefile
  src/xpm/Makefile
+ src/maps/Makefile
  intl/Makefile
  po/Makefile

[Navit-cvs-commit] navit/src Makefile.am,1.23,1.24

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

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

Modified Files:
	Makefile.am 
Log Message:
Add installsamplemap target and use maps as a subdir

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile.am	4 Nov 2007 17:24:47 -0000	1.23
--- Makefile.am	5 Nov 2007 10:56:43 -0000	1.24
***************
*** 29,45 ****
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
  
! samplemap: maps/$(SAMPLE_MAP).bin
! 
! maps/$(SAMPLE_MAP).osm.bz2:
! 	echo "Downloading osm sample map"
! 	mkdir -p maps
! 	wget -O maps/$(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
! 	mv maps/$(SAMPLE_MAP).osm.bz2.tmp maps/$(SAMPLE_MAP).osm.bz2
  
! maps/$(SAMPLE_MAP).bin: maps/$(SAMPLE_MAP).osm.bz2 $(top_srcdir)/src/osm2navit
! 	echo "Converting osm sample map"
! 	bzcat maps/$(SAMPLE_MAP).osm.bz2 | $(top_srcdir)/src/osm2navit >maps/$(SAMPLE_MAP).bin.tmp
! 	mv maps/$(SAMPLE_MAP).bin.tmp maps/$(SAMPLE_MAP).bin
  
- distclean-local:
- 	rm -f maps/$(SAMPLE_MAP).osm.bz2 maps/$(SAMPLE_MAP).bin
--- 29,36 ----
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
  
! samplemap:
! 	make -C maps
  
! installsamplemap:
! 	make -C maps install
  

[Navit-cvs-commit] navit/src/maps Makefile.am,NONE,1.1

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

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

Added Files:
	Makefile.am 
Log Message:
Create maps dir and makefile.am there

--- NEW FILE: Makefile.am ---
include $(top_srcdir)/Makefile.inc

SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2

maps_DATA = $(SAMPLE_MAP).bin

samplemap: $(SAMPLE_MAP).bin

$(SAMPLE_MAP).osm.bz2:
	echo "Downloading osm sample map"
	wget -O $(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
	mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2

$(SAMPLE_MAP).bin: $(SAMPLE_MAP).osm.bz2 $(top_srcdir)/src/osm2navit
	echo "Converting osm sample map"
	bzcat $(SAMPLE_MAP).osm.bz2 | $(top_srcdir)/src/osm2navit >$(SAMPLE_MAP).bin.tmp
	mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin

distclean-local:
	rm -f $(SAMPLE_MAP).osm.bz2 $(SAMPLE_MAP).bin

all:

[Navit-cvs-commit] navit/src/maps - New directory

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

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

Log Message:
Directory /cvsroot/navit/navit/src/maps added to the repository

[Navit-cvs-commit] navit/src/data/mg street.c,1.6,1.7

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

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

Modified Files:
	street.c 
Log Message:
Added support for getting country id from a street

Index: street.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/street.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** street.c	9 Aug 2007 15:02:56 -0000	1.6
--- street.c	5 Nov 2007 09:22:05 -0000	1.7
***************
*** 259,263 ****
--- 259,272 ----
  			attr->u.num|=(street->str->limit & 0x03) ? 2:0;
  		}
+ 		street->attr_next=attr_country_id;
+ 		return 1;
+ 	case attr_country_id:
  		street->attr_next=attr_debug;
+ 		nameid=L(street->str->nameid);
+ 		if (! nameid)
+ 			return 0;
+ 		if (! street->name.len)
+ 			street_name_get_by_id(&street->name,street->name_file,nameid);
+ 		attr->u.num=street->name.country;
  		return 1;
  	case attr_debug:

[Navit-cvs-commit] navit/src attr_def.h, 1.12, 1.13 country.c, 1.6, 1.7 popup.c, 1.13, 1.14 search.c, 1.6, 1.7

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

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

Modified Files:
	attr_def.h country.c popup.c search.c 
Log Message:
Added support for getting country id from a street

Index: popup.c
===================================================================
RCS file: /cvsroot/navit/navit/src/popup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** popup.c	11 Aug 2007 21:58:16 -0000	1.13
--- popup.c	5 Nov 2007 09:22:04 -0000	1.14
***************
*** 122,126 ****
  	char *attr_name=attr_to_name(attr->type);
  
! 	if (attr->type == attr_limit) 
  		popup_printf(menu, menu_type_menu, "%s: %d", attr_name, attr->u.num);
  	else 
--- 122,126 ----
  	char *attr_name=attr_to_name(attr->type);
  
! 	if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) 
  		popup_printf(menu, menu_type_menu, "%s: %d", attr_name, attr->u.num);
  	else 

Index: search.c
===================================================================
RCS file: /cvsroot/navit/navit/src/search.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** search.c	28 Aug 2007 17:31:14 -0000	1.6
--- search.c	5 Nov 2007 09:22:05 -0000	1.7
***************
*** 248,251 ****
--- 248,253 ----
  			else {
  				leu=&this_->levels[level-1];
+ 				if (! leu->curr)
+ 					break;
  				le->parent=leu->curr->data;
  				leu->last=leu->curr;

Index: country.c
===================================================================
RCS file: /cvsroot/navit/navit/src/country.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** country.c	11 Aug 2007 08:02:28 -0000	1.6
--- country.c	5 Nov 2007 09:22:04 -0000	1.7
***************
*** 114,118 ****
  		this->attr_next=attr_id;
  		return 1;
! 	case attr_id:
  		attr->u.num=country->id;
  		this->attr_next=country->car ? attr_country_car : attr_country_iso2;
--- 114,118 ----
  		this->attr_next=attr_id;
  		return 1;
! 	case attr_country_id:
  		attr->u.num=country->id;
  		this->attr_next=country->car ? attr_country_car : attr_country_iso2;
***************
*** 153,157 ****
  	struct country_search *ret=g_new(struct country_search, 1);
  	ret->search=*search;
! 	ret->len=strlen(search->u.str);
  	ret->partial=partial;
  	ret->count=0;
--- 153,160 ----
  	struct country_search *ret=g_new(struct country_search, 1);
  	ret->search=*search;
! 	if (search->type != attr_country_id)
! 		ret->len=strlen(search->u.str);
! 	else
! 		ret->len=0;
  	ret->partial=partial;
  	ret->count=0;
***************
*** 190,194 ****
  			return NULL;
  		this->country=&country[this->count++];
! 		if (match(this, attr_country_iso3, this->country->iso3) ||
  		    match(this, attr_country_iso2, this->country->iso2) ||
  		    match(this, attr_country_car, this->country->car) ||
--- 193,198 ----
  			return NULL;
  		this->country=&country[this->count++];
! 		if ((this->search.type == attr_country_id && this->search.u.num == this->country->id) ||
!                     match(this, attr_country_iso3, this->country->iso3) ||
  		    match(this, attr_country_iso2, this->country->iso2) ||
  		    match(this, attr_country_car, this->country->car) ||

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** attr_def.h	1 Nov 2007 15:16:39 -0000	1.12
--- attr_def.h	5 Nov 2007 09:22:03 -0000	1.13
***************
*** 24,31 ****
  ATTR(flush_time)
  ATTR(zipfile_ref)
  /* boolean */
  ATTR(overwrite)
  ATTR2(0x0002ffff,type_int_end)
- 
  ATTR2(0x00030000,type_string_begin)
  ATTR(type)
--- 24,31 ----
  ATTR(flush_time)
  ATTR(zipfile_ref)
+ ATTR(country_id)
  /* boolean */
  ATTR(overwrite)
  ATTR2(0x0002ffff,type_int_end)
  ATTR2(0x00030000,type_string_begin)
  ATTR(type)

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_action.c,1.19,1.20

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

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

Modified Files:
	gui_gtk_action.c 
Log Message:
Added patches from gnunux for n770 support

Index: gui_gtk_action.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gui_gtk_action.c	11 Aug 2007 14:38:16 -0000	1.19
--- gui_gtk_action.c	4 Nov 2007 21:11:44 -0000	1.20
***************
*** 183,187 ****
--- 183,191 ----
  	{ "RefreshAction", GTK_STOCK_REFRESH, _n("Refresh"), NULL, NULL, G_CALLBACK(refresh_action) },
  	{ "RoadbookAction", GTK_STOCK_JUSTIFY_FILL, _n("Roadbook"), NULL, NULL, G_CALLBACK(roadbook_action) },
+ #ifdef GTK_STOCK_INFO
  	{ "InfoAction", GTK_STOCK_INFO, _n("Info"), NULL, NULL, G_CALLBACK(info_action) },
+ #else
+ 	{ "InfoAction", NULL, _n("Info"), NULL, NULL, G_CALLBACK(info_action) },
+ #endif /*GTK_STOCK_INFO*/
  	{ "DestinationAction", "flag_icon", _n("Destination"), NULL, NULL, G_CALLBACK(destination_action) },
  	{ "RouteClearAction", NULL, _n("Clear"), NULL, NULL, G_CALLBACK(route_clear_action) },
***************
*** 197,201 ****
--- 201,209 ----
  	{ "TrackingAction", NULL ,_n("Tracking"), NULL, NULL, G_CALLBACK(tracking_action),TRUE },
  	{ "OrientationAction", "orientation_icon", _n("Orientation"), NULL, NULL, G_CALLBACK(orient_north_action),FALSE },
+ #ifdef GTK_STOCK_FULLSCREEN
  	{ "FullscreenAction",GTK_STOCK_FULLSCREEN, _n("Fullscreen"), NULL, NULL, G_CALLBACK(window_fullscreen_action), FALSE }
+ #else
+ 	{ "FullscreenAction", NULL, _n("Fullscreen"), NULL, NULL, G_CALLBACK(window_fullscreen_action), FALSE }
+ #endif /*GTK_STOCK_FULLSCREEN*/
  };
  

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.18, 1.19

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Added patches from gnunux for n770 support

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** graphics_gtk_drawing_area.c	25 Oct 2007 14:51:08 -0000	1.18
--- graphics_gtk_drawing_area.c	4 Nov 2007 21:11:44 -0000	1.19
***************
*** 62,65 ****
--- 62,66 ----
  
  static char *fontpaths[]={
+ 	"/usr/share/fonts",
  	"/usr/X11R6/lib/X11/fonts/msttcorefonts",
  	"/usr/X11R6/lib/X11/fonts/truetype",
***************
*** 118,121 ****
--- 119,126 ----
  	    	if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
  			break;
+ 		sprintf(fontpath,"%s/NcrBI4nh.ttf",*filename);
+ 		dbg(1,("font : %s\n",fontpath));
+ 	    	if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
+ 			break;
  		filename++;
  	}

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

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

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

Modified Files:
	garmin.c 
Log Message:
Use the new lib interface for object ids

Index: garmin.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** garmin.c	29 Oct 2007 09:52:45 -0000	1.3
--- garmin.c	4 Nov 2007 18:51:43 -0000	1.4
***************
*** 337,343 ****
  
  	subtype = gar_object_subtype(o);
- 	mr->item.id_hi = otype << 8 | subtype;
  	if (mr->mpriv->conv)
! 		mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POINT, mr->item.id_hi);
  	mr->item.meth = &methods_garmin_point;
  	return &mr->item;
--- 337,343 ----
  
  	subtype = gar_object_subtype(o);
  	if (mr->mpriv->conv)
! 		mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POINT, 
! 				(otype << 8) | subtype);
  	mr->item.meth = &methods_garmin_point;
  	return &mr->item;
***************
*** 347,351 ****
  garmin_pl2item(struct map_rect_priv *mr, struct gobject *o, unsigned char otype)
  {
- 	mr->item.id_hi = otype;
  	if (mr->mpriv->conv)
  		mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POLYLINE, otype);
--- 347,350 ----
***************
*** 357,361 ****
  garmin_pg2item(struct map_rect_priv *mr, struct gobject *o, unsigned char otype)
  {
- 	mr->item.id_hi = otype;
  	if (mr->mpriv->conv)
  		mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POLYGONE, otype);
--- 356,359 ----
***************
*** 389,393 ****
  {
  	struct gobject *o;
! 	o = mr->objs = gar_get_object(mr->mpriv->g, (void *)id_lo);
  	if (!o) {
  		dlog(1, "Can not find object\n");
--- 387,391 ----
  {
  	struct gobject *o;
! 	o = mr->objs = gar_get_object_by_id(mr->mpriv->g, id_hi, id_lo);
  	if (!o) {
  		dlog(1, "Can not find object\n");
***************
*** 395,400 ****
  	}
  
! 	mr->item.id_hi = (int)mr;
! 	mr->item.id_lo = (int)o->gptr;
  	mr->item.priv_data = o;
  	mr->item.type = type_none;
--- 393,398 ----
  	}
  
! 	mr->item.id_hi = id_hi;
! 	mr->item.id_lo = id_lo;
  	mr->item.priv_data = o;
  	mr->item.type = type_none;
***************
*** 418,423 ****
  	mr->cobj = mr->cobj->next;
  	if (o) {
! 		mr->item.id_hi = (int)mr;
! 		mr->item.id_lo = (int)o->gptr;
  		mr->item.priv_data = o;
  		mr->item.type = type_none;
--- 416,421 ----
  	mr->cobj = mr->cobj->next;
  	if (o) {
! 		mr->item.id_hi = gar_object_mapid(o);
! 		mr->item.id_lo = gar_object_index(o);
  		mr->item.priv_data = o;
  		mr->item.type = type_none;

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

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

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

Modified Files:
	map.c 
Log Message:
Fixed a segfault when a map can't be loaded

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/map.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** map.c	28 Aug 2007 17:31:09 -0000	1.5
--- map.c	4 Nov 2007 17:33:30 -0000	1.6
***************
*** 42,45 ****
--- 42,49 ----
  		m->filename=g_strdup(data->u.str);
  	m->priv=maptype_new(&m->meth, attrs);
+ 	if (! m->priv) {
+ 		g_free(m);
+ 		m=NULL;
+ 	}
  	return m;
  }

[Navit-cvs-commit] navit/src/data/binfile binfile.c,1.3,1.4

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

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

Modified Files:
	binfile.c 
Log Message:
Fixed a segfault when a map can't be loaded

Index: binfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** binfile.c	1 Nov 2007 18:57:50 -0000	1.3
--- binfile.c	4 Nov 2007 17:33:30 -0000	1.4
***************
*** 320,323 ****
--- 320,328 ----
  	dbg(0,"file_create %s\n", m->filename);
  	m->fi=file_create(m->filename);
+ 	if (! m->fi) {
+ 		dbg(0,"Failed to load %s\n", m->filename);
+ 		g_free(m);
+ 		return NULL;
+ 	}
  	file_wordexp_destroy(wexp);
  	magic=(int *)(m->fi->begin);

[Navit-cvs-commit] navit/src Makefile.am, 1.22, 1.23 navit.xml, 1.13, 1.14 osm2navit.c, 1.4, 1.5

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

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

Modified Files:
	Makefile.am navit.xml osm2navit.c 
Log Message:
Removed obsolete osm2navit perl script, changed samplemap to v5, bzip2 compressed samplemap, use new osm2navit for samplemap, binformat samplemap

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** osm2navit.c	4 Nov 2007 16:26:41 -0000	1.4
--- osm2navit.c	4 Nov 2007 17:24:48 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  #include <stdio.h>
  #include <math.h>
+ #include <getopt.h>
  #include <unistd.h>
  #include <fcntl.h>
***************
*** 308,313 ****
  			node_buffer_to_hash();
  		}
! 	} else 
! 		g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base));
  }
  
--- 309,318 ----
  			node_buffer_to_hash();
  		}
! 	} else
! 		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);
! 
  }
  
***************
*** 1155,1159 ****
--- 1160,1192 ----
  	FILE *tmp1,*tmp2;
  	char *map=g_strdup(attrmap);
+ 	int c;
+ 
+ 	while (1) {
+ #if 0
+ 		int this_option_optind = optind ? optind : 1;
+ #endif
+ 		int option_index = 0;
+ 		static struct option long_options[] = {
+ 			{"dedupe-ways", 0, 0, 'w'},
+ 			{0, 0, 0, 0}
+ 		};
+ 		c = getopt_long (argc, argv, "w", long_options, &option_index);
+ 		if (c == -1)
+ 			break;
+ 		switch (c) {
+ 		case 'w':
+ 			dedupe_ways_hash=g_hash_table_new(NULL, NULL);
+ 			break;
+ 		case '?':
+ 			exit(1);
+ 			break;
+ 		default:
+ 			printf("c=%d\n", c);
+ 		}	
+ 
+ 	}
  	build_attrmap(map);
+ 
+ 
  #if 1
  	tmp1=fopen("tmpfile1","w+");

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** navit.xml	31 Oct 2007 13:32:22 -0000	1.13
--- navit.xml	4 Nov 2007 17:24:47 -0000	1.14
***************
*** 56,60 ****
  <!-- If you dont want to use the sample map, set enabled="no" in the next line -->
  	<mapset enabled="yes">
! 		<map type="textfile" enabled="yes" data="$NAVIT_SHAREDIR/maps/osm_bbox_11.3,47.9,11.7,48.2.txt" charset="utf-8"/>
  	</mapset>
  <!-- Sample mapset for garmin maps -->
--- 56,60 ----
  <!-- If you dont want to use the sample map, set enabled="no" in the next line -->
  	<mapset enabled="yes">
! 		<map type="binfile" enabled="yes" data="$NAVIT_SHAREDIR/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/>
  	</mapset>
  <!-- Sample mapset for garmin maps -->

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.am	1 Nov 2007 15:21:39 -0000	1.22
--- Makefile.am	4 Nov 2007 17:24:47 -0000	1.23
***************
*** 29,45 ****
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
  
! samplemap: maps/$(SAMPLE_MAP).txt
  
! maps/$(SAMPLE_MAP).osm:
  	echo "Downloading osm sample map"
  	mkdir -p maps
! 	wget -O maps/$(SAMPLE_MAP).osm.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm
! 	mv maps/$(SAMPLE_MAP).osm.tmp maps/$(SAMPLE_MAP).osm
  
! maps/$(SAMPLE_MAP).txt: maps/$(SAMPLE_MAP).osm $(top_srcdir)/src/script/osm2navit
  	echo "Converting osm sample map"
! 	$(top_srcdir)/src/script/osm2navit <maps/$(SAMPLE_MAP).osm >maps/$(SAMPLE_MAP).txt.tmp
! 	mv maps/$(SAMPLE_MAP).txt.tmp maps/$(SAMPLE_MAP).txt
  
  distclean-local:
! 	rm -f maps/$(SAMPLE_MAP).osm maps/$(SAMPLE_MAP).txt
--- 29,45 ----
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
  
! samplemap: maps/$(SAMPLE_MAP).bin
  
! maps/$(SAMPLE_MAP).osm.bz2:
  	echo "Downloading osm sample map"
  	mkdir -p maps
! 	wget -O maps/$(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
! 	mv maps/$(SAMPLE_MAP).osm.bz2.tmp maps/$(SAMPLE_MAP).osm.bz2
  
! maps/$(SAMPLE_MAP).bin: maps/$(SAMPLE_MAP).osm.bz2 $(top_srcdir)/src/osm2navit
  	echo "Converting osm sample map"
! 	bzcat maps/$(SAMPLE_MAP).osm.bz2 | $(top_srcdir)/src/osm2navit >maps/$(SAMPLE_MAP).bin.tmp
! 	mv maps/$(SAMPLE_MAP).bin.tmp maps/$(SAMPLE_MAP).bin
  
  distclean-local:
! 	rm -f maps/$(SAMPLE_MAP).osm.bz2 maps/$(SAMPLE_MAP).bin

[Navit-cvs-commit] navit/src/script osm2navit,1.3,NONE

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

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

Removed Files:
	osm2navit 
Log Message:
Removed obsolete osm2navit perl script, changed samplemap to v5, bzip2 compressed samplemap, use new osm2navit for samplemap, binformat samplemap

--- osm2navit DELETED ---

[Navit-cvs-commit] navit/src osm2navit.c,1.3,1.4

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

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

Modified Files:
	osm2navit.c 
Log Message:
Improved xml parsing

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** osm2navit.c	3 Nov 2007 23:04:52 -0000	1.3
--- osm2navit.c	4 Nov 2007 16:26:41 -0000	1.4
***************
*** 13,16 ****
--- 13,18 ----
  #include "zipfile.h"
  
+ GHashTable *dedupe_ways_hash;
+ 
  
  static char *attrmap={
***************
*** 149,176 ****
  	a->len=l/4+1;
  }
! static int parse_tag(char *p)
  {
! 	char *q, *k, *v;
! 	GHashTable *value_hash;
! 	q=index(p, '"');
! 	if (! q)
  		return 0;
! 	k=q+1;
! 	q=index(k, '"');
! 	if (! q)
  		return 0;
! 	*q++='\0';
! 	q=index(q, '"');
! 	if (! q)
  		return 0;
! 	v=q+1;
! 	q=index(v, '"');
! 	if (! q)
  		return 0;
! 	*q++='\0';
  	if (! strcmp(k,"name")) {
  		strcpy(label_attr_buffer, v);
  		pad_text_attr(&label_attr, label_attr_buffer);
! 		return 1;
  	}
  	if (! strcmp(k,"oneway")) {
--- 151,188 ----
  	a->len=l/4+1;
  }
! 
! static int
! xml_get_attribute(char *xml, char *attribute, char *buffer, int buffer_size)
  {
! 	int len=strlen(attribute);
! 	char *pos,*i,s,attr[len+2];
! 	strcpy(attr, attribute);
! 	strcpy(attr+len, "=");
! 	pos=strstr(xml, attr);
! 	if (! pos)
  		return 0;
! 	pos+=len+1;
! 	s=*pos++;
! 	if (! s)
  		return 0;
! 	i=index(pos, s);
! 	if (! i)
  		return 0;
! 	if (i - pos > buffer_size)
  		return 0;
! 	strncpy(buffer, pos, i-pos);
! 	buffer[i-pos]='\0';
! 	return 1;
! }
! 
! 
! static void
! add_tag(char *k, char *v)
! {
! 	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")) {
***************
*** 187,191 ****
  	value_hash=g_hash_table_lookup(key_hash, k);
  	if (! value_hash)
! 		return 1;
  	item.type=(enum item_type) g_hash_table_lookup(value_hash, v);
  	if (! item.type) {
--- 199,203 ----
  	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) {
***************
*** 193,199 ****
--- 205,224 ----
  		g_hash_table_insert(value_hash, v, (gpointer)item.type);
  	}
+ }
+ 
+ static int
+ parse_tag(char *p)
+ {
+ 	char k_buffer[1024];
+ 	char v_buffer[1024];
+ 	if (!xml_get_attribute(p, "k", k_buffer, 1024))
+ 		return 0;
+ 	if (!xml_get_attribute(p, "v", v_buffer, 1024))
+ 		return 0;
+ 	add_tag(k_buffer, v_buffer);
  	return 1;
  }
  
+ 
  struct buffer {
  	int malloced_step;
***************
*** 257,275 ****
  	struct node_item *ni=(struct node_item *)node_buffer.base;
  	for (i = 0 ; i < count ; i++) 
! 		g_hash_table_insert(node_hash, ni[i].id, i);
  }
  
! static int parse_node(char *p)
  {
- 	int c;
- 	double lat, 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);
! 	c=sscanf(p, "<node id=\"%d\" lat=\"%lf\" lon=\"%lf\"",&ni->id,&lat,&lon);
! 	if (c != 3)
! 		return 0;
  	ni->ref_node=0;
  	ni->ref_way=0;
--- 282,296 ----
  	struct node_item *ni=(struct node_item *)node_buffer.base;
  	for (i = 0 ; i < count ; i++) 
! 		g_hash_table_insert(node_hash, (gpointer)(ni[i].id), (gpointer)i);
  }
  
! 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;
  	ni->ref_node=0;
  	ni->ref_way=0;
***************
*** 283,295 ****
  			node_id_last=ni->id;
  		} else {
! 			fprintf(stderr,"INFO: Nodes out of sequence, adding hash\n");
  			node_hash=g_hash_table_new(NULL, NULL);
  			node_buffer_to_hash();
  		}
  	} else 
! 		g_hash_table_insert(node_hash, ni->id, ni-(struct node_item *)node_buffer.base);
  	return 1;
  }
  
  static struct node_item *
  node_item_get(int id)
--- 304,332 ----
  			node_id_last=ni->id;
  		} else {
! 			fprintf(stderr,"INFO: Nodes out of sequence (new %d vs old %d), adding hash\n", ni->id, node_id_last);
  			node_hash=g_hash_table_new(NULL, NULL);
  			node_buffer_to_hash();
  		}
  	} else 
! 		g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base));
! }
! 
! static int
! parse_node(char *p)
! {
! 	char id_buffer[1024];
! 	char lat_buffer[1024];
! 	char lon_buffer[1024];
! 	if (!xml_get_attribute(p, "id", id_buffer, 1024))
! 		return 0;
! 	if (!xml_get_attribute(p, "lat", lat_buffer, 1024))
! 		return 0;
! 	if (!xml_get_attribute(p, "lon", lon_buffer, 1024))
! 		return 0;
! 	add_node(atoi(id_buffer), atof(lat_buffer), atof(lon_buffer));
  	return 1;
  }
  
+ 
  static struct node_item *
  node_item_get(int id)
***************
*** 301,305 ****
  	if (node_hash) {
  		int i;
! 		i=g_hash_table_lookup(node_hash, id);
  		return ni+i;
  	}
--- 338,342 ----
  	if (node_hash) {
  		int i;
! 		i=(int)(g_hash_table_lookup(node_hash, (gpointer)id));
  		return ni+i;
  	}
***************
*** 351,367 ****
  int wayid;
  
! static int
! parse_way(char *p)
  {
! 	int c;
  	item.type=type_street_unkn;
  	label_attr.len=0;
  	debug_attr.len=0;
  	limit_attr.len=0;
- 	c=sscanf(p, "<way id=\"%d\"", &wayid);
- 	if (c != 1)
- 		return 0;
- 	coord_count=0;
  	sprintf(debug_attr_buffer,"way_id=%d", wayid);
  	return 1;
  }
--- 388,410 ----
  int wayid;
  
! static void
! add_way(int id)
  {
! 	wayid=id;
! 	coord_count=0;
  	item.type=type_street_unkn;
  	label_attr.len=0;
  	debug_attr.len=0;
  	limit_attr.len=0;
  	sprintf(debug_attr_buffer,"way_id=%d", wayid);
+ }
+ 
+ static int
+ parse_way(char *p)
+ {
+ 	char id_buffer[1024];
+ 	if (!xml_get_attribute(p, "id", id_buffer, 1024))
+ 		return 0;
+ 	add_way(atoi(id_buffer));
  	return 1;
  }
***************
*** 380,383 ****
--- 423,432 ----
  {
  	int alen=0;
+ 
+ 	if (dedupe_ways_hash) {
+ 		if (g_hash_table_lookup(dedupe_ways_hash, (gpointer)wayid))
+ 			return;
+ 		g_hash_table_insert(dedupe_ways_hash, (gpointer)wayid, (gpointer)1);
+ 	}
  	pad_text_attr(&debug_attr, debug_attr_buffer);
  	if (label_attr.len)
***************
*** 396,408 ****
  }
  
! static int
! parse_nd(char *p)
  {
! 	int c,ndref,len;
  	struct node_item *ni;
! 	c=sscanf(p, "<nd ref=\"%d\"", &ndref);
! 	if (c != 1)
! 		return 0;
! 	ni=node_item_get(ndref);
  	if (ni) {
  #if 0
--- 445,454 ----
  }
  
! static void
! add_nd(char *p, int ref)
  {
! 	int len;
  	struct node_item *ni;
! 	ni=node_item_get(ref);
  	if (ni) {
  #if 0
***************
*** 410,414 ****
  #else
  		coord_buffer[coord_count].y=0;
! 		coord_buffer[coord_count++].x=ndref;
  #endif
  		ni->ref_way++;
--- 456,460 ----
  #else
  		coord_buffer[coord_count].y=0;
! 		coord_buffer[coord_count++].x=ref;
  #endif
  		ni->ref_way++;
***************
*** 417,421 ****
  		if (len > 0 && p[len-1]=='\n')
  			p[len-1]='\0';	
! 		fprintf(stderr,"WARNING: way %d: node %d not found (%s)\n",wayid,ndref,p);
  	}
  	if (coord_count > 65536) {
--- 463,467 ----
  		if (len > 0 && p[len-1]=='\n')
  			p[len-1]='\0';	
! 		fprintf(stderr,"WARNING: way %d: node %d not found (%s)\n",wayid,ref,p);
  	}
  	if (coord_count > 65536) {
***************
*** 423,429 ****
--- 469,485 ----
  		exit(1);
  	}
+ }
+ 
+ static int
+ parse_nd(char *p)
+ {
+ 	char ref_buffer[1024];
+ 	if (!xml_get_attribute(p, "ref", ref_buffer, 1024))
+ 		return 0;
+ 	add_nd(p, atoi(ref_buffer));
  	return 1;
  }
  
+ 
  static void
  save_buffer(char *filename, struct buffer *b)
***************
*** 1074,1091 ****
  	}
  	th=g_hash_table_lookup(tile_hash, "");
! 	write_zipmember(out, "index", 5, th);
! 	processed_tiles++;
! 	size+=th->total_size;
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip files header)\n", (sizeof(struct zip_lfh)+maxlen)*dir_entries);
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip files)\n", size);
! 	fwrite(zipdir_buffer.base, zipdir_buffer.size, 1, out);
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip directory)\n", zipdir_buffer.size);
! 	eoc.zipenum=dir_entries;
! 	eoc.zipecenn=dir_entries;
! 	eoc.zipecsz=zipdir_buffer.size;
! 	eoc.zipeofst=zipoffset;
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip end of directory)\n", sizeof(eoc));
! 	fwrite(&eoc, sizeof(eoc), 1, out);
! 	fprintf(stderr, "DEBUG: overall size %d bytes\n", size+zipdir_buffer.size+sizeof(eoc));
  	sig_alrm(0);
  	alarm(0);
--- 1130,1149 ----
  	}
  	th=g_hash_table_lookup(tile_hash, "");
! 	if (th) {
! 		write_zipmember(out, "index", 5, th);
! 		processed_tiles++;
! 		size+=th->total_size;
! 		fprintf(stderr, "DEBUG: wrote %d bytes (zip files header)\n", (sizeof(struct zip_lfh)+maxlen)*dir_entries);
! 		fprintf(stderr, "DEBUG: wrote %d bytes (zip files)\n", size);
! 		fwrite(zipdir_buffer.base, zipdir_buffer.size, 1, out);
! 		fprintf(stderr, "DEBUG: wrote %d bytes (zip directory)\n", zipdir_buffer.size);
! 		eoc.zipenum=dir_entries;
! 		eoc.zipecenn=dir_entries;
! 		eoc.zipecsz=zipdir_buffer.size;
! 		eoc.zipeofst=zipoffset;
! 		fprintf(stderr, "DEBUG: wrote %d bytes (zip end of directory)\n", sizeof(eoc));
! 		fwrite(&eoc, sizeof(eoc), 1, out);
! 		fprintf(stderr, "DEBUG: overall size %d bytes\n", size+zipdir_buffer.size+sizeof(eoc));
! 	}
  	sig_alrm(0);
  	alarm(0);

[Navit-cvs-commit] navit/src xmlconfig.c, 1.17, 1.18 navit.c, 1.34, 1.35 navit.h, 1.17, 1.18

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

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

Modified Files:
	xmlconfig.c navit.c navit.h 
Log Message:
Improved diagnostics for graphics/gui problems

Index: navit.h
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** navit.h	9 Oct 2007 16:48:38 -0000	1.17
--- navit.h	4 Nov 2007 10:04:47 -0000	1.18
***************
*** 30,33 ****
--- 30,34 ----
  void navit_add_mapset(struct navit *this_, struct mapset *ms);
  struct mapset *navit_get_mapset(struct navit *this_);
+ struct tracking *navit_get_tracking(struct navit *this_);
  void navit_add_layout(struct navit *this_, struct layout *lay);
  void navit_draw(struct navit *this_);
***************
*** 36,42 ****
  void navit_zoom_out(struct navit *this_, int factor);
  struct navit *navit_new(struct coord *center, enum projection pro, int zoom);
! void navit_set_gui(struct navit *this_, struct gui *gui);
! void navit_set_graphics(struct navit *this_, struct graphics *gra);
! struct graphics * navit_get_graphics(struct navit *this_);
  void navit_set_destination(struct navit *this_, struct coord *c, char *description);
  void navit_add_bookmark(struct navit *this_, struct coord *c, char *description);
--- 37,43 ----
  void navit_zoom_out(struct navit *this_, int factor);
  struct navit *navit_new(struct coord *center, enum projection pro, int zoom);
! void navit_set_gui(struct navit *this_, struct gui *gui, char *type);
! void navit_set_graphics(struct navit *this_, struct graphics *gra, char *type);
! struct graphics *navit_get_graphics(struct navit *this_);
  void navit_set_destination(struct navit *this_, struct coord *c, char *description);
  void navit_add_bookmark(struct navit *this_, struct coord *c, char *description);
***************
*** 71,75 ****
  void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
  void navit_tracking_add(struct navit *this_, struct tracking *tracking);
- struct tracking * navit_get_tracking(struct navit *this_);
  void navit_route_add(struct navit *this_, struct route *route);
  void navit_navigation_add(struct navit *this_, struct navigation *navigation);
--- 72,75 ----

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** navit.c	24 Oct 2007 18:46:40 -0000	1.34
--- navit.c	4 Nov 2007 10:04:47 -0000	1.35
***************
*** 51,56 ****
--- 51,58 ----
  	GList *layouts;
  	struct gui *gui;
+ 	char *gui_type;
  	struct layout *layout_current;
  	struct graphics *gra;
+ 	char *gra_type;
  	struct action *action;
  	struct transformation *trans;
***************
*** 213,219 ****
  
  void
! navit_set_gui(struct navit *this_, struct gui *gui)
  {
  	this_->gui=gui;
  	if (gui_has_main_loop(this_->gui)) {
  		if (! main_loop_gui) {
--- 215,222 ----
  
  void
! navit_set_gui(struct navit *this_, struct gui *gui, char *type)
  {
  	this_->gui=gui;
+ 	this_->gui_type=g_strdup(type);
  	if (gui_has_main_loop(this_->gui)) {
  		if (! main_loop_gui) {
***************
*** 230,236 ****
  
  void
! navit_set_graphics(struct navit *this_, struct graphics *gra)
  {
  	this_->gra=gra;
  	graphics_register_resize_callback(this_->gra, navit_resize, this_);
  	graphics_register_button_callback(this_->gra, navit_button, this_);
--- 233,240 ----
  
  void
! navit_set_graphics(struct navit *this_, struct graphics *gra, char *type)
  {
  	this_->gra=gra;
+ 	this_->gra_type=g_strdup(type);
  	graphics_register_resize_callback(this_->gra, navit_resize, this_);
  	graphics_register_button_callback(this_->gra, navit_button, this_);
***************
*** 781,786 ****
  	struct navit_vehicle *nv;
  
! 	if (!this_->gui || !this_->gra || gui_set_graphics(this_->gui, this_->gra)) {
! 		g_warning("failed to connect graphics to gui\n");
  		g_warning(" Please see http://navit.sourceforge.net/wiki/index.php/Failed_to_connect_graphics_to_gui\n");
  		g_warning(" for explanations and solutions\n");
--- 785,800 ----
  	struct navit_vehicle *nv;
  
! 	if (!this_->gui) {
! 		g_warning("failed to instantiate gui '%s'\n",this_->gui_type);
! 		navit_destroy(this_);
! 		return;
! 	}
! 	if (!this_->gra) {
! 		g_warning("failed to instantiate gui '%s'\n",this_->gra_type);
! 		navit_destroy(this_);
! 		return;
! 	}
! 	if (gui_set_graphics(this_->gui, this_->gra)) {
! 		g_warning("failed to connect graphics '%s' to gui '%s'\n", this_->gra_type, this_->gui_type);
  		g_warning(" Please see http://navit.sourceforge.net/wiki/index.php/Failed_to_connect_graphics_to_gui\n");
  		g_warning(" for explanations and solutions\n");

Index: xmlconfig.c
===================================================================
RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** xmlconfig.c	9 Oct 2007 18:14:27 -0000	1.17
--- xmlconfig.c	4 Nov 2007 10:04:47 -0000	1.18
***************
*** 224,228 ****
  	if (! state->element_object)
  		return 0;
! 	navit_set_graphics(state->parent->element_object, state->element_object);
  	return 1;
  }
--- 224,228 ----
  	if (! state->element_object)
  		return 0;
! 	navit_set_graphics(state->parent->element_object, state->element_object, type);
  	return 1;
  }
***************
*** 239,243 ****
  	if (! state->element_object)
  		return 0;
! 	navit_set_gui(state->parent->element_object, state->element_object);
  	return 1;
  }
--- 239,243 ----
  	if (! state->element_object)
  		return 0;
! 	navit_set_gui(state->parent->element_object, state->element_object, type);
  	return 1;
  }

[Navit-cvs-commit] navit configure.in,1.46,1.47

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

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

Modified Files:
	configure.in 
Log Message:
Added check for libCEGUILibxmlParser.so

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** configure.in	1 Nov 2007 15:29:09 -0000	1.46
--- configure.in	4 Nov 2007 02:05:19 -0000	1.47
***************
*** 208,211 ****
--- 208,217 ----
  )
  
+ 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"],

[Navit-cvs-commit] navit/src osm2navit.c,1.2,1.3

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

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

Modified Files:
	osm2navit.c 
Log Message:
Autodetects and compensates now for unordered nodes

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osm2navit.c	1 Nov 2007 22:39:21 -0000	1.2
--- osm2navit.c	3 Nov 2007 23:04:52 -0000	1.3
***************
*** 248,251 ****
--- 248,263 ----
  }
  
+ int node_id_last;
+ GHashTable *node_hash;
+ 
+ static void
+ node_buffer_to_hash(void)
+ {
+ 	int i,count=node_buffer.size/sizeof(struct node_item);
+ 	struct node_item *ni=(struct node_item *)node_buffer.base;
+ 	for (i = 0 ; i < count ; i++) 
+ 		g_hash_table_insert(node_hash, ni[i].id, i);
+ }
+ 
  static int parse_node(char *p)
  {
***************
*** 267,270 ****
--- 279,292 ----
  	ni->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
  	node_buffer.size+=sizeof(struct node_item);
+ 	if (! node_hash) {
+ 		if (ni->id > node_id_last) {
+ 			node_id_last=ni->id;
+ 		} else {
+ 			fprintf(stderr,"INFO: Nodes out of sequence, adding hash\n");
+ 			node_hash=g_hash_table_new(NULL, NULL);
+ 			node_buffer_to_hash();
+ 		}
+ 	} else 
+ 		g_hash_table_insert(node_hash, ni->id, ni-(struct node_item *)node_buffer.base);
  	return 1;
  }
***************
*** 277,280 ****
--- 299,307 ----
  	int interval=count/4;
  	int p=count/2;
+ 	if (node_hash) {
+ 		int i;
+ 		i=g_hash_table_lookup(node_hash, id);
+ 		return ni+i;
+ 	}
  	while (ni[p].id != id) {
  #if 0
***************
*** 1048,1059 ****
  	th=g_hash_table_lookup(tile_hash, "");
  	write_zipmember(out, "index", 5, th);
  	size+=th->total_size;
! 	fprintf(stderr, "DEBUG: wrote %d bytes\n", size);
  	fwrite(zipdir_buffer.base, zipdir_buffer.size, 1, out);
  	eoc.zipenum=dir_entries;
  	eoc.zipecenn=dir_entries;
  	eoc.zipecsz=zipdir_buffer.size;
  	eoc.zipeofst=zipoffset;
  	fwrite(&eoc, sizeof(eoc), 1, out);
  	sig_alrm(0);
  	alarm(0);
--- 1075,1091 ----
  	th=g_hash_table_lookup(tile_hash, "");
  	write_zipmember(out, "index", 5, th);
+ 	processed_tiles++;
  	size+=th->total_size;
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip files header)\n", (sizeof(struct zip_lfh)+maxlen)*dir_entries);
! 	fprintf(stderr, "DEBUG: wrote %d bytes (zip files)\n", size);
  	fwrite(zipdir_buffer.base, zipdir_buffer.size, 1, out);
+ 	fprintf(stderr, "DEBUG: wrote %d bytes (zip directory)\n", zipdir_buffer.size);
  	eoc.zipenum=dir_entries;
  	eoc.zipecenn=dir_entries;
  	eoc.zipecsz=zipdir_buffer.size;
  	eoc.zipeofst=zipoffset;
+ 	fprintf(stderr, "DEBUG: wrote %d bytes (zip end of directory)\n", sizeof(eoc));
  	fwrite(&eoc, sizeof(eoc), 1, out);
+ 	fprintf(stderr, "DEBUG: overall size %d bytes\n", size+zipdir_buffer.size+sizeof(eoc));
  	sig_alrm(0);
  	alarm(0);