navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src navit.c,1.28,1.29

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

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

Modified Files:
	navit.c 
Log Message:
Bugfix for empty roadbook when destination is set before position

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** navit.c	4 Oct 2007 10:19:40 -0000	1.28
--- navit.c	4 Oct 2007 16:37:18 -0000	1.29
***************
*** 385,388 ****
--- 385,390 ----
  	if (this_->route) {
                  route_set_destination(this_->route, c);
+ 		if (this_->navigation) 
+ 			navigation_update(this_->navigation, this_->route);
                  navit_draw(this_);
          }

[Navit-cvs-commit] navit/src navit.c,1.27,1.28

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

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

Modified Files:
	navit.c 
Log Message:
Query navigation list when opening roadbook window

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** navit.c	7 Sep 2007 12:04:57 -0000	1.27
--- navit.c	4 Oct 2007 10:19:40 -0000	1.28
***************
*** 601,604 ****
--- 601,605 ----
  	navigation_register_callback(this_->navigation, navigation_mode_long, this_->roadbook_callback);
  	this_->roadbook_window=gui_datawindow_new(this_->gui, "Roadbook", NULL, callback_new_1(callback_cast(navit_window_roadbook_destroy), this_));
+ 	navit_window_roadbook_update(this_);
  }
  

[Navit-cvs-commit] navit/src debug.h,1.8,1.9

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

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

Modified Files:
	debug.h 
Log Message:
Bugfix

Index: debug.h
===================================================================
RCS file: /cvsroot/navit/navit/src/debug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** debug.h	16 Jul 2007 20:22:41 -0000	1.8
--- debug.h	3 Oct 2007 20:36:54 -0000	1.9
***************
*** 4,8 ****
  
  #include <stdarg.h>
! int debug_level;
  #define dbg(level,fmt...) ({ if (debug_level >= level) debug_printf(level,MODULE,__PRETTY_FUNCTION__,1,fmt); })
  
--- 4,8 ----
  
  #include <stdarg.h>
! extern int debug_level;
  #define dbg(level,fmt...) ({ if (debug_level >= level) debug_printf(level,MODULE,__PRETTY_FUNCTION__,1,fmt); })
  

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Bugfix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	3 Oct 2007 20:15:57 -0000	1.1
--- Makefile.am	3 Oct 2007 20:24:40 -0000	1.2
***************
*** 2,4 ****
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"data_binfile\"
  moduledata_LTLIBRARIES = libdata_binfile.la
! libdata_binfile_la_SOURCES = binfile.c binfile.h
--- 2,4 ----
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"data_binfile\"
  moduledata_LTLIBRARIES = libdata_binfile.la
! libdata_binfile_la_SOURCES = binfile.c

[Navit-cvs-commit] navit configure.in,1.30,1.31

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

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

Modified Files:
	configure.in 
Log Message:
First work on a binary driver

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure.in	3 Oct 2007 13:47:29 -0000	1.30
--- configure.in	3 Oct 2007 20:15:56 -0000	1.31
***************
*** 253,256 ****
--- 253,257 ----
  src/data/mg/Makefile
  src/data/textfile/Makefile
+ src/data/binfile/Makefile
  src/data/garmin_img/Makefile
  src/data/poi_geodownload/Makefile

[Navit-cvs-commit] navit/src Makefile.am,1.18,1.19 attr.c,1.7,1.8

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

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

Modified Files:
	Makefile.am attr.c 
Log Message:
First work on a binary driver

Index: attr.c
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** attr.c	29 Aug 2007 18:32:12 -0000	1.7
--- attr.c	3 Oct 2007 20:15:57 -0000	1.8
***************
*** 88,91 ****
--- 88,125 ----
  }
  
+ int
+ attr_data_size(struct attr *attr)
+ {
+ 	if (attr->type >= attr_type_string_begin && attr->type <= attr_type_string_end) {
+ 		return strlen(attr->u.str)+1;
+ 	}
+ 	if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) {
+ 		return sizeof(attr->u.num);
+ 	}
+ 	return 0;
+ }
+ 
+ void *
+ attr_data_get(struct attr *attr)
+ {
+ 	if (attr->type >= attr_type_string_begin && attr->type <= attr_type_string_end) {
+ 		return attr->u.str;
+ 	}
+ 	if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) {
+ 		return &attr->u.num;
+ 	}
+ }
+ 
+ void
+ attr_data_set(struct attr *attr, void *data)
+ {
+ 	if (attr->type >= attr_type_string_begin && attr->type <= attr_type_string_end) {
+ 		attr->u.str=data;
+ 	}
+ 	if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) {
+ 		attr->u.num=*((int *)data);
+ 	}
+ }
+ 
  void
  attr_free(struct attr *attr)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.am	3 Oct 2007 13:47:31 -0000	1.18
--- Makefile.am	3 Oct 2007 20:15:57 -0000	1.19
***************
*** 38,39 ****
--- 38,41 ----
  	mv maps/$(SAMPLE_MAP).txt.tmp maps/$(SAMPLE_MAP).txt
  
+ distclean-local:
+ 	rm -f maps/$(SAMPLE_MAP).osm

[Navit-cvs-commit] navit/src/data/binfile Makefile.am, NONE, 1.1 binfile.c, NONE, 1.1

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

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

Added Files:
	Makefile.am binfile.c 
Log Message:
First work on a binary driver

--- NEW FILE: binfile.c ---
#include <glib.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include "debug.h"
#include "plugin.h"
#include "projection.h"
#include "map.h"
#include "maptype.h"
#include "item.h"
#include "attr.h"
#include "coord.h"
#include "transform.h"
#include "file.h"

static int map_id;

struct map_priv {
	int id;
	char *filename;
	struct file *f;
};

struct map_rect_priv {
	int *start;
	int *pos;
	int *pos_coord_start;
	int *pos_coord;
	int *pos_attr_start;
	int *pos_attr;
	int *pos_next;
	int *end;
	enum attr_type attr_last;
        struct map_selection *sel;
        struct map_priv *m;
        struct item item;
};


static void
map_destroy_binfile(struct map_priv *m)
{
	dbg(1,"map_destroy_binfile\n");
	g_free(m);
}

static void
binfile_coord_rewind(void *priv_data)
{
	struct map_rect_priv *mr=priv_data;
	mr->pos_coord=mr->pos_coord_start;
}

static int
binfile_coord_get(void *priv_data, struct coord *c, int count)
{
	struct map_rect_priv *mr=priv_data;
	int ret=0;
	dbg(1,"binfile_coord_get %d\n",count);
	while (count--) {
		dbg(1,"%p vs %p\n", mr->pos_coord, mr->pos_attr_start);
		if (mr->pos_coord >= mr->pos_attr_start)
			break;
		c->x=*(mr->pos_coord++);
		c->y=*(mr->pos_coord++);
		c++;
		ret++;
	}
	return ret;
}

static void
binfile_attr_rewind(void *priv_data)
{
	struct map_rect_priv *mr=priv_data;
	mr->pos_attr=mr->pos_attr_start;
	
}

static int
binfile_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
{	
	struct map_rect_priv *mr=priv_data;
	enum attr_type type;
	int size;

	if (attr_type != mr->attr_last) {
		mr->pos_attr=mr->pos_attr_start;
		mr->attr_last=attr_type;
	}
	while (mr->pos_attr < mr->pos_next) {
		size=*(mr->pos_attr++);
		type=mr->pos_attr[0];
		if (type == attr_type || attr_type == attr_any) {
			if (attr_type == attr_any) {
				dbg(0,"pos %p attr %s size %d\n", mr->pos_attr-1, attr_to_name(type), size);
			}
			attr->type=type;
			attr_data_set(attr, mr->pos_attr+1);
			mr->pos_attr+=size;
			return 1;
		} else {
			mr->pos_attr+=size;
		}
	}
	return 0;
}

static struct item_methods methods_binfile = {
        binfile_coord_rewind,
        binfile_coord_get,
        binfile_attr_rewind,
        binfile_attr_get,
};

static struct map_rect_priv *
map_rect_new_binfile(struct map_priv *map, struct map_selection *sel)
{
	struct map_rect_priv *mr;

	dbg(1,"map_rect_new_binfile\n");
	mr=g_new0(struct map_rect_priv, 1);
	mr->m=map;
	mr->sel=sel;
	mr->start=mr->pos=mr->pos_next=map->f->begin;
	mr->end=map->f->end;
	mr->item.id_hi=0;
	mr->item.id_lo=0;
	mr->item.meth=&methods_binfile;
	mr->item.priv_data=mr;
	return mr;
}


static void
map_rect_destroy_binfile(struct map_rect_priv *mr)
{
        g_free(mr);
}

static void
setup_pos(struct map_rect_priv *mr)
{
	int size,coord_size;
	size=*(mr->pos++);
	mr->pos_next=mr->pos+size;
	mr->item.type=*(mr->pos++);
	coord_size=*(mr->pos++);
	mr->pos_coord_start=mr->pos_coord=mr->pos;
	mr->pos_attr_start=mr->pos_attr=mr->pos_coord+coord_size;
}



static struct item *
map_rect_get_item_binfile(struct map_rect_priv *mr)
{
	mr->pos=mr->pos_next;
	if (mr->pos >= mr->end)
		return NULL;
	mr->item.id_hi=0;
	mr->item.id_lo=mr->pos-mr->start;
	setup_pos(mr);
	return &mr->item;
}

static struct item *
map_rect_get_item_byid_binfile(struct map_rect_priv *mr, int id_hi, int id_lo)
{
	mr->pos=mr->start+id_lo;
	mr->item.id_hi=id_hi;
	mr->item.id_lo=id_lo;
	setup_pos(mr);
	return &mr->item;
}

static struct map_methods map_methods_binfile = {
	projection_mg,
	"utf-8",
	map_destroy_binfile,
	map_rect_new_binfile,
	map_rect_destroy_binfile,
	map_rect_get_item_binfile,
	map_rect_get_item_byid_binfile,
};

static struct map_priv *
map_new_binfile(struct map_methods *meth, struct attr **attrs)
{
	struct map_priv *m;
	struct attr *data=attr_search(attrs, NULL, attr_data);
	struct file_wordexp *wexp;
	char **wexp_data;
	if (! data)
		return NULL;

	wexp=file_wordexp_new(data->u.str);
	wexp_data=file_wordexp_get_array(wexp);
	dbg(1,"map_new_binfile %s\n", data->u.str);	
	*meth=map_methods_binfile;

	m=g_new0(struct map_priv, 1);
	m->id=++map_id;
	m->filename=g_strdup(wexp_data[0]);
	dbg(0,"file_create %s\n", m->filename);
	m->f=file_create(m->filename);
	file_wordexp_destroy(wexp);
	return m;
}

void
plugin_init(void)
{
	dbg(1,"binfile: plugin_init\n");
	plugin_register_map_type("binfile", map_new_binfile);
}


--- NEW FILE: Makefile.am ---
include $(top_srcdir)/Makefile.inc
AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"data_binfile\"
moduledata_LTLIBRARIES = libdata_binfile.la
libdata_binfile_la_SOURCES = binfile.c binfile.h

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

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

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

Modified Files:
	Makefile.am 
Log Message:
First work on a binary driver

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	3 Oct 2007 15:24:48 -0000	1.7
--- Makefile.am	3 Oct 2007 20:15:56 -0000	1.8
***************
*** 62,63 ****
--- 62,74 ----
  		fi; \
  	done
+ 
+ distclean-local:
+ 	for n in $(CATALOGS) __DuMmY ; do \
+ 		if test "$$n" -a "$$n" != "__DuMmY" ; then \
+ 			l=`basename $$n .mo`; \
+ 			rm -f ../locale/$$l/LC_MESSAGES/navit.mo; \
+ 			if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ 				rm -f $$l.po; \
+ 			fi;\
+ 		fi; \
+ 	done

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

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

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

Modified Files:
	Makefile.am 
Log Message:
First work on a binary driver

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	11 Aug 2007 08:02:31 -0000	1.3
--- Makefile.am	3 Oct 2007 20:15:57 -0000	1.4
***************
*** 1 ****
! SUBDIRS=mg textfile garmin_img poi_geodownload
--- 1 ----
! SUBDIRS=mg textfile garmin_img poi_geodownload binfile

[Navit-cvs-commit] navit/src/data/binfile - New directory

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

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

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

[Navit-cvs-commit] navit/po Makefile.am,1.6,1.7

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

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

Modified Files:
	Makefile.am 
Log Message:
Last fix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	3 Oct 2007 14:56:32 -0000	1.6
--- Makefile.am	3 Oct 2007 15:24:48 -0000	1.7
***************
*** 54,55 ****
--- 54,63 ----
  		fi; \
  	done
+ 
+ uninstall-local:
+ 	for n in $(CATALOGS) __DuMmY ; do \
+ 		if test "$$n" -a "$$n" != "__DuMmY" ; then \
+ 			l=`basename $$n .mo`; \
+ 			rm -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/navit.mo; \
+ 		fi; \
+ 	done

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Another try

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	3 Oct 2007 14:49:36 -0000	1.5
--- Makefile.am	3 Oct 2007 14:56:32 -0000	1.6
***************
*** 27,34 ****
  @POFILES@: navit.pot
  	if test "$(top_srcdir)" != "$(top_builddir)"; then \
! 		$(MSGMERGE) --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot \
  	else \
!         	$(MSGMERGE) --update --verbose $@ navit.pot \
!         fi; 
  
  
--- 27,34 ----
  @POFILES@: navit.pot
  	if test "$(top_srcdir)" != "$(top_builddir)"; then \
! 		$(MSGMERGE) --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot; \
  	else \
!         	$(MSGMERGE) --update --verbose $@ navit.pot; \
!         fi
  
  

[Navit-cvs-commit] navit/po Makefile.am,1.4,1.5

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

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

Modified Files:
	Makefile.am 
Log Message:
Another try

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	3 Oct 2007 14:42:37 -0000	1.4
--- Makefile.am	3 Oct 2007 14:49:36 -0000	1.5
***************
*** 29,34 ****
  		$(MSGMERGE) --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot \
  	else \
!         	$(MSGMERGE) --update --verbose $@ navit.pot
!         fi; \
  
  
--- 29,34 ----
  		$(MSGMERGE) --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot \
  	else \
!         	$(MSGMERGE) --update --verbose $@ navit.pot \
!         fi; 
  
  

[Navit-cvs-commit] navit/po Makefile.am,1.3,1.4

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

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

Modified Files:
	Makefile.am 
Log Message:
Another try

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	3 Oct 2007 14:36:00 -0000	1.3
--- Makefile.am	3 Oct 2007 14:42:37 -0000	1.4
***************
*** 26,30 ****
  
  @POFILES@: navit.pot
! 	$(MSGMERGE) --update --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot
  
  navit.pot: $(POTFILES)
--- 26,35 ----
  
  @POFILES@: navit.pot
! 	if test "$(top_srcdir)" != "$(top_builddir)"; then \
! 		$(MSGMERGE) --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot \
! 	else \
!         	$(MSGMERGE) --update --verbose $@ navit.pot
!         fi; \
! 
  
  navit.pot: $(POTFILES)

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Bugfix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	3 Oct 2007 13:47:31 -0000	1.2
--- Makefile.am	3 Oct 2007 14:36:00 -0000	1.3
***************
*** 26,33 ****
  
  @POFILES@: navit.pot
! 	if test "$(top_srcdir)" != "$(top_builddir)"; then \
! 		cp $(top_srcdir)/po/$@ $(top_builddir)/po/$@; \
! 	fi; \
! 	$(MSGMERGE) --update --verbose $@ navit.pot
  
  navit.pot: $(POTFILES)
--- 26,30 ----
  
  @POFILES@: navit.pot
! 	$(MSGMERGE) --update --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@ navit.pot
  
  navit.pot: $(POTFILES)

[Navit-cvs-commit] navit/src/gui/sdl/datafiles Makefile.am, 1.2, 1.3

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

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

Modified Files:
	Makefile.am 
Log Message:
Removed non-existing font

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	12 Sep 2007 12:35:53 -0000	1.2
--- Makefile.am	3 Oct 2007 14:14:23 -0000	1.3
***************
*** 2,6 ****
  
  CEGUIFONTSdir=$(pkgdatadir)/datafiles/fonts
! CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans-18.font fonts/DejaVuSans.ttf fonts/Font.xsd
  
  CEGUILAYOUTdir=$(pkgdatadir)/datafiles/layouts
--- 2,7 ----
  
  CEGUIFONTSdir=$(pkgdatadir)/datafiles/fonts
! # CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans-18.font fonts/DejaVuSans.ttf fonts/Font.xsd
! CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans.ttf fonts/Font.xsd
  
  CEGUILAYOUTdir=$(pkgdatadir)/datafiles/layouts
***************
*** 17,19 ****
  CEGUISCHEMES_DATA = schemes/GUIScheme.xsd schemes/Mineque.scheme schemes/TaharezLook.scheme
  
! EXTRA_DIST = $(CEGUIFONTS_DATA) $(CEGUILAYOUT_DATA) $(CEGUIIMAGESETS_DATA) $(CEGUILOOKNFEEL_DATA) $(CEGUISCHEMES_DATA)
\ No newline at end of file
--- 18,20 ----
  CEGUISCHEMES_DATA = schemes/GUIScheme.xsd schemes/Mineque.scheme schemes/TaharezLook.scheme
  
! EXTRA_DIST = $(CEGUIFONTS_DATA) $(CEGUILAYOUT_DATA) $(CEGUIIMAGESETS_DATA) $(CEGUILOOKNFEEL_DATA) $(CEGUISCHEMES_DATA)

[Navit-cvs-commit] navit/src/gui/sdl Makefile.am,1.6,1.7

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

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

Modified Files:
	Makefile.am 
Log Message:
Added missing variable

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	8 Jul 2007 18:07:14 -0000	1.6
--- Makefile.am	3 Oct 2007 13:57:01 -0000	1.7
***************
*** 1,3 ****
--- 1,4 ----
  include $(top_srcdir)/Makefile.inc
+ SUBDIRS=datafiles
  AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_sdl\"
  modulegui_LTLIBRARIES = libgui_sdl.la

[Navit-cvs-commit] navit/src Makefile.am, 1.17, 1.18 attr_def.h, 1.6, 1.7 main.c, 1.16, 1.17 navit.xml, 1.11, 1.12

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

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

Modified Files:
	Makefile.am attr_def.h main.c navit.xml 
Log Message:
Fixed installation, added sample map

Index: main.c
===================================================================
RCS file: /cvsroot/navit/navit/src/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** main.c	13 Jul 2007 11:48:10 -0000	1.16
--- main.c	3 Oct 2007 13:47:32 -0000	1.17
***************
*** 2,8 ****
--- 2,10 ----
  #include <stdlib.h>
  #include <stdio.h>
+ #include <string.h>
  #include <glib.h>
  #include <sys/types.h>
  #include <sys/wait.h>
+ #include <unistd.h>
  #include <libintl.h>
  #ifdef USE_GTK_MAIN_LOOP
***************
*** 78,81 ****
--- 80,85 ----
  	GError *error = NULL;
  	char *config_file = NULL;
+ 	char *s;
+ 	int l;
  
  	signal(SIGCHLD, sigchld);
***************
*** 86,93 ****
  	setlocale(LC_NUMERIC,"C");
  
! 	if (file_exists("navit.c")) {
  		printf(_("Running from source directory\n"));
  	}
!         bindtextdomain( "navit", "/usr/share/locale" );
  	textdomain( "navit" );
  
--- 90,128 ----
  	setlocale(LC_NUMERIC,"C");
  
! 	if (file_exists("navit.c") || file_exists("navit.o")) {
! 		char buffer[PATH_MAX];
  		printf(_("Running from source directory\n"));
+ 		getcwd(buffer, PATH_MAX);
+ 		setenv("NAVIT_PREFIX", buffer, 0);
+ 		setenv("NAVIT_LIBDIR", buffer, 0);
+ 		setenv("NAVIT_SHAREDIR", buffer, 0);
+ 		setenv("NAVIT_LIBPREFIX", "*/.libs/", 0);
+ 		s=g_strdup_printf("%s/../locale", buffer);	
+ 		setenv("NAVIT_LOCALEDIR", s, 0);
+ 		g_free(s);
+ 	} else {
+ 		if (!getenv("NAVIT_PREFIX")) {
+ 			l=strlen(argv[0]);
+ 			if (l > 10 && !strcmp(argv[0]+l-10,"/bin/navit")) {
+ 				s=g_strdup(argv[0]);
+ 				s[l-10]='\0';
+ 				if (strcmp(s, PREFIX)) 
+ 					printf(_("setting '%s' to '%s'\n"), "NAVIT_PREFIX", s);
+ 				setenv("NAVIT_PREFIX", s, 0);
+ 				g_free(s);
+ 			} else 
+ 				setenv("NAVIT_PREFIX", PREFIX, 0);
+ 		}
+ 		s=g_strdup_printf("%s/share/locale", getenv("NAVIT_PREFIX"));
+ 		setenv("NAVIT_LOCALEDIR", s, 0);
+ 		g_free(s);
+ 		s=g_strdup_printf("%s/share/navit", getenv("NAVIT_PREFIX"));
+ 		setenv("NAVIT_SHAREDIR", s, 0);
+ 		g_free(s);
+ 		s=g_strdup_printf("%s/lib/navit", getenv("NAVIT_PREFIX"));
+ 		setenv("NAVIT_LIBDIR", s, 0);
+ 		g_free(s);
  	}
!         bindtextdomain( "navit", getenv("NAVIT_LOCALEDIR"));
  	textdomain( "navit" );
  
***************
*** 100,114 ****
  #endif
  
  	if (argc > 1) 
  		config_file=argv[1];
! 	else {
  		config_file=g_strjoin(NULL,get_home_directory(), "/.navit/navit.xml" , NULL);
  		if (!file_exists(config_file)) {
! 			if (file_exists("navit.xml.local"))
! 				config_file="navit.xml.local";
! 			else
! 				config_file="navit.xml";
  		}
  	}
  	if (!config_load(config_file, &error)) {
  		g_error(_("Error parsing '%s': %s\n"), config_file, error->message);
--- 135,172 ----
  #endif
  
+ 	config_file=NULL;
  	if (argc > 1) 
  		config_file=argv[1];
! 	if (! config_file) {
  		config_file=g_strjoin(NULL,get_home_directory(), "/.navit/navit.xml" , NULL);
  		if (!file_exists(config_file)) {
! 			g_free(config_file);
! 			config_file=NULL;
! 			}
! 	}
! 	if (! config_file) {
! 		if (file_exists("navit.xml.local"))
! 			config_file="navit.xml.local";
! 	}
! 	if (! config_file) {
! 		if (file_exists("navit.xml"))
! 			config_file="navit.xml";
! 	}
! 	if (! config_file) {
! 		config_file=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/navit.xml.local" , NULL);
! 		if (!file_exists(config_file)) {
! 			g_free(config_file);
! 			config_file=NULL;
  		}
  	}
+ 	if (! config_file) {
+ 		config_file=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/navit.xml" , NULL);
+ 		if (!file_exists(config_file)) {
+ 			g_free(config_file);
+ 			config_file=NULL;
+ 		}
+ 	}
+ 	if (! config_file) 
+ 		g_error(_("No config file navit.xml or navit.xml.local found\n"));
  	if (!config_load(config_file, &error)) {
  		g_error(_("Error parsing '%s': %s\n"), config_file, error->message);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am	29 Aug 2007 18:41:04 -0000	1.17
--- Makefile.am	3 Oct 2007 13:47:31 -0000	1.18
***************
*** 2,6 ****
  SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
  
! AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DMODULE=\"navit\"
  
  
--- 2,8 ----
  SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
  
! 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\"
  
  
***************
*** 8,12 ****
  
  pkgdata_DATA = navit.xml
! EXTRA_DIST = navit.xml
  
  navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
--- 10,16 ----
  
  pkgdata_DATA = navit.xml
! maps_DATA=maps/$(SAMPLE_MAP).txt
! 
! EXTRA_DIST = navit.xml maps/$(SAMPLE_MAP).txt
  
  navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
***************
*** 23,24 ****
--- 27,39 ----
  navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ -Lfib-1.1 -lfib
  
+ 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
+ 

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** navit.xml	29 Aug 2007 21:56:05 -0000	1.11
--- navit.xml	3 Oct 2007 13:47:33 -0000	1.12
***************
*** 2,10 ****
  <!DOCTYPE navit SYSTEM "navit.dtd">
  <plugins>
! 	<plugin path="*/*/.libs/lib*.so" />
! 	<plugin path="graphics/null/.libs/libgraphics_null.so" active="no" />
  </plugins>
  <debug name="navit:do_draw" level="0" />
! <navit center="5031.51 N 735.83 E" zoom="8192" >
  	<gui type="gtk" />
  	<graphics type="gtk_drawing_area" />
--- 2,10 ----
  <!DOCTYPE navit SYSTEM "navit.dtd">
  <plugins>
! 	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" />
! 	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" />
  </plugins>
  <debug name="navit:do_draw" level="0" />
! <navit center="4808 N 1134 E" zoom="256" >
  	<gui type="gtk" />
  	<graphics type="gtk_drawing_area" />
***************
*** 45,49 ****
  	</navigation>
  	<speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" />
! 	<mapset>
  		<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map" />
  		<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp" />
--- 45,50 ----
  	</navigation>
  	<speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" />
! <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line -->
! 	<mapset enabled="no">
  		<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map" />
  		<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp" />
***************
*** 53,56 ****
--- 54,61 ----
  		<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp" />
  	</mapset>
+ <!-- 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>
  	<layout name="Tag">
  		<layer name="sea" details="0">

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** attr_def.h	3 Sep 2007 13:05:30 -0000	1.6
--- attr_def.h	3 Oct 2007 13:47:31 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  ATTR(label)
  ATTR(data)
+ ATTR(charset)
  ATTR(country_all)
  ATTR(country_iso3)

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Fixed installation, added sample map

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	28 Aug 2007 17:31:21 -0000	1.5
--- Makefile.am	3 Oct 2007 13:47:35 -0000	1.6
***************
*** 1,5 ****
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = camping.xpm car_dealer.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm hospital.xpm hotel.xpm parking.xpm restaurant.xpm unknown.xpm burgerking.ico
  EXTRA_DIST = $(xpm_DATA)
! burgerking.ico:
! 	wget http://www.burgerking.de/favicon.ico -O burgerking.ico
--- 1,5 ----
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = camping.xpm car_dealer.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm hospital.xpm hotel.xpm parking.xpm restaurant.xpm unknown.xpm
  EXTRA_DIST = $(xpm_DATA)
! #burgerking.ico:
! #	wget http://www.burgerking.de/favicon.ico -O burgerking.ico

[Navit-cvs-commit] navit/src/data/textfile textfile.c, 1.6, 1.7 textfile.h, 1.3, 1.4

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

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

Modified Files:
	textfile.c textfile.h 
Log Message:
Fixed installation, added sample map

Index: textfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** textfile.c	28 Aug 2007 17:31:17 -0000	1.6
--- textfile.c	3 Oct 2007 13:47:34 -0000	1.7
***************
*** 13,16 ****
--- 13,17 ----
  #include "coord.h"
  #include "transform.h"
+ #include "file.h"
  
  #include "textfile.h"
***************
*** 298,309 ****
  	struct map_priv *m;
  	struct attr *data=attr_search(attrs, NULL, attr_data);
  	if (! data)
  		return NULL;
  	dbg(1,"map_new_textfile %s\n", data->u.str);	
  	*meth=map_methods_textfile;
  
! 	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(data->u.str);
  	return m;
  }
--- 299,321 ----
  	struct map_priv *m;
  	struct attr *data=attr_search(attrs, NULL, attr_data);
+ 	struct attr *charset=attr_search(attrs, NULL, attr_charset);
+ 	struct file_wordexp *wexp;
+ 	char **wexp_data;
  	if (! data)
  		return NULL;
+ 
+ 	wexp=file_wordexp_new(data->u.str);
+ 	wexp_data=file_wordexp_get_array(wexp);
  	dbg(1,"map_new_textfile %s\n", data->u.str);	
  	*meth=map_methods_textfile;
  
! 	m=g_new0(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(wexp_data[0]);
! 	if (charset) {
! 		m->charset=g_strdup(charset->u.str);
! 		meth->charset=m->charset;
! 	}
! 	file_wordexp_destroy(wexp);
  	return m;
  }

Index: textfile.h
===================================================================
RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** textfile.h	8 Jul 2007 15:48:39 -0000	1.3
--- textfile.h	3 Oct 2007 13:47:35 -0000	1.4
***************
*** 5,8 ****
--- 5,9 ----
  	int id;
  	char *filename;
+ 	char *charset;
  };
  

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Fixed installation, added sample map

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/po/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	12 Jul 2007 19:35:41 -0000	1.1
--- Makefile.am	3 Oct 2007 13:47:31 -0000	1.2
***************
*** 7,16 ****
  
  POTFILES  = \
! 	$(top_builddir)/src/main.c \
! 	$(top_builddir)/src/navigation.c \
! 	$(top_builddir)/src/navit.c \
! 	$(top_builddir)/src/country.c \
! 	$(top_builddir)/src/gui/gtk/destination.c \
! 	$(top_builddir)/src/gui/gtk/gui_gtk_action.c
  
  
--- 7,16 ----
  
  POTFILES  = \
! 	$(top_srcdir)/src/main.c \
! 	$(top_srcdir)/src/navigation.c \
! 	$(top_srcdir)/src/navit.c \
! 	$(top_srcdir)/src/country.c \
! 	$(top_srcdir)/src/gui/gtk/destination.c \
! 	$(top_srcdir)/src/gui/gtk/gui_gtk_action.c
  
  
***************
*** 18,26 ****
  
  .po.mo: 
! 	$(MSGFMT) --check --verbose --statistics --output-file=$@ $<
  
  all: @MOFILES@
  
  @POFILES@: navit.pot
  	$(MSGMERGE) --update --verbose $@ navit.pot
  
--- 18,32 ----
  
  .po.mo: 
! 	dir=`basename $@ .mo` ;\
! 	$(MSGFMT) --check --verbose --statistics --output-file=$@ $< && \
! 	mkdir -p ../locale/$$dir/LC_MESSAGES && \
! 	cp $@ ../locale/$$dir/LC_MESSAGES/navit.mo
  
  all: @MOFILES@
  
  @POFILES@: navit.pot
+ 	if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ 		cp $(top_srcdir)/po/$@ $(top_builddir)/po/$@; \
+ 	fi; \
  	$(MSGMERGE) --update --verbose $@ navit.pot
  

[Navit-cvs-commit] navit/src/script osm2navit,1.1,1.2

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

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

Modified Files:
	osm2navit 
Log Message:
Fixed installation, added sample map

Index: osm2navit
===================================================================
RCS file: /cvsroot/navit/navit/src/script/osm2navit,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osm2navit	19 Jul 2007 09:20:27 -0000	1.1
--- osm2navit	3 Oct 2007 13:47:35 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  	return sprintf("%d%09.6f %s", $degi, $deg, $dir);
  }
+ 
  sub coord
  {
***************
*** 19,173 ****
  }
  
  while (<>) {
  	$line = $_;
  	chomp($line);
! 	#print "$line\n";
! 	if ($line =~ /<node id="(.*?)" lat="(.*?)" lon="(.*?)"/) {
! 		$lat{ $1 } = $2;
! 		$lon{ $1 } = $3;
  		%tag=();
! 	} elsif ($line =~ /<segment id="(.*?)" from="(.*?)" to="(.*?)"/) {
! 		$from{ $1 } = $2;
! 		$to{ $1 } = $3;
! 		$reference{ $1 } =0;
  		%tag=();
! 	} elsif ($line =~ /<tag k="(.*?)" v="(.*?)"/) {
! 		if ($1 ne "created_by" && $1 ne "converted_by") {
! 			$tag{ $1 } = $2;
  		}
! 	} elsif ($line =~ /<way id="(.*?)"/) {
  		%tag=();
  		$coords="";
  		$in_way=1;
! 		$way_id=$1;
  		$start='';
  		$end='';
! 	} elsif ($line =~ /<seg id="(.*?)"/) {
  		if ($in_way) {
! 			$from=coord($from{ $1 });
! 			$to=coord($to{ $1 });
! 			$reference{ $1 }++;
  			if ($start eq '') {
  				$start=$from;
  				$end=$to;
  				$coords="$start\n$end\n";
! 				$start="dummy";
! 				$end="dummy";
  			} else {
! 				if ($start == $from) {
  					$coords="$to\n" . $coords;
  					$start=$to;
! 				} elsif ($start == $to) {
  					$coords="$from\n" . $coords;
  					$start=$from;
! 				} elsif ($end == $from) {
  					$coords.=$to . "\n";
  					$end=$to;
! 				} elsif ($end == $to) {
  					$coords.=$from . "\n";
  					$end=$from;
  				} else {
  					push(@coords,$coords);
  					$start=$from;
  					$end=$to;
  					$coords="$start\n$end\n";
! 					$start="dummy";
! 					$end="dummy";
! 					# print STDERR "not connected from=$from to=$to coords=$coords \n";
  				}
  			}
  		}
! 	} elsif ($line =~ /<osm /) {
! 	} elsif ($line =~ /<?xml /) {
! 	} elsif ($line =~ /<\/node/) {
  		if (%tag) {
  			#print STDERR Dumper(\%tag);
  		}
! 	} elsif ($line =~ /<\/segment/) {
  		if (%tag) {
  			#print STDERR Dumper(\%tag);
  		}
! 	} elsif ($line =~ /<\/segment/) {
! 	} elsif ($line =~ /<\/way/) {
! 		$type='street_unkn';
! 		if ($tag{'highway'} ne '') {
! 			for ($tag{'highway'}) {
! 				if (/cycleway/ || /footway/ || /steps/ || /cyclepath/ || /track/ || /service/ || /pedestrian/) {
! 					$type='street_nopass';
! 				} elsif (/residential/ || /unclassified/) {
!                                 	$type='street_1_city';
! 				} elsif (/tertiary/) {
!                                 	$type='street_2_city';
! 				} elsif (/secondary/) {
!                                 	$type='street_3_city';
! 				} elsif (/primary/) {
!                                 	$type='street_4_city';
! 				} elsif (/motorway/) {
!                                 	$type='highway_city';
! 				} else {
! 					print STDERR "Unknown highway $_\n";
! 				}
! 
! 			}
! 		}
! 		if ($tag{'natural'} ne '') {
! 			for ($tag{'natural'}) {
! 				if (/water/) {
! 					$type='water_poly';
! 				} else {
! 					print STDERR "Unknown natural $_\n";
! 				}
! 
! 			}
! 		}
! 		if ($tag{'railway'} ne '') {
! 			for ($tag{'railway'}) {
! 				if (/rail/) {
! 					$type='rail';
! 				} else {
! 					print STDERR "Unknown railway $_\n";
! 				}
! 
! 			}
! 		}
! 		if ($tag{'waterway'} ne '') {
! 			for ($tag{'waterway'}) {
! 				if (/canal/) {
! 					$type='water_line';
! 				} else {
! 					print STDERR "Unknown waterway $_\n";
  				}
! 
! 			}
! 		}
! 		if ($tag{'amenity'} ne '') {
! 			for ($tag{'amenity'}) {
! 				if (/hospital/) {
! 					$type='hospital_poly';
! 				} elsif (/parking/) {
!                                 	$type='parking_lot_poly';
! 				} else {
! 					print STDERR "Unknown amenity $_\n";
  				}
! 
  			}
  		}
! 		if ($tag{'landuse'} ne '') {
! 			for ($tag{'landuse'}) {
! 				if (/cemetery/) {
! 					$type='cemetery_poly';
! 				} elsif (/forest/||/village_green/||/greenfield/||/farm/) {
!                                 	$type='wood';
! 				} elsif (/industrial/ || /residential/) {
!                                 	$type='industry_poly';
! 				} elsif (/parking/) {
!                                 	$type='parking_lot_poly';
! 				} elsif (/water/) {
!                                 	$type='water_poly';
! 				} else {
! 					print STDERR "Unknown landuse $_\n";
! 				}
! 
! 			}
  		}
  		$oline="type=$type";
--- 20,189 ----
  }
  
+ $types={
+ 	'amenity'=>{
+ 	},
+ 	'building'=>{
+ 	},
+ 	'highway'=>{
+ 		'cycleway' =>		'street_nopass',
+ 		'footway' => 		'street_nopass',
+ 		'steps' => 		'street_nopass',
+ 		'cyclepath' => 		'street_nopass',
+ 		'track' => 		'street_nopass',
+ 		'service' => 		'street_nopass',
+ 		'pedestrian' => 	'street_nopass',
+ 		'residential' =>	'street_1_city',
+ 		'unclassified' =>	'street_1_city',
+ 		'tertiary' =>		'street_2_city',
+ 		'secondary' => 		'street_3_city',
+ 		'primary' =>		'street_4_city',
+ 		'trunk' =>		'street_4_city',
+ 		'trunk_link' =>		'ramp',
+ 		'motorway' =>		'highway_city',
+ 		'motorway_link' =>	'ramp',
+ 	},
+ 	'landuse'=>{
+ 		'allotments' =>		'wood',
+ 		'cemetery' =>		'cemetery_poly',
+ 	},
+ 	'leisure'=>{
+ 		'park' => 		'park_poly',
+ 	},
+ 	'natural'=>{
+ 		'wood' =>		'wood',
+ 		'water' =>		'water_poly',
+ 	},
+ 	'place'=>{
+ 		'suburb' =>		'town_poly',
+ 	},
+ 	'railway'=>{
+ 		'rail' =>		'rail',
+ 		'subway' =>		'rail',
+ 		'tram' =>		'rail',
+ 	},
+ 	'waterway'=>{
+ 		'canal' =>		'water_line',
+ 		'river' =>		'water_line',
+ 		'weir' => 		'water_line',
+ 		'stream' => 		'water_line',
+ 		'drain' =>		'water_line',
+ 	},
+ };
+ 
  while (<>) {
  	$line = $_;
  	chomp($line);
! 	if ($line =~ /<(\/[^? ]+)>/) {
! 		$tag=$1;
! 	} elsif ($line =~ /<([^? ]+)(.*)/) {
! 		$tag=$1;
! 		$line = $2;
! 		%attr=();
! 		while ($line =~ / ([^'"=]+)=['"]([^'"]*)['"](.*)/) {
! 			$attr{$1}=$2;
! 			$line=$3;
! 		}
! 	} else {
! 		if ($line =~ /<\?xml/) {
! 			next;
! 		}
! 		print STDERR "Unknown $line\n";
! 		next;
! 	}
! 	#print "tag=$tag\n";
! 	if ($tag eq 'node') {
! 		$lat{$attr{'id'}} = $attr{'lat'};
! 		$lon{$attr{'id'}} = $attr{'lon'};
! 		$creference{$attr{'id'}} = 0;
  		%tag=();
! 	} elsif ($tag eq '/node') {
! 	} elsif ($tag eq 'segment') {
! 		$from{$attr{'id'}} = $attr{'from'};
! 		$to{$attr{'id'}} = $attr{'to'};
! 		$creference{$attr{'from'}}++;
! 		$creference{$attr{'to'}}++;
! 		$reference{$attr{'id'}} = 0;
  		%tag=();
! 	} elsif ($tag eq 'tag') {
! 		if ($attr{'k'} ne 'created_by' && $attr{'k'} ne 'converted_by') {
! 			$tag{$attr{'k'}}=$attr{'v'};
  		}
! 	} elsif ($tag eq 'way') {
  		%tag=();
  		$coords="";
  		$in_way=1;
! 		$way_id=$attr{'id'};
  		$start='';
  		$end='';
! 	} elsif ($tag eq 'seg') {
  		if ($in_way) {
! 			$from=coord($from{$attr{'id'}});
! 			$to=coord($to{$attr{'id'}});
! 			$reference{$attr{'id'}}++;
  			if ($start eq '') {
  				$start=$from;
  				$end=$to;
  				$coords="$start\n$end\n";
! 				#$start="dummy";
! 				#$end="dummy";
  			} else {
! 				if ($creference{$from{$attr{'id'}}} > 2 || $creference{$from{$attr{'id'}}} > 2) {
! 					$start="dummy";
! 					$end="dummy";
! 				}
! 				if ($start eq $from) {
  					$coords="$to\n" . $coords;
  					$start=$to;
! 				} elsif ($start eq $to) {
  					$coords="$from\n" . $coords;
  					$start=$from;
! 				} elsif ($end eq $from) {
  					$coords.=$to . "\n";
  					$end=$to;
! 				} elsif ($end eq $to) {
  					$coords.=$from . "\n";
  					$end=$from;
  				} else {
  					push(@coords,$coords);
+ 					#print STDERR "not connected from=$from to=$to start=$start end=$end\n";
  					$start=$from;
  					$end=$to;
  					$coords="$start\n$end\n";
! 					#$start="dummy";
! 					#$end="dummy";
! 					#exit(0);
  				}
  			}
  		}
! 	} elsif ($tag eq '/node') {
  		if (%tag) {
  			#print STDERR Dumper(\%tag);
  		}
! 	} elsif ($tag eq '/segment') {
  		if (%tag) {
  			#print STDERR Dumper(\%tag);
  		}
! 	} elsif ($tag eq '/way') {
! 		$type='';
! 		while (($key, $value) = each %$types) {
! 			if ($tag{$key} ne '') {
! 				$tagval=$tag{$key};
! 				$newtype=$types->{$key}->{$tagval};
! 				if ($newtype eq '') {
! 					$types->{$key}->{$tagval}='street_unkn';
! 					print STDERR "Unknown $key $tagval\n";
! 					$newtype='street_unkn';
  				}
! 				if ($type ne '') {
! 					print STDERR "conflict way $way_id\n";
! 					#print STDERR Dumper(\%tag);
  				}
! 				$type=$newtype;
  			}
  		}
! 		if ($type eq '') {
! 			print STDERR "Unknown way type:\n";
! 			print STDERR Dumper(\%tag);
! 			$type='street_unkn';
  		}
  		$oline="type=$type";
***************
*** 180,184 ****
  		}
  		$oline .= "\"\n";
! 		push(@coords,$coords);
  		foreach $coords (@coords) {
  			print $oline;
--- 196,202 ----
  		}
  		$oline .= "\"\n";
! 		if ($coords ne "") {
! 			push(@coords,$coords);
! 		}
  		foreach $coords (@coords) {
  			print $oline;
***************
*** 186,201 ****
  		}
  		@coords=();
! 	} elsif ($line =~ /<\/osm/) {
! 	} else {
! 		print "$line\n";
! 	}
! 	if ($count++ > 5) {
! 		#exit(0);
! 	}
! }
! while (($key,$value)=each(%reference)) {
! 	if ($value != 1) {
! 		print STDERR "$key $value\n";
  	}
  }
  
--- 204,217 ----
  		}
  		@coords=();
! 	} elsif ($tag ne 'osm' && $tag ne '/osm' && $tag ne 'bound') {
! 		print STDERR "Unknown $tag\n";
  	}
  }
+ #print STDERR Dumper($types);
+ 
+ #while (($key,$value)=each(%reference)) {
+ #	if ($value != 1) {
+ #		print STDERR "$key $value\n";
+ #	}
+ #}
  

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

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

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

Modified Files:
	map.c 
Log Message:
Fixed installation, added sample map

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** map.c	28 Aug 2007 17:31:16 -0000	1.4
--- map.c	3 Oct 2007 13:47:34 -0000	1.5
***************
*** 115,119 ****
  			break;
  		case file_border_ply:
! 		/* case file_bridge_ply: */
  		case file_build_ply: 
  		case file_golf_ply: 
--- 115,119 ----
  			break;
  		case file_border_ply:
! 		case file_bridge_ply:
  		case file_build_ply: 
  		case file_golf_ply: 

[Navit-cvs-commit] navit Makefile.inc, 1.5, 1.6 configure.in, 1.29, 1.30

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

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

Modified Files:
	Makefile.inc configure.in 
Log Message:
Fixed installation, added sample map

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/navit/navit/Makefile.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.inc	8 Jul 2007 16:42:06 -0000	1.5
--- Makefile.inc	3 Oct 2007 13:47:29 -0000	1.6
***************
*** 8,9 ****
--- 8,10 ----
  pkgdocdir=$(pkgdatadir)
  xpmdir=$(pkgdatadir)/xpm
+ mapsdir=$(pkgdatadir)/maps

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure.in	12 Sep 2007 10:36:00 -0000	1.29
--- configure.in	3 Oct 2007 13:47:29 -0000	1.30
***************
*** 210,214 ****
       PO=""
       if test "$LINGUAS" = ""; then
!            ling=` (cd po; /bin/ls *.po) `
    	   for l in $ling; do
  	        lcode=`basename $l .po`
--- 210,214 ----
       PO=""
       if test "$LINGUAS" = ""; then
!            ling=` (cd $srcdir/po; /bin/ls *.po) `
    	   for l in $ling; do
  	        lcode=`basename $l .po`

[Navit-cvs-commit] navit/src track.h,1.4,1.5

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

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

Modified Files:
	track.h 
Log Message:
Cosmetic change

Index: track.h
===================================================================
RCS file: /cvsroot/navit/navit/src/track.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** track.h	7 Sep 2007 12:04:57 -0000	1.4
--- track.h	2 Oct 2007 20:36:43 -0000	1.5
***************
*** 18,20 ****
  #ifdef __cplusplus
  }
! #endif
\ No newline at end of file
--- 18,20 ----
  #ifdef __cplusplus
  }
! #endif