From: aurel_j <aurel_j@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sun, 13 Apr 2008 17:20:00 +0000 (+0000)
Subject: Add:Core:Add display of townhall
X-Git-Tag: navit-0.5.0.5194svn~4147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38627eb91c670b66c8b8390893c6937e59ca65d5;p=profile%2Fivi%2Fnavit.git

Add:Core:Add display of townhall


git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1005 ffa7fe5e-494d-0410-b361-a75ebd5db220
---

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index d2100c9..337c853 100644
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -235,6 +235,7 @@ ITEM(poi_rail_station)
 ITEM(poi_image)
 ITEM(mini_roundabout)
 ITEM(turning_circle)
+ITEM(poi_townhall)
 /* Line */
 ITEM2(0x80000000,line)
 ITEM2(0x80000001,line_unspecified)
diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index 9dd53cf..8eb0455 100644
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -1099,6 +1099,9 @@ Change to your home coordinates.
 			<item type="poi_tower" order="13-">
 				<icon src="tower.xpm" />
 			</item>
+			<item type="poi_townhall" order="12-">
+				<icon src="townhall.xpm" />
+			</item>
 			<item type="poi_trail" order="0-">
 				<icon src="trail.xpm" />
 			</item>
diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index 94f7a8f..5d372cb 100644
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -65,6 +65,7 @@ static char *attrmap={
 	"n	amenity=college		poi_school\n"
 	"n	amenity=telephone	poi_telephone\n"
 	"n	amenity=theatre		poi_theater\n"
+	"n	amenity=townhall		poi_townhall\n"
 	"n	highway=bus_stop	poi_bus_stop\n"
 	"n	highway=mini_roundabout	mini_roundabout\n"
 	"n	highway=motorway_junction	highway_exit\n"
diff --git a/navit/src/xpm/Makefile.am b/navit/src/xpm/Makefile.am
index 646e3ed..84b181a 100644
--- a/navit/src/xpm/Makefile.am
+++ b/navit/src/xpm/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.inc
 xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm exit.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm flag_wh_bk.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm nav_left_1.xpm nav_left_2.xpm nav_right_1.xpm nav_right_2.xpm nav_straight.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
 xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm
 xpm_DATA += shopping.xpm heliport.xpm cursor.xpm peak.xpm mini_roundabout.xpm
+xpm_DATA += townhall.xpm
 EXTRA_DIST = $(xpm_DATA)
 #burgerking.ico:
 #	wget http://www.burgerking.de/favicon.ico -O burgerking.ico
diff --git a/navit/src/xpm/townhall.xpm b/navit/src/xpm/townhall.xpm
new file mode 100644
index 0000000..150b26f
--- /dev/null
+++ b/navit/src/xpm/townhall.xpm
@@ -0,0 +1,109 @@
+/* XPM */
+static char * townhall_xpm[] = {
+"16 18 88 1",
+" 	c None",
+".	c #BF0000",
+"+	c #CE0000",
+"@	c #A80000",
+"#	c #C20000",
+"$	c #5C652F",
+"%	c #5D6630",
+"&	c #808C42",
+"*	c #818D42",
+"=	c #5B642F",
+"-	c #5D662F",
+";	c #808C41",
+">	c #5B632E",
+",	c #111208",
+"'	c #2B2F16",
+")	c #535A2A",
+"!	c #535B2B",
+"~	c #535C2A",
+"{	c #545C2B",
+"]	c #555C2B",
+"^	c #555D2B",
+"/	c #535B2A",
+"(	c #292D14",
+"_	c #454C23",
+":	c #565F2C",
+"<	c #5D6730",
+"[	c #5A632E",
+"}	c #424822",
+"|	c #363B1C",
+"1	c #414621",
+"2	c #4A5026",
+"3	c #484F25",
+"4	c #454B23",
+"5	c #495026",
+"6	c #484E25",
+"7	c #444922",
+"8	c #3A401D",
+"9	c #32361A",
+"0	c #484D2A",
+"a	c #888888",
+"b	c #66685F",
+"c	c #4E542D",
+"d	c #72736F",
+"e	c #6C6E66",
+"f	c #51582E",
+"g	c #6E6E68",
+"h	c #80807F",
+"i	c #4C512B",
+"j	c #272B14",
+"k	c #6B743E",
+"l	c #9E9E9E",
+"m	c #7D7E76",
+"n	c #75803C",
+"o	c #8F8F8F",
+"p	c #7E7E7A",
+"q	c #7F8B41",
+"r	c #81827E",
+"s	c #6A743C",
+"t	c #75716C",
+"u	c #68665D",
+"v	c #7C5A20",
+"w	c #6E531E",
+"x	c #33371E",
+"y	c #505730",
+"z	c #9A9A9A",
+"A	c #75766E",
+"B	c #58602D",
+"C	c #78571E",
+"D	c #684F1D",
+"E	c #5C6430",
+"F	c #7B7C78",
+"G	c #989898",
+"H	c #50572E",
+"I	c #4B5227",
+"J	c #5D6531",
+"K	c #67695B",
+"L	c #5A5D45",
+"M	c #59602E",
+"N	c #564A1F",
+"O	c #554B20",
+"P	c #5D6430",
+"Q	c #5F624E",
+"R	c #626454",
+"S	c #5C6431",
+"T	c #444A23",
+"U	c #373C1C",
+"V	c #434922",
+"W	c #393E1D",
+"        .+      ",
+"        @#      ",
+"                ",
+"       $%       ",
+"     $&**&=     ",
+"   -&******;>   ",
+",')!~~{{{{]^^/( ",
+"_:<<<<<<<<<<<<[}",
+"  |123456}3578  ",
+"  90abcdefghij  ",
+"   klmnopqrls   ",
+"   klmnopqrls   ",
+"   klmnopqrls   ",
+"   klmntuqrls   ",
+"   klmnvwqrls   ",
+"  xyzABCDEFGH   ",
+"  IJKLMNOPQRST  ",
+"UV_4444444444_VW"};