added bus_halt icon

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

diff --git a/navit/navit.xml b/navit/navit.xml
index 8b73eff..beba02e 100644 (file)
--- a/navit/navit.xml
+++ b/navit/navit.xml
@@ -1077,7 +1077,7 @@ It's always the top left corner of the icon, so you need to consider the icon's
                                                <icon src="bus.xpm" />
                                        </item>
                                        <item type="poi_bus_stop" order="12-">
-                                               <icon src="bus.xpm" />
+                                               <icon src="bus_halt.xpm" />
                                        </item>
                                        <item type="poi_bussines_service" order="12-">
                                                <icon src="bussines_service.xpm" />

diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
index 66472ce..992c75e 100644 (file)
--- a/navit/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
@@ -9,6 +9,7 @@ xpm_DATA += biergarten.xpm
 xpm_DATA += boat_ramp.xpm
 xpm_DATA += boundary_stone.xpm
 xpm_DATA += bus.xpm
+xpm_DATA += bus_halt.xpm
 xpm_DATA += cafe.xpm
 xpm_DATA += camping.xpm
 xpm_DATA += car_dealer.xpm

diff --git a/navit/xpm/bus.xpm b/navit/xpm/bus.xpm
index ec7460d..2328d42 100644 (file)
--- a/navit/xpm/bus.xpm
+++ b/navit/xpm/bus.xpm
@@ -1,165 +1,81 @@
 /* XPM */
-static char *bus[] = {
-/* columns rows colors chars-per-pixel */
-"30 12 147 2",
-"   c #0C0C0C",
-".  c #0E0E0E",
-"X  c #101010",
-"o  c gray8",
-"O  c #161616",
-"+  c gray10",
-"@  c #1D1D1D",
-"#  c #1E1E1E",
-"$  c gray14",
-"%  c gray15",
-"&  c gray17",
-"*  c #323232",
-"=  c gray21",
-"-  c #3A3A3A",
-";  c #3B3C3C",
-":  c gray27",
-">  c #464646",
-",  c #565656",
-"<  c #5B5B5B",
-"1  c #5D6262",
-"2  c #606060",
-"3  c #6B6D6D",
-"4  c #6E7777",
-"5  c #008080",
-"6  c #018080",
-"7  c #018181",
-"8  c #028181",
-"9  c #038181",
-"0  c #038282",
-"q  c #048282",
-"w  c #058282",
-"e  c #068383",
-"r  c #078383",
-"t  c #088484",
-"y  c #0A8585",
-"u  c #0B8686",
-"i  c #0C8686",
-"p  c #0D8686",
-"a  c #0F8787",
-"s  c #108888",
-"d  c #148A8A",
-"f  c #158A8A",
-"g  c #168A8A",
-"h  c #178B8B",
-"j  c #188C8C",
-"k  c #198C8C",
-"l  c #1A8D8D",
-"z  c #1B8D8D",
-"x  c #1C8D8D",
-"c  c #1E8E8E",
-"v  c #1E8F8F",
-"b  c #1F8F8F",
-"n  c #208F8F",
-"m  c #219090",
-"M  c #229191",
-"N  c #259191",
-"B  c #279393",
-"V  c #289393",
-"C  c #299494",
-"Z  c #2B9595",
-"A  c #2C9595",
-"S  c #329999",
-"D  c #359A9A",
-"F  c #379A9A",
-"G  c #389B9B",
-"H  c #3A9898",
-"J  c #3B9D9D",
-"K  c #3F9898",
-"L  c #3C9D9D",
-"P  c #3D9E9E",
-"I  c #3F9F9F",
-"U  c #469494",
-"Y  c #469797",
-"T  c #4E9494",
-"R  c #549393",
-"E  c #579393",
-"W  c #42A0A0",
-"Q  c #43A0A0",
-"!  c #43A1A1",
-"~  c #44A0A0",
-"^  c #46A2A2",
-"/  c #4AA4A4",
-"(  c #4BA5A5",
-")  c #4CA5A5",
-"_  c #4EA6A6",
-"`  c #57A3A3",
-"'  c #52A8A8",
-"]  c #59ACAC",
-"[  c #5AACAC",
-"{  c #5FAEAE",
-"}  c #62A7A7",
-"|  c #64B1B1",
-" . c #66B2B2",
-".. c #7EAAAA",
-"X. c #77BABA",
-"o. c #7BBCBC",
-"O. c #7DBEBE",
-"+. c #7EBEBE",
-"@. c gray51",
-"#. c #868686",
-"$. c gray53",
-"%. c gray54",
-"&. c #8D8D8D",
-"*. c #889A9A",
-"=. c #9F9F9F",
-"-. c #86A0A0",
-";. c #80ABAB",
-":. c gray72",
-">. c #B8BBBB",
-",. c #8CC4C4",
-"<. c #8FC6C6",
-"1. c #9CCCCC",
-"2. c #A0CECE",
-"3. c #A3D0D0",
-"4. c #A5D1D1",
-"5. c #A6D2D2",
-"6. c #A8D2D2",
-"7. c #AED5D5",
-"8. c #AFD6D6",
-"9. c #B0D7D7",
-"0. c #B1D7D7",
-"q. c #B8DADA",
-"w. c #B9DBDB",
-"e. c #BFDEDE",
-"r. c #C3C3C3",
-"t. c gray81",
-"y. c #C0DFDF",
-"u. c #D7DDDD",
-"i. c #C6E1E1",
-"p. c #C9E3E3",
-"a. c #D0E6E6",
-"s. c #D6E9E9",
-"d. c #D7EAEA",
-"f. c #DBE7E7",
-"g. c #D8EAEA",
-"h. c #DBECEC",
-"j. c #DDECEC",
-"k. c #E4E4E4",
-"l. c #E1EEEE",
-"z. c #E6F1F1",
-"x. c #EAF3F3",
-"c. c #EEF5F5",
-"v. c gray94",
-"b. c #F0F6F6",
-"n. c #F6F9F9",
-"m. c #F9FAFA",
-"M. c gray99",
-/* pixels */
-"b.^ h h j d j h h d j j d d d d j d d d j d d d j d j d h _ ",
-"a.l j Y ! Y W u Z Y ! Y D e P ! ! Y M u ^ Y W G t G ! Y N 8.",
-"w.s ' m.m.m.b.n 5.m.m.m.9.d l.m.M.M. .Z m.m.m.w.v e.m.n.[ e.",
-"9.u O.M.M.M.s.h p.M.M.M.<.v z.M.M.M.] Y M.M.M.5.M p.M.x.P 2.",
-"3.u X.e.e.e.<.h 1.e.e.e. .v 9.e.e.e.P / e.e.e.o.v 2.e.2.b +.",
-",.0 e t t t r 7 r e u r t 0 t t u r 7 e e u e e 0 t u e 7 _ ",
-"{ 7 7 7 7 7 5 5 7 5 5 5 5 5 7 7 5 5 5 5 5 5 7 7 7 7 7 5 7 S ",
-"J s K R T H 7 7 5 5 5 5 5 5 7 7 5 5 7 N U E Y l 7 7 7 7 5 V ",
-"Z } 1 X # 4 _ 5 5 5 7 5 5 5 5 5 7 7 M -.&   ; ..p 5 5 5 7 M ",
-"P *.. :.%.+ ..n l l l l h l l h j j ` > , r.= 3 Y l l l l V ",
-"h.:.o @.2 $ u.g.g.g.s.g.s.s.s.s.s.s.g.< - &.% #.l.d.s.s.s.s.",
-"M.v.#.# * =.M.M.M.M.M.M.M.M.M.M.M.M.M.t.> O < k.M.M.M.M.M.M."
-};
+static char *dummy[]={
+"16 16 62 1",
+". c None",
+"S c #070707",
+"6 c #121212",
+"T c #151515",
+"Z c #161616",
+"U c #171717",
+"Y c #181818",
+"5 c #191919",
+"2 c #212121",
+"R c #242424",
+"W c #262626",
+"1 c #282828",
+"I c #292929",
+"V c #2c2c2c",
+"0 c #2d2d2d",
+"4 c #2e2e2e",
+"P c #303030",
+"X c #313131",
+"K c #333333",
+"N c #343434",
+"D c #3b3b3b",
+"E c #3c3c3c",
+"G c #3d3d3d",
+"L c #3e3e3e",
+"M c #444444",
+"J c #474747",
+"Q c #484848",
+"F c #494949",
+"H c #4f4f4f",
+"C c #555555",
+"3 c #585858",
+"7 c #595959",
+"u c #5b5b5b",
+"O c #5c5c5c",
+"B c #737373",
+"x c #747474",
+"w c #767676",
+"i c #787878",
+"m c #7a7a7a",
+"k c #7b7b7b",
+"# c #7c7c7c",
+"n c #7f7f7f",
+"s c #808080",
+"d c #838383",
+"b c #848484",
+"h c #888888",
+"f c #8a8a8a",
+"A c #8d8d8d",
+"v c #909090",
+"p c #969696",
+"g c #9d9d9d",
+"a c #a2a2a2",
+"c c #a3a3a3",
+"e c #a4a4a4",
+"q c #a8a8a8",
+"z c #aaaaaa",
+"y c #b7b7b7",
+"r c #bbbbbb",
+"o c #c0c0c0",
+"j c #c2c2c2",
+"l c #c3c3c3",
+"t c #c4c4c4",
+"................",
+"................",
+"................",
+"................",
+"................",
+".#abcdebefgghe..",
+".ijklmlnopqrstu.",
+".vtwtxldyzAlBtCD",
+"DEFGHIJKLMNOPQRS",
+"TUVWXTYZUY012YTD",
+".3.4G33333.5633.",
+"...........7....",
+"................",
+"................",
+"................",
+"................"};

diff --git a/navit/xpm/bus_halt.xpm b/navit/xpm/bus_halt.xpm
new file mode 100644 (file)
index 0000000..ed7c75e
--- /dev/null
+++ b/navit/xpm/bus_halt.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char *dummy[]={
+"16 16 32 1",
+". c None",
+"f c #009933",
+"e c #019933",
+"h c #149d33",
+"i c #1a9e33",
+"k c #1b9e33",
+"r c #1c9e33",
+"A c #2ca133",
+"v c #2fa233",
+"y c #40a533",
+"D c #49a733",
+"j c #4ea833",
+"d c #53a933",
+"z c #57aa33",
+"B c #68ad33",
+"b c #7cb133",
+"u c #83b333",
+"C c #8fb533",
+"m c #9bb833",
+"a c #9cb833",
+"q c #a0b933",
+"g c #b4bd33",
+"x c #b7bd33",
+"t c #bbbe33",
+"# c #c7c033",
+"l c #d3c333",
+"c c #d4c333",
+"s c #e4c633",
+"w c #ecc833",
+"p c #f1c933",
+"n c #f7ca33",
+"o c #ffcc33",
+".....#abba#.....",
+"...cdeffffedc...",
+"..ghffijjkffhg..",
+".lhfkmnoopqkfhl.",
+".dfrsftoouvwrfd.",
+"#efxnftoouvoxfe#",
+"afionftoouvooifa",
+"bfjonfyzzAvoojfb",
+"bfjonfBCCDvoojfb",
+"afionftoouvooifa",
+"#efxnftoouvoxfe#",
+".dfrsftoouvwrfd.",
+".lhfkmnoopqkfhl.",
+"..ghffijjkffhg..",
+"...cdeffffedc...",
+".....#abba#....."};