From 84f90b01e86791d9ddfb8b040c8b584ce659e5a6 Mon Sep 17 00:00:00 2001
From: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Wed, 6 Feb 2008 13:27:37 +0000
Subject: [PATCH] Add:Core:Added cafe amenity (Thanks Helge)

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@843 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/projs/CodeBlocks/navit.xml.distr |  3 +++
 navit/src/item_def.h                   |  1 +
 navit/src/osm2navit.c                  |  2 +-
 navit/src/xpm/Makefile.am              |  2 +-
 navit/src/xpm/cafe.xpm                 | 25 +++++++++++++++++++++++++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 navit/src/xpm/cafe.xpm

diff --git a/navit/projs/CodeBlocks/navit.xml.distr b/navit/projs/CodeBlocks/navit.xml.distr
index 0ee8733..398d7f5 100644
--- a/navit/projs/CodeBlocks/navit.xml.distr
+++ b/navit/projs/CodeBlocks/navit.xml.distr
@@ -589,6 +589,9 @@ Change to your home coordinates.
 			<item type="poi_attraction" order="5-">
 				<icon src="attraction.xpm" />
 			</item>
+			<item type="poi_cafe" order="12-">
+				<icon src="cafe.xpm" />
+			</item>
 			<item type="poi_bar" order="12-">
 				<icon src="bar.xpm" />
 			</item>
diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index b87273b..25aeb95 100644
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -86,6 +86,7 @@ ITEM(poi_bridge)
 ITEM(poi_park)
 ITEM(poi_water_feature)
 ITEM(poi_bar)
+ITEM(poi_cafe)
 ITEM(poi_picnic)
 ITEM(poi_hospital)
 ITEM(poi_camping)
diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index 175d77f..210af71 100644
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -38,7 +38,7 @@ static char *attrmap={
 	"n	amenity	atm		poi_bank\n"
 	"n	amenity	bank		poi_bank\n"
 	"n	amenity	pub		poi_bar\n"
-	"n	amenity	cafe		poi_bar\n"
+	"n	amenity	cafe		poi_cafe\n"
 	"n	amenity	bus_station	poi_bus_station\n"
 	"n	amenity	parking		poi_car_parking\n"
 	"n	amenity	cinema		poi_cinema\n"
diff --git a/navit/src/xpm/Makefile.am b/navit/src/xpm/Makefile.am
index 5359592..d98b084 100644
--- a/navit/src/xpm/Makefile.am
+++ b/navit/src/xpm/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.inc
-xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
+xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
 xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm
 EXTRA_DIST = $(xpm_DATA)
 #burgerking.ico:
diff --git a/navit/src/xpm/cafe.xpm b/navit/src/xpm/cafe.xpm
new file mode 100644
index 0000000..a61aebc
--- /dev/null
+++ b/navit/src/xpm/cafe.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * cafe_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #0000FF",
+"@	c #FEFEFE",
+"#	c #000000",
+"$	c #808080",
+" .............. ",
+".++++++++++++++.",
+".++++++++++++++.",
+".++@@@@@@@@@@++.",
+".++@@.####.@@++.",
+".++@##....##@++.",
+".++@#######$#++.",
+".++@#######$#++.",
+".++@########@++.",
+".++@.######.@++.",
+".++#..####.@#++.",
+".++@########@++.",
+".++@@@@@@@@@@++.",
+".++++++++++++++.",
+".++++++++++++++.",
+" .............. "};
-- 
2.7.4