navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src item_def.h,1.20,1.21

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

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

Modified Files:
	item_def.h 
Log Message:
Fix:Core:Updated item_def.h from wiki

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** item_def.h	28 Jan 2008 08:13:41 -0000	1.20
--- item_def.h	28 Jan 2008 23:08:07 -0000	1.21
***************
*** 248,251 ****
--- 248,252 ----
  ITEM(aeroway_taxiway)
  ITEM(street_service)
+ ITEM(coverage)
  /* Area */
  ITEM2(0xc0000000,area)

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

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

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

Modified Files:
	log.c 
Log Message:
Fix:Core:Fixed logging issue with closing tags

Index: log.c
===================================================================
RCS file: /cvsroot/navit/navit/src/log.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** log.c	16 Jan 2008 18:21:52 -0000	1.7
--- log.c	28 Jan 2008 23:07:39 -0000	1.8
***************
*** 70,75 ****
  		mode="w";
  	else
! 		mode="a";
  	this_->f=fopen(this_->filename_ex2, mode);
  	this_->empty = !ftell(this_->f);
  }
--- 70,79 ----
  		mode="w";
  	else
! 		mode="r+";
  	this_->f=fopen(this_->filename_ex2, mode);
+ 	if (! this_->f)
+ 		this_->f=fopen(this_->filename_ex2, "w");
+ 	if (!this_->overwrite) 
+ 		fseek(this_->f, 0, SEEK_END);
  	this_->empty = !ftell(this_->f);
  }
***************
*** 143,149 ****
  	gettimeofday(&tv, NULL);
  	delta=(tv.tv_sec-this_->last_flush.tv_sec)*1000+(tv.tv_usec-this_->last_flush.tv_usec)/1000;
  	if (this_->flush_time && delta > this_->flush_time*1000)
  		log_flush(this_);
- 	
  	return TRUE;
  }
--- 147,153 ----
  	gettimeofday(&tv, NULL);
  	delta=(tv.tv_sec-this_->last_flush.tv_sec)*1000+(tv.tv_usec-this_->last_flush.tv_usec)/1000;
+ 	dbg(0,"delta=%d flush_time=%d\n", delta, this_->flush_time);
  	if (this_->flush_time && delta > this_->flush_time*1000)
  		log_flush(this_);
  	return TRUE;
  }
***************
*** 169,176 ****
  	if (flush_time)
  		ret->flush_time=flush_time->u.num;
! 	if (ret->flush_time) 
  		ret->timer=g_timeout_add(ret->flush_time*1000, log_timer, ret);
  	expand_filenames(ret);
  	log_open(ret);
  	return ret;
  }
--- 173,183 ----
  	if (flush_time)
  		ret->flush_time=flush_time->u.num;
! 	if (ret->flush_time) {
! 		dbg(0,"interval %d\n", ret->flush_time*1000);
  		ret->timer=g_timeout_add(ret->flush_time*1000, log_timer, ret);
+ 	}
  	expand_filenames(ret);
  	log_open(ret);
+ 	gettimeofday(&ret->last_flush, NULL);
  	return ret;
  }

[Navit-cvs-commit] navit/src track.c,1.19,1.20

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

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

Modified Files:
	track.c 
Log Message:
Core:Fix:Add include for string.h to fix compiler warnings about 'strlen'

Index: track.c
===================================================================
RCS file: /cvsroot/navit/navit/src/track.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** track.c	28 Dec 2007 10:04:39 -0000	1.19
--- track.c	28 Jan 2008 11:09:03 -0000	1.20
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include <string.h>
  #include "item.h"
  #include "attr.h"
***************
*** 11,26 ****
  #include "mapset.h"
  
- #if 0
- #include <stdio.h>
- #include <glib.h>
- #include "coord.h"
- #include "block.h"
- #include "street.h"
- #include "profile.h"
- #include "tracking.h"
- 
- #endif
- 
- 
  struct tracking_line
  {
--- 12,15 ----
***************
*** 118,122 ****
--- 107,113 ----
  	struct street_data *street;
  	struct tracking_line *tl;
+ #if 0
  	struct coord c;
+ #endif
  
  	dbg(1,"enter\n");

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.4,1.5

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

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
Fix:Core:Patch from mattcallow, ticket #68 : Navit goes into tight loop if gpsd socket is closed. Thanks Matt

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vehicle_gpsd.c	10 Jan 2008 17:56:33 -0000	1.4
--- vehicle_gpsd.c	28 Jan 2008 10:43:08 -0000	1.5
***************
*** 86,91 ****
  		priv->gps = gps_open(source + 7, NULL);
  	g_free(source);
! 	if (!priv->gps)
  		return 0;
  	gps_query(priv->gps, "w+x\n");
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
--- 86,93 ----
  		priv->gps = gps_open(source + 7, NULL);
  	g_free(source);
! 	if (!priv->gps){
! 		dbg(0, "gps_open failed. Have you started gpsd?\n");
  		return 0;
+ 	}
  	gps_query(priv->gps, "w+x\n");
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
***************
*** 125,129 ****
  		if (priv->gps) {
  			vehicle_last = priv;
! 			gps_poll(priv->gps);
  		}
  		return TRUE;
--- 127,135 ----
  		if (priv->gps) {
  			vehicle_last = priv;
!                         if (gps_poll(priv->gps)) {
!                                dbg(0, "gps_poll failed\n");
!                                vehicle_gpsd_close(priv);
!                                vehicle_gpsd_open(priv);
!                         }
  		}
  		return TRUE;

[Navit-cvs-commit] navit/src transform.c, 1.18, 1.19 speech.c, 1.7, 1.8 search.c, 1.9, 1.10 callback.c, 1.10, 1.11

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

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

Modified Files:
	transform.c speech.c search.c callback.c 
Log Message:
Core,Gtk:Fix:Add include for string.h to fix compiler warnings about 'strlen'

Index: transform.c
===================================================================
RCS file: /cvsroot/navit/navit/src/transform.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** transform.c	23 Jan 2008 19:27:10 -0000	1.18
--- transform.c	28 Jan 2008 08:55:42 -0000	1.19
***************
*** 4,7 ****
--- 4,8 ----
  #include <limits.h>
  #include <glib.h>
+ #include <string.h>
  #include "config.h"
  #include "coord.h"

Index: speech.c
===================================================================
RCS file: /cvsroot/navit/navit/src/speech.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** speech.c	9 Jul 2007 22:18:29 -0000	1.7
--- speech.c	28 Jan 2008 08:55:42 -0000	1.8
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include <string.h>
  #include "debug.h"
  #include "speech.h"

Index: search.c
===================================================================
RCS file: /cvsroot/navit/navit/src/search.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** search.c	19 Nov 2007 19:58:18 -0000	1.9
--- search.c	28 Jan 2008 08:55:44 -0000	1.10
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include <string.h>
  #include "debug.h"
  #include "projection.h"

Index: callback.c
===================================================================
RCS file: /cvsroot/navit/navit/src/callback.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** callback.c	4 Jan 2008 09:30:48 -0000	1.10
--- callback.c	28 Jan 2008 08:55:44 -0000	1.11
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include <string.h>
  #include "item.h"
  #include "debug.h"

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_window.c,1.17,1.18

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

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

Modified Files:
	gui_gtk_window.c 
Log Message:
Core,Gtk:Fix:Add include for string.h to fix compiler warnings about 'strlen'

Index: gui_gtk_window.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gui_gtk_window.c	4 Jan 2008 09:29:48 -0000	1.17
--- gui_gtk_window.c	28 Jan 2008 08:55:48 -0000	1.18
***************
*** 1,3 ****
--- 1,4 ----
  #include <stdio.h>
+ #include <string.h>
  #include <stdlib.h>
  #include <gdk/gdkkeysyms.h>

[Navit-cvs-commit] navit/src/vehicle/demo vehicle_demo.c, 1.11, 1.12

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

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

Modified Files:
	vehicle_demo.c 
Log Message:
Core,Gtk:Fix:Add include for string.h to fix compiler warnings about 'strlen'

Index: vehicle_demo.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** vehicle_demo.c	8 Jan 2008 23:48:34 -0000	1.11
--- vehicle_demo.c	28 Jan 2008 08:55:46 -0000	1.12
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include <string.h>
  #include "config.h"
  #include "debug.h"

[Navit-cvs-commit] navit/src/data/mg tree.c, 1.5, 1.6 poly.c, 1.10, 1.11

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

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

Modified Files:
	tree.c poly.c 
Log Message:
Core,Gtk:Fix:Add include for string.h to fix compiler warnings about 'strlen'

Index: poly.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/poly.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** poly.c	24 Jan 2008 18:07:38 -0000	1.10
--- poly.c	28 Jan 2008 08:55:51 -0000	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ #include <string.h>
  #include "debug.h"
  #include "mg.h"

Index: tree.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/tree.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tree.c	12 Nov 2007 19:25:29 -0000	1.5
--- tree.c	28 Jan 2008 08:55:49 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  #include <stdio.h>
+ #include <string.h>
  #include "debug.h"
  #include "mg.h"

[Navit-cvs-commit] navit/src item_def.h, 1.19, 1.20 navit.xml, 1.31, 1.32 osm2navit.c, 1.43, 1.44

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

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

Modified Files:
	item_def.h navit.xml osm2navit.c 
Log Message:
Core:Add:Add support for aeroway terminal and aeroway apron. Thanks to Aurelien Jacobs for the patch.

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** item_def.h	24 Jan 2008 18:07:37 -0000	1.19
--- item_def.h	28 Jan 2008 08:13:41 -0000	1.20
***************
*** 282,283 ****
--- 282,285 ----
  ITEM(poly_farm)
  ITEM(poly_sport_tennis)
+ ITEM(poly_apron)
+ ITEM(poly_terminal)

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** osm2navit.c	28 Jan 2008 08:06:47 -0000	1.43
--- osm2navit.c	28 Jan 2008 08:13:41 -0000	1.44
***************
*** 106,111 ****
--- 106,113 ----
  	"w	building	glasshouse	poly_building\n"
  	"w	building\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	highway	cycleway	street_nopass\n"
  	"w	highway	footway		street_nopass\n"

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** navit.xml	28 Jan 2008 08:06:47 -0000	1.31
--- navit.xml	28 Jan 2008 08:13:41 -0000	1.32
***************
*** 102,105 ****
--- 102,111 ----
  				<label label_size="5" /> 
  			</item>
+ 			<item type="poly_apron" order="0-">
+ 				<polygon color="#d0d0d0" />
+ 			</item>
+ 			<item type="poly_terminal" order="7-">
+ 				<polygon color="#e3c6a6" />
+ 			</item>
  			<item type="rail" order="6-">
  				<polyline color="#808080" width="3" /> 

[Navit-cvs-commit] navit/src navit.xml, 1.30, 1.31 osm2navit.c, 1.42, 1.43

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

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

Modified Files:
	navit.xml osm2navit.c 
Log Message:
Core:Add:Add support for traffic signals. Thanks to Aurelien Jacobs for the patch.

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** osm2navit.c	24 Jan 2008 18:07:38 -0000	1.42
--- osm2navit.c	28 Jan 2008 08:06:47 -0000	1.43
***************
*** 61,64 ****
--- 61,65 ----
  	"n	amenity	telephone	poi_telephone\n"
  	"n	amenity	theatre		poi_theater\n"
+ 	"n	highway	traffic_signals	traffic_signals\n"
  	"n	leisure	slipway		poi_boat_ramp\n"
  	"n	leisure	fishing		poi_fish\n"

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** navit.xml	24 Jan 2008 18:07:37 -0000	1.30
--- navit.xml	28 Jan 2008 08:06:47 -0000	1.31
***************
*** 897,900 ****
--- 897,903 ----
  				<icon src="gc_webcam.xpm" />
  			</item>
+ 			<item type="traffic_signals" order="13-">
+ 				<icon src="traffic_signals.xpm" />
+ 			</item>
  			<item type="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
  				<polygon color="#a0a0a0" />

[Navit-cvs-commit] navit/src popup.c,1.23,1.24

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

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

Modified Files:
	popup.c 
Log Message:
Add:Translations:Made the popup coordinate text more meaningful for translations

Index: popup.c
===================================================================
RCS file: /cvsroot/navit/navit/src/popup.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** popup.c	13 Jan 2008 11:29:06 -0000	1.23
--- popup.c	25 Jan 2008 16:15:44 -0000	1.24
***************
*** 228,232 ****
  	transform_reverse(navit_get_trans(nav), p, &co);
  	men=popup_printf(popup, menu_type_submenu, _("Point 0x%x 0x%x"), co.x, co.y);
! 	popup_printf(men, menu_type_menu, _("Screen %d %d"), p->x, p->y);
  	transform_to_geo(transform_get_projection(navit_get_trans(nav)), &co, &g);
  	transform_geo_text(&g, buffer);	
--- 228,232 ----
  	transform_reverse(navit_get_trans(nav), p, &co);
  	men=popup_printf(popup, menu_type_submenu, _("Point 0x%x 0x%x"), co.x, co.y);
! 	popup_printf(men, menu_type_menu, _("Screen coord : %d %d"), p->x, p->y);
  	transform_to_geo(transform_get_projection(navit_get_trans(nav)), &co, &g);
  	transform_geo_text(&g, buffer);	

[Navit-cvs-commit] navit/po no.po,1.15,1.16

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

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

Modified Files:
	no.po 
Log Message:
Update:Translation:Updated no.po. Thank you Helge

Index: no.po
===================================================================
RCS file: /cvsroot/navit/navit/po/no.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** no.po	24 Jan 2008 18:07:37 -0000	1.15
--- no.po	25 Jan 2008 13:33:33 -0000	1.16
***************
*** 3,6 ****
--- 3,7 ----
  # This file is distributed under the same license as the navit package.
  # Bendik Brenne <be...@xp...>, 2007.
+ # Helge Hafting <hel...@ai...>
  #
  msgid ""
***************
*** 8,13 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
! "PO-Revision-Date: 2007-10-30 16:26+0100\n"
  "Last-Translator: Bendik Brenne <be...@xp...>\n"
  "Language-Team: Bendik Brenne <be...@xp...>\n"
--- 9,14 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-25 14:33+0100\n"
! "PO-Revision-Date: 2008-01-11 09:52+0100\n"
  "Last-Translator: Bendik Brenne <be...@xp...>\n"
  "Language-Team: Bendik Brenne <be...@xp...>\n"
***************
*** 15,33 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
  #: ../src/main.c:108
  #, c-format
  msgid "Running from source directory\n"
! msgstr ""
  
  #: ../src/main.c:124
! #, fuzzy, c-format
  msgid "setting '%s' to '%s'\n"
! msgstr "Bruker '%s'\n"
  
  #: ../src/main.c:202
  #, c-format
  msgid "No config file navit.xml, navit.xml.local found\n"
! msgstr ""
  
  #: ../src/main.c:206
--- 16,35 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
  #: ../src/main.c:108
  #, c-format
  msgid "Running from source directory\n"
! msgstr "Kjører fra kildemappa\n"
  
  #: ../src/main.c:124
! #, c-format
  msgid "setting '%s' to '%s'\n"
! msgstr "setter '%s' til '%s'\n"
  
  #: ../src/main.c:202
  #, c-format
  msgid "No config file navit.xml, navit.xml.local found\n"
! msgstr "Ingen fil navit.xml, fant navit.xml.local\n"
  
  #: ../src/main.c:206
***************
*** 47,56 ****
  
  #: ../src/navigation.c:162
! #, fuzzy, c-format
  msgid "%d m"
  msgstr "%d meter"
  
  #: ../src/navigation.c:164
! #, fuzzy, c-format
  msgid "in %d m"
  msgstr "om %d meter"
--- 49,58 ----
  
  #: ../src/navigation.c:162
! #, c-format
  msgid "%d m"
  msgstr "%d meter"
  
  #: ../src/navigation.c:164
! #, c-format
  msgid "in %d m"
  msgstr "om %d meter"
***************
*** 77,92 ****
  
  #: ../src/navigation.c:182
! #, fuzzy, c-format
  msgid "one kilometer"
  msgid_plural "%d kilometers"
! msgstr[0] "èn kilometer"
! msgstr[1] "èn kilometer"
  
  #: ../src/navigation.c:184
! #, fuzzy, c-format
  msgid "in one kilometer"
  msgid_plural "in %d kilometers"
! msgstr[0] "om èn kilometer"
! msgstr[1] "om èn kilometer"
  
  #: ../src/navigation.c:402
--- 79,94 ----
  
  #: ../src/navigation.c:182
! #, c-format
  msgid "one kilometer"
  msgid_plural "%d kilometers"
! msgstr[0] "én kilometer"
! msgstr[1] "%d kilometer"
  
  #: ../src/navigation.c:184
! #, c-format
  msgid "in one kilometer"
  msgid_plural "in %d kilometers"
! msgstr[0] "om én kilometer"
! msgstr[1] "om %d kilometer"
  
  #: ../src/navigation.c:402
***************
*** 100,108 ****
  #: ../src/navigation.c:413
  msgid "easily "
! msgstr "slakk "
  
  #: ../src/navigation.c:417
  msgid "strongly "
! msgstr "skarp "
  
  #: ../src/navigation.c:420
--- 102,110 ----
  #: ../src/navigation.c:413
  msgid "easily "
! msgstr "slakt "
  
  #: ../src/navigation.c:417
  msgid "strongly "
! msgstr "skarpt "
  
  #: ../src/navigation.c:420
***************
*** 111,117 ****
  
  #: ../src/navigation.c:426
- #, fuzzy
  msgid "When possible, please turn around"
! msgstr "NÃ¥r mulig, vennligst sving"
  
  #: ../src/navigation.c:433
--- 113,118 ----
  
  #: ../src/navigation.c:426
  msgid "When possible, please turn around"
! msgstr "Snu, om det er mulig"
  
  #: ../src/navigation.c:433
***************
*** 134,140 ****
  #. TRANSLATORS: The first argument is strength, the second direction and the third distance
  #: ../src/navigation.c:450
! #, fuzzy, c-format
  msgid "Turn %1$s%2$s %3$s"
! msgstr "Sving %s%s %s"
  
  #: ../src/navigation.c:453
--- 135,141 ----
  #. 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 "Sving %1$stil %2$s %3$s"
  
  #: ../src/navigation.c:453
***************
*** 152,189 ****
  
  #: ../src/navit.c:725
- #, fuzzy
  msgid "Former Destinations"
! msgstr "Destinasjon"
  
  #: ../src/navit.c:735
  msgid "Bookmarks"
! msgstr ""
  
  #: ../src/navit.c:773
  msgid "Vehicle"
! msgstr ""
  
  #: ../src/navit.c:823
- #, fuzzy
  msgid "Command"
! msgstr "Polen"
  
  #: ../src/navit.c:828
  msgid "Length"
! msgstr ""
  
  #: ../src/navit.c:834
  msgid "Time"
! msgstr ""
  
  #: ../src/navit.c:839
- #, fuzzy
  msgid "Destination Length"
! msgstr "Destinasjon"
  
  #: ../src/navit.c:845
- #, fuzzy
  msgid "Destination Time"
! msgstr "Destinasjon"
  
  #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
--- 153,186 ----
  
  #: ../src/navit.c:725
  msgid "Former Destinations"
! msgstr "Tidligere reisemål"
  
  #: ../src/navit.c:735
  msgid "Bookmarks"
! msgstr "Bokmerker"
  
  #: ../src/navit.c:773
  msgid "Vehicle"
! msgstr "Kjøretøy"
  
  #: ../src/navit.c:823
  msgid "Command"
! msgstr "Instruks"
  
  #: ../src/navit.c:828
  msgid "Length"
! msgstr "Avstand"
  
  #: ../src/navit.c:834
  msgid "Time"
! msgstr "Tid"
  
  #: ../src/navit.c:839
  msgid "Destination Length"
! msgstr "Avstand til målet"
  
  #: ../src/navit.c:845
  msgid "Destination Time"
! msgstr "Tid til målet"
  
  #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
***************
*** 220,225 ****
  
  #: ../src/popup.c:241
  msgid "Add as bookmark"
! msgstr ""
  
  #: ../src/country.c:24
--- 217,223 ----
  
  #: ../src/popup.c:241
+ #, fuzzy
  msgid "Add as bookmark"
! msgstr "Bokmerke"
  
  #: ../src/country.c:24
***************
*** 388,392 ****
  
  #: ../src/country.c:65
- #, fuzzy
  msgid "Saudi Arabia"
  msgstr "Saudi-Arabia"
--- 386,389 ----
***************
*** 474,480 ****
  #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97
  #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99
- #, fuzzy
  msgid "Car"
! msgstr "Fjern"
  
  #: ../src/gui/gtk/destination.c:96
--- 471,476 ----
  #: ../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 "Bil"
  
  #: ../src/gui/gtk/destination.c:96
***************
*** 499,507 ****
  #: ../src/gui/gtk/destination.c:99
  msgid "Town"
! msgstr ""
  
  #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
  #: ../src/gui/gtk/destination.c:99
- #, fuzzy
  msgid "District"
  msgstr "Distrikt/Kommune"
--- 495,502 ----
  #: ../src/gui/gtk/destination.c:99
  msgid "Town"
! msgstr "By"
  
  #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98
  #: ../src/gui/gtk/destination.c:99
  msgid "District"
  msgstr "Distrikt/Kommune"
***************
*** 517,523 ****
  
  #: ../src/gui/gtk/destination.c:329
- #, fuzzy
  msgid "Enter Destination"
! msgstr "Destinasjon"
  
  #: ../src/gui/gtk/destination.c:336
--- 512,517 ----
  
  #: ../src/gui/gtk/destination.c:329
  msgid "Enter Destination"
! msgstr "Oppgi reisemålet"
  
  #: ../src/gui/gtk/destination.c:336
***************
*** 535,539 ****
  #: ../src/gui/gtk/destination.c:369
  msgid "Bookmark"
! msgstr ""
  
  #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208
--- 529,533 ----
  #: ../src/gui/gtk/destination.c:369
  msgid "Bookmark"
! msgstr "Bokmerke"
  
  #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208
***************
*** 654,660 ****
  msgstr ""
  
- #, fuzzy
  #~ msgid "RouteGraph"
! #~ msgstr "Rute"
  
  #~ msgid "two kilometers"
--- 648,653 ----
  msgstr ""
  
  #~ msgid "RouteGraph"
! #~ msgstr "Rutegraf"
  
  #~ msgid "two kilometers"

[Navit-cvs-commit] navit configure.in,1.67,1.68

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

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

Modified Files:
	configure.in 
Log Message:
Fix:Install:Removed erroneus exits in CEGUI checks

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** configure.in	9 Jan 2008 17:21:33 -0000	1.67
--- configure.in	25 Jan 2008 12:58:29 -0000	1.68
***************
*** 202,206 ****
  	          [ 	 
  	         echo "Error! Something is wrong with CEGUIBase. Do you have at least cegui-0.5?" 	 
- 	         exit -1 	 
  	         ]) 	 
  	 AC_CHECK_LIB(CEGUIOpenGLRenderer, main, 	 
--- 202,205 ----
***************
*** 208,212 ****
  	          [ 	 
  	         echo "Error! Something is wrong with CEGUIOpenGLRenderer. Do you have at least cegui-0.5? " 	 
- 	         exit -1 	 
  	         ], $OPENGL_LIBS ) 	 
  	 AC_CHECK_LIB(CEGUIFalagardWRBase, main, 	 
--- 207,210 ----
***************
*** 214,218 ****
  	          [ 	 
  	         echo "Error! Something is wrong with CEGUIFalagardWRBase. Do you have at least cegui-0.5?" 	 
- 	         exit -1 	 
  	         ], $OPENGL_LIBS) 	 
  	 CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase" 	 
--- 212,215 ----

[Navit-cvs-commit] navit README,1.10,1.11

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

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

Modified Files:
	README 
Log Message:
Update:Doc:Minors update in README

Index: README
===================================================================
RCS file: /cvsroot/navit/navit/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** README	18 Dec 2007 15:02:21 -0000	1.10
--- README	25 Jan 2008 09:53:45 -0000	1.11
***************
*** 18,22 ****
  destination, but also generates directions and even speaks to you.
  
! Navit currently speaks 9 languages :
  - English
  - German
--- 18,22 ----
  destination, but also generates directions and even speaks to you.
  
! Navit currently speaks 10 languages :
  - English
  - German
***************
*** 28,35 ****
--- 28,39 ----
  - Czech
  - Finish
+ - Danish
  
  For help or more information, please refer to the wiki :
   http://wiki.navit-project.org
  
+ If you don't know where to start, we recommend you to read the 
+ Interactive Help : http://wiki.navit-project.org/index.php/Interactive_help
+ 
  
  Maps:

[Navit-cvs-commit] navit/projs/CodeBlocks gtk_gl_ext.cbp,NONE,1.1

[Albert L F. <af...@us...>]

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

Added Files:
	gtk_gl_ext.cbp 
Log Message:
Fix:projs/CodeBlocks:update project files

--- NEW FILE: gtk_gl_ext.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="gtk_gl_ext" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output=".\bin\Debug\libgtk_gl_ext.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Debug\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
				<Linker>
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Debug" />
				</Linker>
			</Target>
			<Target title="Release">
				<Option output=".\bin\Release\libgtk_gl_ext.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Release\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
				<Linker>
					<Add option="-s" />
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Release" />
				</Linker>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields" />
			<Add option="-DBUILD_DLL" />
			<Add option="-DMODULE=gtk_gl_ext" />
			<Add directory="%GTK_DIR%\include" />
			<Add directory="%GTK_DIR%\include\gtk-2.0" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="%GTK_DIR%\include\cairo" />
			<Add directory="%GTK_DIR%\include\pango-1.0" />
			<Add directory="%GTK_DIR%\include\atk-1.0" />
			<Add directory="..\..\src" />
			<Add directory="Win32Extra" />
			<Add directory="%GTK_DIR%\include\freetype2" />
			<Add directory="%GTK_DIR%\include\gtkglext-1.0" />
			<Add directory="%GTK_DIR%\lib\gtkglext-1.0\include" />
		</Compiler>
		<Linker>
			<Add library="glib-2.0" />
			<Add library="user32" />
			<Add library="intl" />
			<Add library="iconv" />
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<Unit filename="..\..\src\graphics\gtk_gl_ext\graphics_gtk_gl_ext.c">
			<Option compilerVar="CC" />
		</Unit>
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra speech_dispatcher_win32.c, NONE, 1.1

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27833

Added Files:
	speech_dispatcher_win32.c 
Log Message:
Fix:projs/CodeBlocks:added win32 speech dispatcher

--- NEW FILE: speech_dispatcher_win32.c ---
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <glib.h>
#include <stdarg.h>
#include "config.h"
#include "plugin.h"
#include "speech.h"
#include <windows.h>
#define COBJMACROS
#include <sapi.h>
#include <objbase.h>
#include <glib.h>

const IID UUID_OF_ISPVOICE; // = {6C44DF74-72B9-4992-A1EC-EF996E0422D4};


struct speech_priv {
    ISpVoice* pIspVoice;
};

static int
speechd_say(struct speech_priv *this_, const char *text) {
    int err = 1;

    if ( this_->pIspVoice )
    {
        WCHAR* pWideString = g_utf8_to_utf16( text, -1, NULL, NULL, NULL );
        ISpVoice_Speak( this_->pIspVoice, pWideString, 0, NULL);
        g_free( pWideString );
        err = 0;
    }
	return err;
}

static void
speechd_destroy(struct speech_priv *this) {
	g_free(this);
}

static struct speech_methods speechd_meth = {
	speechd_destroy,
	speechd_say,
};

static struct speech_priv *
speechd_new(char *data, struct speech_methods *meth) {
	struct speech_priv *this_;

	this_=g_new(struct speech_priv,1);

    this_->pIspVoice = NULL;


    CLSID clsid_sape;
    CLSID* pw = &clsid_sape;

    CoInitialize(NULL);

    HRESULT hr = CLSIDFromProgID(L"SAPI.SpVoice", &clsid_sape);

    if ( 0 == hr )
    {
        IID UUID_OF_ISPVOICE; // = {6C44DF74-72B9-4992-A1EC-EF996E0422D4};
        UUID_OF_ISPVOICE.Data1 = 0x6C44DF74;
        UUID_OF_ISPVOICE.Data2 = 0x72B9;
        UUID_OF_ISPVOICE.Data3 = 0x4992;
        UUID_OF_ISPVOICE.Data4[0] = 161;
        UUID_OF_ISPVOICE.Data4[1] = 236;
        UUID_OF_ISPVOICE.Data4[2] = 239;
        UUID_OF_ISPVOICE.Data4[3] = 153;
        UUID_OF_ISPVOICE.Data4[4] = 110;
        UUID_OF_ISPVOICE.Data4[5] = 4;
        UUID_OF_ISPVOICE.Data4[6] = 34;
        UUID_OF_ISPVOICE.Data4[7] = 212;

        ISpVoice* pIspVoice;
        hr = CoCreateInstance( &clsid_sape, NULL, CLSCTX_ALL, &UUID_OF_ISPVOICE, &pIspVoice );

        if ( ( 0 == hr ) && ( this_ != NULL ) )
        {
            this_->pIspVoice = pIspVoice;
        }
    }

    // ISpVoice_Speak( pIspVoice, L"If you can hear this, SAPI is working", 0, NULL);
    *meth=speechd_meth;
	return this_;
}


void plugin_init(void)
{
	plugin_register_speech_type("speech_dispatcher", speechd_new);
}

[Navit-cvs-commit] navit/projs/CodeBlocks NavitCore.cbp, NONE, 1.1 Navit.cbp, 1.7, 1.8 Navit.workspace, 1.7, 1.8 Osm2Navit.cbp, 1.3, 1.4 binfile.cbp, 1.2, 1.3 data_garmin.cbp, 1.1, 1.2 data_garmin_img.cbp, 1.1, 1.2 data_mg.cbp, 1.1, 1.2 data_poi_geodownload.cbp, 1.2, 1.3 vehicle_demo.cbp, 1.2, 1.3 vehicle_file.cbp, 1.2, 1.3

[Albert L F. <af...@us...>]

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

Modified Files:
	Navit.cbp Navit.workspace Osm2Navit.cbp binfile.cbp 
	data_garmin.cbp data_garmin_img.cbp data_mg.cbp 
	data_poi_geodownload.cbp vehicle_demo.cbp vehicle_file.cbp 
Added Files:
	NavitCore.cbp 
Log Message:
Fix:projs/CodeBlocks:update project files

Index: data_garmin.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/data_garmin.cbp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** data_garmin.cbp	9 Jan 2008 19:44:03 -0000	1.1
--- data_garmin.cbp	24 Jan 2008 20:45:22 -0000	1.2
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

Index: Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Navit.cbp	15 Jan 2008 19:55:59 -0000	1.7
--- Navit.cbp	24 Jan 2008 20:45:22 -0000	1.8
***************
*** 10,13 ****
--- 10,14 ----
  				<Option output="bin\Debug\Navit" prefix_auto="1" extension_auto="1" />
  				<Option object_output="obj\Debug\" />
+ 				<Option external_deps="bin\Debug\libvehicle_file.la;bin\Debug\libdata_binfile.la;bin\Debug\libgtk_graphics.la;bin\Debug\libgtk_gui.la" />
  				<Option type="1" />
  				<Option compiler="gcc" />
***************
*** 30,35 ****
--- 31,38 ----
  					<Add library="bin\Debug\libdata_textfile.la" />
  					<Add library="libgarmin.a" />
+ 					<Add library="bin\Debug\libwin32_gui.la" />
  					<Add library="ole32" />
  					<Add library="user32" />
+ 					<Add library="gdi32" />
  					<Add library="gtk-win32-2.0" />
  					<Add library="gdk-win32-2.0" />
***************
*** 69,72 ****
--- 72,76 ----
  					<Add library="bin\Release\libdata_mg.la" />
  					<Add library="bin\Release\libdata_textfile.la" />
+ 					<Add library="bin\Release\libwin32_gui.la" />
  					<Add library="libgarmin.a" />
  					<Add library="ole32" />
***************
*** 106,110 ****
  		<Linker>
  			<Add directory="%GTK_DIR%\lib" />
- 			<Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" />
  		</Linker>
  		<Unit filename="Win32Extra\builtin.c">
--- 110,113 ----

Index: Osm2Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Osm2Navit.cbp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Osm2Navit.cbp	12 Jan 2008 22:38:25 -0000	1.3
--- Osm2Navit.cbp	24 Jan 2008 20:45:22 -0000	1.4
***************
*** 14,18 ****
  				<Option compiler="gcc" />
  				<Option use_console_runner="0" />
! 				<Option parameters="--input-file=d:\CB_Projects\netherlands.osm --attr-debug-level=0 -k netherlands.bin" />
  				<Compiler>
  					<Add option="-g" />
--- 14,18 ----
  				<Option compiler="gcc" />
  				<Option use_console_runner="0" />
! 				<Option parameters="--input-file=d:\josm\nld_zuid.osm --attr-debug-level=0 -k ehv3.bin" />
  				<Compiler>
  					<Add option="-g" />
***************
*** 51,55 ****
  			<Add library="gdk-win32-2.0" />
  			<Add library="gdk_pixbuf-2.0" />
- 			<Add library="fib" />
  			<Add library="freetype" />
  			<Add library="z" />
--- 51,54 ----

Index: data_poi_geodownload.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/data_poi_geodownload.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** data_poi_geodownload.cbp	8 Jan 2008 22:12:50 -0000	1.2
--- data_poi_geodownload.cbp	24 Jan 2008 20:45:22 -0000	1.3
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

--- NEW FILE: NavitCore.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="NavitCore" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output="bin\Debug\libNavit" prefix_auto="1" extension_auto="1" />
				<Option working_dir="" />
				<Option object_output="obj\Debug\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
			</Target>
			<Target title="Release">
				<Option output="bin\Release\libNavit" prefix_auto="1" extension_auto="1" />
				<Option working_dir="" />
				<Option object_output="obj\Release\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields" />
			<Add option="-DMODULE=Navit" />
			<Add option='-DPREFIX=\&quot;/usr/local\&quot;' />
			<Add directory="%GTK_DIR%\include" />
			<Add directory="%GTK_DIR%\include\gtk-2.0" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="%GTK_DIR%\include\cairo" />
			<Add directory="%GTK_DIR%\include\pango-1.0" />
			<Add directory="%GTK_DIR%\include\atk-1.0" />
			<Add directory="..\..\src" />
			<Add directory="Win32Extra" />
			<Add directory="..\..\src\fib-1.1" />
			<Add directory="%GTK_DIR%\include\freetype2" />
		</Compiler>
		<Linker>
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<Unit filename="Win32Extra\builtin.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\config.h" />
		<Unit filename="Win32Extra\serial_io.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\serial_io.h" />
		<Unit filename="Win32Extra\setenv.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\setenv.h" />
		<Unit filename="Win32Extra\sys\mman.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\sys\mman.h" />
		<Unit filename="Win32Extra\wordexp.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\wordexp.h" />
		<Unit filename="..\..\src\Makefile" />
		<Unit filename="..\..\src\Makefile.am" />
		<Unit filename="..\..\src\Makefile.in" />
		<Unit filename="..\..\src\attr.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\attr.h" />
		<Unit filename="..\..\src\attr_def.h" />
		<Unit filename="..\..\src\callback.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\callback.h" />
		<Unit filename="..\..\src\color.h" />
		<Unit filename="..\..\src\compass.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\compass.h" />
		<Unit filename="..\..\src\coord.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\coord.h" />
		<Unit filename="..\..\src\country.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\country.h" />
		<Unit filename="..\..\src\cursor.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\cursor.h" />
		<Unit filename="..\..\src\data.h" />
		<Unit filename="..\..\src\data_window.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data_window.h" />
		<Unit filename="..\..\src\data_window_int.h" />
		<Unit filename="..\..\src\debug.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\debug.h" />
		<Unit filename="..\..\src\destination.h" />
		<Unit filename="..\..\src\draw_info.h" />
		<Unit filename="..\..\src\file.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\file.h" />
		<Unit filename="..\..\src\graphics.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\graphics.h" />
		<Unit filename="..\..\src\gtkext.h" />
		<Unit filename="..\..\src\gui.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\gui.h" />
		<Unit filename="..\..\src\gui\gtk\gui_gtk.h" />
		<Unit filename="..\..\src\item.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\item.h" />
		<Unit filename="..\..\src\item_def.h" />
		<Unit filename="..\..\src\layer.h" />
		<Unit filename="..\..\src\layout.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\layout.h" />
		<Unit filename="..\..\src\log.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\log.h" />
		<Unit filename="..\..\src\main.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\main.h" />
		<Unit filename="..\..\src\map-share.h" />
		<Unit filename="..\..\src\map.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\map.h" />
		<Unit filename="..\..\src\map_data.h" />
		<Unit filename="..\..\src\mapset.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\mapset.h" />
		<Unit filename="..\..\src\maptype.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\maptype.h" />
		<Unit filename="..\..\src\menu.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\menu.h" />
		<Unit filename="..\..\src\navigation.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\navigation.h" />
		<Unit filename="..\..\src\navit.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\navit.h" />
		<Unit filename="..\..\src\navit.xml" />
		<Unit filename="..\..\src\osd.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\osd.h" />
		<Unit filename="..\..\src\param.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\param.h" />
		<Unit filename="..\..\src\phrase.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\phrase.h" />
		<Unit filename="..\..\src\plugin.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\plugin.h" />
		<Unit filename="..\..\src\plugin_def.h" />
		<Unit filename="..\..\src\point.h" />
		<Unit filename="..\..\src\popup.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\popup.h" />
		<Unit filename="..\..\src\profile.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\profile.h" />
		<Unit filename="..\..\src\projection.h" />
		<Unit filename="..\..\src\route.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\route.h" />
		<Unit filename="..\..\src\search.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\search.h" />
		<Unit filename="..\..\src\speech.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\speech.h" />
		<Unit filename="..\..\src\statusbar.h" />
		<Unit filename="..\..\src\track.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\track.h" />
		<Unit filename="..\..\src\transform.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\transform.h" />
		<Unit filename="..\..\src\util.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\util.h" />
		<Unit filename="..\..\src\vehicle.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\vehicle.h" />
		<Unit filename="..\..\src\xmlconfig.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\xmlconfig.h" />
		<Unit filename="..\..\src\zipfile.h" />
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

Index: binfile.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/binfile.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** binfile.cbp	8 Jan 2008 22:12:50 -0000	1.2
--- binfile.cbp	24 Jan 2008 20:45:22 -0000	1.3
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

Index: vehicle_demo.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/vehicle_demo.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vehicle_demo.cbp	8 Jan 2008 22:12:50 -0000	1.2
--- vehicle_demo.cbp	24 Jan 2008 20:45:22 -0000	1.3
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

Index: vehicle_file.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/vehicle_file.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vehicle_file.cbp	8 Jan 2008 22:12:50 -0000	1.2
--- vehicle_file.cbp	24 Jan 2008 20:45:22 -0000	1.3
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

Index: Navit.workspace
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Navit.workspace	15 Jan 2008 19:55:59 -0000	1.7
--- Navit.workspace	24 Jan 2008 20:45:22 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <CodeBlocks_workspace_file>
  	<Workspace title="Navit">
+ 		<Project filename="win32_gui.cbp" />
  		<Project filename="fib-1.1.cbp" />
  		<Project filename="Osm2Navit.cbp" />
***************
*** 7,38 ****
  		<Project filename="gentypes.cbp" />
  		<Project filename="data_textfile.cbp" />
  		<Project filename="binfile.cbp" />
! 		<Project filename="data_mg.cbp" />
  		<Project filename="data_garmin.cbp">
  			<Depends filename="gentypes.cbp" />
  		</Project>
- 		<Project filename="mdb.cbp" />
- 		<Project filename="data_poi_geodownload.cbp" />
- 		<Project filename="vehicle_demo.cbp" />
- 		<Project filename="vehicle_file.cbp" />
- 		<Project filename="gtk_gui.cbp" />
- 		<Project filename="gtk_graphics.cbp" />
  		<Project filename="Navit.cbp" active="1">
  			<Depends filename="fib-1.1.cbp" />
  			<Depends filename="Osm2Navit.cbp" />
  			<Depends filename="gentypes.cbp" />
  			<Depends filename="data_textfile.cbp" />
- 			<Depends filename="binfile.cbp" />
- 			<Depends filename="data_mg.cbp" />
- 			<Depends filename="data_garmin.cbp" />
  			<Depends filename="mdb.cbp" />
- 			<Depends filename="data_poi_geodownload.cbp" />
- 			<Depends filename="vehicle_demo.cbp" />
- 			<Depends filename="vehicle_file.cbp" />
  			<Depends filename="gtk_gui.cbp" />
  			<Depends filename="gtk_graphics.cbp" />
  			<Depends filename="speech_speech_dispatcher.cbp" />
  		</Project>
! 		<Project filename="speech_speech_dispatcher.cbp" />
  	</Workspace>
  </CodeBlocks_workspace_file>
--- 8,42 ----
  		<Project filename="gentypes.cbp" />
  		<Project filename="data_textfile.cbp" />
+ 		<Project filename="mdb.cbp" />
+ 		<Project filename="gtk_gui.cbp" />
+ 		<Project filename="gtk_graphics.cbp" />
+ 		<Project filename="gtk_gl_ext.cbp" />
+ 		<Project filename="vehicle_file.cbp" />
+ 		<Project filename="vehicle_demo.cbp" />
+ 		<Project filename="speech_speech_dispatcher.cbp" />
  		<Project filename="binfile.cbp" />
! 		<Project filename="data_poi_geodownload.cbp" />
  		<Project filename="data_garmin.cbp">
  			<Depends filename="gentypes.cbp" />
  		</Project>
  		<Project filename="Navit.cbp" active="1">
+ 			<Depends filename="win32_gui.cbp" />
  			<Depends filename="fib-1.1.cbp" />
  			<Depends filename="Osm2Navit.cbp" />
  			<Depends filename="gentypes.cbp" />
  			<Depends filename="data_textfile.cbp" />
  			<Depends filename="mdb.cbp" />
  			<Depends filename="gtk_gui.cbp" />
  			<Depends filename="gtk_graphics.cbp" />
+ 			<Depends filename="gtk_gl_ext.cbp" />
+ 			<Depends filename="vehicle_file.cbp" />
+ 			<Depends filename="vehicle_demo.cbp" />
  			<Depends filename="speech_speech_dispatcher.cbp" />
+ 			<Depends filename="binfile.cbp" />
+ 			<Depends filename="data_poi_geodownload.cbp" />
+ 			<Depends filename="data_garmin.cbp" />
+ 			<Depends filename="data_mg.cbp" />
  		</Project>
! 		<Project filename="data_mg.cbp" />
  	</Workspace>
  </CodeBlocks_workspace_file>

Index: data_garmin_img.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/data_garmin_img.cbp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** data_garmin_img.cbp	9 Jan 2008 19:44:03 -0000	1.1
--- data_garmin_img.cbp	24 Jan 2008 20:45:22 -0000	1.2
***************
*** 46,52 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
--- 46,49 ----

Index: data_mg.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/data_mg.cbp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** data_mg.cbp	12 Jan 2008 22:38:25 -0000	1.1
--- data_mg.cbp	24 Jan 2008 20:45:22 -0000	1.2
***************
*** 46,54 ****
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
- 			<Add directory="..\..\" />
- 			<Add directory="..\" />
- 			<Add directory="D:\CB_Projects\Navit\src\" />
- 			<Add directory="Win32Extra" />
  			<Add directory="..\..\src" />
  		</Compiler>
  		<Linker>
--- 46,51 ----
  			<Add directory="%GTK_DIR%\include\glib-2.0" />
  			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
  			<Add directory="..\..\src" />
+ 			<Add directory="Win32Extra" />
  		</Compiler>
  		<Linker>

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra builtin.c, 1.4, 1.5

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27333/Win32Extra

Modified Files:
	builtin.c 
Log Message:
Fix:projs/CodeBlocks:update project files

Index: builtin.c
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/builtin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** builtin.c	15 Jan 2008 19:36:12 -0000	1.4
--- builtin.c	24 Jan 2008 20:45:22 -0000	1.5
***************
*** 8,11 ****
--- 8,12 ----
  extern void module_vehicle_demo_init(void);
  extern void module_vehicle_file_init(void);
+ extern void module_win32_gui_init(void);
  extern void module_speech_speech_dispatcher_init(void);
  extern void builtin_init(void);
***************
*** 14,17 ****
--- 15,19 ----
  	module_data_binfile_init();
  	module_data_mg_init();
+ 	module_win32_gui_init();
      module_data_garmin_init();
  	module_data_poi_geodownload_init();

[Navit-cvs-commit] navit/projs/CodeBlocks/win32gui win32_graphics.c, NONE, 1.1 win32_gui.c, NONE, 1.1 win32_gui.h, NONE, 1.1 window.c, NONE, 1.1

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27333/win32gui

Added Files:
	win32_graphics.c win32_gui.c win32_gui.h window.c 
Log Message:
Fix:projs/CodeBlocks:update project files

--- NEW FILE: win32_graphics.c ---
#include <windows.h>
#include <wingdi.h>
#include <glib.h>

#include "config.h"
#include "debug.h"
#include "point.h"
#include "graphics.h"
#include "color.h"
#include "plugin.h"




void ErrorExit(LPTSTR lpszFunction)
{
    // Retrieve the system error message for the last-error code

    LPVOID lpMsgBuf;
    LPVOID lpDisplayBuf;
    DWORD dw = GetLastError();

    FormatMessage(
        FORMAT_MESSAGE_ALLOCATE_BUFFER |
        FORMAT_MESSAGE_FROM_SYSTEM |
        FORMAT_MESSAGE_IGNORE_INSERTS,
        NULL,
        dw,
        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
        (LPTSTR) &lpMsgBuf,
        0, NULL );

    // Display the error message and exit the process

    lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT,
        (lstrlen((LPCTSTR)lpMsgBuf)+lstrlen((LPCTSTR)lpszFunction)+40)*sizeof(TCHAR));
    sprintf((LPTSTR)lpDisplayBuf, TEXT("%s failed with error %d: %s"), lpszFunction, dw, lpMsgBuf);

    printf( "%s\n", lpDisplayBuf );
    MessageBox(NULL, (LPCTSTR)lpDisplayBuf, TEXT("Error"), MB_OK);

    LocalFree(lpMsgBuf);
    LocalFree(lpDisplayBuf);
    ExitProcess(dw);
}


struct graphics_priv {
	struct point p;
	int width;
	int height;
	int library_init;
	int visible;
	HANDLE wnd_parent_handle;
	HANDLE wnd_handle;

	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;
	enum draw_mode_num mode;
};


struct graphics_priv *g_gra;


static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
	switch(Message)
	{
		case WM_CREATE:
		{
				g_gra->wnd_handle = hwnd;
				//if (g_gra->resize_callback)
				// 	(*g_gra->resize_callback)(g_gra->resize_callback_data, g_gra->width, g_gra->height);
				//MoveWindow( hwnd, 0,0, 780, 680, TRUE );
		}
		break;
		case WM_COMMAND:
			switch(LOWORD(wParam))
			{
			}
		break;
		case WM_CLOSE:
			DestroyWindow(hwnd);
		break;
		case WM_LBUTTONDBLCLK:
				if (g_gra->resize_callback)
				 	(*g_gra->resize_callback)(g_gra->resize_callback_data, g_gra->width, g_gra->height);
		break;
		case WM_SIZE:
			{
				//graphics = GetWindowLong( hwnd, DWL_USER, 0 );

				g_gra->width = LOWORD( lParam );
				g_gra->height  = HIWORD( lParam );

			}
		break;
		case WM_DESTROY:
			PostQuitMessage(0);
		break;
		default:
			return DefWindowProc(hwnd, Message, wParam, lParam);
	}
	return 0;
}


static const char g_szClassName[] = "NAVGRA";

void CreateGraphicsWindows( struct graphics_priv* gr )
{
	WNDCLASSEX wc;
	HWND hwnd;
	MSG Msg;
    RECT rcParent;

	wc.cbSize		 = sizeof(WNDCLASSEX);
	wc.style		 = 0;
	wc.lpfnWndProc	 = WndProc;
	wc.cbClsExtra	 = 0;
	wc.cbWndExtra	 = 0;
	wc.hInstance	 = NULL;
	wc.hIcon		 = NULL;
	wc.hCursor		 = LoadCursor(NULL, IDC_ARROW);
	wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
	wc.lpszMenuName  = NULL;
	wc.lpszClassName = g_szClassName;
	wc.hIconSm		 = NULL;


HANDLE hdl = gr->wnd_parent_handle;
	GetWindowRect( gr->wnd_parent_handle,&rcParent);

	if(!RegisterClassEx(&wc))
	{
		ErrorExit( "Window Registration Failed!" );
		return 0;
	}

				g_gra->width = rcParent.right - rcParent.left;
				g_gra->height  = rcParent.bottom - rcParent.top;


	hwnd = CreateWindow( 	g_szClassName,
							"",
							WS_CHILD  ,
							0,
							0,
							g_gra->width,
							g_gra->height,
							gr->wnd_parent_handle,
							NULL,
							NULL,
							NULL);

	if(hwnd == NULL)
	{
		ErrorExit( "Window Creation Failed!" );
		return 0;
	}

	ShowWindow(hwnd, TRUE);
	UpdateWindow(hwnd);
	gr->wnd_handle = hwnd;
}



static void
graphics_destroy(struct graphics_priv *gr)
{
}


static void
gc_destroy(struct graphics_gc_priv *gc)
{

}

static void
gc_set_linewidth(struct graphics_gc_priv *gc, int w)
{
//	gdk_gc_set_line_attributes(gc->gc, w, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
}

static void
gc_set_dashes(struct graphics_gc_priv *gc, unsigned char *dash_list, int n)
{
//	gdk_gc_set_dashes(gc->gc, 0, (gint8 *)dash_list, n);
//	gdk_gc_set_line_attributes(gc->gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_ROUND);
}

static void
gc_set_color(struct graphics_gc_priv *gc, struct color *c, int fg)
{
//	GdkColor gdkc;
//	gdkc.pixel=0;
//	gdkc.red=c->r;
//	gdkc.green=c->g;
//	gdkc.blue=c->b;
//	gdk_colormap_alloc_color(gc->gr->colormap, &gdkc, FALSE, TRUE);
//	if (fg)
//		gdk_gc_set_foreground(gc->gc, &gdkc);
//	else
//		gdk_gc_set_background(gc->gc, &gdkc);
}

static void
gc_set_foreground(struct graphics_gc_priv *gc, struct color *c)
{
//	gc_set_color(gc, c, 1);
}

static void gc_set_background(struct graphics_gc_priv *gc, struct color *c)
{
// 	gc_set_color(gc, c, 0);
}

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)
{
//	struct graphics_gc_priv *gc=g_new(struct graphics_gc_priv, 1);

	*meth=gc_methods;
//	gc->gc=gdk_gc_new(gr->widget->window);
//	gc->gr=gr;
	return NULL;
}


static void draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
{

	int i;
	HANDLE hndl = gr->wnd_handle;

	HDC dc = GetDC( gr->wnd_handle );

	int first = 1;
	for ( i = 0; i< count; i++ )
	{
		if ( first )
		{
			first = 0;
			MoveToEx( dc, p[0].x, p[0].y, NULL );
		}
		else
		{
			LineTo( dc, p[i].x, p[i].y );
		}
	}
	ReleaseDC( gr->wnd_handle, dc );
}

static void draw_polygon(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
{
//	if (gr->mode == draw_mode_begin || gr->mode == draw_mode_end)
//		gdk_draw_polygon(gr->drawable, gc->gc, TRUE, (GdkPoint *)p, count);
//	if (gr->mode == draw_mode_end || gr->mode == draw_mode_cursor)
//		gdk_draw_polygon(gr->widget->window, gc->gc, TRUE, (GdkPoint *)p, count);
}

static void draw_rectangle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int w, int h)
{
//	gdk_draw_rectangle(gr->drawable, gc->gc, TRUE, p->x, p->y, w, h);
}

static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int r)
{
//	if (gr->mode == draw_mode_begin || gr->mode == draw_mode_end)
//		gdk_draw_arc(gr->drawable, gc->gc, FALSE, p->x-r/2, p->y-r/2, r, r, 0, 64*360);
//	if (gr->mode == draw_mode_end || gr->mode == draw_mode_cursor)
//		gdk_draw_arc(gr->widget->window, gc->gc, FALSE, p->x-r/2, p->y-r/2, r, r, 0, 64*360);
}



static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
{
	printf( "restore\n");
}

static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
{
	if ( mode == draw_mode_begin )
	{
		if ( gr->wnd_handle == NULL )
			CreateGraphicsWindows( gr );

		HDC hdcScreen = GetDC( gr->wnd_handle );
/*
		hbmScreen = CreateCompatibleBitmap(hdcScreen,
                     GetDeviceCaps(hdcScreen, HORZRES),
                     GetDeviceCaps(hdcScreen, VERTRES));
                     */

	}

	// force paint
	if (mode == draw_mode_end && gr->mode == draw_mode_begin)
	{
	}

	gr->mode=mode;

}


static void * get_data(struct graphics_priv *this_, char *type)
{
	if ( strcmp( "wnd_parent_handle_ptr", type ) == 0 )
	{
		return &( this_->wnd_parent_handle );
	}
	if ( strcmp( "START_CLIENT", type ) == 0 )
	{
		CreateGraphicsWindows( this_ );
		return NULL;
	}
	return NULL;
}


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

static void register_motion_callback(struct graphics_priv *this_, void (*callback)(void *data, struct point *p), void *data)
{
	this_->motion_callback=callback;
	this_->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_->button_callback=callback;
	this_->button_callback_data=data;
}

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

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)
{
}

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

static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot)
{
	return NULL;
}


static struct graphics_methods graphics_methods = {
 	graphics_destroy,
	draw_mode,
	draw_lines,
	draw_polygon,
	draw_rectangle,
	draw_circle,
	draw_text,
	NULL, // draw_image,
#ifdef HAVE_IMLIB2
	NULL, // draw_image_warp,
#else
	NULL,
#endif
	draw_restore,
	font_new,
	gc_new,
	background_gc,
	NULL, // overlay_new,
	image_new,
	get_data,
	register_resize_callback,
	register_button_callback,
	register_motion_callback,
};

static struct graphics_priv * graphics_win32_drawing_area_new_helper(struct graphics_methods *meth)
{
	struct graphics_priv *this_=g_new0(struct graphics_priv,1);
	*meth=graphics_methods;
	g_gra = this_;
	return this_;
}

struct graphics_priv* win32_graphics_new( struct graphics_methods *meth, struct attr **attrs)
{
	struct graphics_priv* this_=graphics_win32_drawing_area_new_helper(meth);
	return this_;
}

--- NEW FILE: win32_gui.h ---
#ifndef WIN32_GUI_INCLUDED
#define WIN32_GUI_INCLUDED

#include "coord.h"

struct statusbar_methods;
struct menu_methods;
struct datawindow_methods;
struct navit;
struct callback;

struct gui_priv {
	struct navit *nav;
	HANDLE	hwnd;
};

struct menu_priv *gui_gtk_menubar_new(struct gui_priv *gui, struct menu_methods *meth);
struct menu_priv *gui_gtk_toolbar_new(struct gui_priv *gui, struct menu_methods *meth);
struct statusbar_priv *gui_gtk_statusbar_new(struct gui_priv *gui, struct statusbar_methods *meth);
struct menu_priv *gui_gtk_popup_new(struct gui_priv *gui, struct menu_methods *meth);
struct datawindow_priv *gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);

#endif

--- NEW FILE: window.c ---
#define WIN32_LEAN_AND_MEAN

#include <windows.h>

#include "resource.h"

HINSTANCE hInst;

BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
    switch(uMsg)
    {
        case WM_INITDIALOG:
            /*
             * TODO: Add code to initialize the dialog.
             */
            return TRUE;

        case WM_CLOSE:
            EndDialog(hwndDlg, 0);
            return TRUE;

        case WM_COMMAND:
            switch(LOWORD(wParam))
            {
                /*
                 * TODO: Add more control ID's, when needed.
                 */
                case IDC_BTN_QUIT:
                    EndDialog(hwndDlg, 0);
                    return TRUE;

                case IDC_BTN_TEST:
                    MessageBox(hwndDlg, "You clicked \"Test\" button!", "Information", MB_ICONINFORMATION);
                    return TRUE;
            }
    }

    return FALSE;
}


#include <windows.h>

/*  Declare Windows procedure  */
LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);

/*  Make the class name into a global variable  */
char szClassName[ ] = "CodeBlocksWindowsApp";

int WINAPI WinMain1 (HINSTANCE hThisInstance,
                     HINSTANCE hPrevInstance,
                     LPSTR lpszArgument,
                     int nCmdShow)
{
    HWND hwnd;               /* This is the handle for our window */
    MSG messages;            /* Here messages to the application are saved */
    WNDCLASSEX wincl;        /* Data structure for the windowclass */

    /* The Window structure */
    wincl.hInstance = hThisInstance;
    wincl.lpszClassName = szClassName;
    wincl.lpfnWndProc = WindowProcedure;      /* This function is called by windows */
    wincl.style = CS_DBLCLKS;                 /* Catch double-clicks */
    wincl.cbSize = sizeof (WNDCLASSEX);

    /* Use default icon and mouse-pointer */
    wincl.hIcon = LoadIcon (NULL, IDI_APPLICATION);
    wincl.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
    wincl.hCursor = LoadCursor (NULL, IDC_ARROW);
    wincl.lpszMenuName = NULL;                 /* No menu */
    wincl.cbClsExtra = 0;                      /* No extra bytes after the window class */
    wincl.cbWndExtra = 0;                      /* structure or the window instance */
    /* Use Windows's default colour as the background of the window */
    wincl.hbrBackground = (HBRUSH) COLOR_BACKGROUND;

    /* Register the window class, and if it fails quit the program */
    if (!RegisterClassEx (&wincl))
        return 0;

    /* The class is registered, let's create the program*/
    hwnd = CreateWindowEx (
           0,                   /* Extended possibilites for variation */
           szClassName,         /* Classname */
           "Code::Blocks Template Windows App",       /* Title Text */
           WS_OVERLAPPEDWINDOW, /* default window */
           CW_USEDEFAULT,       /* Windows decides the position */
           CW_USEDEFAULT,       /* where the window ends up on the screen */
           544,                 /* The programs width */
           375,                 /* and height in pixels */
           HWND_DESKTOP,        /* The window is a child-window to desktop */
           NULL,                /* No menu */
           hThisInstance,       /* Program Instance handler */
           NULL                 /* No Window Creation data */
           );

    /* Make the window visible on the screen */
    ShowWindow (hwnd, nCmdShow);

    /* Run the message loop. It will run until GetMessage() returns 0 */

#if 0
    while (GetMessage (&messages, NULL, 0, 0))
    {
        /* Translate virtual-key messages into character messages */
        TranslateMessage(&messages);
        /* Send message to WindowProcedure */
        DispatchMessage(&messages);
    }
#endif
    /* The program return-value is 0 - The value that PostQuitMessage() gave */
    return messages.wParam;
}


/*  This function is called by the Windows function DispatchMessage()  */

LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
    switch (message)                  /* handle the messages */
    {
    	case WM_MOUSEMOVE:
    	{
			int xPos = LOWORD(lParam);
			int yPos = HIWORD(lParam);
			printf( "mouse at %d %d \n", xPos, yPos );
    	}

    	break;
        case WM_DESTROY:
            PostQuitMessage (0);       /* send a WM_QUIT to the message queue */
            break;
        default:                      /* for messages that we don't deal with */
            return DefWindowProc (hwnd, message, wParam, lParam);
    }

    return 0;
}

/*

int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
{
    hInst = hInstance;

    // The user interface is a modal dialog box
    return DialogBox(hInstance, MAKEINTRESOURCE(DLG_MAIN), NULL, DialogProc);
}
*/

--- NEW FILE: win32_gui.c ---
#include <stdlib.h>
#include <process.h>
#include <windows.h>
#include <glib.h>
#include "config.h"
#include "plugin.h"
#include "gui.h"
#include "win32_gui.h"
#include "point.h"

#define ID_FILE_EXIT 9001
#define ID_STUFF_GO 9002

const char g_szClassName[] = "myWindowClass";


gboolean message_pump( gpointer data )
{
    MSG messages;            /* Here messages to the application are saved */
    if (GetMessage (&messages, NULL, 0, 0))
    {
        /* Translate virtual-key messages into character messages */
        TranslateMessage(&messages);
        /* Send message to WindowProcedure */
        DispatchMessage(&messages);
    }
    else{
    	exit( 0 );
    }
    return TRUE;
}



struct gui_priv *g_this_;


struct graphics_priv {
	struct point p;
	int width;
	int height;
	int library_init;
	int visible;
	HANDLE wnd_parent_handle;
	HANDLE wnd_handle;

	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;
	// AF FIXenum draw_mode_num mode;
};


extern struct graphics_priv *g_gra;



static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
	switch(Message)
	{
		case WM_CREATE:
		{
			HMENU hMenu, hSubMenu;
			HICON hIcon, hIconSm;

			hMenu = CreateMenu();
			g_this_->hwnd = hwnd;

			hSubMenu = CreatePopupMenu();
			AppendMenu(hSubMenu, MF_STRING, ID_FILE_EXIT, "E&xit");
			AppendMenu(hMenu, MF_STRING | MF_POPUP, (UINT)hSubMenu, "&File");

			hSubMenu = CreatePopupMenu();
			AppendMenu(hSubMenu, MF_STRING, ID_STUFF_GO, "&Go");
			AppendMenu(hMenu, MF_STRING | MF_POPUP, (UINT)hSubMenu, "&Stuff");

			SetMenu(hwnd, hMenu);

#if 0
			hIcon = LoadImage(NULL, "menu_two.ico", IMAGE_ICON, 32, 32, LR_LOADFROMFILE);
			if(hIcon)
				SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
			else
				MessageBox(hwnd, "Could not load large icon!", "Error", MB_OK | MB_ICONERROR);

			hIconSm = LoadImage(NULL, "menu_two.ico", IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
			if(hIconSm)
				SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm);
			else
				MessageBox(hwnd, "Could not load small icon!", "Error", MB_OK | MB_ICONERROR);

#endif

		}
		break;
		case WM_COMMAND:
			switch(LOWORD(wParam))
			{
				case ID_FILE_EXIT:
					PostMessage(hwnd, WM_CLOSE, 0, 0);
				break;
				case ID_STUFF_GO:
								 	(*g_gra->resize_callback)(g_gra->resize_callback_data, g_gra->width, g_gra->height);

//					navit_draw(g_this_->nav);
					// MessageBox(hwnd, "You clicked Go!", "Woo!", MB_OK);
				break;
			}
		break;
		case WM_CLOSE:
			DestroyWindow(hwnd);
		break;
		case WM_DESTROY:
			PostQuitMessage(0);
		break;
		default:
			return DefWindowProc(hwnd, Message, wParam, lParam);
	}
	return 0;
}

int Win32Init( void )
{
	WNDCLASSEX wc;
	HWND hwnd;
	MSG Msg;

	wc.cbSize		 = sizeof(WNDCLASSEX);
	wc.style		 = 0;
	wc.lpfnWndProc	 = WndProc;
	wc.cbClsExtra	 = 0;
	wc.cbWndExtra	 = 0;
	wc.hInstance	 = NULL;
	wc.hIcon		 = NULL;
	wc.hCursor		 = LoadCursor(NULL, IDC_ARROW);
	wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
	wc.lpszMenuName  = NULL;
	wc.lpszClassName = g_szClassName;
	wc.hIconSm		 = NULL;

	if(!RegisterClassEx(&wc))
	{
		MessageBox(NULL, "Window Registration Failed!", "Error!",
			MB_ICONEXCLAMATION | MB_OK);
		return 0;
	}

	hwnd = CreateWindowEx(
		WS_EX_CLIENTEDGE,
		g_szClassName,
		"A Menu #2",
		WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
		CW_USEDEFAULT, CW_USEDEFAULT, 800, 600,
		NULL, NULL, NULL, NULL);

	if(hwnd == NULL)
	{
		MessageBox(NULL, "Window Creation Failed!", "Error!",
			MB_ICONEXCLAMATION | MB_OK);
		return 0;
	}

	ShowWindow(hwnd, TRUE);
	UpdateWindow(hwnd);

	g_idle_add (message_pump, NULL);

	return hwnd;
}


static int win32_gui_set_graphics(struct gui_priv *this_, struct graphics *gra)
{
	HANDLE* wndHandle_ptr = graphics_get_data(gra, "wnd_parent_handle_ptr");

	*wndHandle_ptr = this_->hwnd;

	graphics_get_data(gra, "START_CLIENT");
	return 0;
}


static void win32_gui_add_bookmark_do(struct gui_priv *gui)
{
//	navit_add_bookmark(gui->nav, &gui->dialog_coord, gtk_entry_get_text(GTK_ENTRY(gui->dialog_entry)));
//	gtk_widget_destroy(gui->dialog_win);
}

static int win32_gui_add_bookmark(struct gui_priv *gui, struct pcoord *c, char *description)
{
 	return 1;
}


struct gui_methods win32_gui_methods = {
	NULL, // win32_gui_menubar_new,
	NULL, // win32_gui_toolbar_new,
	NULL, // win32_gui_statusbar_new,
	NULL, // win32_gui_popup_new,
	win32_gui_set_graphics,
	NULL,
	NULL, // win32_gui_datawindow_new,
	win32_gui_add_bookmark,
};



static struct gui_priv *win32_gui_new( struct navit *nav, struct gui_methods *meth, struct attr **attrs)
{
	struct gui_priv *this_;
	int w=792, h=547;
	unsigned xid = 0;

	*meth=win32_gui_methods;

	this_=g_new0(struct gui_priv, 1);
	this_->nav=nav;

	g_this_ = this_;

	Win32Init();


//	navit_zoom_out(this_->nav, 2, NULL);

	return this_;
}

extern struct graphics_priv* win32_graphics_new( struct graphics_methods *meth, struct attr **attrs);


void plugin_init(void)
{
	plugin_register_gui_type("win32", win32_gui_new);
	plugin_register_graphics_type("win32_graphics", win32_graphics_new);
}

[Navit-cvs-commit] navit/projs/CodeBlocks/win32gui - New directory

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26424/win32gui

Log Message:
Directory /cvsroot/navit/navit/projs/CodeBlocks/win32gui added to the repository

[Navit-cvs-commit] navit/src item_def.h, 1.18, 1.19 navit.xml, 1.29, 1.30 osm2navit.c, 1.41, 1.42

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

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

Modified Files:
	item_def.h navit.xml osm2navit.c 
Log Message:
Fix:Core:Added new item types from wiki and changed definitions accordingly

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** item_def.h	23 Jan 2008 21:35:34 -0000	1.18
--- item_def.h	24 Jan 2008 18:07:37 -0000	1.19
***************
*** 247,281 ****
  ITEM(aeroway_runway)
  ITEM(aeroway_taxiway)
  /* Area */
  ITEM2(0xc0000000,area)
  ITEM2(0xc0000001,area_unspecified)
! ITEM(wood)
! ITEM(water_poly)
! ITEM(town_poly)
! ITEM(cemetery_poly)
! ITEM(parking_lot_poly)
! ITEM(industry_poly)
! ITEM(airport_poly)
! ITEM(hospital_poly)
! ITEM(park_poly)
! ITEM(sport_poly)
! ITEM(museum_poly)
  ITEM(image)
  ITEM(image_path)
! ITEM(commercial_center)
! ITEM(golf_course)
! ITEM(university)
! ITEM(national_park)
! ITEM(nature_park)
! ITEM(flats)
! ITEM(scrub)
! ITEM(military_zone)
! ITEM(marine_poly)
  ITEM(plantation)
  ITEM(tundra)
  ITEM(tile)
  ITEM(submap)
! ITEM(building_poly)
! ITEM(place_poly)
! ITEM(station_poly)
! ITEM(farm_poly)
--- 247,283 ----
  ITEM(aeroway_runway)
  ITEM(aeroway_taxiway)
+ ITEM(street_service)
  /* Area */
  ITEM2(0xc0000000,area)
  ITEM2(0xc0000001,area_unspecified)
! ITEM(poly_wood)
! ITEM(poly_water)
! ITEM(poly_town)
! ITEM(poly_cemetery)
! ITEM(poly_car_parking)
! ITEM(poly_industry)
! ITEM(poly_airport)
! ITEM(poly_hospital)
! ITEM(poly_park)
! ITEM(poly_sport)
! ITEM(poly_museum)
  ITEM(image)
  ITEM(image_path)
! ITEM(poly_commercial_center)
! ITEM(poly_golf_course)
! ITEM(poly_university)
! ITEM(poly_national_park)
! ITEM(poly_nature_park)
! ITEM(poly_flats)
! ITEM(poly_scrub)
! ITEM(poly_military_zone)
! ITEM(poly_marine)
  ITEM(plantation)
  ITEM(tundra)
  ITEM(tile)
  ITEM(submap)
! ITEM(poly_building)
! ITEM(poly_place)
! ITEM(poly_station)
! ITEM(poly_farm)
! ITEM(poly_sport_tennis)

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** osm2navit.c	24 Jan 2008 07:31:40 -0000	1.41
--- osm2navit.c	24 Jan 2008 18:07:38 -0000	1.42
***************
*** 102,107 ****
  	"n	place	village		town_label_2e3\n"
  	"n	place	hamlet		town_label_2e2\n"
! 	"w	amenity	place_of_worship	building_poly\n"
! 	"w	building	glasshouse	building_poly\n"
  	"w	building\n"
  	"w	aeroway	runway		aeroway_runway\n"
--- 102,107 ----
  	"n	place	village		town_label_2e3\n"
  	"n	place	hamlet		town_label_2e2\n"
! 	"w	amenity	place_of_worship	poly_building\n"
! 	"w	building	glasshouse	poly_building\n"
  	"w	building\n"
  	"w	aeroway	runway		aeroway_runway\n"
***************
*** 126,149 ****
  	"w	highway	motorway	highway_city\n"
  	"w	highway	motorway_link	ramp\n"
! 	"w	historic	town gate	building_poly\n"
! 	"w	landuse	allotments	wood\n"
! 	"w	landuse	cemetery	cemetery_poly\n"
! 	"w	landuse	forest		wood\n"
! 	"w	landuse	industrial	industry_poly\n"
! 	"w	landuse	residential	town_poly\n"
! 	"w	landuse	farm	farm_poly\n"
! 	"w	leisure	park		park_poly\n"
! 	"w	natural	wood		wood\n"
! 	"w	natural	water		water_poly\n"
  	"w	natural	coastline	water_line\n"
! 	"w	place		suburb		town_poly\n"
! 	"w	place		town		town_poly\n"
  	"w	power	line	powerline\n"
  	"w	railway	rail		rail\n"
  	"w	railway	narrow_gauge	rail\n"
! 	"w	railway	station		building_poly\n"
  	"w	railway	subway		rail\n"
  	"w	railway	tram		rail\n"
! 	"w	sport	golf	golf_course\n"
  	"w	waterway	canal		water_line\n"
  	"w	waterway	river		water_line\n"
--- 126,149 ----
  	"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	station		poly_building\n"
  	"w	railway	subway		rail\n"
  	"w	railway	tram		rail\n"
! 	"w	sport	golf	poly_golf_course\n"
  	"w	waterway	canal		water_line\n"
  	"w	waterway	river		water_line\n"

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** navit.xml	23 Jan 2008 21:43:06 -0000	1.29
--- navit.xml	24 Jan 2008 18:07:37 -0000	1.30
***************
*** 73,99 ****
  	<layout name="Tag">
  		<layer name="sea" details="0">
! 			<item type="wood" order="0-">
  				<polygon color="#8ec78d" /> 
  			</item>
! 			<item type="town_poly" order="0-">
  				<polygon color="#ffc895" /> 
  				<polyline color="#ebb481" /> 
  			</item>
! 			<item type="water_poly" order="0-">
  				<polygon color="#82c8ea" /> 
  				<polyline color="#5096b8" /> 
  				<label label_size="5" /> 
  			</item>
! 			<item type="park_poly" order="0-">
  				<polygon color="#7cc334" /> 
  				<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>
! 			<item type="industry_poly,building_poly,place_poly" order="0-">
  				<polygon color="#e6e6e6" /> 
  			</item>
--- 73,99 ----
  	<layout name="Tag">
  		<layer name="sea" details="0">
! 			<item type="poly_wood" order="0-">
  				<polygon color="#8ec78d" /> 
  			</item>
! 			<item type="poly_town" order="0-">
  				<polygon color="#ffc895" /> 
  				<polyline color="#ebb481" /> 
  			</item>
! 			<item type="poly_water" order="0-">
  				<polygon color="#82c8ea" /> 
  				<polyline color="#5096b8" /> 
  				<label label_size="5" /> 
  			</item>
! 			<item type="poly_park" order="0-">
  				<polygon color="#7cc334" /> 
  				<label label_size="5" /> 
  			</item>
! 			<item type="poly_airport" order="0-">
  				<polygon color="#a0a0a0" /> 
  			</item>
! 			<item type="poly_sport" order="0-">
  				<polygon color="#4af04f" /> 
  			</item>
! 			<item type="poly_industry,poly_building,poly_place" order="0-">
  				<polygon color="#e6e6e6" /> 
  			</item>
***************
*** 897,901 ****
  				<icon src="gc_webcam.xpm" />
  			</item>
! 			<item type="flats,scrub,military_zone,marine_poly,plantation,tundra" order="0-">
  				<polygon color="#a0a0a0" />
  				<label label_size="5" /> 
--- 897,901 ----
  				<icon src="gc_webcam.xpm" />
  			</item>
! 			<item type="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
  				<polygon color="#a0a0a0" />
  				<label label_size="5" /> 

[Navit-cvs-commit] navit/po cs.po, 1.7, 1.8 da.po, 1.1, 1.2 de.po, 1.22, 1.23 es.po, 1.12, 1.13 fi.po, 1.5, 1.6 fr.po, 1.36, 1.37 it.po, 1.13, 1.14 nl.po, 1.3, 1.4 no.po, 1.14, 1.15 pl.po, 1.12, 1.13

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

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

Modified Files:
	cs.po da.po de.po es.po fi.po fr.po it.po nl.po no.po pl.po 
Log Message:
Fix:Core:Added new item types from wiki and changed definitions accordingly

Index: it.po
===================================================================
RCS file: /cvsroot/navit/navit/po/it.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** it.po	16 Jan 2008 22:30:50 -0000	1.13
--- it.po	24 Jan 2008 18:07:37 -0000	1.14
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Andrea GHENSI <and...@gm...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Andrea GHENSI <and...@gm...>\n"
***************
*** 143,200 ****
  msgstr "Hai raggiunto la destinazione %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Proiezione"
  
! #: ../src/navit.c:723
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destinazione"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Polonia"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destinazione"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destinazione"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Quaderno di viaggio"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mappa"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Percorso"
--- 143,200 ----
  msgstr "Hai raggiunto la destinazione %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Proiezione"
  
! #: ../src/navit.c:725
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destinazione"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Polonia"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destinazione"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destinazione"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Quaderno di viaggio"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mappa"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Percorso"

Index: da.po
===================================================================
RCS file: /cvsroot/navit/navit/po/da.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** da.po	16 Jan 2008 22:30:49 -0000	1.1
--- da.po	24 Jan 2008 18:07:37 -0000	1.2
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-15 20:02+0100\n"
  "PO-Revision-Date: 2008-01-15 22:20+0100\n"
  "Last-Translator: Glenn Sommer <gl...@gm...>>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2008-01-15 22:20+0100\n"
  "Last-Translator: Glenn Sommer <gl...@gm...>>\n"
***************
*** 77,81 ****
  
  #: ../src/navigation.c:182
- #, c-format
  #, fuzzy, c-format
  msgid "one kilometer"
--- 77,80 ----
***************
*** 143,196 ****
  msgstr "Du er fremme ved destinationen %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Visning"
  
! #: ../src/navit.c:723
  msgid "Former Destinations"
  msgstr "Tidligere destinationer"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr "Bogmærker"
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr "Køretøj"
  
! #: ../src/navit.c:821
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr "Længde"
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr "Tid"
  
! #: ../src/navit.c:837
  msgid "Destination Length"
  msgstr "Længde til destinationen"
  
! #: ../src/navit.c:843
  msgid "Destination Time"
  msgstr "Tid til destinationen"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Vejbog"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kort"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Rute"
--- 142,195 ----
  msgstr "Du er fremme ved destinationen %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Visning"
  
! #: ../src/navit.c:725
  msgid "Former Destinations"
  msgstr "Tidligere destinationer"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr "Bogmærker"
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr "Køretøj"
  
! #: ../src/navit.c:823
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr "Længde"
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr "Tid"
  
! #: ../src/navit.c:839
  msgid "Destination Length"
  msgstr "Længde til destinationen"
  
! #: ../src/navit.c:845
  msgid "Destination Time"
  msgstr "Tid til destinationen"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Vejbog"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kort"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Rute"

Index: fr.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fr.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** fr.po	16 Jan 2008 22:30:50 -0000	1.36
--- fr.po	24 Jan 2008 18:07:37 -0000	1.37
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-12-17 11:36+0100\n"
  "Last-Translator: KaZeR <ka...@al...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-12-17 11:36+0100\n"
  "Last-Translator: KaZeR <ka...@al...>\n"
***************
*** 143,199 ****
  msgstr "Vous êtes arrivé à votre destination %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Calques"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projection"
  
! #: ../src/navit.c:723
  msgid "Former Destinations"
  msgstr "Destinations précédentes"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Pologne"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destination"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destination"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Carnet de route"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Carte"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"
--- 143,199 ----
  msgstr "Vous êtes arrivé à votre destination %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Calques"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projection"
  
! #: ../src/navit.c:725
  msgid "Former Destinations"
  msgstr "Destinations précédentes"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Pologne"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destination"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destination"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Carnet de route"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Carte"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"

Index: nl.po
===================================================================
RCS file: /cvsroot/navit/navit/po/nl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nl.po	16 Jan 2008 22:30:50 -0000	1.3
--- nl.po	24 Jan 2008 18:07:37 -0000	1.4
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+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.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n"
***************
*** 145,198 ****
  msgstr "%s bestemming bereikt"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projectie"
  
! #: ../src/navit.c:723
  msgid "Former Destinations"
  msgstr "Vorige bestemmingen"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr "Bookmarks"
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr "Voertuig"
  
! #: ../src/navit.c:821
  msgid "Command"
  msgstr "Opdracht"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr "Lengte"
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr "Tijd"
  
! #: ../src/navit.c:837
  msgid "Destination Length"
  msgstr "Afstand"
  
! #: ../src/navit.c:843
  msgid "Destination Time"
  msgstr "Aankomsttijd"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Route"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kaart"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"
--- 145,198 ----
  msgstr "%s bestemming bereikt"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projectie"
  
! #: ../src/navit.c:725
  msgid "Former Destinations"
  msgstr "Vorige bestemmingen"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr "Bookmarks"
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr "Voertuig"
  
! #: ../src/navit.c:823
  msgid "Command"
  msgstr "Opdracht"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr "Lengte"
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr "Tijd"
  
! #: ../src/navit.c:839
  msgid "Destination Length"
  msgstr "Afstand"
  
! #: ../src/navit.c:845
  msgid "Destination Time"
  msgstr "Aankomsttijd"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Route"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kaart"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** de.po	16 Jan 2008 22:30:49 -0000	1.22
--- de.po	24 Jan 2008 18:07:37 -0000	1.23
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+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.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Martin Schaller <mar...@so...>\n"
***************
*** 144,197 ****
  msgstr "%s haben Sie ihr Ziel erreicht"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projektion"
  
! #: ../src/navit.c:723
  msgid "Former Destinations"
  msgstr "Frühere Ziele"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr "Lesezeichen"
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr "Fahrzeug"
  
! #: ../src/navit.c:821
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr "Länge"
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr "Zeit"
  
! #: ../src/navit.c:837
  msgid "Destination Length"
  msgstr "Länge Ziel"
  
! #: ../src/navit.c:843
  msgid "Destination Time"
  msgstr "Zeit Ziel"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Straßenliste"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Karte"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"
--- 144,197 ----
  msgstr "%s haben Sie ihr Ziel erreicht"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projektion"
  
! #: ../src/navit.c:725
  msgid "Former Destinations"
  msgstr "Frühere Ziele"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr "Lesezeichen"
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr "Fahrzeug"
  
! #: ../src/navit.c:823
  msgid "Command"
  msgstr "Kommando"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr "Länge"
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr "Zeit"
  
! #: ../src/navit.c:839
  msgid "Destination Length"
  msgstr "Länge Ziel"
  
! #: ../src/navit.c:845
  msgid "Destination Time"
  msgstr "Zeit Ziel"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Straßenliste"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Karte"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Route"

Index: es.po
===================================================================
RCS file: /cvsroot/navit/navit/po/es.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** es.po	16 Jan 2008 22:30:50 -0000	1.12
--- es.po	24 Jan 2008 18:07:37 -0000	1.13
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-07-15 20:44-0600\n"
  "Last-Translator: Esteban Dauksis <eda...@gm...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-15 20:44-0600\n"
  "Last-Translator: Esteban Dauksis <eda...@gm...>\n"
***************
*** 144,201 ****
  msgstr "Ha llegado a su destino %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Diseño"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Proyección"
  
! #: ../src/navit.c:723
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destino"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Polonia"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destino"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destino"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Guía"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Ruta"
--- 144,201 ----
  msgstr "Ha llegado a su destino %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Diseño"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Proyección"
  
! #: ../src/navit.c:725
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destino"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Polonia"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destino"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destino"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Guía"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Ruta"

Index: fi.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fi.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fi.po	16 Jan 2008 22:30:50 -0000	1.5
--- fi.po	24 Jan 2008 18:07:37 -0000	1.6
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Ossi Berg <o....@ma...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Ossi Berg <o....@ma...>\n"
***************
*** 144,200 ****
  msgstr "Olet saavuttanut kohteesi %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Pohja"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projektio"
  
! #: ../src/navit.c:723
  msgid "Former Destinations"
  msgstr "Aiemmat kohteet"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr "Kirjanmerkit"
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr "Kulkuneuvo"
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Puola"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Kohde"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Kohde"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Ohjeistaja"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kartta"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Reitti"
--- 144,200 ----
  msgstr "Olet saavuttanut kohteesi %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Pohja"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projektio"
  
! #: ../src/navit.c:725
  msgid "Former Destinations"
  msgstr "Aiemmat kohteet"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr "Kirjanmerkit"
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr "Kulkuneuvo"
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Puola"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Kohde"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Kohde"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Ohjeistaja"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kartta"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Reitti"

Index: pl.po
===================================================================
RCS file: /cvsroot/navit/navit/po/pl.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pl.po	16 Jan 2008 22:30:51 -0000	1.12
--- pl.po	24 Jan 2008 18:07:37 -0000	1.13
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-07-12 20:12+0100\n"
  "Last-Translator: Michal Madej <mi...@qu...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-07-12 20:12+0100\n"
  "Last-Translator: Michal Madej <mi...@qu...>\n"
***************
*** 145,202 ****
  msgstr "Dotarłeś do celu %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Układ kolorów"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Odwzorowanie"
  
! #: ../src/navit.c:723
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Cel"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Polska"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Cel"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Cel"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr ""
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Trasa"
--- 145,202 ----
  msgstr "Dotarłeś do celu %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Układ kolorów"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Odwzorowanie"
  
! #: ../src/navit.c:725
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Cel"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Polska"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Cel"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Cel"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr ""
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Trasa"

Index: no.po
===================================================================
RCS file: /cvsroot/navit/navit/po/no.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** no.po	16 Jan 2008 22:30:51 -0000	1.14
--- no.po	24 Jan 2008 18:07:37 -0000	1.15
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-10-30 16:26+0100\n"
  "Last-Translator: Bendik Brenne <be...@xp...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-10-30 16:26+0100\n"
  "Last-Translator: Bendik Brenne <be...@xp...>\n"
***************
*** 143,200 ****
  msgstr "Du har nådd ditt reisemål %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projeksjon"
  
! #: ../src/navit.c:723
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Polen"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Kjørebok"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kart"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Rute"
--- 143,200 ----
  msgstr "Du har nådd ditt reisemål %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Layout"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projeksjon"
  
! #: ../src/navit.c:725
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Polen"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Destinasjon"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Kjørebok"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Kart"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Rute"

Index: cs.po
===================================================================
RCS file: /cvsroot/navit/navit/po/cs.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cs.po	16 Jan 2008 22:30:49 -0000	1.7
--- cs.po	24 Jan 2008 18:07:36 -0000	1.8
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-16 23:15+0100\n"
  "PO-Revision-Date: 2007-09-22 10:34+0200\n"
  "Last-Translator: Vaclav Cerny <va...@se...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.4\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-01-24 10:49+0100\n"
  "PO-Revision-Date: 2007-09-22 10:34+0200\n"
  "Last-Translator: Vaclav Cerny <va...@se...>\n"
***************
*** 146,203 ****
  msgstr "Dorazili jste do cíle %s"
  
! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Rozvržení"
  
! #: ../src/navit.c:668
  msgid "Projection"
  msgstr "Projekce"
  
! #: ../src/navit.c:723
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Cíl"
  
! #: ../src/navit.c:733
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:771
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:821
  #, fuzzy
  msgid "Command"
  msgstr "Polsko"
  
! #: ../src/navit.c:826
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:832
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:837
  #, fuzzy
  msgid "Destination Length"
  msgstr "Cíl"
  
! #: ../src/navit.c:843
  #, fuzzy
  msgid "Destination Time"
  msgstr "Cíl"
  
! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Itinerář"
  
! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Trasa"
--- 146,203 ----
  msgstr "Dorazili jste do cíle %s"
  
! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Layout"
  msgstr "Rozvržení"
  
! #: ../src/navit.c:670
  msgid "Projection"
  msgstr "Projekce"
  
! #: ../src/navit.c:725
  #, fuzzy
  msgid "Former Destinations"
  msgstr "Cíl"
  
! #: ../src/navit.c:735
  msgid "Bookmarks"
  msgstr ""
  
! #: ../src/navit.c:773
  msgid "Vehicle"
  msgstr ""
  
! #: ../src/navit.c:823
  #, fuzzy
  msgid "Command"
  msgstr "Polsko"
  
! #: ../src/navit.c:828
  msgid "Length"
  msgstr ""
  
! #: ../src/navit.c:834
  msgid "Time"
  msgstr ""
  
! #: ../src/navit.c:839
  #, fuzzy
  msgid "Destination Length"
  msgstr "Cíl"
  
! #: ../src/navit.c:845
  #, fuzzy
  msgid "Destination Time"
  msgstr "Cíl"
  
! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Roadbook"
  msgstr "Itinerář"
  
! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
  #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Map"
  msgstr "Mapa"
  
! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Route"
  msgstr "Trasa"

[Navit-cvs-commit] navit/src/data/garmin garmintypes.txt,1.1,1.2

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

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

Modified Files:
	garmintypes.txt 
Log Message:
Fix:Core:Added new item types from wiki and changed definitions accordingly

Index: garmintypes.txt
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/garmintypes.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** garmintypes.txt	25 Oct 2007 09:23:14 -0000	1.1
--- garmintypes.txt	24 Jan 2008 18:07:38 -0000	1.2
***************
*** 358,412 ****
  
  POLYGONE
! 0x01 = town_poly, City (>200k)
! 0x02 = town_poly, City (<200k)
! 0x03 = town_poly, Village
! 0x04 = military_zone, Military
! 0x05 = parking_lot_poly, Parking Lot
! 0x06 = parking_lot_poly, Parking Garage
! 0x07 = airport_poly, Airport
! 0x08 = commercial_center, Shopping Center
! 0x09 = marine_poly, Marina
! 0x0a = university, University/College
! 0x0b = hospital_poly, Hospital
! 0x0c = industry_poly, Industrial
  0x0d = area, Reservation
! 0x0e = airport_poly, Airport Runway
  0x13 = area_unspecified, Man made area
! 0x14 = park_poly, National park
! 0x15 = park_poly, National park
! 0x16 = park_poly, National park
! 0x17 = park_poly, City Park
! 0x18 = golf_course, Golf
! 0x19 = sport_poly, Sport
! 0x1a = cemetery_poly, Cemetery
! 0x1e = park_poly, State Park
! 0x1f = park_poly, State Park
! 0x20 = park_poly, State Park
! 0x28 = water_poly, Ocean
! 0x29 = water_poly, Water Reservour
! 0x32 = water_poly, Sea
! 0x3b = water_poly, Water Reservour
! 0x3c = water_poly, Lake (250-600 km2)
! 0x3d = water_poly, Lake (77-250 km2)
! 0x3e = water_poly, Lake (25-77 km2)
! 0x3f = water_poly, Lake (11-25 km2)
! 0x40 = water_poly, Lake (0.25-11 km2)
! 0x41 = water_poly, Lake (<0.25 km2)
! 0x42 = water_poly, Lake (>3.3k km2)
! 0x43 = water_poly, Lake (1.1-3.3k km2)
! 0x44 = water_poly, Lake (0.6-1.1k km2)
! 0x45 = water_poly, Water Reservour
! 0x46 = water_poly, River (>1km)
! 0x47 = water_poly, River (200m-1km)
! 0x48 = water_poly, River (40-200m)
! 0x49 = water_poly, River (<40m)
  0x4a = area, Definition Area
  0x4b = area, Background
! 0x4c = water_poly, Intermittent River/Lake
! 0x4d = water_poly, Glaciers
  0x4e = plantation, Orchard or plantation
! 0x4f = scrub, Scrub
! 0x50 = wood, Woods
! 0x51 = water_poly, Wetland
  0x52 = tundra, Tundra
! 0x53 = flats, Flats
--- 358,412 ----
  
  POLYGONE
! 0x01 = poly_town, City (>200k)
! 0x02 = poly_town, City (<200k)
! 0x03 = poly_town, Village
! 0x04 = poly_military_zone, Military
! 0x05 = poly_car_parking, Parking Lot
! 0x06 = poly_car_parking, Parking Garage
! 0x07 = poly_airport, Airport
! 0x08 = poly_commercial_center, Shopping Center
! 0x09 = poly_marine, Marina
! 0x0a = poly_university, University/College
! 0x0b = poly_hospital, Hospital
! 0x0c = poly_industry, Industrial
  0x0d = area, Reservation
! 0x0e = poly_airport, Airport Runway
  0x13 = area_unspecified, Man made area
! 0x14 = poly_park, National park
! 0x15 = poly_park, National park
! 0x16 = poly_park, National park
! 0x17 = poly_park, City Park
! 0x18 = poly_golf_course, Golf
! 0x19 = poly_sport, Sport
! 0x1a = poly_cemetery, Cemetery
! 0x1e = poly_park, State Park
! 0x1f = poly_park, State Park
! 0x20 = poly_park, State Park
! 0x28 = poly_water, Ocean
! 0x29 = poly_water, Water Reservour
! 0x32 = poly_water, Sea
! 0x3b = poly_water, Water Reservour
! 0x3c = poly_water, Lake (250-600 km2)
! 0x3d = poly_water, Lake (77-250 km2)
! 0x3e = poly_water, Lake (25-77 km2)
! 0x3f = poly_water, Lake (11-25 km2)
! 0x40 = poly_water, Lake (0.25-11 km2)
! 0x41 = poly_water, Lake (<0.25 km2)
! 0x42 = poly_water, Lake (>3.3k km2)
! 0x43 = poly_water, Lake (1.1-3.3k km2)
! 0x44 = poly_water, Lake (0.6-1.1k km2)
! 0x45 = poly_water, Water Reservour
! 0x46 = poly_water, River (>1km)
! 0x47 = poly_water, River (200m-1km)
! 0x48 = poly_water, River (40-200m)
! 0x49 = poly_water, River (<40m)
  0x4a = area, Definition Area
  0x4b = area, Background
! 0x4c = poly_water, Intermittent River/Lake
! 0x4d = poly_water, Glaciers
  0x4e = plantation, Orchard or plantation
! 0x4f = poly_scrub, Scrub
! 0x50 = poly_wood, Woods
! 0x51 = poly_water, Wetland
  0x52 = tundra, Tundra
! 0x53 = poly_flats, Flats

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

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

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

Modified Files:
	poly.c 
Log Message:
Fix:Core:Added new item types from wiki and changed definitions accordingly

Index: poly.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/poly.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** poly.c	6 Dec 2007 21:41:22 -0000	1.9
--- poly.c	24 Jan 2008 18:07:38 -0000	1.10
***************
*** 120,191 ****
  			switch(poly->type) {
  			case 0x13:
! 				item->type=type_wood;
  				break;
  			case 0x14:
! 				item->type=type_town_poly;
  				break;
  			case 0x15:
! 				item->type=type_cemetery_poly;
  				break;
  			case 0x16:
! 				item->type=type_building_poly;
  				break;
  			case 0x17:
! 				item->type=type_museum_poly;
  				break;
  			case 0x19:
! 				item->type=type_place_poly;
  				break;
  			case 0x1b:
! 				item->type=type_commercial_center;
  				break;
  			case 0x1e:
! 				item->type=type_industry_poly;
  				break;
  			case 0x23:
  				/* FIXME: what is this ?*/
! 				item->type=type_place_poly;
  				break;
  			case 0x24:
! 				item->type=type_parking_lot_poly;
  				break;
  			case 0x28:
! 				item->type=type_airport_poly;
  				break;
  			case 0x29:
! 				item->type=type_station_poly;
  				break;
  			case 0x2d:
! 				item->type=type_hospital_poly;
  				break;
  			case 0x2e:
! 				item->type=type_hospital_poly;
  				break;
  			case 0x2f:
! 				item->type=type_university;
  				break;
  			case 0x30:
! 				item->type=type_university;
  				break;
  			case 0x32:
! 				item->type=type_park_poly;
  				break;
  			case 0x34:
! 				item->type=type_sport_poly;
  				break;
  			case 0x35:
! 				item->type=type_sport_poly;
  				break;
  			case 0x37:
! 				item->type=type_golf_course;
  				break;
  			case 0x38:
! 				item->type=type_national_park;
  				break;
  			case 0x39:
! 				item->type=type_nature_park;
  				break;
  			case 0x3c:
! 				item->type=type_water_poly;
  				break;
  			case 0xbc:
--- 120,191 ----
  			switch(poly->type) {
  			case 0x13:
! 				item->type=type_poly_wood;
  				break;
  			case 0x14:
! 				item->type=type_poly_town;
  				break;
  			case 0x15:
! 				item->type=type_poly_cemetery;
  				break;
  			case 0x16:
! 				item->type=type_poly_building;
  				break;
  			case 0x17:
! 				item->type=type_poly_museum;
  				break;
  			case 0x19:
! 				item->type=type_poly_place;
  				break;
  			case 0x1b:
! 				item->type=type_poly_commercial_center;
  				break;
  			case 0x1e:
! 				item->type=type_poly_industry;
  				break;
  			case 0x23:
  				/* FIXME: what is this ?*/
! 				item->type=type_poly_place;
  				break;
  			case 0x24:
! 				item->type=type_poly_car_parking;
  				break;
  			case 0x28:
! 				item->type=type_poly_airport;
  				break;
  			case 0x29:
! 				item->type=type_poly_station;
  				break;
  			case 0x2d:
! 				item->type=type_poly_hospital;
  				break;
  			case 0x2e:
! 				item->type=type_poly_hospital;
  				break;
  			case 0x2f:
! 				item->type=type_poly_university;
  				break;
  			case 0x30:
! 				item->type=type_poly_university;
  				break;
  			case 0x32:
! 				item->type=type_poly_park;
  				break;
  			case 0x34:
! 				item->type=type_poly_sport;
  				break;
  			case 0x35:
! 				item->type=type_poly_sport;
  				break;
  			case 0x37:
! 				item->type=type_poly_golf_course;
  				break;
  			case 0x38:
! 				item->type=type_poly_national_park;
  				break;
  			case 0x39:
! 				item->type=type_poly_nature_park;
  				break;
  			case 0x3c:
! 				item->type=type_poly_water;
  				break;
  			case 0xbc:

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

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

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

Added Files:
	check_itemdef 
Log Message:
Fix:Core:Added new item types from wiki and changed definitions accordingly

--- NEW FILE: check_itemdef ---
#! /bin/sh
function check_item
{
	grep -q "[(,]$1)" ../item_def.h || echo "$1 missing"
}

echo osm2navit.c
egrep '^	"[nw]	+[^	]+	+[^	]+	+' ../osm2navit.c | sed "s/.*	//" |
while read -r x
do
	check_item "${x%%\\n\"}"
done

echo "navit.xml"
grep '<item type="' <../navit.xml | cut -d \" -f 2 | tr "," "\012" |
while read -r x
do
	check_item "$x"
done

echo "garmintypes.txt"
grep ^0x ../data/garmin/garmintypes.txt | sed -e 's/[A-Z][A-Z]*, //' -e 's/.*= \([^,]*\),.*/\1/' |
while read -r x
do
	check_item "$x"
done