navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src/xpm Makefile.am,1.15,1.16

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

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

Modified Files:
	Makefile.am 
Log Message:
Fix:Core:Added missing xpms

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	27 Feb 2008 22:27:48 -0000	1.15
--- Makefile.am	4 Apr 2008 12:25:49 -0000	1.16
***************
*** 2,6 ****
  xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm exit.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm flag_wh_bk.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm nav_left_1.xpm nav_left_2.xpm nav_right_1.xpm nav_right_2.xpm nav_straight.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
  xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm
! xpm_DATA += shopping.xpm
  EXTRA_DIST = $(xpm_DATA)
  #burgerking.ico:
--- 2,6 ----
  xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm exit.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm flag_wh_bk.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm nav_left_1.xpm nav_left_2.xpm nav_right_1.xpm nav_right_2.xpm nav_straight.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
  xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm
! xpm_DATA += shopping.xpm heliport.xpm cursor.xpm peak.xpm
  EXTRA_DIST = $(xpm_DATA)
  #burgerking.ico:

[Navit-cvs-commit] navit/src/xpm cursor.xpm,NONE,1.1

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

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

Added Files:
	cursor.xpm 
Log Message:
Add:Core:Added cursor.xpm from gtk gui

--- NEW FILE: cursor.xpm ---
/* XPM */
static char * cursor[] = {
"22 22 2 1",
"       c None",
".      c #0000FF",
"                      ",
"                      ",
"                      ",
"          ..          ",
"        ..  ..        ",
"      ..      ..      ",
"     .          .     ",
"     .          .     ",
"    .        ... .    ",
"    .     ... .  .    ",
"   .   ...   .    .   ",
"   . ..     .     .   ",
"    .      .     .    ",
"    .     .      .    ",
"     .   .      .     ",
"     .  .       .     ",
"      ..      ..      ",
"        ..  ..        ",
"          ..          ",
"                      ",
"                      ",
"                      "};

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

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

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

Modified Files:
	Makefile.am 
Log Message:
Add:graphics_qt_qpainter:New graphics driver


Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	4 Jul 2007 22:44:39 -0000	1.2
--- Makefile.am	4 Apr 2008 11:54:03 -0000	1.3
***************
*** 6,7 ****
--- 6,10 ----
    SUBDIRS+=opengl
  endif
+ if USE_GRAPHICS_QT_QPAINTER
+   SUBDIRS+=qt_qpainter
+ endif

[Navit-cvs-commit] navit configure.in,1.79,1.80

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

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

Modified Files:
	configure.in 
Log Message:
Add:graphics_qt_qpainter:New graphics driver


Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** configure.in	6 Mar 2008 19:24:29 -0000	1.79
--- configure.in	4 Apr 2008 11:53:58 -0000	1.80
***************
*** 110,113 ****
--- 110,124 ----
  AM_CONDITIONAL(PLUGINS, [test "x$plugins" = "xyes"])
  
+ AC_ARG_ENABLE(graphics-qt-qpainter, [  --disable-graphics-qt-qpainter             don't create graphics qt-qpainter], enable_graphics_qt_qpainter=$enableval, enable_graphics_qt_qpainter=yes)
+ if test "x${enable_graphics_qt_qpainter}" = "xyes" ; then
+ 	PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,enable_graphics_qt_qpainter=no);
+ fi
+ if test "x${enable_graphics_qt_qpainter}" = "xyes" ; then
+ 	AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
+ 	AC_SUBST(QT_GUI_CFLAGS)
+ 	AC_SUBST(QT_GUI_LIBS)
+ fi
+ AM_CONDITIONAL(USE_GRAPHICS_QT_QPAINTER, test "x${enable_graphics_qt_qpainter}" = "xyes")
+ 
  PKG_CHECK_MODULES(FREETYPE2, [freetype2], [freetype2_pkgconfig=yes], [freetype2_pkgconfig=no])
  if test "x$freetype2_pkgconfig" = "xyes"; then
***************
*** 471,474 ****
--- 482,486 ----
  src/graphics/opengl/Makefile
  src/graphics/null/Makefile
+ src/graphics/qt_qpainter/Makefile
  src/gui/Makefile
  src/gui/gtk/Makefile

[Navit-cvs-commit] navit/src/graphics/qt_qpainter Makefile.am, NONE, 1.1 graphics_qt_qpainter.cpp, NONE, 1.1

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

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

Added Files:
	Makefile.am graphics_qt_qpainter.cpp 
Log Message:
Add:graphics_qt_qpainter:New graphics driver


--- NEW FILE: graphics_qt_qpainter.cpp ---
#include <glib.h>
#include "config.h"
#include "point.h"
#include "graphics.h"
#include "color.h"
#include "debug.h"
#include "plugin.h"

#if 0
#define QWS
#define NO_DEBUG
#endif

#include <qglobal.h>

#if QT_VERSION < 0x040000
#include <qwidget.h>
#include <qapplication.h>
#include <qpainter.h>
#include <qpen.h>
#include <qbrush.h>
#include <qimage.h>
#include <qpixmap.h>
#include <qlistview.h>
#else
#include <QApplication>
#include <QGraphicsScene>
#include <QGraphicsView>
#include <QPainter>
#include <QPen>
#include <QBrush>
#include <QPixmap>
#include <QWidget>
#include <QPolygonF>
#include <QtGui>
#endif


class RenderArea : public QWidget
 {
 public:
     RenderArea(QWidget *parent = 0);
     QPixmap *pixmap;
     void (*resize_callback)(void *data, int w, int h);
     void *resize_callback_data;
     void (*motion_callback)(void *data, struct point *p);
     void *motion_callback_data;
     void (*button_callback)(void *data, int press, int button, struct point *p);
     void *button_callback_data;


 protected:
     QSize sizeHint() const;
     void paintEvent(QPaintEvent *event);
     void resizeEvent(QResizeEvent *event);
     void mouseEvent(int pressed, QMouseEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);

 };

RenderArea::RenderArea(QWidget *parent)
     : QWidget(parent)
 {
     pixmap = new QPixmap(800, 600);
 }

 QSize RenderArea::sizeHint() const
 {
     return QSize(800, 600);
 }

void RenderArea::paintEvent(QPaintEvent * event)
{
     QPainter painter(this);
     painter.drawPixmap(0, 0, *pixmap);
}

void RenderArea::resizeEvent(QResizeEvent * event)
{
	QSize size=event->size();
	delete pixmap;
	pixmap = new QPixmap(size);
	  if (this->resize_callback)
                (this->resize_callback)(this->resize_callback_data, size.width(), size.height());
}

void RenderArea::mouseEvent(int pressed, QMouseEvent *event)
{
	struct point p;
	if (!this->button_callback)
		return;
	p.x=event->x();
	p.y=event->y();
	switch (event->button()) {
	case Qt::LeftButton:
		(this->button_callback)(this->button_callback_data, pressed, 1, &p);
		break;
	case Qt::MidButton:
		(this->button_callback)(this->button_callback_data, pressed, 2, &p);
		break;
	case Qt::RightButton:
		(this->button_callback)(this->button_callback_data, pressed, 3, &p);
		break;
	default:
		break;
	}
}

void RenderArea::mousePressEvent(QMouseEvent *event)
{
	mouseEvent(1, event);
}

void RenderArea::mouseReleaseEvent(QMouseEvent *event)
{
	mouseEvent(0, event);
}

void RenderArea::mouseMoveEvent(QMouseEvent *event)
{
	struct point p;
	if (!this->motion_callback)
		return;
	p.x=event->x();
	p.y=event->y();
	(this->motion_callback)(this->motion_callback_data, &p);
}



static int dummy;

struct graphics_priv {
	QApplication *app;
	RenderArea *widget;
	QPainter *painter;
	struct graphics_gc_priv *background_gc;
	enum draw_mode_num mode;
};

static struct graphics_font_priv {
	int dummy;
} graphics_font_priv;

static struct graphics_gc_priv {
	QPen *pen;
	QBrush *brush;
} graphics_gc_priv;

static struct graphics_image_priv {
	QImage *image;
} graphics_image_priv;

static void
graphics_destroy(struct graphics_priv *gr)
{
}

static void font_destroy(struct graphics_font_priv *font)
{

}

static struct graphics_font_methods font_methods = {
	font_destroy
};

static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags)
{
	*meth=font_methods;
	return &graphics_font_priv;
}

static void
gc_destroy(struct graphics_gc_priv *gc)
{
}

static void
gc_set_linewidth(struct graphics_gc_priv *gc, int w)
{
	gc->pen->setWidth(w);
}

static void
gc_set_dashes(struct graphics_gc_priv *gc, int w, int offset, unsigned char *dash_list, int n)
{
}

static void
gc_set_foreground(struct graphics_gc_priv *gc, struct color *c)
{
#if QT_VERSION >= 0x040000
	QColor col(c->r >> 8, c->g >> 8, c->b >> 8, c->a >> 8); 
#else
	QColor col(c->r >> 8, c->g >> 8, c->b >> 8); 
#endif
	gc->pen->setColor(col);
	gc->brush->setColor(col);
}

static void
gc_set_background(struct graphics_gc_priv *gc, struct color *c)
{
}

static struct graphics_gc_methods gc_methods = {
	gc_destroy,
	gc_set_linewidth,
	gc_set_dashes,	
	gc_set_foreground,	
	gc_set_background	
};

static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics_gc_methods *meth)
{
	*meth=gc_methods;
	struct graphics_gc_priv *ret=g_new0(struct graphics_gc_priv, 1);
	ret->pen=new QPen();
	ret->brush=new QBrush(Qt::SolidPattern);
	return ret;
}


static struct graphics_image_priv *
image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot)
{
	struct graphics_image_priv *ret=g_new0(struct graphics_image_priv, 1);

	ret->image=new QImage(path);
	*w=ret->image->width();
	*h=ret->image->height();
	if (hot) {
		hot->x=*w/2;
		hot->y=*h/2;
	}
	return ret;
}

static void
draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
{
	int i;
#if QT_VERSION >= 0x040000
	QPolygon polygon;
#else
	QPointArray polygon;
#endif

	for (i = 0 ; i < count ; i++)
		polygon.putPoints(i, 1, p[i].x, p[i].y);
	gr->painter->setPen(*gc->pen);
	gr->painter->drawPolyline(polygon);
}

static void
draw_polygon(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
{
	int i;
#if QT_VERSION >= 0x040000
	QPolygon polygon;
#else
	QPointArray polygon;
#endif

	for (i = 0 ; i < count ; i++)
		polygon.putPoints(i, 1, p[i].x, p[i].y);
	gr->painter->setPen(*gc->pen);
	gr->painter->setBrush(*gc->brush);
	gr->painter->drawPolygon(polygon);
}

static void
draw_rectangle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int w, int h)
{
	gr->painter->fillRect(p->x,p->y, w, h, *gc->brush);
}

static void
draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int r)
{
	gr->painter->setPen(*gc->pen);
	gr->painter->drawArc(p->x-r, p->y-r, r*2, r*2, 0, 360*16);
	
}


static void
draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy)
{
	gr->painter->drawText(p->x, p->y, text);
}

static void
draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img)
{
	gr->painter->drawImage(p->x, p->y, *img->image);
}

static void
draw_image_warp(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, char *data)
{
}

static void
draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
{
}

static void
background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
{
	gr->background_gc=gc;
}

static void
draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
{
	dbg(0,"mode=%d\n", mode);
	if (mode == draw_mode_begin) {
		gr->painter->begin(gr->widget->pixmap);
#if 0
		gr->painter->fillRect(QRect(QPoint(0,0), gr->widget->size()), *gr->background_gc->brush);
#endif
	}
#if QT_VERSION < 0x040000
	if (mode == draw_mode_cursor) {
		gr->painter->begin(gr->widget);
	}
#endif
	if (mode == draw_mode_end) {
		if (gr->mode == draw_mode_begin) {
			gr->painter->end();
			gr->widget->update();
		} else {
#if QT_VERSION < 0x040000
			gr->painter->end();
#endif
		}
	}
	gr->mode=mode;
}

static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h);

static int argc=1;
static char *argv[]={"navit",NULL};
static void *
get_data(struct graphics_priv *this_, char *type)
{
	if (strcmp(type, "window"))
		return NULL;
	this_->painter=new QPainter;
	this_->widget->show();
	return &dummy;
}



static void
register_resize_callback(struct graphics_priv *this_, void (*callback)(void *data, int w, int h), void *data)
{
	this_->widget->resize_callback=callback;
        this_->widget->resize_callback_data=data;
}

static void
register_motion_callback(struct graphics_priv *this_, void (*callback)(void *data, struct point *p), void *data)
{
	this_->widget->motion_callback=callback;
        this_->widget->motion_callback_data=data;
}

static void
register_button_callback(struct graphics_priv *this_, void (*callback)(void *data, int press, int button, struct point *p), void *data)
{
	this_->widget->button_callback=callback;
        this_->widget->button_callback_data=data;
}

static struct graphics_methods graphics_methods = {
	graphics_destroy,
	draw_mode,
	draw_lines,
	draw_polygon,
	draw_rectangle,
	draw_circle,
	draw_text,
	draw_image,
	draw_image_warp,
	draw_restore,
	font_new,
	gc_new,
	background_gc,
	overlay_new,
	image_new,
	get_data,
	register_resize_callback,
	register_button_callback,
	register_motion_callback,
};

static struct graphics_priv *
overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h)
{
	*meth=graphics_methods;
	return NULL;
}

#if QT_VERSION < 0x040000
static gboolean
graphics_qt_qpainter_idle(void *data)
{
	struct graphics_priv *gr=(struct graphics_priv *)data;
	gr->app->processOneEvent();
	return TRUE;
}
#endif


static struct graphics_priv *
graphics_qt_qpainter_new(struct graphics_methods *meth, struct attr **attrs)
{
	struct graphics_priv *ret=g_new0(struct graphics_priv, 1);
	*meth=graphics_methods;
	ret->app = new QApplication(argc, argv);
	ret->widget= new RenderArea();
#if QT_VERSION < 0x040000
	g_idle_add(graphics_qt_qpainter_idle, ret);
#endif
	
	return ret;
}

void
plugin_init(void)
{
        plugin_register_graphics_type("qt_qpainter", graphics_qt_qpainter_new);
}

--- NEW FILE: Makefile.am ---
include $(top_srcdir)/Makefile.inc
AM_CPPFLAGS = @QT_GUI_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=graphics_qt_qpainter
modulegraphics_LTLIBRARIES = libgraphics_qt_qpainter.la
libgraphics_qt_qpainter_la_SOURCES = graphics_qt_qpainter.cpp
libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@

[Navit-cvs-commit] navit/src/graphics/qt_qpainter - New directory

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

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

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

[Navit-cvs-commit] navit/src/gui/internal gui_internal.c,1.2,1.3

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

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

Modified Files:
	gui_internal.c 
Log Message:
Fix:gui_internal:Made gui_internal actually do something

Index: gui_internal.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/internal/gui_internal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gui_internal.c	1 Apr 2008 22:40:46 -0000	1.2
--- gui_internal.c	4 Apr 2008 11:52:04 -0000	1.3
***************
*** 18,31 ****
--- 18,278 ----
  #include "graphics.h"
  #include "transform.h"
+ #include "color.h"
  #include "config.h"
  
+ #define STATE_VISIBLE 1
+ #define STATE_SELECTED 2
+ #define STATE_HIGHLIGHTED 4
+ 
  struct gui_priv {
          struct navit *nav;
+ 	struct graphics *gra;
+ 	struct graphics_gc *background;
+ 	struct graphics_gc *highlight_background;
+ 	struct graphics_gc *foreground;
+ 	struct graphics_font *font;
+ 	int w,h;
+ 	int menu;
+ 	struct widget *widgets;
+ 	int widgets_count;
  };
  
+ struct widget {
+ 	int type;
+ 	char *text;
+ 	char *icon;
+ 	void (*func)(struct gui_priv *priv, struct widget *widget);
+ 	void *data;
+ 	int state;
+ 	struct point p;
+ 	int w,h;
+ };
+ 
+ static void
+ action_return(struct gui_priv *this, struct widget *wi)
+ {
+ 	this->menu=0;
+ 	wi->state &= ~STATE_HIGHLIGHTED;
+ 	navit_draw_displaylist(this->nav);
+ }
+ 
+ static void
+ action_zoom_in(struct gui_priv *this, struct widget *wi)
+ {
+ 	this->menu=0;
+ 	wi->state &= ~STATE_HIGHLIGHTED;
+ 	navit_zoom_in(this->nav,2,NULL);
+ }
+ 
+ static void
+ action_zoom_out(struct gui_priv *this, struct widget *wi)
+ {
+ 	this->menu=0;
+ 	wi->state &= ~STATE_HIGHLIGHTED;
+ 	navit_zoom_out(this->nav,2,NULL);
+ }
+ 
+ struct widget main_menu[] = {
+ 	{0, "Return", "xpm/unknown.xpm",action_return},
+ 	{0, "Ziel", "xpm/flag_bk_wh.xpm"},
+ 	{0, "Tour", "xpm/unknown.xpm" },
+ 	{0, "Fahrzeug", "xpm/cursor.xpm"},
+ 	{0, "Kartenpunkt", "xpm/unknown.xpm" },
+ 	{0, "Karte", "xpm/unknown.xpm",NULL,NULL,STATE_SELECTED},
+ 	{0, "Steckenliste", "xpm/unknown.xpm" },
+ 	{0, "Zoom In", "xpm/unknown.xpm",action_zoom_in},
+ 	{0, "Zoom Out", "xpm/unknown.xpm",action_zoom_out},
+ };
+ 
+ 
+ static void
+ gui_internal_draw_button(struct gui_priv *this, struct widget *wi)
+ {
+ 	struct point pnt[5];
+ 	struct graphics_image *img;
+ 	int th=10,tw=40,b=5;
+ 	pnt[0]=wi->p;
+ 	pnt[0].x+=1;
+ 	pnt[0].y+=1;
+ 	if (wi->state & STATE_HIGHLIGHTED) 
+ 		graphics_draw_rectangle(this->gra, this->highlight_background, &pnt, wi->w-1, wi->h-1);
+ 	else
+ 		graphics_draw_rectangle(this->gra, this->background, &pnt, wi->w-1, wi->h-1);
+ 	pnt[0]=wi->p;
+ 	pnt[0].x+=(wi->w-tw)/2;
+ 	pnt[0].y+=wi->h-th-b;
+ 	graphics_draw_text(this->gra, this->foreground, NULL, this->font, wi->text, &pnt[0], 0x10000, 0);
+ 
+ 	img=graphics_image_new(this->gra, wi->icon);	
+ 	pnt[0]=wi->p;
+ 	pnt[0].x+=wi->w/2-img->hot.x;
+ 	pnt[0].y+=(wi->h-th-b)/2-img->hot.y;
+ 	graphics_draw_image(this->gra, this->foreground, &pnt[0], img);
+ 	graphics_image_free(this->gra, img);
+ 
+ 	pnt[0]=wi->p;
+ 	pnt[1].x=pnt[0].x+wi->w;
+ 	pnt[1].y=pnt[0].y;
+ 	pnt[2].x=pnt[0].x+wi->w;
+ 	pnt[2].y=pnt[0].y+wi->h;
+ 	pnt[3].x=pnt[0].x;
+ 	pnt[3].y=pnt[0].y+wi->h;
+ 	pnt[4]=pnt[0];
+ 	if (wi->state & STATE_SELECTED) {
+ 		graphics_gc_set_linewidth(this->foreground, 4);
+ 		b=2;
+ 		pnt[0].x+=b;
+ 		pnt[0].y+=b;
+ 		pnt[1].x-=b-1;
+ 		pnt[1].y+=b;
+ 		pnt[2].x-=b-1;
+ 		pnt[2].y-=b-1;
+ 		pnt[3].x+=b;
+ 		pnt[3].y-=b-1;
+ 		pnt[4].x+=b;
+ 		pnt[4].y+=b;
+ 	}
+ 	graphics_draw_lines(this->gra, this->foreground, pnt, 5);
+ 	if (wi->state & STATE_SELECTED) 
+ 		graphics_gc_set_linewidth(this->foreground, 1);
+ }
+ 
+ static void
+ gui_internal_clear(struct gui_priv *this)
+ {
+ 	struct graphics *gra=this->gra;
+ 	struct point pnt;
+ 	pnt.x=0;
+ 	pnt.y=0;
+ 	dbg(0,"w=%d h=%d\n", this->w, this->h);
+ 	graphics_draw_rectangle(gra, this->background, &pnt, this->w, this->h);
+ }
+ 
+ static void
+ gui_internal_render_menu(struct gui_priv *this, int offset, struct widget *wi, int count)
+ {
+ 	struct graphics *gra=this->gra;
+ 	struct point pnt;
+ 	int w,h,x,y,i;
+ 
+ 	dbg(0,"menu\n");
+ 	w=this->w/4;
+ 	h=this->h/4;
+ 	for (i = 0 ; i < count ; i++)
+ 		wi[i].state&=~STATE_VISIBLE;
+ 	i=offset;
+ 	for (y = 0 ; y < this->h ; y+=h) {
+ 		for (x = 0 ; x < this->w ; x+=w) {
+ 			if (i < count) {
+ 				wi[i].p.x=x;
+ 				wi[i].p.y=y;
+ 				wi[i].w=w;
+ 				wi[i].h=h;
+ 				wi[i].state|=STATE_VISIBLE;
+ 				gui_internal_draw_button(this, &wi[i]);
+ 			}
+ 			i++;
+ 		}
+ 	}
+ 	this->widgets=wi;
+ 	this->widgets_count=count;
+ }
+ 
+ static void
+ gui_internal_highlight(struct gui_priv *this, struct point *p)
+ {
+ 	struct widget *wi,*found=NULL;
+ 	int i;
+ 
+ 	for (i = 0 ; i < this->widgets_count ; i++) {
+ 		wi=&this->widgets[i];
+ 		if (p && wi->state & STATE_VISIBLE && wi->p.x < p->x && wi->p.y < p->y && wi->p.x + wi->w > p->x && wi->p.y + wi->h > p->y)
+ 			found=wi;	
+ 		else
+ 			if (wi->state & STATE_HIGHLIGHTED) {
+ 				wi->state &= ~STATE_HIGHLIGHTED;
+ 				gui_internal_draw_button(this, wi);
+ 			}
+ 	}
+ 	if (! found)
+ 		return;
+ 	if (! (found->state & STATE_HIGHLIGHTED)) {
+ 		found->state |= STATE_HIGHLIGHTED;
+ 		gui_internal_draw_button(this, found);
+ 	}
+ }
+ 
+ static void
+ gui_internal_call_highlighted(struct gui_priv *this)
+ {
+ 	struct widget *wi;
+ 	int i;
+ 
+ 	for (i = 0 ; i < this->widgets_count ; i++) {
+ 		wi=&this->widgets[i];
+ 		if (wi->state & STATE_HIGHLIGHTED) {
+ 			if (wi->func)
+ 				wi->func(this, wi);
+ 		}
+ 	}
+ }
+ static void
+ gui_internal_motion(struct gui_priv *this, struct point *p)
+ {
+ 	if (!this->menu) 
+ 		navit_handle_motion(this->nav, p);
+ }
+ 
+ static void
+ gui_internal_button(struct gui_priv *this, int pressed, int button, struct point *p)
+ {
+ 	struct graphics *gra=this->gra;
+ 	struct point pnt;
+ 	if (!this->menu) {
+ 		if (!navit_handle_button(this->nav, pressed, button, p, NULL))
+ 			return;
+ 		this->menu++;
+ 		graphics_draw_mode(gra, draw_mode_begin);
+ 		gui_internal_clear(this);
+ 		gui_internal_render_menu(this, 0, main_menu, sizeof(main_menu)/sizeof(struct widget));
+ 		graphics_draw_mode(gra, draw_mode_end);
+ 		return;
+ 	}
+ 	if (pressed) {
+ 		graphics_draw_mode(gra, draw_mode_begin);
+ 		gui_internal_highlight(this, p);
+ 		graphics_draw_mode(gra, draw_mode_end);
+ 	} else {
+ 		graphics_draw_mode(gra, draw_mode_begin);
+ 		gui_internal_highlight(this, p);
+ 		graphics_draw_mode(gra, draw_mode_end);
+ 		gui_internal_call_highlighted(this);
+ 		if (this->menu) {
+ 			graphics_draw_mode(gra, draw_mode_begin);
+ 			gui_internal_highlight(this, NULL);
+ 			graphics_draw_mode(gra, draw_mode_end);
+ 		}
+ 	}
+ }
+ 
+ static void
+ gui_internal_resize(struct gui_priv *this, int w, int h)
+ {
+ 	this->w=w;
+ 	this->h=h;
+ 	dbg(0,"w=%d h=%d\n", w, h);
+ 	if (!this->menu)
+ 		navit_resize(this->nav, w, h);
+ } 
+ 
+ 
  static int
  gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra)
  {
  	void *graphics;
+ 	struct color cb={0x7fff,0x7fff,0x7fff,0xffff};
+ 	struct color cbh={0x9fff,0x9fff,0x9fff,0xffff};
+ 	struct color cf={0xbfff,0xbfff,0xbfff,0xffff};
+ 	struct transformation *trans=navit_get_trans(this->nav);
  	
  	dbg(0,"enter\n");
***************
*** 33,36 ****
--- 280,295 ----
          if (! graphics)
                  return 1;
+ 	this->gra=gra;
+ 	transform_get_size(trans, &this->w, &this->h);
+ 	graphics_register_resize_callback(gra, gui_internal_resize, this);
+ 	graphics_register_button_callback(gra, gui_internal_button, this);
+ 	graphics_register_motion_callback(gra, gui_internal_motion, this);
+ 	this->background=graphics_gc_new(gra);
+ 	graphics_gc_set_foreground(this->background, &cb);
+ 	this->highlight_background=graphics_gc_new(gra);
+ 	graphics_gc_set_foreground(this->highlight_background, &cbh);
+ 	this->foreground=graphics_gc_new(gra);
+ 	graphics_gc_set_foreground(this->foreground, &cf);
+ 	this->font=graphics_font_new(gra, 200, 1);
  	return 0;
  }

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.41, 1.42

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:graphics_gtk_drawing_area:Reorganized graphics a bit

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** graphics_gtk_drawing_area.c	31 Mar 2008 16:19:54 -0000	1.41
--- graphics_gtk_drawing_area.c	4 Apr 2008 10:48:31 -0000	1.42
***************
*** 635,642 ****
--- 635,644 ----
  	GtkWidget *widget=gr->widget;
  
+ #if 0
  	if (mode == draw_mode_begin) {
  		if (! gr->parent && gr->background_gc)
  			gdk_draw_rectangle(gr->drawable, gr->background_gc->gc, TRUE, 0, 0, gr->width, gr->height);
  	}
+ #endif
  	if (mode == draw_mode_end && gr->mode == draw_mode_begin) {
  		if (gr->parent) {

[Navit-cvs-commit] navit/src navit.c, 1.89, 1.90 transform.c, 1.19, 1.20 plugin_def.h, 1.8, 1.9 graphics.c, 1.38, 1.39

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

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

Modified Files:
	navit.c transform.c plugin_def.h graphics.c 
Log Message:
Fix:Core:Reorganized graphics a bit

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** graphics.c	24 Mar 2008 17:36:50 -0000	1.38
--- graphics.c	4 Apr 2008 10:44:03 -0000	1.39
***************
*** 575,578 ****
--- 575,581 ----
  {
  	int order=transform_get_order(trans);
+ 	struct point p;
+ 	p.x=0;
+ 	p.y=0;
  	// FIXME find a better place to set the background color
  	graphics_gc_set_background(gra->gc[0], l->color);
***************
*** 580,583 ****
--- 583,587 ----
  	gra->meth.background_gc(gra->priv, gra->gc[0]->priv);
  	gra->meth.draw_mode(gra->priv, draw_mode_begin);
+ 	gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &p, 32767, 32767);
  	xdisplay_draw(displaylist->dl, gra, l, order);
  	gra->meth.draw_mode(gra->priv, draw_mode_end);

Index: plugin_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/plugin_def.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** plugin_def.h	18 Dec 2007 19:36:57 -0000	1.8
--- plugin_def.h	4 Apr 2008 10:44:03 -0000	1.9
***************
*** 1,3 ****
- enum projection;
  struct attr;
  struct navit;
--- 1,2 ----

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** navit.c	18 Mar 2008 22:50:11 -0000	1.89
--- navit.c	4 Apr 2008 10:44:01 -0000	1.90
***************
*** 87,90 ****
--- 87,91 ----
  	struct callback *nav_speech_cb;
  	struct callback *roadbook_callback;
+ 	struct callback *popup_callback;
  	struct datawindow *roadbook_window;
  	struct map *bookmark;
***************
*** 159,163 ****
  		l=g_list_next(l);
  	}
- 	this_->ready=1;
  }
  
--- 160,163 ----
***************
*** 165,173 ****
  navit_draw_displaylist(struct navit *this_)
  {
! 	if (this_->ready)
  		graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current);
  }
  
! static void
  navit_resize(void *data, int w, int h)
  {
--- 165,173 ----
  navit_draw_displaylist(struct navit *this_)
  {
! 	if (this_->ready == 3)
  		graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current);
  }
  
! void
  navit_resize(void *data, int w, int h)
  {
***************
*** 178,185 ****
  	sel.u.p_rect.rl.y=h;
  	transform_set_screen_selection(this_->trans, &sel);
! 	navit_draw(this_);
  }
  
! static gboolean
  navit_popup(void *data)
  {
--- 178,187 ----
  	sel.u.p_rect.rl.y=h;
  	transform_set_screen_selection(this_->trans, &sel);
! 	this_->ready |= 2;
! 	if (this_->ready == 3)
! 		navit_draw(this_);
  }
  
! static void
  navit_popup(void *data)
  {
***************
*** 188,198 ****
  	this_->button_timeout=0;
  	this_->popped=1;
  	return FALSE;
  }
  
! static void
! navit_button(void *data, int pressed, int button, struct point *p)
  {
- 	struct navit *this_=data;
  	int border=16;
  
--- 190,207 ----
  	this_->button_timeout=0;
  	this_->popped=1;
+ }
+ 
+ 
+ static gboolean
+ navit_handle_button_timeout(void *data)
+ {
+ 	callback_call_0((struct callback *)data);
  	return FALSE;
  }
  
! 
! int
! navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback)
  {
  	int border=16;
  
***************
*** 204,208 ****
  			this_->moved=0;
  			this_->popped=0;
! 			this_->button_timeout=g_timeout_add(500, navit_popup, data);
  		}
  		if (button == 2)
--- 213,218 ----
  			this_->moved=0;
  			this_->popped=0;
! 			if (popup_callback)
! 				this_->button_timeout=g_timeout_add(500, navit_handle_button_timeout, popup_callback);
  		}
  		if (button == 2)
***************
*** 235,240 ****
  			p.y-=this_->last.y-this_->pressed.y;
  			navit_set_center_screen(this_, &p);
! 		}
  	}
  }
  
--- 245,261 ----
  			p.y-=this_->last.y-this_->pressed.y;
  			navit_set_center_screen(this_, &p);
! 		} else
! 			return 1;
  	}
+ 	return 0;
+ }
+ 
+ static void
+ navit_button(void *data, int pressed, int button, struct point *p)
+ {
+ 	struct navit *this=data;
+ 	if (! this->popup_callback)
+ 		this->popup_callback=callback_new_1(navit_popup, this);
+ 	navit_handle_button(this, pressed, button, p, this->popup_callback);
  }
  
***************
*** 258,265 ****
  }
  
! static void
! navit_motion(void *data, struct point *p)
  {
- 	struct navit *this_=data;
  	int dx, dy;
  
--- 279,285 ----
  }
  
! void
! navit_handle_motion(struct navit *this_, struct point *p)
  {
  	int dx, dy;
  
***************
*** 274,278 ****
  			this_->current=*p;
  			if (! this_->motion_timeout)
! 				this_->motion_timeout=g_timeout_add(100, navit_motion_timeout, data);
  		}
  	}
--- 294,298 ----
  			this_->current=*p;
  			if (! this_->motion_timeout)
! 				this_->motion_timeout=g_timeout_add(100, navit_motion_timeout, this_);
  		}
  	}
***************
*** 280,283 ****
--- 300,309 ----
  
  static void
+ navit_motion(void *data, struct point *p)
+ {
+ 	navit_handle_motion((struct navit *)data, p);
+ }
+ 
+ static void
  navit_scale(struct navit *this_, long scale, struct point *p)
  {
***************
*** 1060,1063 ****
--- 1086,1092 ----
  #endif
  	callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_);
+ 	this_->ready|=1;
+ 	if (this_->ready == 3)
+ 		navit_draw(this_);
  }
  
***************
*** 1077,1081 ****
  	}
  	*c=c2;
! 	if (this_->ready)
  		navit_draw(this_);
  }
--- 1106,1110 ----
  	}
  	*c=c2;
! 	if (this_->ready == 3)
  		navit_draw(this_);
  }
***************
*** 1096,1100 ****
  	transform_reverse(this_->trans, &p, &cnew);
  	*c=cnew;
! 	if (this_->ready)
  		navit_draw(this_);
  }
--- 1125,1129 ----
  	transform_reverse(this_->trans, &p, &cnew);
  	*c=cnew;
! 	if (this_->ready == 3)
  		navit_draw(this_);
  }
***************
*** 1353,1357 ****
  	int route_path_set=0;
  
! 	if (! this_->ready)
  		return;
  
--- 1382,1386 ----
  	int route_path_set=0;
  
! 	if (this_->ready != 3)
  		return;
  

Index: transform.c
===================================================================
RCS file: /cvsroot/navit/navit/src/transform.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** transform.c	28 Jan 2008 08:55:42 -0000	1.19
--- transform.c	4 Apr 2008 10:44:02 -0000	1.20
***************
*** 276,282 ****
  transform_get_size(struct transformation *t, int *width, int *height)
  {
! 	struct point_rect *r=&t->screen_sel->u.p_rect;
! 	*width=r->rl.x-r->lu.x;
! 	*height=r->rl.y-r->lu.y;
  }
  
--- 276,285 ----
  transform_get_size(struct transformation *t, int *width, int *height)
  {
! 	struct point_rect *r;
! 	if (t->screen_sel) {
! 		r=&t->screen_sel->u.p_rect;
! 		*width=r->rl.x-r->lu.x;
! 		*height=r->rl.y-r->lu.y;
! 	}
  }
  

[Navit-cvs-commit] navit/src/gui/internal gui_internal.c,1.1,1.2

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

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

Modified Files:
	gui_internal.c 
Log Message:
Fix:gui_internal:Fixed for new api

Index: gui_internal.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/internal/gui_internal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gui_internal.c	6 Mar 2008 19:24:30 -0000	1.1
--- gui_internal.c	1 Apr 2008 22:40:46 -0000	1.2
***************
*** 40,45 ****
  	NULL,
  	NULL,
- 	NULL,
- 	NULL,
          gui_internal_set_graphics,
  };
--- 40,43 ----

[Navit-cvs-commit] navit/src navigation.c,1.38,1.39

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

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

Modified Files:
	navigation.c 
Log Message:
Patch:core:Added patches from Bernhard Heibler for announcing street names

Index: navigation.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navigation.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** navigation.c	28 Feb 2008 19:30:09 -0000	1.38
--- navigation.c	31 Mar 2008 16:40:21 -0000	1.39
***************
*** 111,114 ****
--- 111,115 ----
  	int dest_time;
  	int dest_length;
+ 	int told;
  	struct navigation_itm *next;
  	struct navigation_itm *prev;
***************
*** 243,246 ****
--- 244,248 ----
  
  	if (ritem) {
+ 		ret->told=0;
  		if (! item_attr_get(ritem, attr_street_item, &street_item)) {
  			dbg(0,"no street item\n");
***************
*** 449,454 ****
--- 451,521 ----
  	}
  	if (cmd->itm->next) {
+ 		short tellStreetName = 0;
+ 		char  * streetName = 0;
+  
+ 		if(cmd->itm->name1 || cmd->itm->name2 || cmd->itm->item.type == type_ramp) // If the next street has a name
+ 		{
+ 		   if(cmd->itm->name1 && cmd->itm->name2 )
+ 					streetName = g_strdup_printf("%s %s", cmd->itm->name1, cmd->itm->name2);
+ 			 else if(cmd->itm->name1)
+ 		      streetName = g_strdup(cmd->itm->name1);
+ 		   else if(cmd->itm->name2)
+ 		      streetName = g_strdup(cmd->itm->name2);
+ 
+ 			 // Now special handling for ramps and exists
+ 			 
+ 		   if(streetName == 0 && cmd->itm->item.type == type_ramp)
+ 			 {
+ 			 		//printf(">> Next is ramp %lx current is %lx \n", cmd->itm->item.type, itm->item.type);
+ 			 
+ 			 		if(itm->item.type == type_ramp)
+ 			 			streetName = 0;  // looks like we stay on the ramp
+ 			 		if(itm->item.type == type_highway_city || itm->item.type == type_highway_land )
+ 				    streetName = g_strdup(_("exit"));				 
+ 					else
+ 				    streetName = g_strdup(_("ramp"));
+ 			 }
+ 
+ 		   if(type == attr_navigation_speech) // In voice mode
+ 		   {
+ 			 	 // In Voice Mode only tell the street name in level 1 or in level 0 if level 1
+ 				 // was skipped
+ 			 
+ 			   if (level == 1) // we are close to the intersection
+ 			   {
+ 			     cmd->itm->told = 1; // remeber to be checked when we turn
+ 		  	   tellStreetName = 1; // Ok so we tell the name of the street 
+ 			   }
+ 
+ 			   if (level == 0)
+ 				 {
+ 				  if(cmd->itm->told == 0) // we are write at the intersection
+ 						tellStreetName = 1; 
+ 					else
+ 					  cmd->itm->told = 0;  // reset just in case we come to the same street again
+ 				 }
+ 
+    	   }
+ 		   else
+ 		     tellStreetName = 1;
+ 		}
+ 
+ 		if(streetName && tellStreetName )
+ 		{
+ 		/* TRANSLATORS: The first argument is strength, the second direction and the third distance */
+ 	
+ 		if( strcasestr(streetName,"weg") 
+ 		   || strcasestr(streetName,"platz")
+ 		   || strcasestr(streetName,"ring"))
+ 		  ret=g_strdup_printf(_("Turn %1$s%2$s %3$s onto %4$s"), strength, dir, d, streetName);
+ 		else
+ 		   ret=g_strdup_printf(_("Turn %1$s%2$s %3$s into %4$s"), strength, dir, d, streetName);
+ 		}
+ 		else
  		/* TRANSLATORS: The first argument is strength, the second direction and the third distance */
  		ret=g_strdup_printf(_("Turn %1$s%2$s %3$s"), strength, dir, d);
+ 		
+ 		if(streetName)
+ 			g_free(streetName);
  	}
  	else

[Navit-cvs-commit] navit/po de.po,1.26,1.27

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

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

Modified Files:
	de.po 
Log Message:
Patch:core:Added patches from Bernhard Heibler for announcing street names

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** de.po	30 Mar 2008 20:33:54 -0000	1.26
--- de.po	31 Mar 2008 16:40:21 -0000	1.27
***************
*** 47,81 ****
  msgstr "Es wurde keine Instanz erzeugt, Ende\n"
  
! #: ../src/navigation.c:162
  #, c-format
  msgid "%d m"
  msgstr "%d Meter"
  
! #: ../src/navigation.c:164
  #, c-format
  msgid "in %d m"
  msgstr "In %d metern"
  
! #: ../src/navigation.c:168
  #, c-format
  msgid "%d meters"
  msgstr "%d Meter"
  
! #: ../src/navigation.c:170
  #, c-format
  msgid "in %d meters"
  msgstr "In %d metern"
  
! #: ../src/navigation.c:176
  #, c-format
  msgid "%d.%d kilometer"
  msgstr "%d,%d Kilometer"
  
! #: ../src/navigation.c:178
  #, c-format
  msgid "in %d.%d kilometers"
  msgstr "In %d,%d Kilometern"
  
! #: ../src/navigation.c:182
  #, c-format
  msgid "one kilometer"
--- 47,81 ----
  msgstr "Es wurde keine Instanz erzeugt, Ende\n"
  
! #: ../src/navigation.c:163
  #, c-format
  msgid "%d m"
  msgstr "%d Meter"
  
! #: ../src/navigation.c:165
  #, c-format
  msgid "in %d m"
  msgstr "In %d metern"
  
! #: ../src/navigation.c:169
  #, c-format
  msgid "%d meters"
  msgstr "%d Meter"
  
! #: ../src/navigation.c:171
  #, c-format
  msgid "in %d meters"
  msgstr "In %d metern"
  
! #: ../src/navigation.c:177
  #, c-format
  msgid "%d.%d kilometer"
  msgstr "%d,%d Kilometer"
  
! #: ../src/navigation.c:179
  #, c-format
  msgid "in %d.%d kilometers"
  msgstr "In %d,%d Kilometern"
  
! #: ../src/navigation.c:183
  #, c-format
  msgid "one kilometer"
***************
*** 84,88 ****
  msgstr[1] "%d Kilometer"
  
! #: ../src/navigation.c:184
  #, c-format
  msgid "in one kilometer"
--- 84,88 ----
  msgstr[1] "%d Kilometer"
  
! #: ../src/navigation.c:185
  #, c-format
  msgid "in one kilometer"
***************
*** 91,143 ****
  msgstr[1] "In %d Kilometern"
  
! #: ../src/navigation.c:404
  msgid "right"
  msgstr "rechts"
  
! #: ../src/navigation.c:411
  msgid "left"
  msgstr "links"
  
! #: ../src/navigation.c:415
  msgid "easily "
  msgstr "leicht "
  
! #: ../src/navigation.c:419
  msgid "strongly "
  msgstr "scharf "
  
! #: ../src/navigation.c:422
  msgid "unknown "
  msgstr "unbekannt "
  
  #
! #: ../src/navigation.c:428
  msgid "When possible, please turn around"
  msgstr "Wenn möglich bitte wenden"
  
! #: ../src/navigation.c:435
  #, c-format
  msgid "Follow the road for the next %s"
  msgstr "Dem Straßenverlauf %s folgen"
  
! #: ../src/navigation.c:439
  msgid "soon"
  msgstr "Demnächst"
  
! #: ../src/navigation.c:445
  msgid "now"
  msgstr "Jetzt"
  
! #: ../src/navigation.c:448
  msgid "error"
  msgstr "fehler"
  
  #. TRANSLATORS: The first argument is strength, the second direction and the third distance
! #: ../src/navigation.c:452
  #, c-format
  msgid "Turn %1$s%2$s %3$s"
  msgstr "%3$s %1$s%2$s abbiegen"
  
! #: ../src/navigation.c:455
  #, c-format
  msgid "You have reached your destination %s"
--- 91,161 ----
  msgstr[1] "In %d Kilometern"
  
! #: ../src/navigation.c:406
  msgid "right"
  msgstr "rechts"
  
! #: ../src/navigation.c:413
  msgid "left"
  msgstr "links"
  
! #: ../src/navigation.c:417
  msgid "easily "
  msgstr "leicht "
  
! #: ../src/navigation.c:421
  msgid "strongly "
  msgstr "scharf "
  
! #: ../src/navigation.c:424
  msgid "unknown "
  msgstr "unbekannt "
  
  #
! #: ../src/navigation.c:430
  msgid "When possible, please turn around"
  msgstr "Wenn möglich bitte wenden"
  
! #: ../src/navigation.c:437
  #, c-format
  msgid "Follow the road for the next %s"
  msgstr "Dem Straßenverlauf %s folgen"
  
! #: ../src/navigation.c:441
  msgid "soon"
  msgstr "Demnächst"
  
! #: ../src/navigation.c:447
  msgid "now"
  msgstr "Jetzt"
  
! #: ../src/navigation.c:450
  msgid "error"
  msgstr "fehler"
  
+ #: ../src/navigation.c:474
+ msgid "exit"
+ msgstr "Ausfahrt"
+ 
+ #: ../src/navigation.c:476
+ msgid "ramp"
+ msgstr "Autobahneinfahrt"
+ 
+ #: ../src/navigation.c:510
+ #, c-format
+ msgid "Turn %1$s%2$s %3$s onto %4$s"
+ msgstr "%3$s %1$s%2$s abbiegen auf den %4$s"
+ 
+ #: ../src/navigation.c:512
+ #, c-format
+ msgid "Turn %1$s%2$s %3$s into %4$s"
+ msgstr "%3$s %1$s%2$s abbiegen auf die %4$s"
+ 
  #. TRANSLATORS: The first argument is strength, the second direction and the third distance
! #: ../src/navigation.c:516
  #, c-format
  msgid "Turn %1$s%2$s %3$s"
  msgstr "%3$s %1$s%2$s abbiegen"
  
! #: ../src/navigation.c:522
  #, c-format
  msgid "You have reached your destination %s"

[Navit-cvs-commit] navit/src item_def.h, 1.30, 1.31 navit.xml, 1.49, 1.50 osm2navit.c, 1.69, 1.70

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

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

Modified Files:
	item_def.h navit.xml osm2navit.c 
Log Message:
Patch:core:Added patches from Christoph Eckert for better match of osm tags to navit items

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** item_def.h	31 Mar 2008 16:33:10 -0000	1.30
--- item_def.h	31 Mar 2008 16:35:22 -0000	1.31
***************
*** 287,290 ****
--- 287,313 ----
  ITEM(track_gravelled)
  ITEM(track_unpaved)
+ ITEM(track_ground)
+ ITEM(track_grass)
+ ITEM(rail_narrow_gauge)
+ ITEM(rail_light)
+ ITEM(rail_subway)
+ ITEM(rail_mono)
+ ITEM(rail_tram)
+ ITEM(rail_preserved)
+ ITEM(rail_disused)
+ ITEM(rail_abandoned)
+ ITEM(lift_cable_car)
+ ITEM(lift_chair)
+ ITEM(lift_drag)
+ ITEM(living_street)
+ ITEM(bus_guideway)
+ ITEM(street_construction)
+ ITEM(border_civil)
+ ITEM(border_political)
+ ITEM(border_national_park)
+ ITEM(water_river)
+ ITEM(water_canal)
+ ITEM(water_stream)
+ ITEM(water_drain)
  /* Area */
  ITEM2(0xc0000000,area)
***************
*** 324,325 ****
--- 347,398 ----
  ITEM(poly_terminal)
  ITEM(countryindex)
+ ITEM(poly_sports_centre)
+ ITEM(poly_sports_stadium)
+ ITEM(poly_sports_track)
+ ITEM(poly_sports_pitch)
+ ITEM(poly_water_park)
+ ITEM(poly_marina)
+ ITEM(poly_fishing)
+ ITEM(poly_theme_park)
+ ITEM(poly_attraction)
+ ITEM(poly_ruins)
+ ITEM(poly_archaeological_site)
+ ITEM(poly_artwork)
+ ITEM(poly_zoo)
+ ITEM(poly_camp_site)
+ ITEM(poly_caravan_site)
+ ITEM(poly_picnic_site)
+ ITEM(poly_playground)
+ ITEM(poly_allotments)
+ ITEM(poly_village_green)
+ ITEM(poly_recreation_ground)
+ ITEM(poly_common)
+ ITEM(poly_garden)
+ ITEM(poly_nature_reserve)
+ ITEM(poly_glacier)
+ ITEM(poly_scree)
+ ITEM(poly_fell)
+ ITEM(poly_heath)
+ ITEM(poly_marsh)
+ ITEM(poly_mud)
+ ITEM(poly_land)
+ ITEM(poly_beach)
+ ITEM(poly_quarry)
+ ITEM(poly_landfill)
+ ITEM(poly_retail)
+ ITEM(poly_commercial)
+ ITEM(poly_brownfield)
+ ITEM(poly_greenfield)
+ ITEM(poly_construction)
+ ITEM(poly_railway)
+ ITEM(poly_military)
+ ITEM(poly_airfield)
+ ITEM(poly_barracks)
+ ITEM(poly_danger_area)
+ ITEM(poly_range)
+ ITEM(poly_naval_base)
+ ITEM(poly_basin)
+ ITEM(poly_reservoir)
+ ITEM(poly_college)
+ ITEM(poly_battlefield)
+ 

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** osm2navit.c	31 Mar 2008 16:19:02 -0000	1.69
--- osm2navit.c	31 Mar 2008 16:35:23 -0000	1.70
***************
*** 120,138 ****
  	"w	aeroway=taxiway		aeroway_taxiway\n"
  	"w	aeroway=terminal	poly_terminal\n"
- 	"w	amenity=parking		poly_car_parking\n"
  	"w	highway=bridleway	bridleway\n"
  	"w	highway=cycleway	cycleway\n"
  	"w	highway=cyclepath	cycleway\n"
  	"w	highway=footway		footway\n"
  	"w	highway=steps		steps\n"
  	"w	highway=track		track_gravelled\n"
  	"w	highway=service		street_service\n"
  	"w	highway=pedestrian	street_pedestrian\n"
  	"w	highway=residential	street_1_city\n"
  	"w	highway=unclassified	street_1_city\n"
  	"w	highway=minor		street_1_land\n"
  	"w	highway=tertiary	street_2_city\n"
  	"w	highway=secondary	street_3_city\n"
- 	"w	highway=unsurfaced	track_gravelled\n"
  	"w	highway=primary		street_4_city\n"
  	"w	highway=primary_link	ramp\n"
--- 120,145 ----
  	"w	aeroway=taxiway		aeroway_taxiway\n"
  	"w	aeroway=terminal	poly_terminal\n"
  	"w	highway=bridleway	bridleway\n"
  	"w	highway=cycleway	cycleway\n"
  	"w	highway=cyclepath	cycleway\n"
+ 	"w	cycleway=track	cycleway\n"
  	"w	highway=footway		footway\n"
  	"w	highway=steps		steps\n"
+ 	"w	highway=unsurfaced	track_gravelled\n"
  	"w	highway=track		track_gravelled\n"
+ 	"w	highway=track,tracktype=grade1		track_paved\n"
+ 	"w	highway=track,tracktype=grade2		track_gravelled\n"
+ 	"w	highway=track,tracktype=grade3		track_unpaved\n"
+ 	"w	highway=track,tracktype=grade4		track_ground\n"
+ 	"w	highway=track,tracktype=grade5		track_grass\n"
  	"w	highway=service		street_service\n"
+ 	"w	highway=construction		street_construction\n"
  	"w	highway=pedestrian	street_pedestrian\n"
  	"w	highway=residential	street_1_city\n"
+ 	"w	highway=living_street		living_street\n"
  	"w	highway=unclassified	street_1_city\n"
  	"w	highway=minor		street_1_land\n"
  	"w	highway=tertiary	street_2_city\n"
  	"w	highway=secondary	street_3_city\n"
  	"w	highway=primary		street_4_city\n"
  	"w	highway=primary_link	ramp\n"
***************
*** 142,152 ****
  	"w	highway=motorway_link	ramp\n"
  	"w	historic=town gate	poly_building\n"
! 	"w	landuse=allotments	poly_wood\n"
  	"w	landuse=cemetery	poly_cemetery\n"
  	"w	landuse=forest		poly_wood\n"
  	"w	landuse=industrial	poly_industry\n"
  	"w	landuse=residential	poly_town\n"
  	"w	landuse=farm	poly_farm\n"
  	"w	leisure=park		poly_park\n"
  	"w	natural=wood		poly_wood\n"
  	"w	natural=water		poly_water\n"
--- 149,194 ----
  	"w	highway=motorway_link	ramp\n"
  	"w	historic=town gate	poly_building\n"
! 	"w	amenity=parking		poly_car_parking\n"
! 	"w	landuse=allotments	poly_allotments\n"
  	"w	landuse=cemetery	poly_cemetery\n"
+ 	"w	amenity=grave_yard	poly_cemetery\n"
  	"w	landuse=forest		poly_wood\n"
  	"w	landuse=industrial	poly_industry\n"
  	"w	landuse=residential	poly_town\n"
+ 	"w	amenity=college	poly_college\n"
+ 	"w	amenity=university	poly_university\n"
+ 	"w	tourism=camp_site	poly_camp_site\n"
+ 	"w	tourism=caravan_site	poly_caravan_site\n"
+ 	"w	tourism=picnic_site	poly_picnic_site\n"
+ 	"w	tourism=theme_park	poly_theme_park\n"
+ 	"w	tourism=attraction	poly_attraction\n"
+ 	"w	tourism=zoo	poly_zoo\n"
+ 	"w	tourism=artwork	poly_artwork\n"
+ 	"w	historic=archaeological_site	poly_archaeological_site\n"
+ 	"w	historic=ruins	poly_ruins\n"
+ 	"w	historic=battlefield	poly_battlefield\n"
+ 	"w	landuse=quarry	poly_quarry\n"
+ 	"w	landuse=landfill	poly_landfill\n"
+ 	"w	landuse=retail	poly_retail\n"
+ 	"w	landuse=commercial	poly_commercial\n"
+ 	"w	landuse=brownfield	poly_brownfield\n"
+ 	"w	landuse=greenfield	poly_greenfield\n"
+ 	"w	landuse=construction	poly_construction\n"
+ 	"w	landuse=railway	poly_railway\n"
+ 	"w	natural=glacier	poly_glacier\n"
+ 	"w	natural=scree	poly_scree\n"
+ 	"w	natural=scrub	poly_scrub\n"
+ 	"w	natural=fell	poly_fell\n"
+ 	"w	natural=heath	poly_heath\n"
+ 	"w	natural=marsh	poly_marsh\n"
+ 	"w	natural=mud	poly_mud\n"
+ 	"w	natural=beach	poly_beach\n"
+ 	"w	natural=land	poly_land\n"
+ 	"w	landuse=basin	poly_basin\n"
+ 	"w	landuse=reservoir	poly_reservoir\n"
  	"w	landuse=farm	poly_farm\n"
  	"w	leisure=park		poly_park\n"
+ 	"w	landuse=village_green		poly_village_green\n"
+ 	"w	landuse=recreation_ground		poly_recreation_ground\n"
  	"w	natural=wood		poly_wood\n"
  	"w	natural=water		poly_water\n"
***************
*** 154,171 ****
  	"w	place=suburb		poly_town\n"
  	"w	place=town		poly_town\n"
  	"w	power=line	powerline\n"
  	"w	railway=rail		rail\n"
! 	"w	railway=narrow_gauge	rail\n"
! 	"w	railway=subway		rail\n"
! 	"w	railway=tram		rail\n"
  	"w	leisure=golf_course	poly_golf_course\n"
! 	"w	waterway=canal		water_line\n"
! 	"w	waterway=river		water_line\n"
! 	"w	waterway=weir		water_line\n"
! 	"w	waterway=stream		water_line\n"
! 	"w	waterway=drain		water_line\n"
  	"w	waterway=riverbank	poly_water\n"
  	"w	boundary=administrative	border_country\n"
  	"w	route=ferry		ferry\n"
  };
  
--- 196,241 ----
  	"w	place=suburb		poly_town\n"
  	"w	place=town		poly_town\n"
+ 	"w	landuse=military	poly_military\n"
+ 	"w	military=airfield	poly_airfield\n"
+ 	"w	military=barracks	poly_barracks\n"
+ 	"w	military=danger_area	poly_danger_area\n"
+ 	"w	military=range	poly_range\n"
+ 	"w	military=naval_base	poly_naval_base\n"
  	"w	power=line	powerline\n"
  	"w	railway=rail		rail\n"
! 	"w	railway=narrow_gauge	rail_narrow_gauge\n"
! 	"w	railway=light_rail		rail_light\n"
! 	"w	railway=subway		rail_subway\n"
! 	"w	railway=tram		rail_tram\n"
! 	"w	railway=monorail		rail_mono\n"
! 	"w	railway=preserved		rail_preserved\n"
! 	"w	railway=disused		rail_disused\n"
! 	"w	railway=abandoned		rail_abandoned\n"
! 	"w	aerialway=cable_car		lift_cable_car\n"
! 	"w	aerialway=chair_lift		lift_chair\n"
! 	"w	aerialway=drag_lift		lift_drag\n"
  	"w	leisure=golf_course	poly_golf_course\n"
! 	"w	sport=*		poly_sport\n"
! 	"w	leisure=stadium		poly_sports_stadium\n"
! 	"w	leisure=track		poly_sports_track\n"
! 	"w	leisure=pitch		poly_sports_pitch\n"
! 	"w	leisure=water_park		poly_water_park\n"
! 	"w	leisure=marina		poly_marina\n"
! 	"w	leisure=fishing		poly_fishing\n"
! 	"w	leisure=garden		poly_garden\n"
! 	"w	leisure=common		poly_common\n"
! 	"w	leisure=playground		poly_playground\n"
! 	"w	leisure=nature_reserve		poly_nature_reserve\n"
! 	"w	waterway=canal		water_canal\n"
! 	"w	waterway=river		water_river\n"
! 	"w	waterway=stream		water_stream\n"
! 	"w	waterway=drain		water_drain\n"
  	"w	waterway=riverbank	poly_water\n"
  	"w	boundary=administrative	border_country\n"
+ 	"w	boundary=civil	border_civil\n"
+ 	"w	boundary=political	border_political\n"
+ 	"w	boundary=national_park	border_national_park\n"
  	"w	route=ferry		ferry\n"
+ 	"w	highway=bus_guideway		bus_guideway\n"
  };
  

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** navit.xml	31 Mar 2008 16:33:09 -0000	1.49
--- navit.xml	31 Mar 2008 16:35:22 -0000	1.50
***************
*** 1058,1061 ****
--- 1058,1065 ----
  				<polyline color="#ebb481" /> 
  			</item>
+ 			<item type="poly_park" order="0-">
+ 				<polygon color="#7cc334" /> 
+ 				<label label_size="5" /> 
+ 			</item>
  			<item type="poly_water" order="0-">
  				<polygon color="#82c8ea" /> 
***************
*** 1063,1068 ****
  				<label label_size="5" /> 
  			</item>
! 			<item type="poly_park" order="0-">
! 				<polygon color="#7cc334" /> 
  				<label label_size="5" /> 
  			</item>
--- 1067,1073 ----
  				<label label_size="5" /> 
  			</item>
! 			<item type="poly_land" order="0-">
! 				<polygon color="#ffefb7" /> 
! 				<polyline color="#ffefb7" /> 
  				<label label_size="5" /> 
  			</item>
***************
*** 1071,1075 ****
  			</item>
  			<item type="poly_sport" order="0-">
! 				<polygon color="#4af04f" /> 
  			</item>
  			<item type="poly_industry,poly_place" order="0-">
--- 1076,1080 ----
  			</item>
  			<item type="poly_sport" order="0-">
! 				<polygon color="#deb887" /> 
  			</item>
  			<item type="poly_industry,poly_place" order="0-">
***************
*** 1080,1084 ****
  			</item>
  			<item type="water_line" order="0-">
! 				<polyline color="#5096b8" width="1" /> 
  				<label label_size="5" /> 
  			</item>
--- 1085,1105 ----
  			</item>
  			<item type="water_line" order="0-">
! 				<polyline color="#82c8ea" width="2" /> 
! 				<label label_size="5" /> 
! 			</item>
! 			<item type="water_river" order="0-">
! 				<polyline color="#82c8ea" width="4" /> 
! 				<label label_size="5" /> 
! 			</item>
! 			<item type="water_canal" order="0-">
! 				<polyline color="#82c8ea" width="3" /> 
! 				<label label_size="5" /> 
! 			</item>
! 			<item type="water_stream" order="0-">
! 				<polyline color="#82c8ea" width="2" /> 
! 				<label label_size="5" /> 
! 			</item>
! 			<item type="water_drain" order="0-">
! 				<polyline color="#82c8ea" width="1" /> 
  				<label label_size="5" /> 
  			</item>
***************
*** 1095,1104 ****
  				<polygon color="#e7cf87" />
  			</item>
- 			<item type="rail" order="6-">
- 				<polyline color="#808080" width="3" /> 
- 			</item>
- 			<item type="ferry" order="5-">
- 				<polyline color="#000000" width="1" /> 
- 			</item>
  			<item type="border_country" order="0-">
  				<polyline color="#b8434e" width="1" /> 
--- 1116,1119 ----
***************
*** 1155,1219 ****
  				<polyline color="#000000" width="1" /> 
  			</item>
! 			<item type="track_paved" order="10-">
  				<polyline color="#d2d2d2" width="4" />
  				<polyline color="#fefefe" width="2" />
  			</item>
  			<item type="track_gravelled" order="10-">
! 				<polyline color="#d2d2d2" width="3" />
  				<polyline color="#fefefe" width="2" />
  			</item>
! 			<item type="track_unpaved" order="10-">
! 				<polyline color="#d2d2d2" width="2" />
! 				<polyline color="#fefefe" width="2" />
  			</item>
  			<item type="bridleway" order="10-">
! 				<polyline color="#d2d2d2" width="2" />
! 				<polyline color="#fefefe" width="2" />
  			</item>
  			<item type="cycleway" order="10-">
! 				<polyline color="#d2d2d2" width="3" />
! 				<polyline color="#fefefe" width="2" />
  			</item>
! 			<item type="footway" order="10-">
! 				<polyline color="#d2d2d2" width="2" />
! 				<polyline color="#fefefe" width="2" />
  			</item>
! 			<item type="steps" order="10-">
! 				<polyline color="#d2d2d2" width="1" />
! 				<polyline color="#fefefe" width="2" /> 
  			</item>
! 			<item type="street_pedestrian" order="10">
  				<polyline color="#d2d2d2" width="3" />
  				<polyline color="#dddddd" width="1" />
  			</item>
! 			<item type="street_pedestrian" order="11">
  				<polyline color="#d2d2d2" width="5" />
  				<polyline color="#dddddd" width="3" />
  			</item>
! 			<item type="street_pedestrian" order="12">
  				<polyline color="#d2d2d2" width="8" />
  				<polyline color="#dddddd" width="6" />
  			</item>
! 			<item type="street_pedestrian" order="13">
  				<polyline color="#d2d2d2" width="9" />
  				<polyline color="#dddddd" width="7" />
  			</item>
! 			<item type="street_pedestrian" order="14">
  				<polyline color="#d2d2d2" width="13" />
  				<polyline color="#dddddd" width="9" />
  			</item>
! 			<item type="street_pedestrian" order="15">
  				<polyline color="#d2d2d2" width="18" />
  				<polyline color="#dddddd" width="14" />
  			</item>
! 			<item type="street_pedestrian" order="16">
  				<polyline color="#d2d2d2" width="21" />
  				<polyline color="#dddddd" width="17" />
  			</item>
! 			<item type="street_pedestrian" order="17">
  				<polyline color="#d2d2d2" width="25" />
  				<polyline color="#dddddd" width="21" />
  			</item>
! 			<item type="street_pedestrian" order="18">
  				<polyline color="#d2d2d2" width="40" />
  				<polyline color="#dddddd" width="34" />
--- 1170,1240 ----
  				<polyline color="#000000" width="1" /> 
  			</item>
! 			<item type="track_paved" order="9-">
  				<polyline color="#d2d2d2" width="4" />
  				<polyline color="#fefefe" width="2" />
  			</item>
  			<item type="track_gravelled" order="10-">
! 				<polyline color="#dcdcdc" width="3" />
  				<polyline color="#fefefe" width="2" />
  			</item>
! 			<item type="track_unpaved" order="11-">
! 				<polyline color="#fff0f5" width="2" />
! 				<polyline color="#fff0f5" width="2" />
! 			</item>
! 			<item type="track_ground" order="12-">
! 				<polyline color="#fff0f5" width="3" />
! 				<polyline color="#fff0f5" width="2" />
! 			</item>
! 			<item type="track_grass" order="12-">
! 				<polyline color="#ffffe0" width="2" />
! 				<polyline color="#ffffe0" width="2" />
  			</item>
  			<item type="bridleway" order="10-">
! 				<polyline color="#8B5A2B" width="2" />
! 				<polyline color="#8B5A2B" width="2" />
  			</item>
  			<item type="cycleway" order="10-">
! 				<polyline color="#00BD00" width="3" />
! 				<polyline color="#00BD00" width="2" />
  			</item>
! 			<item type="footway" order="11-">
! 				<polyline color="#CD853F" width="2" />
  			</item>
! 			<item type="steps" order="11-">
! 				<polyline color="#CD853F" width="2" dash="5" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="10">
  				<polyline color="#d2d2d2" width="3" />
  				<polyline color="#dddddd" width="1" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="11">
  				<polyline color="#d2d2d2" width="5" />
  				<polyline color="#dddddd" width="3" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="12">
  				<polyline color="#d2d2d2" width="8" />
  				<polyline color="#dddddd" width="6" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="13">
  				<polyline color="#d2d2d2" width="9" />
  				<polyline color="#dddddd" width="7" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="14">
  				<polyline color="#d2d2d2" width="13" />
  				<polyline color="#dddddd" width="9" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="15">
  				<polyline color="#d2d2d2" width="18" />
  				<polyline color="#dddddd" width="14" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="16">
  				<polyline color="#d2d2d2" width="21" />
  				<polyline color="#dddddd" width="17" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="17">
  				<polyline color="#d2d2d2" width="25" />
  				<polyline color="#dddddd" width="21" />
  			</item>
! 			<item type="street_pedestrian,living_street" order="18">
  				<polyline color="#d2d2d2" width="40" />
  				<polyline color="#dddddd" width="34" />
***************
*** 1255,1259 ****
  				<polyline color="#fefefe" width="9" />
  			</item>
- 			
  			<item type="street_0,street_1_city,street_1_land" order="10">
  				<polyline color="#d2d2d2" width="4" /> 
--- 1276,1279 ----
***************
*** 1585,1588 ****
--- 1605,1647 ----
  				<polyline color="#d3dbbc" width="150" />
  			</item>
+ 			<item type="rail" order="6-">
+ 				<polyline color="#696969" width="3" />
+ 			</item>
+ 			<item type="rail_narrow_gauge" order="6-">
+ 				<polyline color="#696969" width="3" />
+ 			</item>
+ 			<item type="rail_light" order="8-">
+ 				<polyline color="#696969" width="2" />
+ 			</item>
+ 			<item type="rail_subway" order="8-">
+ 				<polyline color="#696969" width="2" dash="10" />
+ 			</item>
+ 			<item type="rail_mono" order="10-">
+ 				<polyline color="#696969" width="2" />
+ 			</item>
+ 			<item type="rail_tram,bus_guideway" order="10-">
+ 				<polyline color="#696969" width="2navit" />
+ 			</item>
+ 			<item type="rail_preserved" order="10-">
+ 				<polyline color="#696969" width="1" dash="7" />
+ 			</item>
+ 			<item type="rail_disused" order="12-">
+ 				<polyline color="#d3d3d3" width="1" dash="10" />
+ 			</item>
+ 			<item type="rail_abandoned" order="12-">
+ 				<polyline color="#f5f5f5" width="1" dash="10" />
+ 			</item>
+ 			<item type="lift_cable_car" order="6-">
+ 				<polyline color="#696969" width="1" dash="5" />
+ 			</item>
+ 			<item type="lift_chair" order="6-">
+ 				<polyline color="#696969" width="1" dash="5" />
+ 			</item>
+ 			<item type="lift_drag" order="6-">
+ 				<polyline color="#696969" width="1" dash="5" />
+ 			</item>
+ 			<item type="ferry" order="5-">
+ 				<polyline color="#000000" width="3" dash="5" /> 
+ 			</item>
  			<item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
  				<circle color="#000000" radius="3" label_size="7" />
***************
*** 1618,1622 ****
  				<polyline color="#3f3f3f" width="1" />
  			</item>
- 			
  			<item type="poi_airport" order="5-">
  				<icon src="airport.xpm" />
--- 1677,1680 ----

[Navit-cvs-commit] navit/src navit.xml, 1.48, 1.49 item_def.h, 1.29, 1.30

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

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

Modified Files:
	navit.xml item_def.h 
Log Message:
Add:core:Added new item type poi_image which displays an image on top of the map

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** item_def.h	24 Mar 2008 17:39:29 -0000	1.29
--- item_def.h	31 Mar 2008 16:33:10 -0000	1.30
***************
*** 233,236 ****
--- 233,237 ----
  ITEM(poi_peak)
  ITEM(poi_rail_station)
+ ITEM(poi_image)
  /* Line */
  ITEM2(0x80000000,line)

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** navit.xml	29 Mar 2008 09:35:48 -0000	1.48
--- navit.xml	31 Mar 2008 16:33:09 -0000	1.49
***************
*** 1035,1038 ****
--- 1035,1041 ----
  				<label label_size="5" /> 
  			</item>
+ 			<item type="poi_image" order="0-">
+ 				<image />
+ 			</item>
  			<item type="rg_segment" order="0-">
  				<polyline color="#FF089C" width="1" />

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

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

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

Modified Files:
	textfile.c textfile.h 
Log Message:
Fix:data_textfile:Fixed pipe support

Index: textfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** textfile.c	26 Feb 2008 08:54:47 -0000	1.11
--- textfile.c	31 Mar 2008 16:20:40 -0000	1.12
***************
*** 201,204 ****
--- 201,205 ----
  		char *oargs,*args=g_strdup(map->filename),*sep=" ";
  		enum layer_type lay;
+ 		g_free(mr->args);
  		while (sel) {
  			oargs=args;
***************
*** 214,218 ****
  		}
  		dbg(1,"popen args %s\n", args);
! 		mr->f=popen(args, "r");
  	} else {
  		mr->f=fopen(map->filename, "r");
--- 215,220 ----
  		}
  		dbg(1,"popen args %s\n", args);
! 		mr->args=args;
! 		mr->f=popen(mr->args, "r");
  	} else {
  		mr->f=fopen(map->filename, "r");
***************
*** 257,261 ****
  			}
  			mr->item.id_hi++;
! 			fseek(mr->f, 0, SEEK_SET);
  			get_line(mr);
  		}
--- 259,267 ----
  			}
  			mr->item.id_hi++;
! 			if (mr->m->is_pipe) {
! 				pclose(mr->f);
! 				mr->f=popen(mr->args, "r");
! 			} else
! 				fseek(mr->f, 0, SEEK_SET);
  			get_line(mr);
  		}
***************
*** 306,310 ****
  map_rect_get_item_byid_textfile(struct map_rect_priv *mr, int id_hi, int id_lo)
  {
! 	fseek(mr->f, id_lo, SEEK_SET);
  	get_line(mr);
  	mr->item.id_hi=id_hi;
--- 312,320 ----
  map_rect_get_item_byid_textfile(struct map_rect_priv *mr, int id_hi, int id_lo)
  {
! 	if (mr->m->is_pipe) {
! 		pclose(mr->f);
! 		mr->f=popen(mr->args, "r");
! 	} else
! 		fseek(mr->f, id_lo, SEEK_SET);
  	get_line(mr);
  	mr->item.id_hi=id_hi;

Index: textfile.h
===================================================================
RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** textfile.h	26 Feb 2008 08:54:48 -0000	1.6
--- textfile.h	31 Mar 2008 16:20:40 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  	struct map_priv *m;
  	struct item item;
+ 	char *args;
  };
  

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.40, 1.41

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:graphics_gtk_drawing_area:Added support for images with a single coordinate

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** graphics_gtk_drawing_area.c	6 Mar 2008 19:24:29 -0000	1.40
--- graphics_gtk_drawing_area.c	31 Mar 2008 16:19:54 -0000	1.41
***************
*** 543,546 ****
--- 543,552 ----
  		imlib_render_image_on_drawable_skewed(0, 0, w, h, p[0].x, p[0].y, p[1].x-p[0].x, 0, 0, p[1].y-p[0].y);
  	}
+ 	if (count == 1) {
+ 		/* 
+                    0 
+         	     */
+ 		imlib_render_image_on_drawable_skewed(0, 0, w, h, p[0].x-w/2, p[0].y-h/2, w, 0, 0, h);
+ 	}
  }
  #endif

[Navit-cvs-commit] navit/src osm2navit.c,1.68,1.69

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

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

Modified Files:
	osm2navit.c 
Log Message:
Fix:Tools:Made coverage working again

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** osm2navit.c	30 Mar 2008 20:33:32 -0000	1.68
--- osm2navit.c	31 Mar 2008 16:19:02 -0000	1.69
***************
*** 844,847 ****
--- 844,849 ----
  	else
  		item.type=type_street_unkn;
+ 	if (coverage && IS_STREET(item))
+ 		item.type=type_coverage;
  	item.clen=coord_count*2;
  	item.len=item.clen+2+alen;

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

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

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

Added Files:
	geotag 
Log Message:
Add:Core:Added rudimentary support for geotagging


--- NEW FILE: geotag ---
#! /bin/sh
#TZ=UTC+00:00:00
TZ=UTC+00:59:57
export TZ
order=${5%%,*}
case $order in
10|11)
	size=1000
	;;
12|13)
	size=4000
	;;	
14|15)
	size=16000
	;;	
16|17|18|19)
	size=64000
	;;
*)
	exit
esac
ls -l --full-time images/*.jpg  | sed -e 's/^\([^ ]* \)\{5\}//' -e 's/20\([0-9]*\)-\([0-9]*\)-\([0-9]*\) \([0-9]*\):\([0-9]*\):\([0-9]*\)\.[0-9]* [^ ]*/\\$GPRMC,\4\5\6\\.000,\\([^,]*,\\)\\{7\\}\3\2\1,\\([^,]*,\\)\\{2\\}[^,]*\\*..$/' | tail +2 |
while read -r sentence image
do
	if [ ! -f $image.$size ]
	then
		djpeg -scale 1/8 $image | pamscale -pixels $size | cjpeg >$image.$size

	fi
	if [ ! -f $image.txt ]
	then
		grep -e "$sentence" tracks/* | sed -e 's/^\([^,]*,\)\{3\}\(\([^,]*,\)\{4\}\).*/\2/' -e 's/,/ /g' > $image.txt
		[ -s $image.txt ] || echo "$sentence not found" >&2
	fi
	sed "s&\$&type=poi_image label=$image.$size&" <$image.txt
done

[Navit-cvs-commit] navit/src/data/binfile binfile.c,1.21,1.22

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

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

Modified Files:
	binfile.c 
Log Message:
Fix:data_binfile:Cleaned up a bit, added correct partial handling

Index: binfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** binfile.c	21 Mar 2008 20:23:48 -0000	1.21
--- binfile.c	30 Mar 2008 21:37:23 -0000	1.22
***************
*** 20,24 ****
  static int map_id;
  
- static GHashTable *search_results;
  
  struct minmax {
--- 20,23 ----
***************
*** 54,58 ****
  	enum attr_type attr_last;
  	int label;
! 	unsigned int *label_attr[2];
          struct map_selection *sel;
          struct map_priv *m;
--- 53,57 ----
  	enum attr_type attr_last;
  	int label;
! 	int *label_attr[2];
          struct map_selection *sel;
          struct map_priv *m;
***************
*** 68,71 ****
--- 67,72 ----
  	struct attr *search;
  	struct map_selection *ms;
+ 	int partial;
+ 	GHashTable *search_results;
  };
  
***************
*** 450,454 ****
  {
  	struct map_rect_priv *map_rec;
! 	int country = item->id_lo;
  	
  	switch (search->type) {
--- 451,457 ----
  {
  	struct map_rect_priv *map_rec;
! 	struct map_search_priv *msp;
! 	struct map_selection *ms;
! 	int i;
  	
  	switch (search->type) {
***************
*** 456,466 ****
  			break;
  		case attr_town_name:
! 			search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
! 			struct item *it;
  			map_rec = map_rect_new_binfile(map, NULL);
! 			map_rec->country_id = country;
! 			struct map_search_priv *msp = g_new(struct map_search_priv, 1);
  			msp->mr = map_rec;
  			msp->search = search;
  			return msp;
  			break;
--- 459,469 ----
  			break;
  		case attr_town_name:
! 			msp = g_new(struct map_search_priv, 1);
! 			msp->search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
  			map_rec = map_rect_new_binfile(map, NULL);
! 			map_rec->country_id = item->id_lo;
  			msp->mr = map_rec;
  			msp->search = search;
+ 			msp->partial = partial;
  			return msp;
  			break;
***************
*** 468,475 ****
  			break;
  		case attr_street_name:
- 			search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
- 			struct map_selection *ms = NULL;
  			ms = g_new(struct map_selection, 1);
- 			int i = 0;
  			ms->next = NULL;
  			for (i = 0; i < layer_end; i++)
--- 471,475 ----
***************
*** 509,512 ****
--- 509,514 ----
  				msp->mr = map_rec;
  				msp->search = search;
+ 				msp->partial = partial;
+ 				msp->search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
  				return msp;
  			}
***************
*** 519,524 ****
  	return NULL;
  }
  
! struct item *
  binmap_search_get_item(struct map_search_priv *map_search)
  {
--- 521,534 ----
  	return NULL;
  }
+ static int
+ ascii_cmp(char *name, char *match, int partial)
+ {
+ 	if (partial)
+ 		return g_ascii_strncasecmp(name, match, strlen(match));
+ 	else
+ 		return g_ascii_strcasecmp(name, match);
+ }
  
! static struct item *
  binmap_search_get_item(struct map_search_priv *map_search)
  {
***************
*** 529,534 ****
  				struct attr at;
  				if (binfile_attr_get(it->priv_data, attr_label, &at)) {
! 					char* tmp = g_strdup(at.u.str);
! 					if (g_ascii_strncasecmp(tmp, map_search->search->u.str, strlen(map_search->search->u.str)) == 0) {
  						return it;
  					}
--- 539,543 ----
  				struct attr at;
  				if (binfile_attr_get(it->priv_data, attr_label, &at)) {
! 					if (!ascii_cmp(at.u.str, map_search->search->u.str, map_search->partial)) {
  						return it;
  					}
***************
*** 539,546 ****
  				struct attr at;
  				if (binfile_attr_get(it->priv_data, attr_label, &at)) {
! 					char* tmp = g_strdup(at.u.str);
! 					if (g_ascii_strncasecmp(tmp, map_search->search->u.str, strlen(map_search->search->u.str)) == 0) {
! 						if (!g_hash_table_lookup(search_results, at.u.str)) {
! 							g_hash_table_insert(search_results, tmp, "");
  							return it;
  						}
--- 548,554 ----
  				struct attr at;
  				if (binfile_attr_get(it->priv_data, attr_label, &at)) {
! 					if (!ascii_cmp(at.u.str, map_search->search->u.str, map_search->partial)) {
! 						if (!g_hash_table_lookup(map_search->search_results, at.u.str)) {
! 							g_hash_table_insert(map_search->search_results, g_strdup(at.u.str), "");
  							return it;
  						}
***************
*** 556,560 ****
  binmap_search_destroy(struct map_search_priv *ms)
  {
! 	g_hash_table_destroy(search_results);
  	g_free(ms->mr->sel);
  	map_rect_destroy_binfile(ms->mr);
--- 564,568 ----
  binmap_search_destroy(struct map_search_priv *ms)
  {
! 	g_hash_table_destroy(ms->search_results);
  	g_free(ms->mr->sel);
  	map_rect_destroy_binfile(ms->mr);

[Navit-cvs-commit] navit/po de.po,1.25,1.26

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

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

Modified Files:
	de.po 
Log Message:
FIX:NLS:Fixed wrong translation

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** de.po	17 Feb 2008 14:58:59 -0000	1.25
--- de.po	30 Mar 2008 20:33:54 -0000	1.26
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-02-17 15:56+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Martin Schaller <mar...@so...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-03-30 18:05+0200\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Martin Schaller <mar...@so...>\n"
***************
*** 17,46 ****
  "Plural-Forms:  nplurals=2; plural=n != 1;\n"
  
! #: ../src/main.c:108
  #, c-format
  msgid "Running from source directory\n"
  msgstr "Aufruf aus Quellverzeichnis\n"
  
! #: ../src/main.c:124
  #, c-format
  msgid "setting '%s' to '%s'\n"
  msgstr "setze '%s' auf '%s'\n"
  
! #: ../src/main.c:202
  #, c-format
  msgid "No config file navit.xml, navit.xml.local found\n"
  msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n"
  
! #: ../src/main.c:206
  #, c-format
  msgid "Error parsing '%s': %s\n"
  msgstr "Fehler beim Parsen von '%s': %s\n"
  
! #: ../src/main.c:209
  #, c-format
  msgid "Using '%s'\n"
  msgstr "Benutze '%s'\n"
  
! #: ../src/main.c:212
  #, c-format
  msgid "No instance has been created, exiting\n"
--- 17,46 ----
  "Plural-Forms:  nplurals=2; plural=n != 1;\n"
  
! #: ../src/main.c:143
  #, c-format
  msgid "Running from source directory\n"
  msgstr "Aufruf aus Quellverzeichnis\n"
  
! #: ../src/main.c:159
  #, c-format
  msgid "setting '%s' to '%s'\n"
  msgstr "setze '%s' auf '%s'\n"
  
! #: ../src/main.c:239
  #, c-format
  msgid "No config file navit.xml, navit.xml.local found\n"
  msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n"
  
! #: ../src/main.c:243
  #, c-format
  msgid "Error parsing '%s': %s\n"
  msgstr "Fehler beim Parsen von '%s': %s\n"
  
! #: ../src/main.c:246
  #, c-format
  msgid "Using '%s'\n"
  msgstr "Benutze '%s'\n"
  
! #: ../src/main.c:249
  #, c-format
  msgid "No instance has been created, exiting\n"
***************
*** 91,227 ****
  msgstr[1] "In %d Kilometern"
  
! #: ../src/navigation.c:402
  msgid "right"
  msgstr "rechts"
  
! #: ../src/navigation.c:409
  msgid "left"
  msgstr "links"
  
! #: ../src/navigation.c:413
  msgid "easily "
  msgstr "leicht "
  
! #: ../src/navigation.c:417
  msgid "strongly "
  msgstr "scharf "
  
! #: ../src/navigation.c:420
  msgid "unknown "
  msgstr "unbekannt "
  
  #
! #: ../src/navigation.c:426
  msgid "When possible, please turn around"
  msgstr "Wenn möglich bitte wenden"
  
! #: ../src/navigation.c:433
  #, c-format
  msgid "Follow the road for the next %s"
  msgstr "Dem Straßenverlauf %s folgen"
  
! #: ../src/navigation.c:437
  msgid "soon"
  msgstr "Demnächst"
  
! #: ../src/navigation.c:443
  msgid "now"
  msgstr "Jetzt"
  
! #: ../src/navigation.c:446
  msgid "error"
  msgstr "fehler"
  
  #. TRANSLATORS: The first argument is strength, the second direction and the third distance
! #: ../src/navigation.c:450
  #, c-format
  msgid "Turn %1$s%2$s %3$s"
  msgstr "%3$s %1$s%2$s abbiegen"
  
! #: ../src/navigation.c:453
  #, c-format
  msgid "You have reached your destination %s"
  msgstr "%s haben Sie ihr Ziel erreicht"
  
! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198
! msgid "Layout"
! msgstr "Layout"
! 
! #: ../src/navit.c:691
! msgid "Projection"
! msgstr "Projektion"
! 
! #: ../src/navit.c:746
  msgid "Former Destinations"
  msgstr "Frühere Ziele"
  
! #: ../src/navit.c:756
  msgid "Bookmarks"
  msgstr "Lesezeichen"
  
! #: ../src/navit.c:794
! msgid "Vehicle"
! msgstr "Fahrzeug"
! 
! #: ../src/navit.c:863
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:868
  msgid "Length"
  msgstr "Länge"
  
! #: ../src/navit.c:872 ../src/navit.c:897
  msgid "km"
  msgstr "km"
  
! #: ../src/navit.c:876 ../src/navit.c:901
  msgid "m"
  msgstr "m"
  
! #: ../src/navit.c:882
  msgid "Time"
  msgstr "Zeit"
  
! #: ../src/navit.c:894
  msgid "Destination Length"
  msgstr "Länge Ziel"
  
! #: ../src/navit.c:907
  msgid "Destination Time"
  msgstr "Zeit Ziel"
  
! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Straßenliste"
  
! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368
! #: ../src/gui/gtk/gui_gtk_action.c:197
! msgid "Map"
! msgstr "Karte"
! 
! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196
! msgid "Route"
! msgstr "Route"
! 
! #: ../src/popup.c:229
  #, c-format
  msgid "Point 0x%x 0x%x"
  msgstr "Punkt 0x%x 0x%x"
  
! #: ../src/popup.c:230
  #, c-format
  msgid "Screen coord : %d %d"
  msgstr "Bildschirm %d %d"
  
! #: ../src/popup.c:239
  msgid "Set as position"
  msgstr "Als Position setzen"
  
! #: ../src/popup.c:240
  msgid "Set as destination"
  msgstr "Als Ziel setzen"
  
! #: ../src/popup.c:241
  msgid "Add as bookmark"
  msgstr "Als Lesezeichen aufnehmen"
--- 91,206 ----
  msgstr[1] "In %d Kilometern"
  
! #: ../src/navigation.c:404
  msgid "right"
  msgstr "rechts"
  
! #: ../src/navigation.c:411
  msgid "left"
  msgstr "links"
  
! #: ../src/navigation.c:415
  msgid "easily "
  msgstr "leicht "
  
! #: ../src/navigation.c:419
  msgid "strongly "
  msgstr "scharf "
  
! #: ../src/navigation.c:422
  msgid "unknown "
  msgstr "unbekannt "
  
  #
! #: ../src/navigation.c:428
  msgid "When possible, please turn around"
  msgstr "Wenn möglich bitte wenden"
  
! #: ../src/navigation.c:435
  #, c-format
  msgid "Follow the road for the next %s"
  msgstr "Dem Straßenverlauf %s folgen"
  
! #: ../src/navigation.c:439
  msgid "soon"
  msgstr "Demnächst"
  
! #: ../src/navigation.c:445
  msgid "now"
  msgstr "Jetzt"
  
! #: ../src/navigation.c:448
  msgid "error"
  msgstr "fehler"
  
  #. TRANSLATORS: The first argument is strength, the second direction and the third distance
! #: ../src/navigation.c:452
  #, c-format
  msgid "Turn %1$s%2$s %3$s"
  msgstr "%3$s %1$s%2$s abbiegen"
  
! #: ../src/navigation.c:455
  #, c-format
  msgid "You have reached your destination %s"
  msgstr "%s haben Sie ihr Ziel erreicht"
  
! #: ../src/navit.c:636 ../src/gui/gtk/gui_gtk_action.c:151
  msgid "Former Destinations"
  msgstr "Frühere Ziele"
  
! #: ../src/navit.c:646 ../src/gui/gtk/gui_gtk_action.c:152
  msgid "Bookmarks"
  msgstr "Lesezeichen"
  
! #: ../src/navit.c:736
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:741
  msgid "Length"
  msgstr "Länge"
  
! #: ../src/navit.c:745 ../src/navit.c:770
  msgid "km"
  msgstr "km"
  
! #: ../src/navit.c:749 ../src/navit.c:774
  msgid "m"
  msgstr "m"
  
! #: ../src/navit.c:755
  msgid "Time"
  msgstr "Zeit"
  
! #: ../src/navit.c:767
  msgid "Destination Length"
  msgstr "Länge Ziel"
  
! #: ../src/navit.c:780
  msgid "Destination Time"
  msgstr "Zeit Ziel"
  
! #: ../src/navit.c:809 ../src/gui/gtk/gui_gtk_action.c:160
  msgid "Roadbook"
  msgstr "Straßenliste"
  
! #: ../src/popup.c:231
  #, c-format
  msgid "Point 0x%x 0x%x"
  msgstr "Punkt 0x%x 0x%x"
  
! #: ../src/popup.c:232
  #, c-format
  msgid "Screen coord : %d %d"
  msgstr "Bildschirm %d %d"
  
! #: ../src/popup.c:241
  msgid "Set as position"
  msgstr "Als Position setzen"
  
! #: ../src/popup.c:242
  msgid "Set as destination"
  msgstr "Als Ziel setzen"
  
! #: ../src/popup.c:243
  msgid "Add as bookmark"
  msgstr "Als Lesezeichen aufnehmen"
***************
*** 266,270 ****
  #: ../src/country.c:31
  msgid "Netherlands Antilles"
! msgstr "Niederlande"
  
  #
--- 245,249 ----
  #: ../src/country.c:31
  msgid "Netherlands Antilles"
! msgstr "Niederländische Antillen"
  
  #
***************
*** 1460,1641 ****
  msgstr "Simbabwe"
  
! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97
! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
  msgid "Car"
  msgstr "Auto"
  
! #: ../src/gui/gtk/destination.c:96
  msgid "Iso2"
  msgstr "Iso2"
  
! #: ../src/gui/gtk/destination.c:96
  msgid "Iso3"
  msgstr "Iso3"
  
! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334
  msgid "Country"
  msgstr "Land"
  
  #
! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
! #: ../src/gui/gtk/destination.c:99
  msgid "Postal"
  msgstr "PLZ"
  
! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
! #: ../src/gui/gtk/destination.c:99
  msgid "Town"
  msgstr "Ort"
  
  #
! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
! #: ../src/gui/gtk/destination.c:99
  msgid "District"
  msgstr "Ortsteil"
  
! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
! #: ../src/gui/gtk/destination.c:343
  msgid "Street"
  msgstr "Straße"
  
! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:345
  msgid "Number"
  msgstr "Nummer"
  
  #
! #: ../src/gui/gtk/destination.c:329
  msgid "Enter Destination"
  msgstr "Ziel eingeben"
  
! #: ../src/gui/gtk/destination.c:336
  msgid "Zip Code"
  msgstr "PLZ"
  
! #: ../src/gui/gtk/destination.c:338
  msgid "City"
  msgstr "Ort"
  
! #: ../src/gui/gtk/destination.c:340
  msgid "District/Township"
  msgstr "Ortsteil/Gemeinde"
  
! #: ../src/gui/gtk/destination.c:369
  msgid "Bookmark"
  msgstr "Lesezeichen"
  
! #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208
  msgid "Destination"
  msgstr "Ziel"
  
! #: ../src/gui/gtk/gui_gtk_action.c:195
  msgid "Display"
  msgstr "Anzeige"
  
! #: ../src/gui/gtk/gui_gtk_action.c:199
  msgid "ZoomOut"
  msgstr "Verkleinern"
  
! #: ../src/gui/gtk/gui_gtk_action.c:200
  msgid "ZoomIn"
  msgstr "Vergrößern"
  
! #: ../src/gui/gtk/gui_gtk_action.c:201
  msgid "Refresh"
  msgstr "Aktualisieren"
  
! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206
  msgid "Info"
  msgstr "Info"
  
! #: ../src/gui/gtk/gui_gtk_action.c:209
  msgid "Clear"
  msgstr "Löschen"
  
! #: ../src/gui/gtk/gui_gtk_action.c:210
  msgid "Test"
  msgstr "Test"
  
! #: ../src/gui/gtk/gui_gtk_action.c:211
  msgid "_Quit"
  msgstr "Beenden"
  
! #: ../src/gui/gtk/gui_gtk_action.c:218
  msgid "Cursor"
  msgstr "Marke"
  
! #: ../src/gui/gtk/gui_gtk_action.c:219
  msgid "Tracking"
  msgstr "Spurverfolgung"
  
! #: ../src/gui/gtk/gui_gtk_action.c:220
  msgid "Orientation"
  msgstr "Orientierung"
  
! #: ../src/gui/gtk/gui_gtk_action.c:222 ../src/gui/gtk/gui_gtk_action.c:224
  msgid "Fullscreen"
  msgstr "Vollbild"
  
! #: ../src/gui/gtk/gui_gtk_action.c:232
  msgid "Data"
  msgstr "Daten"
  
! #: ../src/gui/gtk/gui_gtk_action.c:233
! msgid "VisibleBlocks"
! msgstr "Sichtbare Blöcke"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:234
! msgid "VisibleTowns"
! msgstr "Sichtbare Städte"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:235
! msgid "VisiblePolys"
! msgstr "Sichtbare Polygone"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:236
! msgid "VisibleStreets"
! msgstr "Sichtbare Straßen"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:237
! msgid "VisiblePoints"
! msgstr "Sichtbare Punkte"
! 
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "N"
  msgstr "N"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "NE"
  msgstr "NO"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "E"
  msgstr "O"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "SE"
  msgstr "SO"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "S"
  msgstr "S"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "SW"
  msgstr "SW"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "W"
  msgstr "W"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "NW"
  msgstr "NW"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:105
  #, c-format
  msgid "Route %4.0fkm    %02d:%02d ETA"
  msgstr "Route %4.0fkm    %02d:%02d ETA"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:156
  msgid "Route 0000km  0+00:00 ETA"
  msgstr "Route 0000km 0+00:00 ETA"
--- 1439,1620 ----
  msgstr "Simbabwe"
  
! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100
  msgid "Car"
  msgstr "Auto"
  
! #: ../src/gui/gtk/destination.c:97
  msgid "Iso2"
  msgstr "Iso2"
  
! #: ../src/gui/gtk/destination.c:97
  msgid "Iso3"
  msgstr "Iso3"
  
! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:403
  msgid "Country"
  msgstr "Land"
  
  #
! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
! #: ../src/gui/gtk/destination.c:100
  msgid "Postal"
  msgstr "PLZ"
  
! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
! #: ../src/gui/gtk/destination.c:100
  msgid "Town"
  msgstr "Ort"
  
  #
! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
! #: ../src/gui/gtk/destination.c:100
  msgid "District"
  msgstr "Ortsteil"
  
! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100
! #: ../src/gui/gtk/destination.c:412
  msgid "Street"
  msgstr "Straße"
  
! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:414
  msgid "Number"
  msgstr "Nummer"
  
  #
! #: ../src/gui/gtk/destination.c:398
  msgid "Enter Destination"
  msgstr "Ziel eingeben"
  
! #: ../src/gui/gtk/destination.c:405
  msgid "Zip Code"
  msgstr "PLZ"
  
! #: ../src/gui/gtk/destination.c:407
  msgid "City"
  msgstr "Ort"
  
! #: ../src/gui/gtk/destination.c:409
  msgid "District/Township"
  msgstr "Ortsteil/Gemeinde"
  
! #: ../src/gui/gtk/destination.c:437 ../src/gui/gtk/gui_gtk_action.c:153
! msgid "Map"
! msgstr "Karte"
! 
! #: ../src/gui/gtk/destination.c:438
  msgid "Bookmark"
  msgstr "Lesezeichen"
  
! #: ../src/gui/gtk/destination.c:439 ../src/gui/gtk/gui_gtk_action.c:166
  msgid "Destination"
  msgstr "Ziel"
  
! #: ../src/gui/gtk/gui_gtk_action.c:149
  msgid "Display"
  msgstr "Anzeige"
  
! #: ../src/gui/gtk/gui_gtk_action.c:150
! msgid "Route"
! msgstr "Route"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:154
! msgid "Layout"
! msgstr "Layout"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:155
! msgid "Projection"
! msgstr "Projektion"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:156
! msgid "Vehicle"
! msgstr "Fahrzeug"
! 
! #: ../src/gui/gtk/gui_gtk_action.c:157
  msgid "ZoomOut"
  msgstr "Verkleinern"
  
! #: ../src/gui/gtk/gui_gtk_action.c:158
  msgid "ZoomIn"
  msgstr "Vergrößern"
  
! #: ../src/gui/gtk/gui_gtk_action.c:159
  msgid "Refresh"
  msgstr "Aktualisieren"
  
! #: ../src/gui/gtk/gui_gtk_action.c:162 ../src/gui/gtk/gui_gtk_action.c:164
  msgid "Info"
  msgstr "Info"
  
! #: ../src/gui/gtk/gui_gtk_action.c:167
  msgid "Clear"
  msgstr "Löschen"
  
! #: ../src/gui/gtk/gui_gtk_action.c:168
  msgid "Test"
  msgstr "Test"
  
! #: ../src/gui/gtk/gui_gtk_action.c:169
  msgid "_Quit"
  msgstr "Beenden"
  
! #: ../src/gui/gtk/gui_gtk_action.c:176
  msgid "Cursor"
  msgstr "Marke"
  
! #: ../src/gui/gtk/gui_gtk_action.c:177
  msgid "Tracking"
  msgstr "Spurverfolgung"
  
! #: ../src/gui/gtk/gui_gtk_action.c:178
  msgid "Orientation"
  msgstr "Orientierung"
  
! #: ../src/gui/gtk/gui_gtk_action.c:180 ../src/gui/gtk/gui_gtk_action.c:182
  msgid "Fullscreen"
  msgstr "Vollbild"
  
! #: ../src/gui/gtk/gui_gtk_action.c:190
  msgid "Data"
  msgstr "Daten"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "N"
  msgstr "N"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "NE"
  msgstr "NO"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "E"
  msgstr "O"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "SE"
  msgstr "SO"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "S"
  msgstr "S"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "SW"
  msgstr "SW"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "W"
  msgstr "W"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:46 ../src/gui/gtk/gui_gtk_statusbar.c:81
  msgid "NW"
  msgstr "NW"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:103
  #, c-format
  msgid "Route %4.0fkm    %02d:%02d ETA"
  msgstr "Route %4.0fkm    %02d:%02d ETA"
  
! #: ../src/gui/gtk/gui_gtk_statusbar.c:148
  msgid "Route 0000km  0+00:00 ETA"
  msgstr "Route 0000km 0+00:00 ETA"

[Navit-cvs-commit] navit/src osm2navit.c,1.67,1.68

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

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

Modified Files:
	osm2navit.c 
Log Message:
Fix:Tools:Added processing of entities, fixed wrong country id for nl

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** osm2navit.c	29 Mar 2008 09:35:05 -0000	1.67
--- osm2navit.c	30 Mar 2008 20:33:32 -0000	1.68
***************
*** 200,204 ****
  	{ 40,"Austria,Österreich,AUT"},
  	{276,"Germany,Deutschland,Bundesrepublik Deutschland"},
! 	{518,"Nederland,The Netherlands,Niederlande,NL"},
  };
  
--- 200,204 ----
  	{ 40,"Austria,Österreich,AUT"},
  	{276,"Germany,Deutschland,Bundesrepublik Deutschland"},
! 	{528,"Nederland,The Netherlands,Niederlande,NL"},
  };
  
***************
*** 525,528 ****
--- 525,560 ----
  }
  
+ struct entity {
+ 	char *entity;
+ 	char c;
+ } entities[]= {
+ 	{"&qout;",'"'},
+ 	{"'",'\''},
+ 	{"&",'&'},
+ 	{"&lt;",'<'},
+ 	{"&gt;",'>'},
+ };
+ 
+ static void
+ decode_entities(char *buffer)
+ {
+ 	char *pos=buffer;
+ 	int i,len,found;
+ 
+ 	while ((pos=strchr(pos, '&'))) {
+ 		found=0;
+ 		for (i = 0 ; i < sizeof(entities)/sizeof(struct entity); i++) {
+ 			len=strlen(entities[i].entity);
+ 			if (!strncmp(pos, entities[i].entity, len)) {
+ 				*pos=entities[i].c;
+ 			 	memmove(pos+1, pos+len, strlen(pos+len)+1);
+ 				found=1;
+ 				break;
+ 			}
+ 		}
+ 		pos++;
+ 	}
+ }
+ 
  static int
  parse_tag(char *p)
***************
*** 534,537 ****
--- 566,570 ----
  	if (!xml_get_attribute(p, "v", v_buffer, BUFFER_SIZE))
  		return 0;
+ 	decode_entities(v_buffer);
  	add_tag(k_buffer, v_buffer);
  	return 1;

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

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

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

Modified Files:
	nl.po 
Log Message:
Fix:NLS:Added patch from udovdh for nl translations

Index: nl.po
===================================================================
RCS file: /cvsroot/navit/navit/po/nl.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nl.po	24 Mar 2008 17:50:20 -0000	1.7
--- nl.po	29 Mar 2008 17:11:08 -0000	1.8
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-02-21 17:53+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-03-29 10:39+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
[...1692 lines suppressed...]
  msgid "Route 0000km  0+00:00 ETA"
  msgstr "Route 0000km  0+00:00 Aankomsttijd"
  
+ #~ msgid "VisibleBlocks"
+ #~ msgstr "Toon blokken"
+ 
+ #~ msgid "VisibleTowns"
+ #~ msgstr "Zichtbare Steden"
+ 
+ #~ msgid "VisiblePolys"
+ #~ msgstr "Toon polygonen"
+ 
+ #~ msgid "VisibleStreets"
+ #~ msgstr "Toon straten"
+ 
+ #~ msgid "VisiblePoints"
+ #~ msgstr "Toon punten"
+ 
  #~ msgid "Moldova"
  #~ msgstr "Moldavië"

[Navit-cvs-commit] navit/src navit.xml,1.47,1.48

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

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

Modified Files:
	navit.xml 
Log Message:
Add:Core:Added T@H layout to navit.xml

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** navit.xml	24 Mar 2008 17:39:29 -0000	1.47
--- navit.xml	29 Mar 2008 09:35:48 -0000	1.48
***************
*** 2006,2009 ****
--- 2006,2462 ----
  		</layer>
  	</layout>
+ <layout name="T@H">
+ 		<layer name="sea" details="0">
+ 			
+ 			
+ <!-- landuse=forest -->
+ 			<item type="wood" order="0-">
+ 				<polygon color="#72bf81" /> 
+ 			</item>
+ <!-- landuse=residential -->
+ 			<item type="town_poly" order="0-">
+ 				<polygon color="#f2f2f2" /> 
+ 			</item>
+ <!-- natural=water -->
+ 			<item type="water_poly" order="0-">
+ 				<polygon color="#b5d6f1" /> 
+ 				<polyline color="#b5d6f1" /> 
+ 				<label label_size="8" /> 
+ 			</item>
+ <!-- leisure=park -->
+ 			<item type="park_poly" order="0-">
+ 				<polygon color="#c7f1a3" /> 
+ 				<polyline color="#79c691" /> 
+ 				<label label_size="5" /> 
+ 			</item>
+ 			<item type="airport_poly" order="0-">
+ 				<polygon color="#a0a0a0" /> 
+ 			</item>
+ 			<item type="sport_poly" order="0-">
+ 				<polygon color="#4af04f" /> 
+ 			</item>
+ 			
+ <!-- landuse=industrial -->
+ 			<item type="industry_poly,building_poly,place_poly" order="0-">
+ 				<polygon color="#ecd8ff" /> 
+ 			</item>
+ <!-- waterway=stream -->
+ 			<item type="water_line" order="0-4">
+ 				<polyline color="#b5d6f1" width="1" /> 
+ 				<label label_size="8" /> 
+ 			</item>
+ <!-- railway=subway -->
+ 			<item type="rail" order="6">
+ 				<polyline color="#aaaaaa" width="1" /> 
+ 			</item>
+ 			<item type="rail" order="7-8">
+ 				<polyline color="#aaaaaa" width="2" /> 
+ 			</item>
+ 			<item type="rail" order="9-">
+ 				<polyline color="#aaaaaa" width="6" /> 
+ 			</item>
+ 			<item type="ferry" order="5-">
+ 				<polyline color="#000000" width="1" /> 
+ 			</item>
+ 			<item type="border_country" order="0-">
+ 				<polyline color="#b8434e" width="1" /> 
+ 			</item>
+ 			<item type="border_state" order="0-">
+ 				<polyline color="#808080" width="1" /> 
+ 			</item>
+ 			<item type="height_line_1" order="0-">
+ 				<polyline color="#000000" width="1" /> 
+ 			</item>
+ 			<item type="height_line_2" order="0-">
+ 				<polyline color="#000000" width="2" /> 
+ 			</item>
+ <!-- routing -->
+ 			<item type="street_route" order="2">
+ 				<polyline color="#0000a0" width="4" /> 
+ 			</item>
+ 			<item type="street_route" order="3-5">
+ 				<polyline color="#0000a0" width="8" /> 
+ 			</item>
+ 			<item type="street_route" order="6">
+ 				<polyline color="#0000a0" width="10" /> 
+ 			</item>
+ 			<item type="street_route" order="7-8">
+ 				<polyline color="#0000a0" width="16" /> 
+ 			</item>
+ 			<item type="street_route" order="9-10">
+ 				<polyline color="#0000a0" width="20" /> 
+ 			</item>
+ 			<item type="street_route" order="11">
+ 				<polyline color="#0000a0" width="28" /> 
+ 			</item>
+ 			<item type="street_route" order="12">
+ 				<polyline color="#0000a0" width="32" /> 
+ 			</item>
+ 			<item type="street_route" order="13">
+ 				<polyline color="#0000a0" width="52" /> 
+ 			</item>
+ 			<item type="street_route" order="14">
+ 				<polyline color="#0000a0" width="64" /> 
+ 			</item>
+ 			<item type="street_route" order="15">
+ 				<polyline color="#0000a0" width="68" /> 
+ 			</item>
+ 			<item type="street_route" order="16">
+ 				<polyline color="#0000a0" width="132" /> 
+ 			</item>
+ 			<item type="street_route" order="17">
+ 				<polyline color="#0000a0" width="268" /> 
+ 			</item>
+ 			<item type="street_route" order="18">
+ 				<polyline color="#0000a0" width="530" /> 
+ 			</item>
+ <!-- highway=service,footway, ,... -->
+ 			<item type="street_nopass" order="10">
+ 				<polyline color="#efeaa0" width="1" /> 
+ 			</item>
+ 			<item type="street_nopass" order="11-12">
+ 				<polyline color="#efeaa0" width="2" /> 
+ 			</item>
+ 			<item type="street_nopass" order="13-">
+ 				<polyline color="#efeaa0" width="4" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="10">
+ 				<polyline color="#d2d2d2" width="4" /> 
+ 				<polyline color="#ffffff" width="2" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="11">
+ 				<polyline color="#d2d2d2" width="6" /> 
+ 				<polyline color="#ffffff" width="4" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="12">
+ 				<polyline color="#d2d2d2" width="10" /> 
+ 				<polyline color="#ffffff" width="8" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="13">
+ 				<polyline color="#d2d2d2" width="12" /> 
+ 				<polyline color="#ffffff" width="9" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="14">
+ 				<polyline color="#d2d2d2" width="15" /> 
+ 				<polyline color="#ffffff" width="13" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="15">
+ 				<polyline color="#d2d2d2" width="17" /> 
+ 				<polyline color="#ffffff" width="14" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="16">
+ 				<polyline color="#d2d2d2" width="33" /> 
+ 				<polyline color="#ffffff" width="26" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="17">
+ 				<polyline color="#d2d2d2" width="69" /> 
+ 				<polyline color="#ffffff" width="61" /> 
+ 			</item>
+ 			<item type="street_0,street_1_city,street_1_land" order="18">
+ 				<polyline color="#d2d2d2" width="132" /> 
+ 				<polyline color="#ffffff" width="126" /> 
+ 			</item>
+ <!-- highway=tertiary -->
+ 			<item type="street_2_city,street_2_land" order="7-8">
+ 				<polyline color="#c4c4c4" width="2" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="9">
+ 				<polyline color="#c4c4c4" width="4" /> 
+ 				<polyline color="#f7f496" width="2" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="10">
+ 				<polyline color="#c4c4c4" width="6" /> 
+ 				<polyline color="#f7f496" width="4" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="11">
+ 				<polyline color="#c4c4c4" width="8" /> 
+ 				<polyline color="#f7f496" width="6" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="12">
+ 				<polyline color="#c4c4c4" width="12" /> 
+ 				<polyline color="#f7f496" width="9" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="13">
+ 				<polyline color="#c4c4c4" width="15" /> 
+ 				<polyline color="#f7f496" width="11" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="14">
+ 				<polyline color="#c4c4c4" width="18" /> 
+ 				<polyline color="#f7f496" width="14" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="15">
+ 				<polyline color="#c4c4c4" width="21" /> 
+ 				<polyline color="#f7f496" width="17" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="16">
+ 				<polyline color="#c4c4c4" width="35" /> 
+ 				<polyline color="#f7f496" width="30" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="17">
+ 				<polyline color="#c4c4c4" width="73" /> 
+ 				<polyline color="#f7f496" width="67" /> 
+ 			</item>
+ 			<item type="street_2_city,street_2_land" order="18">
+ 				<polyline color="#c4c4c4" width="144" /> 
+ 				<polyline color="#f7f496" width="138" /> 
+ 			</item>
+ <!-- highway=secondary -->
+ 			<item type="street_3_city,street_3_land,ramp" order="7">
+ 				<polyline color="#fdbf6f" width="1" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="8">
+ 				<polyline color="#000000" width="2" /> 
+ 				<polyline color="#fdbf6f" width="1" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="9">
+ 				<polyline color="#000000" width="5" /> 
+ 				<polyline color="#fdbf6f" width="3" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="10">
+ 				<polyline color="#000000" width="8" /> 
+ 				<polyline color="#fdbf6f" width="6" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="11">
+ 				<polyline color="#000000" width="9" /> 
+ 				<polyline color="#fdbf6f" width="7" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="12">
+ 				<polyline color="#000000" width="11" /> 
+ 				<polyline color="#fdbf6f" width="9" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="13">
+ 				<polyline color="#000000" width="16" /> 
+ 				<polyline color="#fdbf6f" width="14" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="14">
+ 				<polyline color="#000000" width="19" /> 
+ 				<polyline color="#fdbf6f" width="17" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="15">
+ 				<polyline color="#000000" width="23" /> 
+ 				<polyline color="#fdbf6f" width="21" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="16">
+ 				<polyline color="#000000" width="36" /> 
+ 				<polyline color="#fdbf6f" width="34" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="17">
+ 				<polyline color="#000000" width="75" /> 
+ 				<polyline color="#fdbf6f" width="73" /> 
+ 			</item>
+ 			<item type="street_3_city,street_3_land,ramp" order="18">
+ 				<polyline color="#000000" width="152" /> 
+ 				<polyline color="#fdbf6f" width="150" /> 
+ 			</item>
+ <!-- highway=primary -->
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="2-6">
+ 				<polyline color="#e46d71" width="1" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="7-8">
+ 				<polyline color="#e46d71" width="3" /> 
+ 				<polyline color="#e46d71" width="1" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="9">
+ 				<polyline color="#e46d71" width="5" /> 
+ 				<polyline color="#e46d71" width="3" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="10">
+ 				<polyline color="#e46d71" width="6" /> 
+ 				<polyline color="#e46d71" width="4" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="11">
+ 				<polyline color="#e46d71" width="9" /> 
+ 				<polyline color="#e46d71" width="7" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="12">
+ 				<polyline color="#e46d71" width="13" /> 
+ 				<polyline color="#e46d71" width="9" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="13">
+ 				<polyline color="#e46d71" width="18" /> 
+ 				<polyline color="#e46d71" width="14" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="14">
+ 				<polyline color="#e46d71" width="21" /> 
+ 				<polyline color="#e46d71" width="17" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="15">
+ 				<polyline color="#e46d71" width="24" /> 
+ 				<polyline color="#e46d71" width="20" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="16">
+ 				<polyline color="#e46d71" width="39" /> 
+ 				<polyline color="#e46d71" width="33" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="17">
+ 				<polyline color="#e46d71" width="78" /> 
+ 				<polyline color="#e46d71" width="72" /> 
+ 			</item>
+ 			<item type="street_4_city,street_4_land,street_n_lanes" order="18">
+ 				<polyline color="#e46d71" width="156" /> 
+ 				<polyline color="#e46d71" width="150" /> 
+ 			</item>
+ <!-- highway=motorway -->
+ 			<item type="highway_city,highway_land" order="2">
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="3-5">
+ 				<polyline color="#87908a" width="3" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="6">
+ 				<polyline color="#87908a" width="4" /> 
+ 				<polyline color="#809bc0" width="2" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="7-8">
+ 				<polyline color="#87908a" width="7" /> 
+ 				<polyline color="#809bc0" width="5" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="9-10">
+ 				<polyline color="#87908a" width="9" /> 
+ 				<polyline color="#809bc0" width="5" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="11">
+ 				<polyline color="#87908a" width="13" /> 
+ 				<polyline color="#809bc0" width="9" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="12">
+ 				<polyline color="#87908a" width="15" /> 
+ 				<polyline color="#809bc0" width="10" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="13">
+ 				<polyline color="#87908a" width="25" /> 
+ 				<polyline color="#809bc0" width="17" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="14">
+ 				<polyline color="#87908a" width="31" /> 
+ 				<polyline color="#809bc0" width="24" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="15">
+ 				<polyline color="#87908a" width="33" /> 
+ 				<polyline color="#809bc0" width="27" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="16">
+ 				<polyline color="#87908a" width="65" /> 
+ 				<polyline color="#809bc0" width="59" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="17">
+ 				<polyline color="#87908a" width="133" /> 
+ 				<polyline color="#809bc0" width="127" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ 			<item type="highway_city,highway_land" order="18">
+ 				<polyline color="#87908a" width="264" /> 
+ 				<polyline color="#809bc0" width="258" /> 
+ 				<polyline color="#809bc0" width="1" /> 
+ 			</item>
+ <!-- unbekannte elemente -->
+ 			<item type="street_unkn" order="11-">
+ 				<polyline color="#f3d6b6" width="3" /> 
+ 			</item>
+ 			<item type="highway_exit_label" order="10-">
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- highway=primary (font)-->
+ 			<item type="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes" order="10-18">
+ 				<label label_size="9" />
+ 			</item>
+ 			<item type="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+ 				<label label_size="9" />
+ 			</item>
+ 			<item type="street_nopass,street_0,street_1_city,street_1_land" order="12-18">
+ 				<label label_size="9" />
+ 			</item>
+ <!-- place=suburb -->
+ 			<item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="9-">
+ 				<circle color="#000000" radius="3" label_size="9" />
+ 			</item>
+ 			<item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ 			<item type="town_label_1e3,town_label_2e3,town_label_5e3" order="10-">
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ 			<item type="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ 			<item type="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ 			<item type="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
+ 				<circle color="#000000" radius="3" label_size="10" />
+ 			</item>
+ <!-- place=city -->
+ 			<item type="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
+ 				<circle color="#000000" radius="3" label_size="15" />
+ 			</item>
+ 			<item type="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
+ 				<circle color="#000000" radius="3" label_size="15" />
+ 			</item>
+ 			<item type="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
+ 				<circle color="#000000" radius="3" label_size="15" />
+ 			</item>
+ 			<item type="town_label_1e7,district_label_1e7" order="1-">
+ 				<circle color="#000000" radius="3" label_size="15" />
+ 			</item>
+ 			<item type="flats,scrub,military_zone,marine_poly,plantation,tundra" order="0-">
+ 				<polygon color="#a0a0a0" />
+ 				<label label_size="5" /> 
+ 			</item>
+ 			<item type="rg_point" order="0-">
+ 				<circle color="#FF089C" radius="10"  />
+ 			</item>
+ 			
+ <!-- !!!!...POIs...!!!! -->
+ 
+ <!-- amenity=bank -->
+ 			<item type="poi_bank" order="14-">
+ 				<icon src="bank.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- amenity=fuel -->
+ 			<item type="poi_fuel" order="14-">
+ 				<icon src="fuel.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- amenity=hospitalg -->
+ 			<item type="poi_hospital" order="14-">
+ 				<icon src="hospital.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- amenity=parking -->
+ 			<item type="poi_car_parking" order="14-">
+ 				<icon src="parking.xpm" />
+ 			</item>
+ <!-- amenity=police -->
+ 			<item type="poi_police" order="14-">
+ 				<icon src="police.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- amenity=restaurant -->
+ 			<item type="poi_restaurant" order="14-">
+ 				<icon src="restaurant.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- leisure=golf_curse -->
+ 			<item type="poi_golf" order="14-">
+ 				<icon src="golf.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ <!-- tourism=hotel -->
+ 			<item type="poi_hotel" order="14-">
+ 				<icon src="hotel.xpm" />
+ 				<circle color="#000000" radius="3" label_size="7" />
+ 			</item>
+ 		</layer>
+ 	</layout>
  </navit>
  </config>

[Navit-cvs-commit] navit/src osm2navit.c,1.66,1.67

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

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

Modified Files:
	osm2navit.c 
Log Message:
Add:Tools:Made key=value handling more flexible in osm2navit

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** osm2navit.c	24 Mar 2008 17:39:29 -0000	1.66
--- osm2navit.c	29 Mar 2008 09:35:05 -0000	1.67
***************
*** 39,173 ****
  
  static char *attrmap={
! 	"n	historic\n"
! 	"n	type	junktion\n"
! 	"n	amenity	hospital	poi_hospital\n"
! 	"n	amenity	atm		poi_bank\n"
! 	"n	amenity	bank		poi_bank\n"
! 	"n	amenity	pub		poi_bar\n"
! 	"n	amenity	cafe		poi_cafe\n"
! 	"n	amenity	bus_station	poi_bus_station\n"
! 	"n	amenity	parking		poi_car_parking\n"
! 	"n	amenity	cinema		poi_cinema\n"
! 	"n	amenity	fire_station	poi_firebrigade\n"
! 	"n	amenity	fuel		poi_fuel\n"
! 	"n	amenity	courthouse	poi_justice\n"
! 	"n	amenity	library		poi_library\n"
! 	"n	amenity	pharmacy	poi_pharmacy\n"
! 	"n	amenity	place_of_worship	poi_church\n"
! 	"n	amenity	police		poi_police\n"
! 	"n	amenity	post_office	poi_post\n"
! 	"n	amenity	post_box	poi_post\n"
! 	"n	amenity	public_building	poi_public_office\n"
! 	"n	amenity	restaurant	poi_restaurant\n"
! 	"n	amenity	fast_food	poi_fastfood\n"
! 	"n	amenity	toilets		poi_restroom\n"
! 	"n	amenity	school		poi_school\n"
! 	"n	amenity	university	poi_school\n"
! 	"n	amenity	college		poi_school\n"
! 	"n	amenity	telephone	poi_telephone\n"
! 	"n	amenity	theatre		poi_theater\n"
! 	"n	highway	bus_stop	poi_bus_stop\n"
! 	"n	highway	motorway_junction	highway_exit\n"
! 	"n	highway	traffic_signals	traffic_signals\n"
! 	"n	leisure	slipway		poi_boat_ramp\n"
! 	"n	leisure	fishing		poi_fish\n"
! 	"n	sport	golf	poi_golf\n"
! 	"n	leisure	golf_course	poi_golf\n"
! 	"n	leisure	marina		poi_marine\n"
! 	"n	leisure	sports_centre	poi_sport\n"
! 	"n	leisure	stadium		poi_stadium\n"
! 	"n	shop	supermarket	poi_shopping\n"
! 	"n	shop	convenience	poi_shop_grocery\n"
! 	"n	tourism	attraction	poi_attraction\n"
! 	"n	tourism	camp_site	poi_camp_rv\n"
! 	"n	tourism	caravan_site	poi_camp_rv\n"
! 	"n	tourism	hotel		poi_hotel\n"
! 	"n	tourism	motel		poi_hotel\n"
! 	"n	tourism	guest_house	poi_hotel\n"
! 	"n	tourism	hostel		poi_hotel\n"
! 	"n	tourism	information	poi_information\n"
! 	"n	tourism	picnic_site	poi_picnic\n"
! 	"n	tourism	theme_park	poi_resort\n"
! 	"n	tourism	zoo		poi_zoo\n"
! 	"n	historic	museum	poi_museum_history\n"
! 	"n	amenity	grave_yard	poi_cemetery\n"
! 	"n	landuse	cemetery	poi_cemetery\n"
! 	"n	military	airfield	poi_military\n"
! 	"n	military	bunker		poi_military\n"
! 	"n	military	barracks	poi_military\n"
! 	"n	military	range		poi_military\n"
! 	"n	military	danger_area	poi_danger_area\n"
! 	"n	sport	swimming	poi_swimming\n"
! 	"n	sport	skiing		poi_skiing\n"
! 	"n	aeroway	aerodrome	poi_airport\n"
! 	"n	aeroway	airport		poi_airport\n"
! 	"n	aeroway	terminal	poi_airport\n"
! 	"n	aeroway	helipad		poi_heliport\n"
! 	"n	man_made	tower	poi_tower\n"
! 	"n	natural	bay		poi_bay\n"
! 	"n	natural	peak		poi_peak\n"
! 	"n	place	suburb		district_label\n"
! 	"n	place	city		town_label_2e5\n"
! 	"n	place	town		town_label_2e4\n"
! 	"n	place	village		town_label_2e3\n"
! 	"n	place	hamlet		town_label_2e2\n"
! 	"n	railway	station		poi_rail_station\n"
! 	"w	amenity	place_of_worship	poly_building\n"
! 	"w	building	glasshouse	poly_building\n"
! 	"w	building	1	poly_building\n"
! 	"w	building\n"
! 	"w	aeroway	aerodrome	poly_airport\n"
! 	"w	aeroway	apron		poly_apron\n"
! 	"w	aeroway	runway		aeroway_runway\n"
! 	"w	aeroway	taxiway		aeroway_taxiway\n"
! 	"w	aeroway	terminal	poly_terminal\n"
! 	"w	amenity	parking		poly_car_parking\n"
! 	"w	highway	bridleway	bridleway\n"
! 	"w	highway	cycleway	cycleway\n"
! 	"w	highway	cyclepath	cycleway\n"
! 	"w	highway	footway		footway\n"
! 	"w	highway	steps		steps\n"
! 	"w	highway	track		track_gravelled\n"
! 	"w	highway	service		street_service\n"
! 	"w	highway	pedestrian	street_pedestrian\n"
! 	"w	highway	residential	street_1_city\n"
! 	"w	highway	unclassified	street_1_city\n"
! 	"w	highway	minor		street_1_land\n"
! 	"w	highway	tertiary	street_2_city\n"
! 	"w	highway	secondary	street_3_city\n"
! 	"w	highway	unsurfaced	track_gravelled\n"
! 	"w	highway	primary		street_4_city\n"
! 	"w	highway	primary_link	ramp\n"
! 	"w	highway	trunk		street_4_city\n"
! 	"w	highway	trunk_link	ramp\n"
! 	"w	highway	motorway	highway_city\n"
! 	"w	highway	motorway_link	ramp\n"
! 	"w	historic	town gate	poly_building\n"
! 	"w	landuse	allotments	poly_wood\n"
! 	"w	landuse	cemetery	poly_cemetery\n"
! 	"w	landuse	forest		poly_wood\n"
! 	"w	landuse	industrial	poly_industry\n"
! 	"w	landuse	residential	poly_town\n"
! 	"w	landuse	farm	poly_farm\n"
! 	"w	leisure	park		poly_park\n"
! 	"w	natural	wood		poly_wood\n"
! 	"w	natural	water		poly_water\n"
! 	"w	natural	coastline	water_line\n"
! 	"w	place		suburb		poly_town\n"
! 	"w	place		town		poly_town\n"
! 	"w	power	line	powerline\n"
! 	"w	railway	rail		rail\n"
! 	"w	railway	narrow_gauge	rail\n"
! 	"w	railway	subway		rail\n"
! 	"w	railway	tram		rail\n"
! 	"w	leisure	golf_course	poly_golf_course\n"
! 	"w	waterway	canal		water_line\n"
! 	"w	waterway	river		water_line\n"
! 	"w	waterway	weir		water_line\n"
! 	"w	waterway	stream		water_line\n"
! 	"w	waterway	drain		water_line\n"
! 	"w	waterway	riverbank	poly_water\n"
! 	"w	boundary	administrative	border_country\n"
! 	"w	route		ferry		ferry\n"
  };
  
--- 39,171 ----
  
  static char *attrmap={
! 	"n	*=*			point_unkn\n"
! 	"n	amenity=hospital	poi_hospital\n"
! 	"n	amenity=atm		poi_bank\n"
! 	"n	amenity=bank		poi_bank\n"
! 	"n	amenity=pub		poi_bar\n"
! 	"n	amenity=cafe		poi_cafe\n"
! 	"n	amenity=bus_station	poi_bus_station\n"
! 	"n	amenity=parking		poi_car_parking\n"
! 	"n	amenity=cinema		poi_cinema\n"
! 	"n	amenity=fire_station	poi_firebrigade\n"
! 	"n	amenity=fuel		poi_fuel\n"
! 	"n	amenity=courthouse	poi_justice\n"
! 	"n	amenity=library		poi_library\n"
! 	"n	amenity=pharmacy	poi_pharmacy\n"
! 	"n	amenity=place_of_worship	poi_church\n"
! 	"n	amenity=police		poi_police\n"
! 	"n	amenity=post_office	poi_post\n"
! 	"n	amenity=post_box	poi_post\n"
! 	"n	amenity=public_building	poi_public_office\n"
! 	"n	amenity=restaurant	poi_restaurant\n"
! 	"n	amenity=fast_food	poi_fastfood\n"
! 	"n	amenity=toilets		poi_restroom\n"
! 	"n	amenity=school		poi_school\n"
! 	"n	amenity=university	poi_school\n"
! 	"n	amenity=college		poi_school\n"
! 	"n	amenity=telephone	poi_telephone\n"
! 	"n	amenity=theatre		poi_theater\n"
! 	"n	highway=bus_stop	poi_bus_stop\n"
! 	"n	highway=motorway_junction	highway_exit\n"
! 	"n	highway=traffic_signals	traffic_signals\n"
! 	"n	leisure=slipway		poi_boat_ramp\n"
! 	"n	leisure=fishing		poi_fish\n"
! 	"n	sport=golf	poi_golf\n"
! 	"n	leisure=golf_course	poi_golf\n"
! 	"n	leisure=marina		poi_marine\n"
! 	"n	leisure=sports_centre	poi_sport\n"
! 	"n	leisure=stadium		poi_stadium\n"
! 	"n	shop=supermarket	poi_shopping\n"
! 	"n	shop=convenience	poi_shop_grocery\n"
! 	"n	tourism=attraction	poi_attraction\n"
! 	"n	tourism=camp_site	poi_camp_rv\n"
! 	"n	tourism=caravan_site	poi_camp_rv\n"
! 	"n	tourism=hotel		poi_hotel\n"
! 	"n	tourism=motel		poi_hotel\n"
! 	"n	tourism=guest_house	poi_hotel\n"
! 	"n	tourism=hostel		poi_hotel\n"
! 	"n	tourism=information	poi_information\n"
! 	"n	tourism=picnic_site	poi_picnic\n"
! 	"n	tourism=theme_park	poi_resort\n"
! 	"n	tourism=zoo		poi_zoo\n"
! 	"n	historic=museum	poi_museum_history\n"
! 	"n	amenity=grave_yard	poi_cemetery\n"
! 	"n	landuse=cemetery	poi_cemetery\n"
! 	"n	military=airfield	poi_military\n"
! 	"n	military=bunker		poi_military\n"
! 	"n	military=barracks	poi_military\n"
! 	"n	military=range		poi_military\n"
! 	"n	military=danger_area	poi_danger_area\n"
! 	"n	sport=swimming	poi_swimming\n"
! 	"n	sport=skiing		poi_skiing\n"
! 	"n	aeroway=aerodrome	poi_airport\n"
! 	"n	aeroway=airport		poi_airport\n"
! 	"n	aeroway=terminal	poi_airport\n"
! 	"n	aeroway=helipad		poi_heliport\n"
! 	"n	man_made=tower	poi_tower\n"
! 	"n	natural=bay		poi_bay\n"
! 	"n	natural=peak		poi_peak\n"
! 	"n	place=suburb		district_label\n"
! 	"n	place=city		town_label_2e5\n"
! 	"n	place=town		town_label_2e4\n"
! 	"n	place=village		town_label_2e3\n"
! 	"n	place=hamlet		town_label_2e2\n"
! 	"n	railway=station		poi_rail_station\n"
! 	"w	*=*			street_unkn\n"
! 	"w	amenity=place_of_worship	poly_building\n"
! 	"w	building=*	poly_building\n"
! 	"w	aeroway=aerodrome	poly_airport\n"
! 	"w	aeroway=apron		poly_apron\n"
! 	"w	aeroway=runway		aeroway_runway\n"
! 	"w	aeroway=taxiway		aeroway_taxiway\n"
! 	"w	aeroway=terminal	poly_terminal\n"
! 	"w	amenity=parking		poly_car_parking\n"
! 	"w	highway=bridleway	bridleway\n"
! 	"w	highway=cycleway	cycleway\n"
! 	"w	highway=cyclepath	cycleway\n"
! 	"w	highway=footway		footway\n"
! 	"w	highway=steps		steps\n"
! 	"w	highway=track		track_gravelled\n"
! 	"w	highway=service		street_service\n"
! 	"w	highway=pedestrian	street_pedestrian\n"
! 	"w	highway=residential	street_1_city\n"
! 	"w	highway=unclassified	street_1_city\n"
! 	"w	highway=minor		street_1_land\n"
! 	"w	highway=tertiary	street_2_city\n"
! 	"w	highway=secondary	street_3_city\n"
! 	"w	highway=unsurfaced	track_gravelled\n"
! 	"w	highway=primary		street_4_city\n"
! 	"w	highway=primary_link	ramp\n"
! 	"w	highway=trunk		street_4_city\n"
! 	"w	highway=trunk_link	ramp\n"
! 	"w	highway=motorway	highway_city\n"
! 	"w	highway=motorway_link	ramp\n"
! 	"w	historic=town gate	poly_building\n"
! 	"w	landuse=allotments	poly_wood\n"
! 	"w	landuse=cemetery	poly_cemetery\n"
! 	"w	landuse=forest		poly_wood\n"
! 	"w	landuse=industrial	poly_industry\n"
! 	"w	landuse=residential	poly_town\n"
! 	"w	landuse=farm	poly_farm\n"
! 	"w	leisure=park		poly_park\n"
! 	"w	natural=wood		poly_wood\n"
! 	"w	natural=water		poly_water\n"
! 	"w	natural=coastline	water_line\n"
! 	"w	place=suburb		poly_town\n"
! 	"w	place=town		poly_town\n"
! 	"w	power=line	powerline\n"
! 	"w	railway=rail		rail\n"
! 	"w	railway=narrow_gauge	rail\n"
! 	"w	railway=subway		rail\n"
! 	"w	railway=tram		rail\n"
! 	"w	leisure=golf_course	poly_golf_course\n"
! 	"w	waterway=canal		water_line\n"
! 	"w	waterway=river		water_line\n"
! 	"w	waterway=weir		water_line\n"
! 	"w	waterway=stream		water_line\n"
! 	"w	waterway=drain		water_line\n"
! 	"w	waterway=riverbank	poly_water\n"
! 	"w	boundary=administrative	border_country\n"
! 	"w	route=ferry		ferry\n"
  };
  
***************
*** 208,212 ****
  #endif
  
! static GHashTable *way_key_hash, *node_key_hash;
  
  static GHashTable *strings_hash = NULL;
--- 206,224 ----
  #endif
  
! struct attr_mapping {
! 	enum item_type type;
! 	int attr_present_idx_count;
! 	int attr_present_idx[0];	
! };
! 
! static struct attr_mapping **attr_mapping_node;
! static int attr_mapping_node_count;
! static struct attr_mapping **attr_mapping_way;
! static int attr_mapping_way_count;
! 
! static char *attr_present;
! static int attr_present_count;
! static GHashTable *attr_hash;
! 
  
  static GHashTable *strings_hash = NULL;
***************
*** 232,238 ****
  build_attrmap_line(char *line)
  {
! 	char *t=NULL,*k=NULL,*v=NULL,*i=NULL,*p;
! 	gpointer *data;
! 	GHashTable *key_hash,*value_hash;
  	t=line;
  	p=strchr(t,'\t');
--- 244,250 ----
  build_attrmap_line(char *line)
  {
! 	char *t=NULL,*kvl=NULL,*i=NULL,*p,*kv;
! 	struct attr_mapping ***attr_mapping_curr,*attr_mapping=g_malloc0(sizeof(struct attr_mapping));
! 	int idx,attr_mapping_count=0,*attr_mapping_curr_count;
  	t=line;
  	p=strchr(t,'\t');
***************
*** 240,251 ****
  		while (*p == '\t')
  			*p++='\0';
! 		k=p;
! 		p=strchr(k,'\t');
! 	}
! 	if (p) {
! 		while (*p == '\t')
! 			*p++='\0';
! 		v=p;
! 		p=strchr(v,'\t');
  	}
  	if (p) {
--- 252,257 ----
  		while (*p == '\t')
  			*p++='\0';
! 		kvl=p;
! 		p=strchr(kvl,'\t');
  	}
  	if (p) {
***************
*** 257,278 ****
  		if (! i)
  			i="street_unkn";
! 		key_hash=way_key_hash;
  	} else {
  		if (! i)
  			i="point_unkn";
! 		key_hash=node_key_hash;
! 	}
! 	value_hash=g_hash_table_lookup(key_hash, k);
! 	if (! value_hash) {
! 		value_hash=g_hash_table_new(g_str_hash, g_str_equal);
! 		g_hash_table_insert(key_hash, string_hash_lookup(k), value_hash);
  	}
! 	if (v) {
! 		data=(gpointer)item_from_name(i);
! 		g_hash_table_insert(value_hash, string_hash_lookup(v), data);
  	}
! #if 0
! 	fprintf(stderr,"'%s' '%s' '%s'\n", k, v, i);
! #endif
  }
  
--- 263,287 ----
  		if (! i)
  			i="street_unkn";
! 		attr_mapping_curr=&attr_mapping_way;
! 		attr_mapping_curr_count=&attr_mapping_way_count;
  	} else {
  		if (! i)
  			i="point_unkn";
! 		attr_mapping_curr=&attr_mapping_node;
! 		attr_mapping_curr_count=&attr_mapping_node_count;
  	}
! 	attr_mapping->type=item_from_name(i);
! 	while ((kv=strtok(kvl, ","))) {
! 		kvl=NULL;
! 		if (!(idx=(int)g_hash_table_lookup(attr_hash, kv))) {
! 			idx=attr_present_count++;
! 			g_hash_table_insert(attr_hash, kv, (gpointer) idx);
! 		}
! 		attr_mapping=g_realloc(attr_mapping, sizeof(struct attr_mapping)+(attr_mapping_count+1)*sizeof(int));
! 		attr_mapping->attr_present_idx[attr_mapping_count++]=idx;
! 		attr_mapping->attr_present_idx_count=attr_mapping_count;
  	}
! 	*attr_mapping_curr=g_realloc(*attr_mapping_curr, sizeof(**attr_mapping_curr)*(*attr_mapping_curr_count+1));
! 	(*attr_mapping_curr)[(*attr_mapping_curr_count)++]=attr_mapping;
  }
  
***************
*** 281,286 ****
  {
  	char *p;
! 	way_key_hash=g_hash_table_new(g_str_hash, g_str_equal);
! 	node_key_hash=g_hash_table_new(g_str_hash, g_str_equal);
  	while (map) {
  		p=strchr(map,'\n');
--- 290,295 ----
  {
  	char *p;
! 	attr_hash=g_hash_table_new(g_str_hash, g_str_equal);
! 	attr_present_count=1;
  	while (map) {
  		p=strchr(map,'\n');
***************
*** 291,294 ****
--- 300,304 ----
  		map=p;
  	}
+ 	attr_present=g_malloc0(sizeof(*attr_present)*attr_present_count);
  }
  
***************
*** 416,420 ****
  	GHashTable *value_hash;
  	enum item_type type;
! 	int level=2;
  	if (! strcmp(k,"ele"))
  		level=9;
--- 426,431 ----
  	GHashTable *value_hash;
  	enum item_type type;
! 	int idx,level=2;
! 	char buffer[BUFFER_SIZE*2+2];
  	if (! strcmp(k,"ele"))
  		level=9;
***************
*** 496,530 ****
  	if (level >= 5)
  		return;
! 	if (in_way)
! 		value_hash=g_hash_table_lookup(way_key_hash, k);
! 	else
! 		value_hash=g_hash_table_lookup(node_key_hash, k);
! 	if (! value_hash) {
! 		if (report)
! 			fprintf(stderr,"Unknown %s %d key '%s' (value '%s')\n", in_way ? "way" : "node", in_way ? wayid:nodeid, k, v);
! 		return;
! 	}
! 	type=(enum item_type) g_hash_table_lookup(value_hash, v);
! 	if (!type) {
! 		if (report)
! 			fprintf(stderr,"Unknown %s %d value of '%s' '%s'\n", in_way ? "way" : "node", in_way ? wayid:nodeid, k, v);
! 		if ( ignore_unkown == 1 )
! 			return;
! 		type=in_way ? type_street_unkn : type_point_unkn;
! 	        g_hash_table_insert(value_hash, string_hash_lookup( v ), (gpointer)item.type);
! 	}
! 	if ( (type != type_street_unkn ) && ( type != type_point_unkn )  )
! 	{
! 		item.type=type;
! 		if (coverage && IS_STREET(item))
! 			item.type=type_coverage;
! 	}
! 	else
! 	{
!         	if ( ignore_unkown == 1 )
! 		{
! 		    level = 10;
! 		}
! 	}
  }
  
--- 507,526 ----
  	if (level >= 5)
  		return;
! 
! 	strcpy(buffer,"*=*");
! 	if ((idx=(int)g_hash_table_lookup(attr_hash, buffer)))
! 		attr_present[idx]=1;
! 
! 	sprintf(buffer,"%s=*", k);
! 	if ((idx=(int)g_hash_table_lookup(attr_hash, buffer)))
! 		attr_present[idx]=2;
! 
! 	sprintf(buffer,"*=%s", v);
! 	if ((idx=(int)g_hash_table_lookup(attr_hash, buffer)))
! 		attr_present[idx]=2;
! 
! 	sprintf(buffer,"%s=%s", k, v);
! 	if ((idx=(int)g_hash_table_lookup(attr_hash, buffer)))
! 		attr_present[idx]=4;
  }
  
***************
*** 767,774 ****
  }
  
  static void
  end_way(FILE *out)
  {
! 	int alen=0;
  
  	if (! out)
--- 763,792 ----
  }
  
+ static int
+ attr_longest_match(struct attr_mapping **mapping, int mapping_count, enum item_type *types, int types_count)
+ {
+ 	int i,j,longest=0,ret=0,sum;
+ 	struct attr_mapping *curr;
+ 	for (i = 0 ; i < mapping_count ; i++) {
+ 		sum=0;
+ 		curr=mapping[i];
+ 		for (j = 0 ; j < curr->attr_present_idx_count ; j++)
+ 			sum+=attr_present[curr->attr_present_idx[j]];
+ 		if (sum > longest) {
+ 			longest=sum;
+ 			ret=0;
+ 		}
+ 		if (sum > 0 && sum == longest && ret < types_count) 
+ 			types[ret++]=curr->type;
+ 	}
+ 	memset(attr_present, 0, sizeof(*attr_present)*attr_present_count);
+ 	return ret;
+ }
+ 
  static void
  end_way(FILE *out)
  {
! 	int alen=0,count;
! 	enum item_type types[5];
  
  	if (! out)
***************
*** 779,782 ****
--- 797,801 ----
  		g_hash_table_insert(dedupe_ways_hash, (gpointer)wayid, (gpointer)1);
  	}
+ 	count=attr_longest_match(attr_mapping_way, attr_mapping_way_count, types, sizeof(types)/sizeof(enum item_type));
  	pad_text_attr(&debug_attr, debug_attr_buffer);
  	if (label_attr.len)
***************
*** 788,791 ****
--- 807,814 ----
  	if (flags_attr.len)
  		alen+=flags_attr.len+1;
+ 	if (count)
+ 		item.type=types[0];
+ 	else
+ 		item.type=type_street_unkn;
  	item.clen=coord_count*2;
  	item.len=item.clen+2+alen;
***************
*** 805,813 ****
  end_node(FILE *out)
  {
! 	int alen=0;
! 	int conflict=0;
  	struct country_table *result=NULL, *lookup;
  	if (!out || ! node_is_tagged || ! nodeid)
  		return;
  	pad_text_attr(&debug_attr, debug_attr_buffer);
  	if (label_attr.len)
--- 828,837 ----
  end_node(FILE *out)
  {
! 	int alen=0,conflict=0,count;
! 	enum item_type types[5];
  	struct country_table *result=NULL, *lookup;
  	if (!out || ! node_is_tagged || ! nodeid)
  		return;
+ 	count=attr_longest_match(attr_mapping_node, attr_mapping_node_count, types, sizeof(types)/sizeof(enum item_type));
  	pad_text_attr(&debug_attr, debug_attr_buffer);
  	if (label_attr.len)
***************
*** 815,818 ****
--- 839,846 ----
  	if (debug_attr.len)
  		alen+=debug_attr.len+1;
+ 	if (count)
+ 		item.type=types[0];
+ 	else
+ 		item.type=type_point_unkn;
  	item.clen=2;
  	item.len=item.clen+2+alen;

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_window.c,1.25,1.26

[Michael F. <ho...@us...>]

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

Modified Files:
	gui_gtk_window.c 
Log Message:
GTK:Fix:Supply name when selecting former destination or bookmark from menu

Index: gui_gtk_window.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** gui_gtk_window.c	25 Mar 2008 16:59:19 -0000	1.25
--- gui_gtk_window.c	25 Mar 2008 22:53:46 -0000	1.26
***************
*** 222,229 ****
  
  static void
! gui_gtk_action_activate(GtkToggleAction *action, struct action_cb_data *data)
  {
  	if(data->attr.type == attr_destination) {
! 		navit_set_destination(data->gui->nav, data->attr.u.pcoord, NULL);
  	}
  }
--- 222,232 ----
  
  static void
! gui_gtk_action_activate(GtkAction *action, struct action_cb_data *data)
  {
  	if(data->attr.type == attr_destination) {
! 		char * label;
! 		g_object_get(G_OBJECT(action), "label", &label,NULL);
! 		navit_set_destination(data->gui->nav, data->attr.u.pcoord, label);
! 		g_free(label);
  	}
  }