navit-cvs-commit — CVS commit mailing list

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

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

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

Modified Files:
	map.c 
Log Message:
Bugfixing in Searching


Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/map.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** map.c	4 Nov 2007 17:33:30 -0000	1.6
--- map.c	6 Nov 2007 22:43:18 -0000	1.7
***************
*** 170,176 ****
  		this->priv=country_search_new(&this->search_attr, partial);
  	else {
! 		if (m->meth.map_search_new)
! 			this->priv=m->meth.map_search_new(m->priv, item, search_attr, partial);
! 		else {
  			g_free(this);
  			this=NULL;
--- 170,178 ----
  		this->priv=country_search_new(&this->search_attr, partial);
  	else {
! 		if (m->meth.map_search_new) {
! 			if (m->meth.charset) 
! 				this->search_attr.u.str=g_convert(this->search_attr.u.str, -1,m->meth.charset,"utf-8",NULL,NULL,NULL);
! 			this->priv=m->meth.map_search_new(m->priv, item, &this->search_attr, partial);
! 		} else {
  			g_free(this);
  			this=NULL;
***************
*** 202,207 ****
  	if (this->search_attr.type >= attr_country_all && this->search_attr.type <= attr_country_name)
  		country_search_destroy(this->priv);
! 	else
  		this->m->meth.map_search_destroy(this->priv);
  	g_free(this);
  }
--- 204,212 ----
  	if (this->search_attr.type >= attr_country_all && this->search_attr.type <= attr_country_name)
  		country_search_destroy(this->priv);
! 	else {
! 		if (this->m->meth.charset) 
! 				g_free(this->search_attr.u.str);
  		this->m->meth.map_search_destroy(this->priv);
+ 	}
  	g_free(this);
  }

[Navit-cvs-commit] navit/po cs.po, 1.2, 1.3 de.po, 1.16, 1.17 es.po, 1.6, 1.7 fr.po, 1.26, 1.27 it.po, 1.8, 1.9 no.po, 1.9, 1.10 pl.po, 1.7, 1.8

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

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

Modified Files:
	cs.po de.po es.po fr.po it.po no.po pl.po 
Log Message:
Bumped version number to 0.0.3

Index: it.po
===================================================================
RCS file: /cvsroot/navit/navit/po/it.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** it.po	5 Nov 2007 20:47:58 -0000	1.8
--- it.po	5 Nov 2007 23:54:29 -0000	1.9
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

Index: fr.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fr.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** fr.po	5 Nov 2007 20:47:58 -0000	1.26
--- fr.po	5 Nov 2007 23:54:29 -0000	1.27
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** de.po	5 Nov 2007 20:47:57 -0000	1.16
--- de.po	5 Nov 2007 23:54:28 -0000	1.17
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

Index: es.po
===================================================================
RCS file: /cvsroot/navit/navit/po/es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** es.po	5 Nov 2007 20:47:57 -0000	1.6
--- es.po	5 Nov 2007 23:54:29 -0000	1.7
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

Index: pl.po
===================================================================
RCS file: /cvsroot/navit/navit/po/pl.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pl.po	28 Sep 2007 23:55:04 -0000	1.7
--- pl.po	5 Nov 2007 23:54:29 -0000	1.8
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-09-29 01:53+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-09-29 01:53+0200\n"

Index: no.po
===================================================================
RCS file: /cvsroot/navit/navit/po/no.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** no.po	5 Nov 2007 20:47:58 -0000	1.9
--- no.po	5 Nov 2007 23:54:29 -0000	1.10
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

Index: cs.po
===================================================================
RCS file: /cvsroot/navit/navit/po/cs.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cs.po	5 Nov 2007 20:47:57 -0000	1.2
--- cs.po	5 Nov 2007 23:54:28 -0000	1.3
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: navit_cs\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-11-05 21:44+0100\n"

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

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

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

Modified Files:
	configure.in 
Log Message:
Bumped version number to 0.0.3

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** configure.in	5 Nov 2007 21:07:38 -0000	1.50
--- configure.in	5 Nov 2007 23:54:28 -0000	1.51
***************
*** 1,3 ****
! AC_INIT(navit, 0.0.2)
  AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(config.h)
--- 1,3 ----
! AC_INIT(navit, 0.0.3)
  AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(config.h)

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp,1.27,1.28

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

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

Modified Files:
	gui_sdl_window.cpp 
Log Message:
Fixed wrong starting value of scrollbar

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** gui_sdl_window.cpp	5 Nov 2007 21:02:57 -0000	1.27
--- gui_sdl_window.cpp	5 Nov 2007 21:35:20 -0000	1.28
***************
*** 388,392 ****
  	
  	CEGUI::Scrollbar * sb = static_cast<const CEGUI::Scrollbar *>(CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1"));
! // 	printf("moving : %f\n",sb->getScrollPosition());
  	eyeZ=-sb->getScrollPosition();
  	if (eyeZ>-100){
--- 388,392 ----
  	
  	CEGUI::Scrollbar * sb = static_cast<const CEGUI::Scrollbar *>(CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1"));
!  	dbg(0,"moving : %f\n",sb->getScrollPosition());
  	eyeZ=-sb->getScrollPosition();
  	if (eyeZ>-100){

[Navit-cvs-commit] navit/src/gui/sdl/datafiles/layouts Mineque.layout, 1.7, 1.8 TaharezLook.layout, 1.3, 1.4

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

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

Modified Files:
	Mineque.layout TaharezLook.layout 
Log Message:
Fixed wrong starting value of scrollbar

Index: TaharezLook.layout
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/TaharezLook.layout,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TaharezLook.layout	26 Oct 2007 16:34:26 -0000	1.3
--- TaharezLook.layout	5 Nov 2007 21:35:20 -0000	1.4
***************
*** 145,149 ****
                  <Property Name="OverlapSize" Value="0" />
                  <Property Name="DocumentSize" Value="2000" />
!                 <Property Name="ScrollPosition" Value="0" />
                  <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
                  <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />
--- 145,149 ----
                  <Property Name="OverlapSize" Value="0" />
                  <Property Name="DocumentSize" Value="2000" />
!                 <Property Name="ScrollPosition" Value="400" />
                  <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
                  <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />

Index: Mineque.layout
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Mineque.layout	30 Oct 2007 20:58:11 -0000	1.7
--- Mineque.layout	5 Nov 2007 21:35:20 -0000	1.8
***************
*** 76,80 ****
  			<Property Name="OverlapSize" Value="0" />
  			<Property Name="DocumentSize" Value="2000" />
! 			<Property Name="ScrollPosition" Value="0" />
  			<Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
  			<Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />
--- 76,80 ----
  			<Property Name="OverlapSize" Value="0" />
  			<Property Name="DocumentSize" Value="2000" />
! 			<Property Name="ScrollPosition" Value="400" />
  			<Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />
  			<Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />

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

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

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

Modified Files:
	sdl_events.cpp 
Log Message:
Added default country selection

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sdl_events.cpp	5 Nov 2007 21:02:57 -0000	1.11
--- sdl_events.cpp	5 Nov 2007 21:24:46 -0000	1.12
***************
*** 406,440 ****
  		
  		// Code to get the current country and set it by default for the search
! 		// FIXME : needs more work / testing
! 		dbg(1,"Trying to find the current country\n");
! 		struct tracking * tracking= navit_get_tracking(sdl_gui_navit);
! 		if(tracking == NULL){
! 			dbg(1,"Can't find the country for the current road. Falling back to $LANG\n");
! 		} else {
! 			dbg(1,"OK, trying to get attributes\n");
! // 			tracking_get_current_attr(tracking, attr_country_id, &attr);
! //			tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr)
! 			struct attr attr,attr2;
! 			tracking_get_current_attr(tracking,attr_country_id,&attr);
! 			dbg(1,"OK, got attributes\n");
  
! 			struct country_search *c_search=country_search_new(&attr, 0);
! 			if(c_search){
! 				dbg(1,"OK, got search\n");
! 	
! 				struct item *item=country_search_get_item(c_search);
! 				if(item){
! 					dbg(1,"OK, got item\n");
! 					if(item_attr_get(item, attr_country_name, &attr2)){
! 						dbg(1,"OK, got item_attr_get : %s\n",attr2.u.str);
! 					}
! 				} else {
! 					dbg(1,"Item is null, fallback to LC_LANG\n");
! 				}
! 			}
! 			
!    			country_search_destroy(c_search);
! 		}
! 		dbg(1,"Done with country selection\n");
  
  		/*
--- 406,426 ----
  		
  		// Code to get the current country and set it by default for the search
! 		struct attr search_attr, country_name, *country_attr;
! 		struct tracking *tracking;
! 		struct country_search *cs;
! 		struct item *item;
  
! 
! 		Editbox* country_edit = static_cast<Editbox*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox"));
! 
! 		country_attr=country_default();
! 		tracking=navit_get_tracking(sdl_gui_navit);
! 		if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr)) 
! 			country_attr=&search_attr;
! 		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);
  
  		/*

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

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

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

Modified Files:
	Makefile.am 
Log Message:
osm2navit is in builddir

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/maps/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	5 Nov 2007 10:55:43 -0000	1.1
--- Makefile.am	5 Nov 2007 21:15:52 -0000	1.2
***************
*** 12,18 ****
  	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
  
--- 12,18 ----
  	mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2
  
! $(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
  

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Added a switch to configure to disable the sample map

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Makefile.am	5 Nov 2007 14:43:17 -0000	1.26
--- Makefile.am	5 Nov 2007 21:07:39 -0000	1.27
***************
*** 1,8 ****
  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\"
--- 1,8 ----
  include $(top_srcdir)/Makefile.inc
  DIST_SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
! SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
! if BUILD_SAMPLEMAP
!   SUBDIRS += maps
! endif
  
  AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
***************
*** 30,38 ****
  
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
- 
- samplemap:
- 	make -C maps
- 
- installsamplemap:
- 	make -C maps install
- 
--- 30,31 ----

[Navit-cvs-commit] navit Makefile.am, 1.6, 1.7 configure.in, 1.49, 1.50

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

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

Modified Files:
	Makefile.am configure.in 
Log Message:
Added a switch to configure to disable the sample map

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	5 Nov 2007 10:56:43 -0000	1.6
--- Makefile.am	5 Nov 2007 21:07:38 -0000	1.7
***************
*** 3,20 ****
  pkgdoc_DATA = README
  EXTRA_DIST = README
- 
- all-local:
- 	@echo ------------------------
- 	@echo Navit build complete
- 	@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
- 
--- 3,4 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** configure.in	5 Nov 2007 15:35:58 -0000	1.49
--- configure.in	5 Nov 2007 21:07:38 -0000	1.50
***************
*** 29,32 ****
--- 29,36 ----
  
  AC_ARG_ENABLE(libgps, [  --disable-libgps             don't use libgps], USE_LIBGPS=$enableval, USE_LIBGPS=yes)
+ 
+ AC_ARG_ENABLE(samplemap, [  --disable-samplemap             don't build the samplemap], samplemap=$enableval, samplemap=yes)
+ AM_CONDITIONAL(BUILD_SAMPLEMAP, [test "x$samplemap" = "xyes"])
+ 
  AC_PATH_X
  if test x"$have_x" != xyes; then
***************
*** 432,435 ****
--- 436,445 ----
  	echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
  fi
+ if test "x$samplemap" = "xyes"
+ 	then
+ 	echo "Samplemap   : ENABLED"
+ 	else
+ 	echo "Samplemap   : DISABLED"
+ fi
  if  [ test x"$gtk2_pkgconfig" != xyes ] && [ test x"$sdl" != xyes ]
  	then

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl.h, 1.2, 1.3 gui_sdl_window.cpp, 1.26, 1.27 sdl_events.cpp, 1.10, 1.11 sdl_events.h, 1.5, 1.6

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

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

Modified Files:
	gui_sdl.h gui_sdl_window.cpp sdl_events.cpp sdl_events.h 
Log Message:
Really fixed sdl_gui_navit compilation problems

Index: gui_sdl.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gui_sdl.h	4 Jul 2007 22:44:45 -0000	1.2
--- gui_sdl.h	5 Nov 2007 21:02:57 -0000	1.3
***************
*** 9,12 ****
--- 9,14 ----
  struct navit;
  
+ extern struct navit *sdl_gui_navit;
+ 
  struct gui_priv {
  /*

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** gui_sdl_window.cpp	5 Nov 2007 20:48:15 -0000	1.26
--- gui_sdl_window.cpp	5 Nov 2007 21:02:57 -0000	1.27
***************
*** 45,48 ****
--- 45,50 ----
  GLdouble upZ=0;
  
+ struct navit *sdl_gui_navit;
+ 
  #include <CEGUI/RendererModules/OpenGLGUIRenderer/openglrenderer.h>
  #include "CEGUIDefaultResourceProvider.h"

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sdl_events.cpp	5 Nov 2007 20:48:15 -0000	1.10
--- sdl_events.cpp	5 Nov 2007 21:02:57 -0000	1.11
***************
*** 36,39 ****
--- 36,40 ----
  
  // extern "C" struct navit *global_navit;
+ // 
  
  void route_to(int x,int y){
***************
*** 391,395 ****
  	using namespace CEGUI;
  
- // 	extern struct navit *sdl_gui_navit;
  
  	extern CEGUI::Window* myRoot;
--- 392,395 ----

Index: sdl_events.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sdl_events.h	5 Nov 2007 20:48:16 -0000	1.5
--- sdl_events.h	5 Nov 2007 21:02:57 -0000	1.6
***************
*** 9,13 ****
  #define SRCH_NUMBER 4
  
! extern struct navit *sdl_gui_navit;
  
  bool handleItemSelect(int r);
--- 9,13 ----
  #define SRCH_NUMBER 4
  
! 
  
  bool handleItemSelect(int r);

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp, 1.25, 1.26 sdl_events.cpp, 1.9, 1.10 sdl_events.h, 1.4, 1.5

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

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

Modified Files:
	gui_sdl_window.cpp sdl_events.cpp sdl_events.h 
Log Message:
Fixed sdl_gui_navit compilation problems

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** gui_sdl_window.cpp	5 Nov 2007 14:35:57 -0000	1.25
--- gui_sdl_window.cpp	5 Nov 2007 20:48:15 -0000	1.26
***************
*** 60,64 ****
  
  
! struct navit *sdl_gui_navit;
  
  static int
--- 60,64 ----
  
  
! // struct navit *sdl_gui_navit;
  
  static int

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sdl_events.cpp	5 Nov 2007 16:19:20 -0000	1.9
--- sdl_events.cpp	5 Nov 2007 20:48:15 -0000	1.10
***************
*** 391,394 ****
--- 391,396 ----
  	using namespace CEGUI;
  
+ // 	extern struct navit *sdl_gui_navit;
+ 
  	extern CEGUI::Window* myRoot;
  	const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);

Index: sdl_events.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sdl_events.h	5 Nov 2007 16:19:20 -0000	1.4
--- sdl_events.h	5 Nov 2007 20:48:16 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  #define SRCH_NUMBER 4
  
+ extern struct navit *sdl_gui_navit;
  
  bool handleItemSelect(int r);

[Navit-cvs-commit] navit/src/gui/gtk destination.c,1.7,1.8

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

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

Modified Files:
	destination.c 
Log Message:
Bugfixes for searching

Index: destination.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** destination.c	5 Nov 2007 17:52:39 -0000	1.7
--- destination.c	5 Nov 2007 20:21:29 -0000	1.8
***************
*** 37,41 ****
  	struct coord *c=NULL;
  	GtkTreeIter iter;
! 	gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter);
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) 
--- 37,42 ----
  	struct coord *c=NULL;
  	GtkTreeIter iter;
! 	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter))
! 		return;
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) 
***************
*** 63,67 ****
  	char *desc;
  
! 	gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter);
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) {
--- 64,69 ----
  	char *desc;
  
! 	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter))
! 		return;
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) {
***************
*** 78,82 ****
  	char *desc;
  
! 	gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter);
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) {
--- 80,85 ----
  	char *desc;
  
! 	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter))
! 		return;
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1);
  	if (c) {

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

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

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

Modified Files:
	street.c 
Log Message:
Bugfixes for searching

Index: street.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/street.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** street.c	5 Nov 2007 09:22:05 -0000	1.7
--- street.c	5 Nov 2007 20:21:28 -0000	1.8
***************
*** 468,476 ****
  	dbg(1,"country 0x%x town_assoc 0x%x name '%s'\n", country, town_assoc, name);
  	d=(mr->search_item.id_hi & 0xffff)-country;
! 	dbg(1,"country %d\n", d);
  	if (!d) {
! 		d=mr->search_item.id_lo-town_assoc;
! 		dbg(1,"assoc %d 0x%x-0x%x\n",d, mr->search_item.id_lo, town_assoc);
! 		if (! d) {
  			if (mr->search_partial)
  				d=strncasecmp(mr->search_str, name, strlen(mr->search_str));
--- 468,475 ----
  	dbg(1,"country 0x%x town_assoc 0x%x name '%s'\n", country, town_assoc, name);
  	d=(mr->search_item.id_hi & 0xffff)-country;
! 	dbg(1,"country %d (%d vs %d)\n", d, mr->search_item.id_hi & 0xffff, country);
  	if (!d) {
! 		if (mr->search_item.id_lo == town_assoc ) {
! 			dbg(1,"town_assoc match (0x%x)\n", town_assoc);
  			if (mr->search_partial)
  				d=strncasecmp(mr->search_str, name, strlen(mr->search_str));
***************
*** 478,481 ****
--- 477,486 ----
  				d=strcasecmp(mr->search_str, name);
  			dbg(1,"string %d\n", d);
+ 		} else {
+ 			if (town_assoc < mr->search_item.id_lo)
+ 				d=1;
+ 			else
+ 				d=-1;
+ 			dbg(1,"assoc %d 0x%x-0x%x\n",d, mr->search_item.id_lo, town_assoc);
  		}
  	}

[Navit-cvs-commit] navit/src navit.c,1.35,1.36

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

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

Modified Files:
	navit.c 
Log Message:
Bugfixes for searching

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** navit.c	4 Nov 2007 10:04:47 -0000	1.35
--- navit.c	5 Nov 2007 20:21:27 -0000	1.36
***************
*** 405,432 ****
  {
  #if 0
- #include "attr.h"
- #include "item.h"
- #include "search.h"
  	struct attr attr;
  	struct search_list *sl;
  	struct search_list_result *res;
  
! 	debug_level_set("data_mg:town_search_get_item",1);
! 	debug_level_set("data_mg:town_search_compare",1);
! 	debug_level_set("data_mg:tree_search_next",1);
  	sl=search_list_new(this_->mapsets->data);
  	attr.type=attr_country_all;
! 	attr.u.str="Deu";
  	search_list_search(sl, &attr, 1);
! 	while (res=search_list_get_result(sl)) {
  		printf("country result\n");
  	}
  	attr.type=attr_town_name;
! 	attr.u.str="U";
  	search_list_search(sl, &attr, 1);
! 	while (res=search_list_get_result(sl)) {
  		printf("town result\n");
  	}
  	search_list_destroy(sl);
  #endif
  }
--- 405,438 ----
  {
  #if 0
  	struct attr attr;
+ #include "search.h"
  	struct search_list *sl;
  	struct search_list_result *res;
  
! 	debug_level_set("data_mg:town_search_get_item",9);
! 	debug_level_set("data_mg:town_search_compare",9);
! 	debug_level_set("data_mg:tree_search_next",9);
! 	debug_level_set("data_mg:map_search_new_mg",9);
  	sl=search_list_new(this_->mapsets->data);
  	attr.type=attr_country_all;
! 	attr.u.str="Fra";
  	search_list_search(sl, &attr, 1);
! 	while ((res=search_list_get_result(sl))) {
  		printf("country result\n");
  	}
  	attr.type=attr_town_name;
! 	attr.u.str="seclin";
  	search_list_search(sl, &attr, 1);
! 	while ((res=search_list_get_result(sl))) {
  		printf("town result\n");
  	}
+ 	attr.type=attr_street_name;
+ 	attr.u.str="rue";
+ 	search_list_search(sl, &attr, 1);
+ 	while ((res=search_list_get_result(sl))) {
+ 		printf("street result\n");
+ 	}
  	search_list_destroy(sl);
+ 	exit(0);
  #endif
  }

[Navit-cvs-commit] navit/src country.c,1.8,1.9 country.h,1.5,1.6

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

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

Modified Files:
	country.c country.h 
Log Message:
Fixed this vs this_

Index: country.h
===================================================================
RCS file: /cvsroot/navit/navit/src/country.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** country.h	5 Nov 2007 17:52:39 -0000	1.5
--- country.h	5 Nov 2007 19:37:01 -0000	1.6
***************
*** 11,17 ****
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this);
  struct attr *country_default(void);
! void country_search_destroy(struct country_search *this);
  /* end of prototypes */
  
--- 11,17 ----
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this_);
  struct attr *country_default(void);
! void country_search_destroy(struct country_search *this_);
  /* end of prototypes */
  

Index: country.c
===================================================================
RCS file: /cvsroot/navit/navit/src/country.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** country.c	5 Nov 2007 17:52:39 -0000	1.8
--- country.c	5 Nov 2007 19:37:00 -0000	1.9
***************
*** 100,111 ****
  country_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
  {
!         struct country_search *this=priv_data;
! 	struct country *country=this->country;
  
          attr->type=attr_type;
          switch (attr_type) {
          case attr_any:
!                 while (this->attr_next != attr_none) {
!                         if (country_attr_get(this, this->attr_next, attr))
                                  return 1;
                  }
--- 100,111 ----
  country_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
  {
!         struct country_search *this_=priv_data;
! 	struct country *country=this_->country;
  
          attr->type=attr_type;
          switch (attr_type) {
          case attr_any:
!                 while (this_->attr_next != attr_none) {
!                         if (country_attr_get(this_, this_->attr_next, attr))
                                  return 1;
                  }
***************
*** 113,137 ****
          case attr_label:
  		attr->u.str=gettext(country->name);
! 		this->attr_next=attr_country_id;
  		return 1;
  	case attr_country_id:
  		attr->u.num=country->id;
! 		this->attr_next=country->car ? attr_country_car : attr_country_iso2;
  		return 1;
          case attr_country_car:
  		attr->u.str=country->car;
! 		this->attr_next=attr_country_iso2;
  		return attr->u.str ? 1 : 0;
          case attr_country_iso2:
  		attr->u.str=country->iso2;
! 		this->attr_next=attr_country_iso3;
  		return 1;
          case attr_country_iso3:
  		attr->u.str=country->iso3;
! 		this->attr_next=attr_country_name;
  		return 1;
          case attr_country_name:
  		attr->u.str=gettext(country->name);
! 		this->attr_next=attr_none;
  		return 1;
   	default:
--- 113,137 ----
          case attr_label:
  		attr->u.str=gettext(country->name);
! 		this_->attr_next=attr_country_id;
  		return 1;
  	case attr_country_id:
  		attr->u.num=country->id;
! 		this_->attr_next=country->car ? attr_country_car : attr_country_iso2;
  		return 1;
          case attr_country_car:
  		attr->u.str=country->car;
! 		this_->attr_next=attr_country_iso2;
  		return attr->u.str ? 1 : 0;
          case attr_country_iso2:
  		attr->u.str=country->iso2;
! 		this_->attr_next=attr_country_iso3;
  		return 1;
          case attr_country_iso3:
  		attr->u.str=country->iso3;
! 		this_->attr_next=attr_country_name;
  		return 1;
          case attr_country_name:
  		attr->u.str=gettext(country->name);
! 		this_->attr_next=attr_none;
  		return 1;
   	default:
***************
*** 171,185 ****
  
  static int
! match(struct country_search *this, enum attr_type type, const char *name)
  {
  	int ret;
  	if (!name)
  		return 0;
! 	if (this->search.type != type && this->search.type != attr_country_all)
  		return 0;
! 	if (this->partial)
! 		ret=(strncasecmp(this->search.u.str, name, this->len) == 0);
  	else
! 		ret=(strcasecmp(this->search.u.str, name) == 0);
  	return ret;
  	
--- 171,185 ----
  
  static int
! match(struct country_search *this_, enum attr_type type, const char *name)
  {
  	int ret;
  	if (!name)
  		return 0;
! 	if (this_->search.type != type && this_->search.type != attr_country_all)
  		return 0;
! 	if (this_->partial)
! 		ret=(strncasecmp(this_->search.u.str, name, this_->len) == 0);
  	else
! 		ret=(strcasecmp(this_->search.u.str, name) == 0);
  	return ret;
  	
***************
*** 188,204 ****
  
  struct item *
! country_search_get_item(struct country_search *this)
  {
  	for (;;) {
! 		if (this->count >= sizeof(country)/sizeof(struct country))
  			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) ||
! 		    match(this, attr_country_name, gettext(this->country->name))) {
! 			this->item.id_lo=this->country->id;
! 			return &this->item;
  		}
  	}
--- 188,204 ----
  
  struct item *
! country_search_get_item(struct country_search *this_)
  {
  	for (;;) {
! 		if (this_->count >= sizeof(country)/sizeof(struct country))
  			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) ||
! 		    match(this_, attr_country_name, gettext(this_->country->name))) {
! 			this_->item.id_lo=this_->country->id;
! 			return &this_->item;
  		}
  	}
***************
*** 224,229 ****
  
  void
! country_search_destroy(struct country_search *this)
  {
! 	g_free(this);
  }
--- 224,229 ----
  
  void
! country_search_destroy(struct country_search *this_)
  {
! 	g_free(this_);
  }

[Navit-cvs-commit] navit/src attr.c, 1.9, 1.10 navigation.c, 1.25, 1.26

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

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

Modified Files:
	attr.c navigation.c 
Log Message:
Fix some warnings

Index: attr.c
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** attr.c	28 Oct 2007 11:00:52 -0000	1.9
--- attr.c	5 Nov 2007 18:00:25 -0000	1.10
***************
*** 109,112 ****
--- 109,113 ----
  		return &attr->u.num;
  	}
+ 	return NULL;
  }
  

Index: navigation.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navigation.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** navigation.c	28 Oct 2007 11:00:53 -0000	1.25
--- navigation.c	5 Nov 2007 18:00:26 -0000	1.26
***************
*** 554,558 ****
  navigation_call_callbacks(struct navigation *this_, int force_speech)
  {
! 	int distance, level;
  	void *p=this_;
  	callback_list_call(this_->callback, 1, &p);
--- 554,558 ----
  navigation_call_callbacks(struct navigation *this_, int force_speech)
  {
! 	int distance, level = 0;
  	void *p=this_;
  	callback_list_call(this_->callback, 1, &p);

[Navit-cvs-commit] navit/src country.c, 1.7, 1.8 country.h, 1.4, 1.5 search.c, 1.7, 1.8 track.c, 1.13, 1.14

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

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

Modified Files:
	country.c country.h search.c track.c 
Log Message:
Made some reasonable defaults for country in destination dialog

Index: country.c
===================================================================
RCS file: /cvsroot/navit/navit/src/country.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** country.c	5 Nov 2007 09:22:04 -0000	1.7
--- country.c	5 Nov 2007 17:52:39 -0000	1.8
***************
*** 1,4 ****
--- 1,5 ----
  #include <string.h>
  #include <stdio.h>
+ #include <stdlib.h>
  #include <glib.h>
  #include <libintl.h>
***************
*** 112,116 ****
          case attr_label:
  		attr->u.str=gettext(country->name);
! 		this->attr_next=attr_id;
  		return 1;
  	case attr_country_id:
--- 113,117 ----
          case attr_label:
  		attr->u.str=gettext(country->name);
! 		this->attr_next=attr_country_id;
  		return 1;
  	case attr_country_id:
***************
*** 204,207 ****
--- 205,226 ----
  }
  
+ static struct attr country_default_attr;
+ static char iso2[3];
+ 
+ struct attr *
+ country_default(void)
+ {
+ 	char *lang;
+ 	if (country_default_attr.u.str)
+ 		return &country_default_attr;
+ 	lang=getenv("LANG");
+ 	if (!lang || strlen(lang) < 5)
+ 		return NULL;
+ 	strncpy(iso2, lang+3, 2);
+ 	country_default_attr.type=attr_country_iso2;
+ 	country_default_attr.u.str=iso2;
+ 	return &country_default_attr;
+ }
+ 
  void
  country_search_destroy(struct country_search *this)

Index: search.c
===================================================================
RCS file: /cvsroot/navit/navit/src/search.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** search.c	5 Nov 2007 09:22:05 -0000	1.7
--- search.c	5 Nov 2007 17:52:39 -0000	1.8
***************
*** 64,67 ****
--- 64,72 ----
  	switch(search_attr->type) {
  	case attr_country_all:
+ 	case attr_country_id:
+ 	case attr_country_iso2:
+ 	case attr_country_iso3:
+ 	case attr_country_car:
+ 	case attr_country_name:
  		level=0;
  		break;
***************
*** 80,84 ****
  		le=&this_->levels[level];
  		le->attr=*search_attr;
! 		le->attr.u.str=g_strdup(search_attr->u.str);
  		search_list_search_free(this_, level);
  		le->partial=partial;
--- 85,90 ----
  		le=&this_->levels[level];
  		le->attr=*search_attr;
! 		if (search_attr->type != attr_country_id)
! 			le->attr.u.str=g_strdup(search_attr->u.str);
  		search_list_search_free(this_, level);
  		le->partial=partial;

Index: country.h
===================================================================
RCS file: /cvsroot/navit/navit/src/country.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** country.h	5 Nov 2007 16:15:26 -0000	1.4
--- country.h	5 Nov 2007 17:52:39 -0000	1.5
***************
*** 11,16 ****
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this_);
! void country_search_destroy(struct country_search *this_);
  
  #ifdef __cplusplus
--- 11,18 ----
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this);
! struct attr *country_default(void);
! void country_search_destroy(struct country_search *this);
! /* end of prototypes */
  
  #ifdef __cplusplus

Index: track.c
===================================================================
RCS file: /cvsroot/navit/navit/src/track.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** track.c	9 Oct 2007 16:57:38 -0000	1.13
--- track.c	5 Nov 2007 17:52:39 -0000	1.14
***************
*** 83,93 ****
  tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr)
  {
! 	struct item *item=&_this->curr_line->street->item;
  	int result=0;
  	struct map_rect *mr=map_rect_new(item->map,NULL);
  	item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
! 	if (item_attr_get(item, attr_street_name, attr)){
  		result=1;
- 	}
  	map_rect_destroy(mr);
  	return result;
--- 83,97 ----
  tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr)
  {
! 	struct item *item;
  	int result=0;
+ 	if (! _this->curr_line || ! _this->curr_line->street)
+ 		return 0;
+ 	item=&_this->curr_line->street->item;
+ 	if (! item)
+ 		return 0;
  	struct map_rect *mr=map_rect_new(item->map,NULL);
  	item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
! 	if (item_attr_get(item, type, attr))
  		result=1;
  	map_rect_destroy(mr);
  	return result;

[Navit-cvs-commit] navit/src/gui/gtk destination.c,1.6,1.7

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

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

Modified Files:
	destination.c 
Log Message:
Made some reasonable defaults for country in destination dialog

Index: destination.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** destination.c	11 Aug 2007 08:02:47 -0000	1.6
--- destination.c	5 Nov 2007 17:52:39 -0000	1.7
***************
*** 10,13 ****
--- 10,15 ----
  #include "item.h"
  #include "coord.h"
+ #include "track.h"
+ #include "country.h"
  #include "search.h"
  
***************
*** 303,306 ****
--- 305,312 ----
  	int i;
  	struct search_param *search=&search_param;
+ 	struct attr search_attr, country_name, *country_attr;
+ 	struct tracking *tracking;
+ 	struct country_search *cs;
+ 	struct item *item;
  
  
***************
*** 396,399 ****
--- 402,414 ----
  	gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
  
+ 	country_attr=country_default();
+ 	tracking=navit_get_tracking(nav);
+ 	if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr)) 
+ 		country_attr=&search_attr;
+ 	cs=country_search_new(country_attr, 0);
+ 	item=country_search_get_item(cs);
+ 	if (item && item_attr_get(item, attr_country_name, &country_name)) 
+ 		gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str);
+ 	country_search_destroy(cs);
  	return 0;
  }

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

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

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

Modified Files:
	osm2navit.c 
Log Message:
Don't remove FILE *'s

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** osm2navit.c	5 Nov 2007 11:07:56 -0000	1.6
--- osm2navit.c	5 Nov 2007 17:41:29 -0000	1.7
***************
*** 1156,1159 ****
--- 1156,1162 ----
  }
  
+ #define TMPFILE1 "tmpfile1"
+ #define TMPFILE2 "tmpfile2"
+ 
  int main(int argc, char **argv)
  {
***************
*** 1207,1211 ****
  
  #if 1
! 	tmp1=fopen("tmpfile1","w+");
  	fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
  	phase1(stdin,tmp1);
--- 1210,1214 ----
  
  #if 1
! 	tmp1=fopen(TMPFILE1,"w+");
  	fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
  	phase1(stdin,tmp1);
***************
*** 1217,1222 ****
  	load_buffer("coords",&node_buffer);
  #endif
! 	tmp1=fopen("tmpfile1","r");
! 	tmp2=fopen("tmpfile2","w+");
  	fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n");
  	phase2(tmp1,tmp2);
--- 1220,1225 ----
  	load_buffer("coords",&node_buffer);
  #endif
! 	tmp1=fopen(TMPFILE1,"r");
! 	tmp2=fopen(TMPFILE2,"w+");
  	fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n");
  	phase2(tmp1,tmp2);
***************
*** 1224,1228 ****
  	fclose(tmp1);
  	if(!keep_tmpfiles)
! 		remove(tmp1);
  	free(node_buffer.base);
  	node_buffer.base=NULL;
--- 1227,1231 ----
  	fclose(tmp1);
  	if(!keep_tmpfiles)
! 		remove(TMPFILE1);
  	free(node_buffer.base);
  	node_buffer.base=NULL;
***************
*** 1230,1238 ****
  	node_buffer.size=0;
  	fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n");
! 	tmp2=fopen("tmpfile2","r");
  	phase3(tmp2);
  	fclose(tmp2);
  	if(!keep_tmpfiles)
! 		remove(tmp2);
  	fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
  	phase4(stdout);
--- 1233,1241 ----
  	node_buffer.size=0;
  	fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n");
! 	tmp2=fopen(TMPFILE2,"r");
  	phase3(tmp2);
  	fclose(tmp2);
  	if(!keep_tmpfiles)
! 		remove(TMPFILE2);
  	fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
  	phase4(stdout);

[Navit-cvs-commit] navit/src navit.xml,1.14,1.15

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

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

Modified Files:
	navit.xml 
Log Message:
Add comment - what formats are accepted for center coordinates

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** navit.xml	4 Nov 2007 17:24:47 -0000	1.14
--- navit.xml	5 Nov 2007 17:02:45 -0000	1.15
***************
*** 6,9 ****
--- 6,16 ----
  </plugins>
  <debug name="navit:do_draw" level="0" />
+ <!--
+ Center coordinates format:
+ [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W 
+ [-][D]D.d[d]... [-][D][D]D.d[d]... 
+ [-]0xX [-]0xX 
+ Change to your home coordinates.
+ -->
  <navit center="4808 N 1134 E" zoom="256" >
  	<gui type="gtk" />

[Navit-cvs-commit] navit/src/gui/sdl sdl_events.cpp, 1.8, 1.9 sdl_events.h, 1.3, 1.4

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

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

Modified Files:
	sdl_events.cpp sdl_events.h 
Log Message:
Worked on a default value for country

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sdl_events.cpp	26 Oct 2007 16:34:25 -0000	1.8
--- sdl_events.cpp	5 Nov 2007 16:19:20 -0000	1.9
***************
*** 1,4 ****
--- 1,5 ----
  #include "CEGUI.h"
  #include "sdl_events.h"
+ #include "gui_sdl.h"
  
  #include <CEGUI/RendererModules/OpenGLGUIRenderer/openglrenderer.h>
***************
*** 8,16 ****
  #include "item.h"
  #include "navit.h"
! 
! #include "coord.h"
! 
! // Theses are needed for searches
  #include "search.h"
  
  // Library for window switching (-> nGhost)
--- 9,18 ----
  #include "item.h"
  #include "navit.h"
! #include "debug.h"
! #include "track.h"
  #include "search.h"
+ #include "coord.h"
+ #include "country.h"
+ #include "string.h"
  
  // Library for window switching (-> nGhost)
***************
*** 245,249 ****
  
  void handle_destination_change(){
- 	// dbg(1,"Called handle_destination_change\n");
  
  	using namespace CEGUI;
--- 247,250 ----
***************
*** 391,395 ****
  
  	extern CEGUI::Window* myRoot;
- 
  	const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);
  	if(we.window->getParent()->getChild("DestinationWindow")->isVisible()){
--- 392,395 ----
***************
*** 401,404 ****
--- 401,465 ----
  		street_edit->setText("");
  		town_edit->activate();
+ 		
+ 		
+ 		// Code to get the current country and set it by default for the search
+ 		// FIXME : needs more work / testing
+ 		dbg(1,"Trying to find the current country\n");
+ 		struct tracking * tracking= navit_get_tracking(sdl_gui_navit);
+ 		if(tracking == NULL){
+ 			dbg(1,"Can't find the country for the current road. Falling back to $LANG\n");
+ 		} else {
+ 			dbg(1,"OK, trying to get attributes\n");
+ // 			tracking_get_current_attr(tracking, attr_country_id, &attr);
+ //			tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr)
+ 			struct attr attr,attr2;
+ 			tracking_get_current_attr(tracking,attr_country_id,&attr);
+ 			dbg(1,"OK, got attributes\n");
+ 
+ 			struct country_search *c_search=country_search_new(&attr, 0);
+ 			if(c_search){
+ 				dbg(1,"OK, got search\n");
+ 	
+ 				struct item *item=country_search_get_item(c_search);
+ 				if(item){
+ 					dbg(1,"OK, got item\n");
+ 					if(item_attr_get(item, attr_country_name, &attr2)){
+ 						dbg(1,"OK, got item_attr_get : %s\n",attr2.u.str);
+ 					}
+ 				} else {
+ 					dbg(1,"Item is null, fallback to LC_LANG\n");
+ 				}
+ 			}
+ 			
+    			country_search_destroy(c_search);
+ 		}
+ 		dbg(1,"Done with country selection\n");
+ 
+ 		/*
+ 		// This code should 'guess' your country based upon your locale settings.
+ 		// useful if nothing else worked
+ 		char * lc_lang;
+ 		lc_lang = getenv ("LANG");
+ 		if (lc_lang!=NULL){
+ 			char lang_code [3];
+ 			strncpy(lang_code, lc_lang+3, 2);
+ 			lang_code[2]='\0';
+ 			dbg(0,"LC_LANG = %s -> %s\n",lc_lang,lang_code);
+ 
+ 			struct search_param *search=&search_param;
+ 			struct search_list_result *res;
+ 			search->attr.type=attr_country_iso2;
+ 			search->attr.u.str=lang_code;
+ 			dbg(0,"launching iso2 search\n");	
+ 			search_list_search(search->sl, &search->attr, 1);
+ 			dbg(0,"got result. ready to parse\n");
+  			while((res=search_list_get_result(search->sl))) {
+  				dbg(0," got country : \n",res->country->name);
+  			}
+ 			dbg(0,"done parsing\n");
+ 		}
+ 
+ 		*/
+ 
  		SDL_dest.current_search=SRCH_COUNTRY;
  		MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("DestinationWindow/Listbox"));
***************
*** 407,411 ****
  	}
  
! 	extern struct navit *sdl_gui_navit;
  
  	if(sdl_gui_navit){	
--- 468,472 ----
  	}
  
! // 	extern struct navit *sdl_gui_navit;
  
  	if(sdl_gui_navit){	

Index: sdl_events.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sdl_events.h	26 Oct 2007 16:34:25 -0000	1.3
--- sdl_events.h	5 Nov 2007 16:19:20 -0000	1.4
***************
*** 9,12 ****
--- 9,13 ----
  #define SRCH_NUMBER 4
  
+ 
  bool handleItemSelect(int r);
  bool ItemSelect(const CEGUI::EventArgs& event);

[Navit-cvs-commit] navit/src country.h,1.3,1.4

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

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

Modified Files:
	country.h 
Log Message:
Made country.h C++ compliant

Index: country.h
===================================================================
RCS file: /cvsroot/navit/navit/src/country.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** country.h	9 Oct 2007 16:44:05 -0000	1.3
--- country.h	5 Nov 2007 16:15:26 -0000	1.4
***************
*** 2,5 ****
--- 2,9 ----
  #define NAVIT_COUNTRY_H
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /* prototypes */
  struct attr;
***************
*** 7,12 ****
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this);
! void country_search_destroy(struct country_search *this);
  
  #endif
--- 11,20 ----
  struct item;
  struct country_search *country_search_new(struct attr *search, int partial);
! struct item *country_search_get_item(struct country_search *this_);
! void country_search_destroy(struct country_search *this_);
! 
! #ifdef __cplusplus
! }
! #endif
  
  #endif

[Navit-cvs-commit] navit/src/data Makefile.am,1.5,1.6

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

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

Modified Files:
	Makefile.am 
Log Message:
Comment out the garmin_img driver

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	25 Oct 2007 09:34:15 -0000	1.5
--- Makefile.am	5 Nov 2007 15:35:59 -0000	1.6
***************
*** 1,5 ****
! SUBDIRS=mg textfile garmin_img poi_geodownload binfile
  if HAVELIBGARMIN
  SUBDIRS+=garmin
  endif
  
--- 1,8 ----
! SUBDIRS=mg textfile poi_geodownload binfile
! #  garmin_img
  if HAVELIBGARMIN
  SUBDIRS+=garmin
  endif
  
+ DIST_SUBDIRS=mg textfile poi_geodownload binfile garmin
+ 

[Navit-cvs-commit] navit configure.in,1.48,1.49

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

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

Modified Files:
	configure.in 
Log Message:
Comment out the garmin_img driver

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** configure.in	5 Nov 2007 10:56:43 -0000	1.48
--- configure.in	5 Nov 2007 15:35:58 -0000	1.49
***************
*** 369,373 ****
  src/data/binfile/Makefile
  src/data/garmin/Makefile
- src/data/garmin_img/Makefile
  src/data/poi_geodownload/Makefile
  src/data/poi_geodownload/libmdb/Makefile
--- 369,372 ----
***************
*** 395,398 ****
--- 394,398 ----
  po/Makefile
  ])
+ #src/data/garmin_img/Makefile
  
  AC_OUTPUT

[Navit-cvs-commit] navit/src attr.h,1.9,1.10

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

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

Modified Files:
	attr.h 
Log Message:
Fixed a warning

Index: attr.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** attr.h	28 Oct 2007 11:00:52 -0000	1.9
--- attr.h	5 Nov 2007 15:18:14 -0000	1.10
***************
*** 35,38 ****
--- 35,41 ----
  struct attr *attr_new_from_text(const char *name, const char *value);
  struct attr *attr_search(struct attr **attrs, struct attr *last, enum attr_type attr);
+ int attr_data_size(struct attr *attr);
+ void *attr_data_get(struct attr *attr);
+ void attr_data_set(struct attr *attr, void *data);
  void attr_free(struct attr *attr);
  /* end of prototypes */