navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] CVSROOT avail,NONE,1.1 commitinfo,1.1,1.2

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

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

Modified Files:
	commitinfo 
Added Files:
	avail 
Log Message:
Added read-only access to fsk141


--- NEW FILE: avail ---
avail
unavail fsk141

Index: commitinfo
===================================================================
RCS file: /cvsroot/navit/CVSROOT/commitinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commitinfo	21 Nov 2005 22:10:33 -0000	1.1
--- commitinfo	29 Nov 2007 08:33:15 -0000	1.2
***************
*** 14,15 ****
--- 14,16 ----
  # If the name "ALL" appears as a regular expression it is always used
  # in addition to the first matching regex or "DEFAULT".
+ ALL /cvsroot/sitedocs/CVSROOT/cvstools/cvs_acls

[Navit-cvs-commit] navit/src navigation.c,1.27,1.28

[Alexander A. <za...@us...>]

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

Modified Files:
	navigation.c 
Log Message:
Fix crash when trying to speak and have no directions

Index: navigation.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navigation.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** navigation.c	23 Nov 2007 13:40:37 -0000	1.27
--- navigation.c	29 Nov 2007 08:14:01 -0000	1.28
***************
*** 556,559 ****
--- 556,561 ----
  	int distance, level = 0;
  	void *p=this_;
+ 	if (!this_->cmd_first)
+ 		return;
  	callback_list_call(this_->callback, 1, &p);
  	distance=round_distance(this_->first->dest_length-this_->cmd_first->itm->dest_length);

[Navit-cvs-commit] navit/src/xpm airport.xpm, NONE, 1.1 bank.xpm, NONE, 1.1 dumping-station.xpm, NONE, 1.1 golf.xpm, NONE, 1.1 highway_exit.xpm, NONE, 1.1 information.xpm, NONE, 1.1 police.xpm, NONE, 1.1 trailerpark.xpm, NONE, 1.1 Makefile.am, 1.6, 1.7

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

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

Modified Files:
	Makefile.am 
Added Files:
	airport.xpm bank.xpm dumping-station.xpm golf.xpm 
	highway_exit.xpm information.xpm police.xpm trailerpark.xpm 
Log Message:
Added icons from matth


--- NEW FILE: highway_exit.xpm ---
/* XPM */
static char * highway_exit_xpm[] = {
"16 16 46 1",
" 	c None",
".	c #035E9F",
"+	c #77A8CB",
"@	c #D4E3EE",
"#	c #337CB1",
"$	c #CFE0EC",
"%	c #4688B8",
"&	c #8DB6D3",
"*	c #A5C5DC",
"=	c #488AB9",
"-	c #4588B8",
";	c #B0CDE1",
">	c #8EB7D4",
",	c #DEEAF2",
"'	c #5C97C1",
")	c #5592BE",
"!	c #7EACCE",
"~	c #E6EFF5",
"{	c #F5F8FB",
"]	c #2E79AF",
"^	c #FFFFFF",
"/	c #166AA6",
"(	c #EAF1F7",
"_	c #8CB5D3",
":	c #2674AC",
"<	c #83B0CF",
"[	c #76A7CB",
"}	c #5894BF",
"|	c #FEFEFE",
"1	c #1469A5",
"2	c #0A63A2",
"3	c #74A6CA",
"4	c #EFF4F8",
"5	c #3880B3",
"6	c #EEF4F8",
"7	c #72A5C9",
"8	c #CADDEB",
"9	c #ACCADF",
"0	c #2272AB",
"a	c #3C82B4",
"b	c #3B81B4",
"c	c #045F9F",
"d	c #196CA7",
"e	c #1B6DA8",
"f	c #367EB2",
"g	c #1C6EA8",
"................",
"................",
"................",
"................",
"................",
"................",
"+@@@#$%&*=@-@@@;",
">,').!~{])^/](_:",
">~<[.}|~1)^2.~3.",
">4;;56789)^2.~3.",
"0aaa:bcdaeac.fg.",
"................",
"................",
"................",
"................",
"................"};

--- NEW FILE: trailerpark.xpm ---
/* XPM */
static char * trailerpark_xpm[] = {
"16 16 91 1",
" 	c #325692",
".	c #335692",
"+	c #335592",
"@	c #325592",
"#	c #325591",
"$	c #335690",
"%	c #335593",
"&	c #8195B7",
"*	c #BCC7D9",
"=	c #C4CEDE",
"-	c #CCD5E3",
";	c #D3DAE3",
">	c #D8DEE8",
",	c #DDE3EB",
"'	c #DFE5EC",
")	c #D9E1E9",
"!	c #D5DCE6",
"~	c #D2D8E2",
"{	c #CAD3E0",
"]	c #C1CCDB",
"^	c #8D9FBD",
"/	c #345590",
"(	c #F3F5F8",
"_	c #FEFEFD",
":	c #FDFEFD",
"<	c #FDFFFD",
"[	c #FFFFFF",
"}	c #FEFFFE",
"|	c #FCFFFC",
"1	c #FDFEFE",
"2	c #DFE5EB",
"3	c #F6F9FA",
"4	c #C0C9DA",
"5	c #3B5B94",
"6	c #3A5B93",
"7	c #B3C0D5",
"8	c #FCFDFE",
"9	c #3D5C92",
"0	c #C9D1DE",
"a	c #335591",
"b	c #BCC8DA",
"c	c #B1BED4",
"d	c #FBFDFE",
"e	c #355791",
"f	c #C8D0DD",
"g	c #DFE4EB",
"h	c #CED6E1",
"i	c #6A83AC",
"j	c #6B83AC",
"k	c #C4CFDF",
"l	c #FFFFFE",
"m	c #FCFDFD",
"n	c #6C84AC",
"o	c #6A83AD",
"p	c #D6DCE4",
"q	c #FFFEFE",
"r	c #E0E6ED",
"s	c #99AAC5",
"t	c #D1DAE4",
"u	c #FEFEFE",
"v	c #355793",
"w	c #37588E",
"x	c #F6F8FA",
"y	c #F4F7F8",
"z	c #869AB9",
"A	c #E3EBF0",
"B	c #95A7C1",
"C	c #E0E5ED",
"D	c #DEE4EB",
"E	c #788FB7",
"F	c #A9BAD2",
"G	c #ADBBD1",
"H	c #91A4C2",
"I	c #C7D1DE",
"J	c #3D5F94",
"K	c #D0D7E2",
"L	c #7C92B6",
"M	c #8FA1C1",
"N	c #5C79A6",
"O	c #92A2C2",
"P	c #A6B5CB",
"Q	c #B7C2D4",
"R	c #C3CCDB",
"S	c #325693",
"T	c #3E5E98",
"U	c #546FA1",
"V	c #395994",
"W	c #7087B1",
"X	c #3F5F99",
"Y	c #345593",
"Z	c #345592",
"   .  ++@#$%+++ ",
" .&*=-;>,')!~{]^",
" /(_:<:[}|<__:12",
" $34567[89666502",
" a3b+.c[de+.++fg",
" a3hijklmniiiopg",
" a3[[[}[[[[[[lqg",
" a3[[[[l[l[[[[lg",
" a3[[[[rstu[[[lg",
"vwxuuuyzABCuuuuD",
"EFGGGGHIJKLGGGGM",
"NO     PQR%    S",
"TU     VWX     S",
" Y     Z %     S",
"               S",
" ++++++++++++++."};

--- NEW FILE: police.xpm ---
/* XPM */
static char * police_xpm[] = {
"16 16 63 1",
" 	c None",
".	c #035E9F",
"+	c #2372AB",
"@	c #0761A0",
"#	c #98BDD7",
"$	c #7BABCC",
"%	c #176BA6",
"&	c #629BC3",
"*	c #D4E3EE",
"=	c #B4CFE2",
"-	c #4E8DBB",
";	c #2E79AF",
">	c #BFD6E6",
",	c #488AB9",
"'	c #A8C7DD",
")	c #BBD4E5",
"!	c #C0D7E7",
"~	c #C3D9E8",
"{	c #347DB1",
"]	c #307BB0",
"^	c #5793BF",
"/	c #8AB4D2",
"(	c #1167A4",
"_	c #9EC1DA",
":	c #A5C5DC",
"<	c #99BDD8",
"[	c #699FC6",
"}	c #D3E3EE",
"|	c #74A6CA",
"1	c #7AAACC",
"2	c #649CC4",
"3	c #92B9D5",
"4	c #518FBC",
"5	c #2976AD",
"6	c #D5E4EF",
"7	c #1268A5",
"8	c #1E6FA9",
"9	c #6CA1C7",
"0	c #5290BD",
"a	c #E8F0F6",
"b	c #6AA0C6",
"c	c #C2D8E8",
"d	c #0A63A2",
"e	c #1368A5",
"f	c #CBDEEB",
"g	c #88B3D1",
"h	c #E0EBF3",
"i	c #5B96C0",
"j	c #C4D9E8",
"k	c #196CA7",
"l	c #3C82B4",
"m	c #0B63A2",
"n	c #2D79AF",
"o	c #045F9F",
"p	c #73A5C9",
"q	c #C6DBE9",
"r	c #ACCADF",
"s	c #93BAD5",
"t	c #E3EDF4",
"u	c #0C64A2",
"v	c #B9D2E4",
"w	c #E5EEF5",
"x	c #377FB2",
"................",
"..............+.",
"............@#$%",
"............&*=-",
"..........;>,')!",
"..........~{]^/(",
"........,/_:<[..",
"........(}|12...",
"......34.567....",
"....890abcd.....",
"...efghijk......",
"..5l6mcno.......",
".pqrst/.........",
"u*v9............",
".+w,............",
"..x+............"};

--- NEW FILE: bank.xpm ---
/* XPM */
static char * bank_xpm[] = {
"16 16 60 1",
" 	c None",
".	c #FFFFFF",
"+	c #E7E7E7",
"@	c #ECECEC",
"#	c #8F8F8F",
"$	c #A9A9A9",
"%	c #D5D5D5",
"&	c #626262",
"*	c #6F6F6F",
"=	c #C3C3C3",
"-	c #F5F5F5",
";	c #F1F1F1",
">	c #454545",
",	c #060606",
"'	c #1A1A1A",
")	c #202020",
"!	c #0E0E0E",
"~	c #0D0D0D",
"{	c #7C7C7C",
"]	c #141414",
"^	c #DEDEDE",
"/	c #FBFBFB",
"(	c #B4B4B4",
"_	c #4F4F4F",
":	c #474747",
"<	c #787878",
"[	c #0A0A0A",
"}	c #AFAFAF",
"|	c #8A8A8A",
"1	c #4D4D4D",
"2	c #010101",
"3	c #272727",
"4	c #727272",
"5	c #DCDCDC",
"6	c #DDDDDD",
"7	c #606060",
"8	c #414141",
"9	c #1B1B1B",
"0	c #0B0B0B",
"a	c #CBCBCB",
"b	c #F2F2F2",
"c	c #5F5F5F",
"d	c #FEFEFE",
"e	c #434343",
"f	c #545454",
"g	c #696969",
"h	c #929292",
"i	c #8B8B8B",
"j	c #999999",
"k	c #949494",
"l	c #030303",
"m	c #9F9F9F",
"n	c #9E9E9E",
"o	c #2B2B2B",
"p	c #000000",
"q	c #151515",
"r	c #888888",
"s	c #7A7A7A",
"t	c #FDFDFD",
"u	c #8E8E8E",
"................",
".......+@.......",
".......#$.......",
"......%&*=-.....",
"....;>,')!~.....",
"....{]^#$/(.....",
"...._:.#$.......",
"....<[}|$.......",
"....;122345.....",
"......67890a....",
".......#$b)c....",
"....d..#$.ef....",
"....gh^ijklm....",
"....no22pqrd....",
"......;sjt......",
".......u$......."};

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	3 Oct 2007 13:47:35 -0000	1.6
--- Makefile.am	28 Nov 2007 22:28:20 -0000	1.7
***************
*** 1,4 ****
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = camping.xpm car_dealer.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm hospital.xpm hotel.xpm parking.xpm restaurant.xpm unknown.xpm
  EXTRA_DIST = $(xpm_DATA)
  #burgerking.ico:
--- 1,4 ----
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = airport.xpm bank.xpm camping.xpm car_dealer.xpm dumping-station.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 parking.xpm police.xpm restaurant.xpm trailerpark.xpm unknown.xpm
  EXTRA_DIST = $(xpm_DATA)
  #burgerking.ico:

--- NEW FILE: airport.xpm ---
/* XPM */
static char * airport_xpm[] = {
"16 16 56 1",
" 	c None",
".	c #03705F",
"+	c #0F7767",
"@	c #0F7766",
"#	c #DBEAE8",
"$	c #D9EAE7",
"%	c #FEFEFE",
"&	c #FAFCFB",
"*	c #F8FAFA",
"=	c #FBFDFC",
"-	c #FCFDFD",
";	c #0A7463",
">	c #73B0A6",
",	c #F8FBFB",
"'	c #F9FBFB",
")	c #82B7AE",
"!	c #58A095",
"~	c #057160",
"{	c #5CA398",
"]	c #F8FBFA",
"^	c #FFFFFF",
"/	c #FBFCFC",
"(	c #E1EDEB",
"_	c #077261",
":	c #459689",
"<	c #EFF6F5",
"[	c #6FADA3",
"}	c #2E897B",
"|	c #F1F7F6",
"1	c #FAFCFC",
"2	c #388E81",
"3	c #ECF4F3",
"4	c #F3F8F7",
"5	c #EDF5F3",
"6	c #519C90",
"7	c #0A7464",
"8	c #FDFEFE",
"9	c #087362",
"0	c #4A988C",
"a	c #AED1CC",
"b	c #61A59B",
"c	c #529D91",
"d	c #0B7564",
"e	c #F7FAFA",
"f	c #338B7D",
"g	c #66A89E",
"h	c #077362",
"i	c #B4D4CF",
"j	c #E7F1F0",
"k	c #097363",
"l	c #DCEBE9",
"m	c #218172",
"n	c #348C7E",
"o	c #047160",
"p	c #278476",
"q	c #30897B",
".......+@.......",
".......#$.......",
".......%%.......",
".......&*.......",
".......=-.......",
".......&-.......",
".....;>,')!.....",
"...~{]^^^^/(_...",
"..:^^^^^^^^^<[..",
"}|^^^^/^-1/^^^(2",
"3^4567.88.90#'^a",
"bcd....e^....f6g",
"......./1.......",
".....hi%%jk.....",
".....l^--^^.....",
".....mno.pq....."};

--- NEW FILE: golf.xpm ---
/* XPM */
static char * golf_xpm[] = {
"16 16 256 2",
"  	c #3D3D3D",
". 	c #696969",
"+ 	c #393939",
"@ 	c #474747",
"# 	c #3A3223",
"$ 	c #0D0D0D",
"% 	c #060606",
"& 	c #4A412F",
"* 	c #5A5A5A",
"= 	c #555555",
"- 	c #15110B",
"; 	c #514632",
"> 	c #121212",
", 	c #221D13",
"' 	c #6E5C3B",
") 	c #4D3E22",
"! 	c #292929",
"~ 	c #161616",
"{ 	c #2B2B2B",
"] 	c #222222",
"^ 	c #564B37",
"/ 	c #1E1E1E",
"( 	c #242424",
"_ 	c #29251B",
": 	c #202020",
"< 	c #090909",
"[ 	c #1C1C1C",
"} 	c #110E08",
"| 	c #020202",
"1 	c #181818",
"2 	c #1A1A1A",
"3 	c #080807",
"4 	c #0F0C07",
"5 	c #010101",
"6 	c #ADADAD",
"7 	c #65583D",
"8 	c #FEFEFE",
"9 	c #484848",
"0 	c #909090",
"a 	c #292317",
"b 	c #3C3424",
"c 	c #504631",
"d 	c #4C3D21",
"e 	c #62573F",
"f 	c #6E5D3C",
"g 	c #867552",
"h 	c #886D36",
"i 	c #6C6C6C",
"j 	c #F7F7F7",
"k 	c #FDFDFD",
"l 	c #A2A2A2",
"m 	c #FAFAFA",
"n 	c #FBFBFB",
"o 	c #6D6D6D",
"p 	c #C7C7C7",
"q 	c #F1F1F1",
"r 	c #989898",
"s 	c #FFCE6D",
"t 	c #D4D4D4",
"u 	c #262626",
"v 	c #F6F6F6",
"w 	c #F5F5F5",
"x 	c #B1B1B1",
"y 	c #FFD278",
"z 	c #ACACAC",
"A 	c #505050",
"B 	c #D1D1D1",
"C 	c #BEBEBE",
"D 	c #BDBDBD",
"E 	c #B0B0B0",
"F 	c #9A9A9A",
"G 	c #404040",
"H 	c #8F8F8F",
"I 	c #A3A3A3",
"J 	c #F3F3F3",
"K 	c #635840",
"L 	c #4C4C4C",
"M 	c #878787",
"N 	c #FCFCFC",
"O 	c #CDCDCD",
"P 	c #D7D7D7",
"Q 	c #4D4D4D",
"R 	c #A1A1A1",
"S 	c #C3C3C3",
"T 	c #373737",
"U 	c #F0F0F0",
"V 	c #F4F4F4",
"W 	c #E1E1E1",
"X 	c #F2F2F2",
"Y 	c #DBDBDB",
"Z 	c #B2B2B2",
"` 	c #A9A9A9",
" .	c #424242",
"..	c #BFBFBF",
"+.	c #7D7D7D",
"@.	c #D0D0D0",
"#.	c #EAEAEA",
"$.	c #8B8B8B",
"%.	c #2C2C2C",
"&.	c #898989",
"*.	c #AEAEAE",
"=.	c #F9F9F9",
"-.	c #272115",
";.	c #5C5C5C",
">.	c #D8D8D8",
",.	c #DFDFDF",
"'.	c #494949",
").	c #B3B3B3",
"!.	c #2F2F2F",
"~.	c #888888",
"{.	c #515151",
"].	c #9D9D9D",
"^.	c #6F6F6F",
"/.	c #2F281B",
"(.	c #434343",
"_.	c #2D271B",
":.	c #F5C86E",
"<.	c #6B6B6B",
"[.	c #A18D63",
"}.	c #DCB568",
"|.	c #5B4D32",
"1.	c #554729",
"2.	c #F2C469",
"3.	c #D2D2D2",
"4.	c #BA9E66",
"5.	c #86734E",
"6.	c #FACB6F",
"7.	c #D0AF6D",
"8.	c #FDCB69",
"9.	c #9E9E9E",
"0.	c #A5A5A5",
"a.	c #666666",
"b.	c #B7B7B7",
"c.	c #777777",
"d.	c #927B4D",
"e.	c #5C5038",
"f.	c #E6E6E6",
"g.	c #6E6E6E",
"h.	c #6A6A6A",
"i.	c #040403",
"j.	c #9B7E43",
"k.	c #67583A",
"l.	c #999999",
"m.	c #EFEFEF",
"n.	c #3E3729",
"o.	c #62553A",
"p.	c #CBCBCB",
"q.	c #828282",
"r.	c #FACC6E",
"s.	c #D5B370",
"t.	c #524732",
"u.	c #443B29",
"v.	c #DCDCDC",
"w.	c #93805A",
"x.	c #ABABAB",
"y.	c #BBBBBB",
"z.	c #C1C1C1",
"A.	c #6C5B3A",
"B.	c #DDB86D",
"C.	c #756341",
"D.	c #BCBCBC",
"E.	c #483F2D",
"F.	c #8B7854",
"G.	c #F9C866",
"H.	c #FDCD6F",
"I.	c #787878",
"J.	c #B49455",
"K.	c #E7BE6B",
"L.	c #716348",
"M.	c #E2BA6C",
"N.	c #62563F",
"O.	c #847351",
"P.	c #A88D55",
"Q.	c #AE8F50",
"R.	c #A28B5E",
"S.	c #E3E3E3",
"T.	c #C8C8C8",
"U.	c #D2B06C",
"V.	c #A7A7A7",
"W.	c #303030",
"X.	c #201B12",
"Y.	c #4E3F23",
"Z.	c #9B9B9B",
"`.	c #CECECE",
" +	c #5F533D",
".+	c #5F543E",
"++	c #9B8457",
"@+	c #848484",
"#+	c #727272",
"$+	c #65583E",
"%+	c #66583E",
"&+	c #EAC06C",
"*+	c #ECC068",
"=+	c #8C8C8C",
"-+	c #FECC6A",
";+	c #322E26",
">+	c #939393",
",+	c #B5B5B5",
"'+	c #C6C6C6",
")+	c #F5C971",
"!+	c #D5D5D5",
"~+	c #776748",
"{+	c #959595",
"]+	c #534832",
"^+	c #C3A363",
"/+	c #AA8B4D",
"(+	c #AD8E4F",
"_+	c #7F7F7F",
":+	c #0C0B09",
"<+	c #F8F8F8",
"[+	c #7A7A7A",
"}+	c #444444",
"|+	c #403828",
"1+	c #A38851",
"2+	c #443C2D",
"3+	c #FECC66",
"4+	c #EBEBEB",
"5+	c #957E4F",
"6+	c #DADADA",
"7+	c #BFA166",
"8+	c #636363",
"9+	c #504227",
"0+	c #CCCCCC",
"a+	c #D3B372",
"b+	c #757575",
"c+	c #988256",
"d+	c #B9B9B9",
"e+	c #AC9363",
"f+	c #C2C2C2",
"g+	c #64573D",
"h+	c #AFAFAF",
"i+	c #605031",
"j+	c #E8E8E8",
"k+	c #E9E9E9",
"l+	c #E5E5E5",
"m+	c #705E3D",
"n+	c #D3D3D3",
"o+	c #565656",
"p+	c #B8B8B8",
"q+	c #B6B6B6",
"r+	c #A6A6A6",
"s+	c #584D36",
"t+	c #5B4F37",
"u+	c #5E523A",
"v+	c #353535",
"w+	c #969696",
"x+	c #979797",
"y+	c #8D8D8D",
"z+	c #4B422F",
"A+	c #5D5D5D",
"B+	c #7B7B7B",
"C+	c #020201",
"D+	c #FFCF6F",
"E+	c #FFCC66",
"F+	c #FFFFFF",
"G+	c #000000",
"G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+",
"G+G+G+G+F+F+F+F+F+F+F+F+v.G+G+G+",
"G+G+G+G+G+G+O n G+5 k+F+z G+G+G+",
"G+G+G+G+G+G+F+F+G+F+8 F+G+G+G+G+",
"G+G+G+G+G+G+G+G+F+W 3 F+G+G+G+G+",
"G+G+G+G+G+G+G+F+F+j F+G+G+G+G+G+",
"G+G+G+G+G+G+r F+F+F+G+G+G+G+G+G+",
"G+G+G+G+G+G+l F+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+G+l F+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+G+6 F+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+G+*.F+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+G+j F+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+k F+| F+6 G+G+G+G+G+G+",
"G+G+G+G+F+w 5 G+F+6 G+G+G+G+G+G+",
"G+G+G+G+G+G+G+G+F+].G+G+G+G+G+G+",
"G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+"};

--- NEW FILE: dumping-station.xpm ---
/* XPM */
static char * dumping_station_xpm[] = {
"16 16 93 2",
"  	c #899EBF",
". 	c #5170A1",
"+ 	c #516FA2",
"@ 	c #526FA1",
"# 	c #748CB4",
"$ 	c #516FA1",
"% 	c #5270A1",
"& 	c #AEBBD1",
"* 	c #5C78A6",
"= 	c #325692",
"- 	c #5572A3",
"; 	c #FBFCFD",
"> 	c #FFFFFF",
", 	c #FEFEFE",
"' 	c #F8F9FB",
") 	c #EEF1F6",
"! 	c #DFE4EE",
"~ 	c #E3E7EF",
"{ 	c #F1F3F7",
"] 	c #506EA0",
"^ 	c #899BBD",
"/ 	c #8399BD",
"( 	c #A9B9D1",
"_ 	c #C1CCDC",
": 	c #BDC9D9",
"< 	c #8DA0C1",
"[ 	c #8196BA",
"} 	c #8498BC",
"| 	c #6D86B0",
"1 	c #315693",
"2 	c #889CBE",
"3 	c #325593",
"4 	c #F8F9FA",
"5 	c #46679B",
"6 	c #879CBC",
"7 	c #9EAEC8",
"8 	c #47669B",
"9 	c #DCE2E9",
"0 	c #FFFFFE",
"a 	c #FFFEFE",
"b 	c #FDFEFE",
"c 	c #FEFFFD",
"d 	c #748DB6",
"e 	c #DDE2EC",
"f 	c #CFD6E3",
"g 	c #B8C4D6",
"h 	c #F9FAFC",
"i 	c #325691",
"j 	c #DAE0EB",
"k 	c #FBFBFC",
"l 	c #D2DBE5",
"m 	c #C9D3E0",
"n 	c #C3CDDC",
"o 	c #F3F5F8",
"p 	c #E1E6EE",
"q 	c #9FAEC7",
"r 	c #CCD5E1",
"s 	c #CBD4E1",
"t 	c #CAD3E0",
"u 	c #5876A5",
"v 	c #6D86AD",
"w 	c #48679C",
"x 	c #6F88B0",
"y 	c #6983AC",
"z 	c #49679C",
"A 	c #E8ECF2",
"B 	c #D6DEE8",
"C 	c #4D6B9E",
"D 	c #647DA9",
"E 	c #5572A2",
"F 	c #49679B",
"G 	c #94A6C4",
"H 	c #9CACC8",
"I 	c #A0B0CA",
"J 	c #D5DCE7",
"K 	c #CAD3E1",
"L 	c #BDC7DA",
"M 	c #BDC8DA",
"N 	c #DCE2EA",
"O 	c #FFFEFF",
"P 	c #5F7AA7",
"Q 	c #AAB9D0",
"R 	c #A1B2CD",
"S 	c #7A91B5",
"T 	c #375994",
"U 	c #335792",
"V 	c #FEFFFE",
"W 	c #7990B5",
"X 	c #AEBCD1",
"Y 	c #98AAC5",
"Z 	c #BCC7D8",
"` 	c #FAFAFA",
" .	c #F3F3F3",
"  . + @ # @ @ + @ $ @ @ % % % & ",
"* = = - ; > , ' > ) ! ~ { ] = ^ ",
"* = = / ; ( _ > : < [ } > | 1 2 ",
"* = 3 } 4 5 6 > 7 8 5 5 9 | 1 2 ",
"* = 3 } 0 a b > , a a , c | 1 2 ",
"* = d e > > > f g h > > c | 1 2 ",
"* i j k l m n o p q r s t u 1 2 ",
"v w x y z w z A B C D E z z F G ",
"> > > > > > > > > > H I > > > > ",
"> > > > > > > J K K L M K K N O ",
"> > > > > > > P i i Q R = i S 0 ",
"> > > > > > > P = = T U = = S V ",
"> > > > > > > P = = = = = = W V ",
"> > > > > > > X Y Y Y Y Y Y Z 0 ",
"> > > > > > > V V V V V V V > > ",
"` > > > > > > > > > > > > > >  ."};

--- NEW FILE: information.xpm ---
/* XPM */
static char * information_xpm[] = {
"16 16 51 1",
" 	c #156907",
".	c #1D6E0F",
"+	c #83B07C",
"@	c #A7C7A2",
"#	c #55934B",
"$	c #A7C6A2",
"%	c #FDFDFD",
"&	c #FAFCFA",
"*	c #4C8D42",
"=	c #1E6F11",
"-	c #F8FBF8",
";	c #A0C39B",
">	c #1F6F12",
",	c #A0C29B",
"'	c #B2CDAE",
")	c #FBFCFB",
"!	c #508F45",
"~	c #217014",
"{	c #93BA8C",
"]	c #B5D0B1",
"^	c #5E9855",
"/	c #75A970",
"(	c #D5E5D5",
"_	c #D5E5D4",
":	c #D9E7D8",
"<	c #DBE8DA",
"[	c #6FA368",
"}	c #1A6C0C",
"|	c #F4F8F3",
"1	c #83B17D",
"2	c #E4EEE2",
"3	c #82AF7B",
"4	c #E3EDE1",
"5	c #7FAD78",
"6	c #80AE79",
"7	c #DFEBDE",
"8	c #84B17E",
"9	c #DFEADD",
"0	c #1B6C0D",
"a	c #EFF4ED",
"b	c #A0C29A",
"c	c #186B0A",
"d	c #2E7C24",
"e	c #93BB8F",
"f	c #E3EDE3",
"g	c #E2EDE2",
"h	c #DCE9DC",
"i	c #DDEADD",
"j	c #D6E5D6",
"k	c #599754",
"l	c #25741A",
"      .+@#      ",
"      $%%&*     ",
"     =-%%%;     ",
"     >&%%%,     ",
"      '%%)!     ",
"      ~{]^      ",
"     /(_:<[     ",
"     }|%%%1     ",
"      2%%%3     ",
"      4%%%5     ",
"      4%%%6     ",
"      7%%%8     ",
"      9%%%3     ",
"     0a%%%b     ",
"   cdefghijkl   ",
"                "};

[Navit-cvs-commit] navit/src/data/poi_geodownload/libmdb Makefile.am, 1.5, 1.6

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

Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19594/data/poi_geodownload/libmdb

Modified Files:
	Makefile.am 
Log Message:
Reverted fib-1.1 and poi_geodownload to libtool


Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	7 Nov 2007 18:21:45 -0000	1.5
--- Makefile.am	28 Nov 2007 20:04:59 -0000	1.6
***************
*** 1,5 ****
  SUBDIRS=include
- AM_CFLAGS = -shared
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(srcdir)/include
! noinst_LIBRARIES = libmdb.a
! libmdb_a_SOURCES=backend.c catalog.c data.c dump.c file.c iconv.c index.c kkd.c like.c map.c mem.c money.c options.c props.c sargs.c stats.c table.c worktable.c write.c
--- 1,4 ----
  SUBDIRS=include
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(srcdir)/include
! noinst_LTLIBRARIES = libmdb.la
! libmdb_la_SOURCES=backend.c catalog.c data.c dump.c file.c iconv.c index.c kkd.c like.c map.c mem.c money.c options.c props.c sargs.c stats.c table.c worktable.c write.c

[Navit-cvs-commit] navit/src/fib-1.1 Makefile.am,1.4,1.5

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

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

Modified Files:
	Makefile.am 
Log Message:
Reverted fib-1.1 and poi_geodownload to libtool


Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/fib-1.1/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	7 Nov 2007 18:21:45 -0000	1.4
--- Makefile.am	28 Nov 2007 20:04:59 -0000	1.5
***************
*** 1,4 ****
! noinst_LIBRARIES = libfib.a
! AM_CFLAGS=-shared
! libfib_a_SOURCES = fib.c fib.h fibpriv.h
  EXTRA_DIST=README configure.in fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 fibtest.c fibtest2.c tt.c use.c
--- 1,3 ----
! noinst_LTLIBRARIES = libfib.la
! libfib_la_SOURCES = fib.c fib.h fibpriv.h
  EXTRA_DIST=README configure.in fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 fibtest.c fibtest2.c tt.c use.c

[Navit-cvs-commit] navit/src navit.xml,1.18,1.19

[Alexander A. <za...@us...>]

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

Modified Files:
	navit.xml 
Log Message:
init libgarmin with config, get debug level from config and use it

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** navit.xml	24 Nov 2007 12:40:25 -0000	1.18
--- navit.xml	28 Nov 2007 11:08:54 -0000	1.19
***************
*** 66,72 ****
  	</mapset>
  <!-- Sample mapset for garmin maps -->
!         <mapset enabled="no">
!                 <map type="garmin" enabled="yes" data="/path/to/img"/>
!         </mapset>
  
  	<layout name="Tag">
--- 66,72 ----
  	</mapset>
  <!-- Sample mapset for garmin maps -->
! 	<mapset enabled="no">
! 		<map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
! 	</mapset>
  
  	<layout name="Tag">

[Navit-cvs-commit] navit/src/data/garmin garmin.c,1.10,1.11

[Alexander A. <za...@us...>]

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

Modified Files:
	garmin.c 
Log Message:
init libgarmin with config, get debug level from config and use it

Index: garmin.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** garmin.c	25 Nov 2007 12:20:54 -0000	1.10
--- garmin.c	28 Nov 2007 11:08:54 -0000	1.11
***************
*** 73,76 ****
--- 73,77 ----
  
  int garmin_debug = 10;
+ 
  void 
  logfn(char *file, int line, int level, char *fmt, ...)
***************
*** 555,564 ****
  		level = get_level(sel);
  //		level = nl2gl[level].g;
! 		printf("Looking level=%d for %f %f %f %f\n",
  			level, r.lulat, r.lulong, r.rllat, r.rllong);
  	}
  	gm = gar_find_subfiles(map->mpriv->g, sel ? &r : NULL, flags);
  	if (!gm) {
! 		dlog(1, "Can not find map data\n");
  		return -1;
  	}
--- 556,570 ----
  		level = get_level(sel);
  //		level = nl2gl[level].g;
! 		dlog(2, "Looking level=%d for %f %f %f %f\n",
  			level, r.lulat, r.lulong, r.rllat, r.rllong);
  	}
  	gm = gar_find_subfiles(map->mpriv->g, sel ? &r : NULL, flags);
  	if (!gm) {
! 		if (sel) {
! 			dlog(1, "Can not find map data for the area: %f %f %f %f\n",
! 				r.lulat, r.lulong, r.rllat, r.rllong);
! 		} else {
! 			dlog(1, "Can not find map data\n");
! 		}
  		return -1;
  	}
***************
*** 572,576 ****
  	level = level - sl;
  	level = (gm->maxlevel - gm->minlevel) - level;
! 	dlog(1, "sl=%d el=%d level=%d\n", sl, el, level);
  #endif
  	sl = (18-gm->zoomlevels)/2;
--- 578,582 ----
  	level = level - sl;
  	level = (gm->maxlevel - gm->minlevel) - level;
! 	dlog(3, "sl=%d el=%d level=%d\n", sl, el, level);
  #endif
  	sl = (18-gm->zoomlevels)/2;
***************
*** 582,586 ****
  	level = level - sl;
  	level = gm->basebits + level;
! 	dlog(1, "sl=%d el=%d level=%d\n", sl, el, level);
  	map->gmap = gm;
  	glast = &map->objs;
--- 588,592 ----
  	level = level - sl;
  	level = gm->basebits + level;
! 	dlog(3, "sl=%d el=%d level=%d\n", sl, el, level);
  	map->gmap = gm;
  	glast = &map->objs;
***************
*** 597,601 ****
  	}
  	map->cobj = map->objs;
! 	dlog(1, "Loaded %d objects\n", rc);
  	return rc;
  }
--- 603,607 ----
  	}
  	map->cobj = map->objs;
! 	dlog(2, "Loaded %d objects\n", rc);
  	return rc;
  }
***************
*** 617,621 ****
  	} else {
  		while (ms) {
! 			dlog(1, "order town:%d street=%d poly=%d\n",
  				ms->order[layer_town],
  				ms->order[layer_street],
--- 623,627 ----
  	} else {
  		while (ms) {
! 			dlog(2, "order town:%d street=%d poly=%d\n",
  				ms->order[layer_town],
  				ms->order[layer_street],
***************
*** 647,651 ****
  gmap_destroy(struct map_priv *m)
  {
! 	dlog(1, "garmin_map_destroy\n");
  	if (m->g)
  		gar_free(m->g);
--- 653,657 ----
  gmap_destroy(struct map_priv *m)
  {
! 	dlog(5, "garmin_map_destroy\n");
  	if (m->g)
  		gar_free(m->g);
***************
*** 674,683 ****
--- 680,698 ----
  	struct map_priv *m;
  	struct attr *data;
+ 	struct attr *debug;
  	char buf[PATH_MAX];
  	struct stat st;
+ 	int dl = 1;
+ 	struct gar_config cfg;
  
  	data=attr_search(attrs, NULL, attr_data);
  	if (! data)
  		return NULL;
+ 	debug=attr_search(attrs, NULL, attr_debug);
+ 	if (debug) {
+ 		dl = atoi(debug->u.str);
+ 		if (!dl)
+ 			dl = 1;
+ 	}
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
***************
*** 687,691 ****
  		return NULL;
  	}
! 	m->g = gar_init(NULL, logfn);
  	if (!m->g) {
  		g_free(m->filename);
--- 702,710 ----
  		return NULL;
  	}
! 	memset(&cfg, 0, sizeof(struct gar_config));
! 	cfg.opm = OPM_GPS;
! 	cfg.debuglevel = dl;
! 	garmin_debug = dl;
! 	m->g = gar_init_cfg(NULL, logfn, &cfg);
  	if (!m->g) {
  		g_free(m->filename);

[Navit-cvs-commit] navit/src Makefile.am,1.27,1.28

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

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

Modified Files:
	Makefile.am 
Log Message:
Fixed missing @ZLIB_LIBS@

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.am	5 Nov 2007 21:07:39 -0000	1.27
--- Makefile.am	27 Nov 2007 14:13:12 -0000	1.28
***************
*** 27,31 ****
  osm2navit_SOURCES = osm2navit.c item.c debug.c zipfile.h
  
! navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ -Lfib-1.1 -lfib
  
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
--- 27,31 ----
  osm2navit_SOURCES = osm2navit.c item.c debug.c zipfile.h
  
! navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ @ZLIB_LIBS@ -Lfib-1.1 -lfib
  
  osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@

[Navit-cvs-commit] navit/src file.c, 1.8, 1.9 file.h, 1.8, 1.9 osm2navit.c, 1.11, 1.12

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

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

Modified Files:
	file.c file.h osm2navit.c 
Log Message:
Added support for compressed maps

Index: osm2navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osm2navit.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** osm2navit.c	22 Nov 2007 22:55:30 -0000	1.11
--- osm2navit.c	27 Nov 2007 11:10:28 -0000	1.12
***************
*** 356,366 ****
  };
  
! struct buffer node_buffer = {
  	64*1024*1024,
  };
  
- struct buffer zipdir_buffer = {
- 	1024*1024,
- };
  
  static void
--- 356,363 ----
  };
  
! static struct buffer node_buffer = {
  	64*1024*1024,
  };
  
  
  static void
***************
*** 534,537 ****
--- 531,536 ----
  	int alen=0;
  
+ 	if (! out)
+ 		return;
  	if (dedupe_ways_hash) {
  		if (g_hash_table_lookup(dedupe_ways_hash, (gpointer)wayid))
***************
*** 559,563 ****
  {
  	int alen=0;
! 	if (! node_is_tagged || ! nodeid)
  		return;
  	pad_text_attr(&debug_attr, debug_attr_buffer);
--- 558,562 ----
  {
  	int alen=0;
! 	if (!out || ! node_is_tagged || ! nodeid)
  		return;
  	pad_text_attr(&debug_attr, debug_attr_buffer);
***************
*** 1151,1155 ****
  		th=g_hash_table_lookup(tile_hash, next->data);
  		if (!th) {
! 			fprintf(stderr,"No tile found for '%s'\n", next->data);
  		}
  		add_tile_hash(th);
--- 1150,1154 ----
  		th=g_hash_table_lookup(tile_hash, next->data);
  		if (!th) {
! 			fprintf(stderr,"No tile found for '%s'\n", (char *)(next->data));
  		}
  		add_tile_hash(th);
***************
*** 1302,1307 ****
  	if (phase == 3)
  		tile_hash=g_hash_table_new(g_str_hash, g_str_equal);
! 	phase34_process_file(phase, ways_in);
! 	phase34_process_file(phase, nodes_in);
  	fprintf(stderr,"read %d bytes\n", bytes_read);
  	if (phase == 3)
--- 1301,1308 ----
  	if (phase == 3)
  		tile_hash=g_hash_table_new(g_str_hash, g_str_equal);
! 	if (ways_in)
! 		phase34_process_file(phase, ways_in);
! 	if (nodes_in)
! 		phase34_process_file(phase, nodes_in);
  	fprintf(stderr,"read %d bytes\n", bytes_read);
  	if (phase == 3)
***************
*** 1321,1346 ****
  }
  
! int
! dir_entries;
  
! static void
! add_zipdirentry(char *name, struct zip_cd *cd)
  {
! 	int cd_size=sizeof(struct zip_cd)+strlen(name);
! 	struct zip_cd *cdn;
! 	if (zipdir_buffer.size + cd_size > zipdir_buffer.malloced) 
! 		extend_buffer(&zipdir_buffer);
! 	cdn=(struct zip_cd *)(zipdir_buffer.base+zipdir_buffer.size);
! 	*cdn=*cd;
! 	strcpy((char *)(cdn+1), name);
! 	zipdir_buffer.size += cd_size;
! 	dir_entries++;
! }
  
! long long zipoffset;
! int zipdir_size;
  
  static void
! write_zipmember(FILE *out, FILE *dir_out, char *name, int filelen, char *data, int data_size)
  {
  	struct zip_lfh lfh = {
--- 1322,1360 ----
  }
  
! static long long zipoffset;
! static int zipdir_size;
  
! static int
! compress2_int(Byte *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)
  {
! 	z_stream stream;
! 	int err;
  
! 	stream.next_in = (Bytef*)source;
! 	stream.avail_in = (uInt)sourceLen;
! 	stream.next_out = dest;
! 	stream.avail_out = (uInt)*destLen;
! 	if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
! 
! 	stream.zalloc = (alloc_func)0;
! 	stream.zfree = (free_func)0;
! 	stream.opaque = (voidpf)0;
! 
! 	err = deflateInit2(&stream, level, Z_DEFLATED, -15, 9, Z_DEFAULT_STRATEGY);
! 	if (err != Z_OK) return err;
! 
! 	err = deflate(&stream, Z_FINISH);
! 	if (err != Z_STREAM_END) {
! 		deflateEnd(&stream);
! 		return err == Z_OK ? Z_BUF_ERROR : err;
! 	}
! 	*destLen = stream.total_out;
! 
! 	err = deflateEnd(&stream);
! 	return err;
! }
  
  static void
! write_zipmember(FILE *out, FILE *dir_out, char *name, int filelen, char *data, int data_size, int compression_level)
  {
  	struct zip_lfh lfh = {
***************
*** 1364,1368 ****
  		0x00,
  		0x0000,
! 		0x0000,
  		0xbe2a,
  		0x5d37,
--- 1378,1382 ----
  		0x00,
  		0x0000,
! 		0x0,
  		0xbe2a,
  		0x5d37,
***************
*** 1379,1392 ****
  	};
  	char filename[filelen+1];
! 	int crc,len;
  
  	crc=crc32(0, NULL, 0);
  	crc=crc32(crc, (unsigned char *)data, data_size);
  	lfh.zipcrc=crc;
! 	lfh.zipsize=data_size;
  	lfh.zipuncmp=data_size;
  	cd.zipccrc=crc;
! 	cd.zipcsiz=data_size;
  	cd.zipcunc=data_size;
  	strcpy(filename, name);
  	len=strlen(filename);
--- 1393,1421 ----
  	};
  	char filename[filelen+1];
! 	int error,crc,len,comp_size=data_size;
! 	uLongf destlen=data_size+data_size/500+12;
! 	char compbuffer[destlen];
  
  	crc=crc32(0, NULL, 0);
  	crc=crc32(crc, (unsigned char *)data, data_size);
+ 	if (compression_level) {
+ 		error=compress2_int((Byte *)compbuffer, &destlen, (Bytef *)data, data_size, compression_level);
+ 		if (error == Z_OK) {
+ 			if (destlen < data_size) {
+ 				data=compbuffer;
+ 				comp_size=destlen;
+ 			}
+ 		} else {
+ 			fprintf(stderr,"compress2 returned %d\n", error);
+ 		}
+ 	}
  	lfh.zipcrc=crc;
! 	lfh.zipsize=comp_size;
  	lfh.zipuncmp=data_size;
+ 	lfh.zipmthd=compression_level ? 8:0;
  	cd.zipccrc=crc;
! 	cd.zipcsiz=comp_size;
  	cd.zipcunc=data_size;
+ 	cd.zipcmthd=compression_level ? 8:0;
  	strcpy(filename, name);
  	len=strlen(filename);
***************
*** 1397,1402 ****
  	fwrite(&lfh, sizeof(lfh), 1, out);
  	fwrite(filename, filelen, 1, out);
! 	fwrite(data, data_size, 1, out);
! 	zipoffset+=sizeof(lfh)+filelen+data_size;
  	fwrite(&cd, sizeof(cd), 1, dir_out);
  	fwrite(filename, filelen, 1, dir_out);
--- 1426,1431 ----
  	fwrite(&lfh, sizeof(lfh), 1, out);
  	fwrite(filename, filelen, 1, out);
! 	fwrite(data, comp_size, 1, out);
! 	zipoffset+=sizeof(lfh)+filelen+comp_size;
  	fwrite(&cd, sizeof(cd), 1, dir_out);
  	fwrite(filename, filelen, 1, dir_out);
***************
*** 1405,1409 ****
  
  static int
! process_slice(FILE *ways_in, FILE *nodes_in, int size, int maxnamelen, FILE *out, FILE *dir_out)
  {
  	struct tile_head *th;
--- 1434,1438 ----
  
  static int
! process_slice(FILE *ways_in, FILE *nodes_in, int size, int maxnamelen, FILE *out, FILE *dir_out, int compression_level)
  {
  	struct tile_head *th;
***************
*** 1421,1426 ****
  		th=th->next;
  	}
! 	fseek(ways_in, 0, SEEK_SET);
! 	fseek(nodes_in, 0, SEEK_SET);
  	phase34(4, maxnamelen, ways_in, nodes_in, NULL);
  
--- 1450,1457 ----
  		th=th->next;
  	}
! 	if (ways_in)
! 		fseek(ways_in, 0, SEEK_SET);
! 	if (nodes_in)
! 		fseek(nodes_in, 0, SEEK_SET);
  	phase34(4, maxnamelen, ways_in, nodes_in, NULL);
  
***************
*** 1433,1439 ****
  			} else {
  				if (strlen(th->name))
! 					write_zipmember(out, dir_out, th->name, maxnamelen, th->zip_data, th->total_size);
  				else
! 					write_zipmember(out, dir_out, "index", sizeof("index")-1, th->zip_data, th->total_size);
  				zipfiles++;
  			}
--- 1464,1470 ----
  			} else {
  				if (strlen(th->name))
! 					write_zipmember(out, dir_out, th->name, maxnamelen, th->zip_data, th->total_size, compression_level);
  				else
! 					write_zipmember(out, dir_out, "index", sizeof("index")-1, th->zip_data, th->total_size, compression_level);
  				zipfiles++;
  			}
***************
*** 1456,1460 ****
  
  static int
! phase4(FILE *ways_in, FILE *nodes_in, FILE *out, FILE *dir_out)
  {
  	int slice_size=1024*1024*1024;
--- 1487,1491 ----
  
  static int
! phase4(FILE *ways_in, FILE *nodes_in, FILE *out, FILE *dir_out, int compression_level)
  {
  	int slice_size=1024*1024*1024;
***************
*** 1505,1509 ****
  			th=th->next;
  		}
! 		zipfiles+=process_slice(ways_in, nodes_in, size, maxnamelen, out, dir_out);
  		slices++;
  	}
--- 1536,1540 ----
  			th=th->next;
  		}
! 		zipfiles+=process_slice(ways_in, nodes_in, size, maxnamelen, out, dir_out, compression_level);
  		slices++;
  	}
***************
*** 1527,1538 ****
  	fprintf(f,"Usage :\n");
  	fprintf(f,"bzcat planet.osm.bz2 | osm2navit mymap.bin\n");
! 	fprintf(f,"Available switches :\n");
! 	fprintf(f,"-h (--help)             : this screen\n");
! 	fprintf(f,"-a (--attr-debug-level) : control which data is included in the debug attribute\n");
! 	fprintf(f,"-c (--dump-coordinates) : dump coordinates after phase 1\n");
! 	fprintf(f,"-e (--end)		: end at specified phase\n");
! 	fprintf(f,"-k (--keep-tmpfiles)    : do not delete tmp files after processing. useful to reuse them\n\n");
! 	fprintf(f,"-s (--start)		: start at specified phase\n");
! 	fprintf(f,"-w (--dedupe-ways)      : ensure no duplicate ways or nodes. useful when using several input files\n");
  	exit(1);
  }
--- 1558,1572 ----
  	fprintf(f,"Usage :\n");
  	fprintf(f,"bzcat planet.osm.bz2 | osm2navit mymap.bin\n");
! 	fprintf(f,"Available switches:\n");
! 	fprintf(f,"-h (--help)              : this screen\n");
! 	fprintf(f,"-N (--nodes-only)        : process only nodes\n");
! 	fprintf(f,"-W (--ways-only)         : process only ways\n");
! 	fprintf(f,"-a (--attr-debug-level)  : control which data is included in the debug attribute\n");
! 	fprintf(f,"-c (--dump-coordinates)  : dump coordinates after phase 1\n");
! 	fprintf(f,"-e (--end)               : end at specified phase\n");
! 	fprintf(f,"-k (--keep-tmpfiles)     : do not delete tmp files after processing. useful to reuse them\n\n");
! 	fprintf(f,"-s (--start)             : start at specified phase\n");
! 	fprintf(f,"-w (--dedupe-ways)       : ensure no duplicate ways or nodes. useful when using several input files\n");
! 	fprintf(f,"-z (--compression-level) : set the compression level\n");
  	exit(1);
  }
***************
*** 1540,1547 ****
  int main(int argc, char **argv)
  {
! 	FILE *ways,*ways_split,*nodes,*tilesdir,*zipdir,*res;
  	char *map=g_strdup(attrmap);
  	int c,start=1,end=4,dump_coordinates=0;
  	int keep_tmpfiles=0;
  	char *result;
  	while (1) {
--- 1574,1583 ----
  int main(int argc, char **argv)
  {
! 	FILE *ways=NULL,*ways_split=NULL,*nodes=NULL,*tilesdir,*zipdir,*res;
  	char *map=g_strdup(attrmap);
  	int c,start=1,end=4,dump_coordinates=0;
  	int keep_tmpfiles=0;
+ 	int process_nodes=1, process_ways=1;
+ 	int compression_level=9;
  	char *result;
  	while (1) {
***************
*** 1552,1568 ****
  		static struct option long_options[] = {
  			{"attr-debug-level", 1, 0, 'a'},
  			{"dedupe-ways", 0, 0, 'w'},
  			{"end", 1, 0, 'e'},
  			{"help", 0, 0, 'h'},
  			{"keep-tmpfiles", 0, 0, 'k'},
  			{"start", 1, 0, 's'},
  			{0, 0, 0, 0}
  		};
! 		c = getopt_long (argc, argv, "a:ce:hks:w", long_options, &option_index);
  		if (c == -1)
  			break;
  		switch (c) {
! 		case 'h':
! 			usage(stdout);
  			break;
  		case 'a':
--- 1588,1610 ----
  		static struct option long_options[] = {
  			{"attr-debug-level", 1, 0, 'a'},
+ 			{"compression-level", 1, 0, 'z'},
  			{"dedupe-ways", 0, 0, 'w'},
  			{"end", 1, 0, 'e'},
  			{"help", 0, 0, 'h'},
  			{"keep-tmpfiles", 0, 0, 'k'},
+ 			{"nodes-only", 0, 0, 'N'},
  			{"start", 1, 0, 's'},
+ 			{"ways-only", 0, 0, 'W'},
  			{0, 0, 0, 0}
  		};
! 		c = getopt_long (argc, argv, "NWa:ce:hks:w", long_options, &option_index);
  		if (c == -1)
  			break;
  		switch (c) {
! 		case 'N':
! 			process_ways=0;
! 			break;
! 		case 'W':
! 			process_nodes=0;
  			break;
  		case 'a':
***************
*** 1575,1578 ****
--- 1617,1623 ----
  			end=atoi(optarg);
  			break;
+ 		case 'h':
+ 			usage(stdout);
+ 			break;
  		case 'k':
  			fprintf(stderr,"I will KEEP tmp files\n");
***************
*** 1585,1588 ****
--- 1630,1636 ----
  			dedupe_ways_hash=g_hash_table_new(NULL, NULL);
  			break;
+ 		case 'z':
+ 			compression_level=atoi(optarg);
+ 			break;
  		case '?':
  			usage(stderr);
***************
*** 1600,1610 ****
  
  	if (start == 1) {
! 		ways=fopen64("ways.tmp","w+");
! 		nodes=fopen64("nodes.tmp","w+");
  		phase=1;
  		fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
  		phase1(stdin,ways,nodes);
! 		fclose(ways);
! 		fclose(nodes);
  	}
  	if (end == 1 || dump_coordinates) 
--- 1648,1662 ----
  
  	if (start == 1) {
! 		if (process_ways)
! 			ways=fopen64("ways.tmp","w+");
! 		if (process_nodes)
! 			nodes=fopen64("nodes.tmp","w+");
  		phase=1;
  		fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
  		phase1(stdin,ways,nodes);
! 		if (ways)
! 			fclose(ways);
! 		if (nodes)
! 			fclose(nodes);
  	}
  	if (end == 1 || dump_coordinates) 
***************
*** 1615,1627 ****
  		load_buffer("coords.tmp",&node_buffer);
  	if (start <= 2) {
! 		ways=fopen64("ways.tmp","r");
! 		ways_split=fopen64("ways_split.tmp","w+");
! 		phase=2;
! 		fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n");
! 		phase2(ways,ways_split);
! 		fclose(ways_split);
! 		fclose(ways);
! 		if(!keep_tmpfiles)
! 			remove("ways.tmp");
  	}
  	free(node_buffer.base);
--- 1667,1682 ----
  		load_buffer("coords.tmp",&node_buffer);
  	if (start <= 2) {
! 		if (process_ways) {
! 			ways=fopen64("ways.tmp","r");
! 			ways_split=fopen64("ways_split.tmp","w+");
! 			phase=2;
! 			fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n");
! 			phase2(ways,ways_split);
! 			fclose(ways_split);
! 			fclose(ways);
! 			if(!keep_tmpfiles)
! 				remove("ways.tmp");
! 		} else 
! 			fprintf(stderr,"PROGRESS: Skipping Phase 2\n");
  	}
  	free(node_buffer.base);
***************
*** 1634,1644 ****
  		phase=3;
  		fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n");
! 		ways_split=fopen64("ways_split.tmp","r");
! 		nodes=fopen64("nodes.tmp","r");
  		tilesdir=fopen64("tilesdir.tmp","w+");
  		phase3(ways_split,nodes,tilesdir);
  		fclose(tilesdir);
! 		fclose(nodes);
! 		fclose(ways_split);
  	}
  	if (end == 3)
--- 1689,1703 ----
  		phase=3;
  		fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n");
! 		if (process_ways)
! 			ways_split=fopen64("ways_split.tmp","r");
! 		if (process_nodes)
! 			nodes=fopen64("nodes.tmp","r");
  		tilesdir=fopen64("tilesdir.tmp","w+");
  		phase3(ways_split,nodes,tilesdir);
  		fclose(tilesdir);
! 		if (nodes)
! 			fclose(nodes);
! 		if (ways_split)
! 			fclose(ways_split);
  	}
  	if (end == 3)
***************
*** 1647,1659 ****
  		phase=4;
  		fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
! 		ways_split=fopen64("ways_split.tmp","r");
! 		nodes=fopen64("nodes.tmp","r");
  		res=fopen64(result,"w+");
  		zipdir=fopen64("zipdir.tmp","w+");
! 		phase4(ways_split,nodes,res,zipdir);
  		fclose(zipdir);
  		fclose(res);
! 		fclose(nodes);
! 		fclose(ways_split);
  		if(!keep_tmpfiles) {
  			remove("nodes.tmp");
--- 1706,1722 ----
  		phase=4;
  		fprintf(stderr,"PROGRESS: Phase 4: assembling map\n");
! 		if (process_ways)
! 			ways_split=fopen64("ways_split.tmp","r");
! 		if (process_nodes)
! 			nodes=fopen64("nodes.tmp","r");
  		res=fopen64(result,"w+");
  		zipdir=fopen64("zipdir.tmp","w+");
! 		phase4(ways_split,nodes,res,zipdir,compression_level);
  		fclose(zipdir);
  		fclose(res);
! 		if (nodes)
! 			fclose(nodes);
! 		if (ways_split)
! 			fclose(ways_split);
  		if(!keep_tmpfiles) {
  			remove("nodes.tmp");

Index: file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/file.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** file.c	22 Nov 2007 22:55:30 -0000	1.8
--- file.c	27 Nov 2007 11:10:18 -0000	1.9
***************
*** 11,14 ****
--- 11,16 ----
  #include <wordexp.h>
  #include <glib.h>
+ #include <zlib.h>
+ #include "debug.h"
  #include "file.h"
  
***************
*** 67,70 ****
--- 69,124 ----
  }
  
+ static int
+ uncompress_int(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
+ {
+ 	z_stream stream;
+ 	int err;
+ 
+ 	stream.next_in = (Bytef*)source;
+ 	stream.avail_in = (uInt)sourceLen;
+ 	stream.next_out = dest;
+ 	stream.avail_out = (uInt)*destLen;
+ 
+ 	stream.zalloc = (alloc_func)0;
+ 	stream.zfree = (free_func)0;
+ 
+ 	err = inflateInit2(&stream, -MAX_WBITS);
+ 	if (err != Z_OK) return err;
+ 
+ 	err = inflate(&stream, Z_FINISH);
+ 	if (err != Z_STREAM_END) {
+ 	inflateEnd(&stream);
+ 	if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+ 		return Z_DATA_ERROR;
+ 		return err;
+ 	}
+ 	*destLen = stream.total_out;
+ 
+ 	err = inflateEnd(&stream);
+ 	return err;
+ }
+ 
+ unsigned char *
+ file_data_read_compressed(struct file *file, long long offset, int size, int size_uncomp)
+ {
+ 	void *ret;
+ 	char buffer[size];
+ 	uLongf destLen=size_uncomp;
+ 	
+ 	ret=g_malloc(size_uncomp);
+ 	lseek(file->fd, offset, SEEK_SET);
+ 	if (read(file->fd, buffer, size) != size) {
+ 		g_free(ret);
+ 		ret=NULL;
+ 	} else {
+ 		if (uncompress_int(ret, &destLen, (Bytef *)buffer, size) != Z_OK) {
+ 			dbg(0,"uncompress failed\n");
+ 			g_free(ret);
+ 			ret=NULL;
+ 		}
+ 	}
+ 	return ret;
+ }
+ 
  void
  file_data_free(struct file *file, unsigned char *data)

Index: file.h
===================================================================
RCS file: /cvsroot/navit/navit/src/file.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** file.h	22 Nov 2007 22:55:30 -0000	1.8
--- file.h	27 Nov 2007 11:10:26 -0000	1.9
***************
*** 20,23 ****
--- 20,24 ----
  int file_mmap(struct file *file);
  unsigned char *file_data_read(struct file *file, long long offset, int size);
+ unsigned char *file_data_read_compressed(struct file *file, long long offset, int size, int size_uncomp);
  void file_data_free(struct file *file, unsigned char *data);
  int file_exists(char *name);

[Navit-cvs-commit] navit/src/data/binfile binfile.c,1.8,1.9

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

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

Modified Files:
	binfile.c 
Log Message:
Added support for compressed maps

Index: binfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** binfile.c	22 Nov 2007 22:55:30 -0000	1.8
--- binfile.c	27 Nov 2007 11:10:29 -0000	1.9
***************
*** 153,157 ****
  
  
! static void
  zipfile_to_tile(struct file *f, struct zip_cd *cd, struct tile *t)
  {
--- 153,157 ----
  
  
! static int
  zipfile_to_tile(struct file *f, struct zip_cd *cd, struct tile *t)
  {
***************
*** 161,173 ****
  	dbg(1,"enter %p %p %p\n", f, cd, t);
  	dbg(1,"cd->zipofst=0x%x\n", cd->zipofst);
  	lfh=(struct zip_lfh *)(file_data_read(f,cd->zipofst,sizeof(struct zip_lfh)));
  	zipfn=(char *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh), lfh->zipfnln));
  	strncpy(buffer, zipfn, lfh->zipfnln);
  	buffer[lfh->zipfnln]='\0';
! 	dbg(0,"0x%x '%s' %d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl);
! 	t->start=(int *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh)+lfh->zipfnln, lfh->zipuncmp));
! 	t->end=t->start+lfh->zipuncmp/4;
  	file_data_free(f, (unsigned char *)zipfn);
  	file_data_free(f, (unsigned char *)lfh);
  }
  
--- 161,185 ----
  	dbg(1,"enter %p %p %p\n", f, cd, t);
  	dbg(1,"cd->zipofst=0x%x\n", cd->zipofst);
+ 	t->start=NULL;
  	lfh=(struct zip_lfh *)(file_data_read(f,cd->zipofst,sizeof(struct zip_lfh)));
  	zipfn=(char *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh), lfh->zipfnln));
  	strncpy(buffer, zipfn, lfh->zipfnln);
  	buffer[lfh->zipfnln]='\0';
! 	dbg(0,"0x%x '%s' %d %d,%d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl, lfh->zipsize, lfh->zipuncmp);
! 	switch (lfh->zipmthd) {
! 	case 0:
! 		t->start=(int *)(file_data_read(f,cd->zipofst+sizeof(struct zip_lfh)+lfh->zipfnln, lfh->zipuncmp));
! 		t->end=t->start+lfh->zipuncmp/4;
! 		break;
! 	case 8:
! 		t->start=(int *)(file_data_read_compressed(f,cd->zipofst+sizeof(struct zip_lfh)+lfh->zipfnln, lfh->zipsize, lfh->zipuncmp));
! 		t->end=t->start+lfh->zipuncmp/4;
! 		break;
! 	default:
! 		dbg(0,"Unknown compression method %d\n", lfh->zipmthd);
! 	}
  	file_data_free(f, (unsigned char *)zipfn);
  	file_data_free(f, (unsigned char *)lfh);
+ 	return t->start != NULL;
  }
  
***************
*** 181,187 ****
  	dbg(1,"enter %p %d\n", mr, zipfile);
  	t.zipfile_num=zipfile;
! 	zipfile_to_tile(f, cd, &t);
  	file_data_free(f, (unsigned char *)cd);
- 	push_tile(mr, &t);
  }
  
--- 193,199 ----
  	dbg(1,"enter %p %d\n", mr, zipfile);
  	t.zipfile_num=zipfile;
! 	if (zipfile_to_tile(f, cd, &t))
! 		push_tile(mr, &t);
  	file_data_free(f, (unsigned char *)cd);
  }
  
***************
*** 263,266 ****
--- 275,280 ----
  	for (;;) {
  		t=mr->t;
+ 		if (! t)
+ 			return NULL;
  		t->pos=t->pos_next;
  		if (t->pos >= t->end) {

[Navit-cvs-commit] navit/src main.c,1.17,1.18

[Alexander A. <za...@us...>]

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

Modified Files:
	main.c 
Log Message:
Fix Ticket #30 - exit gracefuly when no config file or config file is invalid

Index: main.c
===================================================================
RCS file: /cvsroot/navit/navit/src/main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** main.c	3 Oct 2007 13:47:32 -0000	1.17
--- main.c	27 Nov 2007 09:29:39 -0000	1.18
***************
*** 167,174 ****
  		}
  	}
! 	if (! config_file) 
! 		g_error(_("No config file navit.xml or navit.xml.local found\n"));
  	if (!config_load(config_file, &error)) {
! 		g_error(_("Error parsing '%s': %s\n"), config_file, error->message);
  	} else {
  		printf(_("Using '%s'\n"), config_file);
--- 167,177 ----
  		}
  	}
! 	if (!config_file) {
! 		printf(_("No config file navit.xml, navit.xml.local found\n"));
! 		exit(1);
! 	}
  	if (!config_load(config_file, &error)) {
! 		printf(_("Error parsing '%s': %s\n"), config_file, error->message);
! 		exit(1);
  	} else {
  		printf(_("Using '%s'\n"), config_file);

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

[Alexander A. <za...@us...>]

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

Modified Files:
	navit.h 
Log Message:
Add navit_toggle_routegraph_display prototype

Index: navit.h
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** navit.h	19 Nov 2007 19:58:17 -0000	1.19
--- navit.h	26 Nov 2007 10:15:48 -0000	1.20
***************
*** 82,85 ****
--- 82,87 ----
  struct displaylist *navit_get_displaylist(struct navit *this_);
  void navit_destroy(struct navit *this_);
+ void navit_toggle_routegraph_display(struct navit *nav);
+ 
  /* end of prototypes */
  #ifdef __cplusplus

[Navit-cvs-commit] navit/po fr.po,1.28,1.29

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

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

Modified Files:
	fr.po 
Log Message:
Fixes a missing \n in po


Index: fr.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fr.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** fr.po	25 Nov 2007 15:12:17 -0000	1.28
--- fr.po	25 Nov 2007 16:24:15 -0000	1.29
***************
*** 28,32 ****
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr "Fichier de configuration navit.xml ou navit.xml.local non trouvé"
  
  #: ../src/main.c:172
--- 28,32 ----
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr "Fichier de configuration navit.xml ou navit.xml.local non trouvé\n"
  
  #: ../src/main.c:172

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp,1.30,1.31

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

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

Modified Files:
	gui_sdl_window.cpp 
Log Message:
- Fixed missing current road name display
- Ensures navigation tip is visible when needed
- Fix some other UTF-8 issues


Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** gui_sdl_window.cpp	23 Nov 2007 17:34:57 -0000	1.30
--- gui_sdl_window.cpp	25 Nov 2007 15:13:32 -0000	1.31
***************
*** 20,23 ****
--- 20,25 ----
  #include "debug.h"
  #include "attr.h"
+ #include "track.h"
+ 
  
  #include "CEGUI.h"
***************
*** 100,109 ****
  	list=navigation_list_new(nav);
  
! 	// First, update the 'Navigation Tip' on the main window
  
  	try {
  		struct attr attr;
  		item_attr_get(navigation_list_get_item(list), attr_navigation_speech, &attr);
! 		WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->setText(attr.u.str);
  	}
  	catch (CEGUI::Exception& e)
--- 102,113 ----
  	list=navigation_list_new(nav);
  
! 	// First, ensure the navigation tip is visible. quick workaround for when resuming a destination
! 	WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->show();
  
+ 	// update the 'Navigation Tip' on the main window
  	try {
  		struct attr attr;
  		item_attr_get(navigation_list_get_item(list), attr_navigation_speech, &attr);
! 		WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->setText((CEGUI::utf8*)(attr.u.str));
  	}
  	catch (CEGUI::Exception& e)
***************
*** 146,149 ****
--- 150,168 ----
  }
  
+ static void show_road_name(){
+ 	struct tracking *tracking;
+ 	struct attr road_name_attr;
+ 	tracking=navit_get_tracking(sdl_gui_navit);
+ 
+ 	using namespace CEGUI;
+ 	extern Window* myRoot;
+ 
+ 
+ 	if (tracking && tracking_get_current_attr(tracking, attr_label, &road_name_attr) ) {
+ 		WindowManager::getSingleton().getWindow("Navit/Routing/CurrentRoadName")->setText((CEGUI::utf8*)(road_name_attr.u.str));
+ 	}
+ 
+ }
+ 
  static int gui_run_main_loop(struct gui_priv *this_)
  {
***************
*** 215,218 ****
--- 234,238 ----
   			profile(0,"main context");
  
+ 		show_road_name();
  	//	graphics_get_data(this_->gra,DLid);
  		

[Navit-cvs-commit] navit/po fr.po,1.27,1.28

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

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

Modified Files:
	fr.po 
Log Message:
Added some missing translations


Index: fr.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fr.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** fr.po	5 Nov 2007 23:54:29 -0000	1.27
--- fr.po	25 Nov 2007 15:12:17 -0000	1.28
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2007-11-05 21:44+0100\n"
  "PO-Revision-Date: 2007-07-16 13:54+0100\n"
  "Last-Translator: KaZeR <ka...@al...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.0.3\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2007-11-25 15:41+0100\n"
  "PO-Revision-Date: 2007-07-16 13:54+0100\n"
  "Last-Translator: KaZeR <ka...@al...>\n"
***************
*** 28,32 ****
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr ""
  
  #: ../src/main.c:172
--- 28,32 ----
  #: ../src/main.c:170
  msgid "No config file navit.xml or navit.xml.local found\n"
! msgstr "Fichier de configuration navit.xml ou navit.xml.local non trouvé"
  
  #: ../src/main.c:172
***************
*** 180,188 ****
  msgstr "Dans %d m, vous êtes arrivé."
  
! #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180
  msgid "Layout"
  msgstr "Calques"
  
! #: ../src/navit.c:462
  msgid "Projection"
  msgstr "Projection"
--- 180,188 ----
  msgstr "Dans %d m, vous êtes arrivé."
  
! #: ../src/navit.c:548 ../src/gui/gtk/gui_gtk_action.c:186
  msgid "Layout"
  msgstr "Calques"
  
! #: ../src/navit.c:561
  msgid "Projection"
  msgstr "Projection"
***************
*** 436,548 ****
  msgstr "Spitzberg"
  
! #: ../src/gui/gtk/destination.c:325
  msgid "Country"
  msgstr "Pays"
  
! #: ../src/gui/gtk/destination.c:327
  msgid "Zip Code"
  msgstr "Code postal"
  
! #: ../src/gui/gtk/destination.c:329
  msgid "City"
  msgstr "Ville"
  
! #: ../src/gui/gtk/destination.c:331
  msgid "District/Township"
  msgstr "District"
  
! #: ../src/gui/gtk/destination.c:334
  msgid "Street"
  msgstr "Rue"
  
! #: ../src/gui/gtk/destination.c:336
  msgid "Number"
  msgstr "Numéro"
  
! #: ../src/gui/gtk/gui_gtk_action.c:177
  msgid "Display"
  msgstr "Affichage"
  
! #: ../src/gui/gtk/gui_gtk_action.c:178
  msgid "Route"
  msgstr "Route"
  
! #: ../src/gui/gtk/gui_gtk_action.c:179
  msgid "Map"
  msgstr "Carte"
  
! #: ../src/gui/gtk/gui_gtk_action.c:181
  msgid "ZoomOut"
  msgstr "Zoom Arrière"
  
! #: ../src/gui/gtk/gui_gtk_action.c:182
  msgid "ZoomIn"
  msgstr "Zoom Avant"
  
! #: ../src/gui/gtk/gui_gtk_action.c:183
  msgid "Refresh"
  msgstr "Rafraichir"
  
! #: ../src/gui/gtk/gui_gtk_action.c:184
  msgid "Roadbook"
  msgstr "Carnet de route"
  
! #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188
  msgid "Info"
  msgstr "Info"
  
! #: ../src/gui/gtk/gui_gtk_action.c:190
  msgid "Destination"
  msgstr "Destination"
  
! #: ../src/gui/gtk/gui_gtk_action.c:191
  msgid "Clear"
  msgstr "Effacer"
  
! #: ../src/gui/gtk/gui_gtk_action.c:192
  msgid "Test"
  msgstr "Test"
  
! #: ../src/gui/gtk/gui_gtk_action.c:193
  msgid "_Quit"
  msgstr "_Quitter"
  
! #: ../src/gui/gtk/gui_gtk_action.c:200
  msgid "Cursor"
  msgstr "Curseur"
  
! #: ../src/gui/gtk/gui_gtk_action.c:201
  msgid "Tracking"
  msgstr "Suivi"
  
! #: ../src/gui/gtk/gui_gtk_action.c:202
  msgid "Orientation"
  msgstr "Orientation"
  
! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206
  msgid "Fullscreen"
! msgstr ""
  
! #: ../src/gui/gtk/gui_gtk_action.c:214
  msgid "Data"
  msgstr "Données"
  
! #: ../src/gui/gtk/gui_gtk_action.c:215
  msgid "VisibleBlocks"
  msgstr "VisibleBlocks"
  
! #: ../src/gui/gtk/gui_gtk_action.c:216
  msgid "VisibleTowns"
  msgstr "VisibleTowns"
  
! #: ../src/gui/gtk/gui_gtk_action.c:217
  msgid "VisiblePolys"
  msgstr "VisiblePolys"
  
! #: ../src/gui/gtk/gui_gtk_action.c:218
  msgid "VisibleStreets"
  msgstr "VisibleStreets"
  
! #: ../src/gui/gtk/gui_gtk_action.c:219
  msgid "VisiblePoints"
  msgstr "VisiblePoints"
--- 436,553 ----
  msgstr "Spitzberg"
  
! #: ../src/gui/gtk/destination.c:330
  msgid "Country"
  msgstr "Pays"
  
! #: ../src/gui/gtk/destination.c:332
  msgid "Zip Code"
  msgstr "Code postal"
  
! #: ../src/gui/gtk/destination.c:334
  msgid "City"
  msgstr "Ville"
  
! #: ../src/gui/gtk/destination.c:336
  msgid "District/Township"
  msgstr "District"
  
! #: ../src/gui/gtk/destination.c:339
  msgid "Street"
  msgstr "Rue"
  
! #: ../src/gui/gtk/destination.c:341
  msgid "Number"
  msgstr "Numéro"
  
! #: ../src/gui/gtk/gui_gtk_action.c:183
  msgid "Display"
  msgstr "Affichage"
  
! #: ../src/gui/gtk/gui_gtk_action.c:184
  msgid "Route"
  msgstr "Route"
  
! #: ../src/gui/gtk/gui_gtk_action.c:185
  msgid "Map"
  msgstr "Carte"
  
! #: ../src/gui/gtk/gui_gtk_action.c:187
  msgid "ZoomOut"
  msgstr "Zoom Arrière"
  
! #: ../src/gui/gtk/gui_gtk_action.c:188
  msgid "ZoomIn"
  msgstr "Zoom Avant"
  
! #: ../src/gui/gtk/gui_gtk_action.c:189
  msgid "Refresh"
  msgstr "Rafraichir"
  
! #: ../src/gui/gtk/gui_gtk_action.c:190
  msgid "Roadbook"
  msgstr "Carnet de route"
  
! #: ../src/gui/gtk/gui_gtk_action.c:192 ../src/gui/gtk/gui_gtk_action.c:194
  msgid "Info"
  msgstr "Info"
  
! #: ../src/gui/gtk/gui_gtk_action.c:196
  msgid "Destination"
  msgstr "Destination"
  
! #: ../src/gui/gtk/gui_gtk_action.c:197
  msgid "Clear"
  msgstr "Effacer"
  
! #: ../src/gui/gtk/gui_gtk_action.c:198
  msgid "Test"
  msgstr "Test"
  
! #: ../src/gui/gtk/gui_gtk_action.c:199
  msgid "_Quit"
  msgstr "_Quitter"
  
! #: ../src/gui/gtk/gui_gtk_action.c:206
  msgid "Cursor"
  msgstr "Curseur"
  
! #: ../src/gui/gtk/gui_gtk_action.c:207
  msgid "Tracking"
  msgstr "Suivi"
  
! #: ../src/gui/gtk/gui_gtk_action.c:208
  msgid "Orientation"
  msgstr "Orientation"
  
! #: ../src/gui/gtk/gui_gtk_action.c:210 ../src/gui/gtk/gui_gtk_action.c:212
  msgid "Fullscreen"
! msgstr "Plein écran"
  
! #: ../src/gui/gtk/gui_gtk_action.c:220
  msgid "Data"
  msgstr "Données"
  
! #: ../src/gui/gtk/gui_gtk_action.c:221
  msgid "VisibleBlocks"
  msgstr "VisibleBlocks"
  
! #: ../src/gui/gtk/gui_gtk_action.c:222
  msgid "VisibleTowns"
  msgstr "VisibleTowns"
  
! #: ../src/gui/gtk/gui_gtk_action.c:223
  msgid "VisiblePolys"
  msgstr "VisiblePolys"
  
! #: ../src/gui/gtk/gui_gtk_action.c:224
  msgid "VisibleStreets"
  msgstr "VisibleStreets"
  
! #: ../src/gui/gtk/gui_gtk_action.c:225
  msgid "VisiblePoints"
  msgstr "VisiblePoints"
+ 
+ #: ../src/gui/gtk/gui_gtk_action.c:226
+ #, fuzzy
+ msgid "RouteGraph"
+ msgstr "Route"

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

[Alexander A. <za...@us...>]

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

Modified Files:
	garmin.c 
Log Message:
Pass flags when opening gmap

Index: garmin.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** garmin.c	22 Nov 2007 15:36:12 -0000	1.9
--- garmin.c	25 Nov 2007 12:20:54 -0000	1.10
***************
*** 314,321 ****
  				case 2:
  					mr->last_attr++;
! 					attr->type = attr_street_name;
! 					rc = garmin_object_label(g, attr);
! 					if (rc)
! 						return rc;
  				case 3:
  					mr->last_attr++;
--- 314,323 ----
  				case 2:
  					mr->last_attr++;
! 					if (g->type == GO_POLYLINE) {
! 						attr->type = attr_street_name;
! 						rc = garmin_object_label(g, attr);
! 						if (rc)
! 							return rc;
! 					}
  				case 3:
  					mr->last_attr++;
***************
*** 556,560 ****
  			level, r.lulat, r.lulong, r.rllat, r.rllong);
  	}
! 	gm = gar_find_subfiles(map->mpriv->g, sel ? &r : NULL);
  	if (!gm) {
  		dlog(1, "Can not find map data\n");
--- 558,562 ----
  			level, r.lulat, r.lulong, r.rllat, r.rllong);
  	}
! 	gm = gar_find_subfiles(map->mpriv->g, sel ? &r : NULL, flags);
  	if (!gm) {
  		dlog(1, "Can not find map data\n");

[Navit-cvs-commit] navit/src transform.c,1.11,1.12

[Alexander A. <za...@us...>]

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

Modified Files:
	transform.c 
Log Message:
Only round garmin distance for the avoid float compile

Index: transform.c
===================================================================
RCS file: /cvsroot/navit/navit/src/transform.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** transform.c	23 Nov 2007 10:43:14 -0000	1.11
--- transform.c	25 Nov 2007 01:43:04 -0000	1.12
***************
*** 464,469 ****
  	float a=(sinlat*sinlat)+cosf(lat1)*cosf(lat2)*(sinlong*sinlong);
  	float c=2*asinf(minf(1,sqrt(a)));
!  
! 	return roundf(earth_radius*c);
  }
  
--- 464,472 ----
  	float a=(sinlat*sinlat)+cosf(lat1)*cosf(lat2)*(sinlong*sinlong);
  	float c=2*asinf(minf(1,sqrt(a)));
! #ifdef AVOID_FLOAT
! 	return round(earth_radius*c);
! #else
! 	return earth_radius*c;
! #endif
  }
  

[Navit-cvs-commit] navit/src coord.c, 1.7, 1.8 gui.c, 1.5, 1.6 gui.h, 1.6, 1.7 navit.c, 1.40, 1.41 popup.c, 1.16, 1.17 track.c, 1.17, 1.18

[Alexander A. <za...@us...>]

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

Modified Files:
	coord.c gui.c gui.h navit.c popup.c track.c 
Log Message:
Fix bookmarks with projections, add /usr/X11R6/lib/X11/fonts/TTF to font path and check for luximbi.ttf, remove useless coord iterations from track and some shame from the code there

Index: coord.c
===================================================================
RCS file: /cvsroot/navit/navit/src/coord.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** coord.c	28 Oct 2007 11:00:53 -0000	1.7
--- coord.c	25 Nov 2007 01:32:14 -0000	1.8
***************
*** 117,120 ****
--- 117,128 ----
  	/* [Proj:][-][D]D.d[d]... [-][D][D]D.d[d]... */
  	/* [Proj:][-]0xX [-]0xX */
+ /*
+  * Currently supported:
+  * 	[Proj:]-0xX [-]0xX 
+  * 	- where Proj can be mg/garmin, defaults to mg
+  * 	[Proj:][D][D]Dmm.ss[S][S] N/S [D][D]DMM.ss[S][S]... E/W
+  * 	[Proj:][-][D]D.d[d]... [-][D][D]D.d[d]
+  * 	- where Proj can be geo
+  */
  
  int
***************
*** 124,128 ****
  	char *proj=NULL,*s,*co;
  	const char *str=c_str;
! 	int args,ret;
  	struct coord_geo g;
  	struct coord c;
--- 132,136 ----
  	char *proj=NULL,*s,*co;
  	const char *str=c_str;
! 	int args,ret = 0;
  	struct coord_geo g;
  	struct coord c;
***************
*** 139,142 ****
--- 147,160 ----
  		str=co+1;
  		s=index(str,' ');
+ 		if (!strcmp(proj, "mg"))
+ 			str_pro = projection_mg;
+ 		else if (!strcmp(proj, "garmin"))
+ 			str_pro = projection_garmin;
+ 		else if (!strcmp(proj, "geo"))
+ 			str_pro = projection_none;
+ 		else {
+ 			dbg(0, "Unknown projection: %s\n", proj);
+ 			goto out;
+ 		}
  	}
  	if (! s)
***************
*** 148,152 ****
  		args=sscanf(str, "%i %i%n",&c.x, &c.y, &ret);
  		if (args < 2)
! 			return 0;
  		dbg(1,"str='%s' x=0x%x y=0x%x c=%d\n", str, c.x, c.y, ret);
  		dbg(1,"rest='%s'\n", str+ret);
--- 166,170 ----
  		args=sscanf(str, "%i %i%n",&c.x, &c.y, &ret);
  		if (args < 2)
! 			goto out;
  		dbg(1,"str='%s' x=0x%x y=0x%x c=%d\n", str, c.x, c.y, ret);
  		dbg(1,"rest='%s'\n", str+ret);
***************
*** 154,162 ****
  		if (str_pro == projection_none) 
  			str_pro=projection_mg;
! 		if (str_pro == projection_mg) {
! 			*c_ret=c;
! 		} else {
! 			printf("help\n");
  		}
  	} else if (*s == 'N' || *s == 'n' || *s == 'S' || *s == 's') {
  		dbg(1,"str='%s'\n", str);
--- 172,180 ----
  		if (str_pro == projection_none) 
  			str_pro=projection_mg;
! 		if (str_pro != pro) {
! 			transform_to_geo(str_pro, &c, &g);
! 			transform_from_geo(pro, &g, &c);
  		}
+ 		*c_ret=c;
  	} else if (*s == 'N' || *s == 'n' || *s == 'S' || *s == 's') {
  		dbg(1,"str='%s'\n", str);
***************
*** 165,169 ****
  		args=sscanf(str, "%lf %c %lf %c%n", &lat, &ns, &lng, &ew, &ret);
  		if (args < 4)
! 			return 0;
  		if (str_pro == projection_none) {
  			g.lat=floor(lat/100);
--- 183,187 ----
  		args=sscanf(str, "%lf %c %lf %c%n", &lat, &ns, &lng, &ew, &ret);
  		if (args < 4)
! 			goto out;
  		if (str_pro == projection_none) {
  			g.lat=floor(lat/100);
***************
*** 185,189 ****
  		args=sscanf(str, "%lf %lf%n", &lng, &lat, &ret);
  		if (args < 2)
! 			return 0;
  		dbg(1,"str='%s' x=%f y=%f  c=%d\n", str, lng, lat, ret);
  		dbg(1,"rest='%s'\n", str+ret);
--- 203,207 ----
  		args=sscanf(str, "%lf %lf%n", &lng, &lat, &ret);
  		if (args < 2)
! 			goto out;
  		dbg(1,"str='%s' x=%f y=%f  c=%d\n", str, lng, lat, ret);
  		dbg(1,"rest='%s'\n", str+ret);
***************
*** 199,202 ****
--- 217,221 ----
  		printf("ret=%d delta=%d ret_str='%s'\n", ret, str-c_str, c_str+ret);
  	}
+ out:
  	if (proj)
  		free(proj);

Index: popup.c
===================================================================
RCS file: /cvsroot/navit/navit/src/popup.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** popup.c	19 Nov 2007 19:58:17 -0000	1.16
--- popup.c	25 Nov 2007 01:32:14 -0000	1.17
***************
*** 61,73 ****
  {
  	struct navit *nav=data1;
! 	struct coord *c=data2;
  	struct coord_geo g;
  	char buffer[1024];
  	char buffer_geo[1024];
! 	transform_to_geo(transform_get_projection(navit_get_trans(nav)), c, &g);
! 	transform_geo_text(&g, buffer_geo);	
  	sprintf(buffer,"Map Point %s", buffer_geo);
! 	if (!gui_add_bookmark(navit_get_gui(nav), c, buffer)) 
! 		navit_add_bookmark(nav, c, buffer);
  }
  
--- 61,76 ----
  {
  	struct navit *nav=data1;
! 	struct pcoord *pc=data2;
! 	struct coord c;
  	struct coord_geo g;
  	char buffer[1024];
  	char buffer_geo[1024];
! 	c.x = pc->x;
! 	c.y = pc->y;
! 	transform_to_geo(pc->pro, &c, &g);
! 	transform_geo_text(&g, buffer_geo);
  	sprintf(buffer,"Map Point %s", buffer_geo);
! 	if (!gui_add_bookmark(navit_get_gui(nav), pc, buffer)) 
! 		navit_add_bookmark(nav, pc, buffer);
  }
  

Index: gui.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gui.h	9 Oct 2007 16:44:10 -0000	1.6
--- gui.h	25 Nov 2007 01:32:14 -0000	1.7
***************
*** 10,13 ****
--- 10,14 ----
  struct graphics;
  struct coord;
+ struct pcoord;
  
  struct gui_methods {
***************
*** 19,23 ****
  	int (*run_main_loop)(struct gui_priv *priv);
  	struct datawindow_priv *(*datawindow_new)(struct gui_priv *priv, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
! 	int (*add_bookmark)(struct gui_priv *priv, struct coord *c, char *description);
  };
  
--- 20,24 ----
  	int (*run_main_loop)(struct gui_priv *priv);
  	struct datawindow_priv *(*datawindow_new)(struct gui_priv *priv, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
! 	int (*add_bookmark)(struct gui_priv *priv, struct pcoord *c, char *description);
  };
  
***************
*** 44,48 ****
  struct menu *gui_popup_new(struct gui *gui);
  struct datawindow *gui_datawindow_new(struct gui *gui, char *name, struct callback *click, struct callback *close);
! int gui_add_bookmark(struct gui *gui, struct coord *c, char *description);
  int gui_set_graphics(struct gui *this_, struct graphics *gra);
  int gui_has_main_loop(struct gui *this_);
--- 45,49 ----
  struct menu *gui_popup_new(struct gui *gui);
  struct datawindow *gui_datawindow_new(struct gui *gui, char *name, struct callback *click, struct callback *close);
! int gui_add_bookmark(struct gui *gui, struct pcoord *c, char *description);
  int gui_set_graphics(struct gui *this_, struct graphics *gra);
  int gui_has_main_loop(struct gui *this_);

Index: gui.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gui.c	28 Aug 2007 17:31:08 -0000	1.5
--- gui.c	25 Nov 2007 01:32:14 -0000	1.6
***************
*** 99,103 ****
  
  int
! gui_add_bookmark(struct gui *gui, struct coord *c, char *description)
  {
  	int ret;
--- 99,103 ----
  
  int
! gui_add_bookmark(struct gui *gui, struct pcoord *c, char *description)
  {
  	int ret;

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** navit.c	24 Nov 2007 12:40:25 -0000	1.40
--- navit.c	25 Nov 2007 01:32:14 -0000	1.41
***************
*** 374,378 ****
  }
  
! 
  static void
  navit_append_coord(struct navit *this_, char *file, struct pcoord *c, char *type, char *description, struct menu *rmen, GHashTable *h, void (*callback)(struct menu *menu, void *data1, void *data2))
--- 374,389 ----
  }
  
! static const char *
! navit_proj2str(enum projection pro)
! {
! 	switch (pro) {
! 		case projection_mg:
! 			return "mg";
! 		case projection_garmin:
! 			return "garmin";
! 		default:
! 			return "";
! 	}
! }
  static void
  navit_append_coord(struct navit *this_, char *file, struct pcoord *c, char *type, char *description, struct menu *rmen, GHashTable *h, void (*callback)(struct menu *menu, void *data1, void *data2))
***************
*** 381,391 ****
  	int offset=0;
  	char *buffer;
  
  	f=fopen(file, "a");
  	if (f) {
  		offset=ftell(f);
! 		if (c) 
! 			fprintf(f,"p=%u 0x%x 0x%x type=%s label=\"%s\"\n", c->pro, c->x, c->y, type, description);
! 		else
  			fprintf(f,"\n");
  		fclose(f);
--- 392,405 ----
  	int offset=0;
  	char *buffer;
+ 	const char *prostr;
  
  	f=fopen(file, "a");
  	if (f) {
  		offset=ftell(f);
! 		if (c) {
! 			prostr = navit_proj2str(c->pro);
! 			fprintf(f,"%s%s0x%x 0x%x type=%s label=\"%s\"\n",
! 				 prostr, *prostr ? ":" : "", c->x, c->y, type, description);
! 		} else
  			fprintf(f,"\n");
  		fclose(f);
***************
*** 404,408 ****
  	char *s,*i;
  	struct coord co;
! 	char *cp, *ep;
  	enum projection pro = projection_mg;
  	*name=NULL;
--- 418,422 ----
  	char *s,*i;
  	struct coord co;
! 	char *cp;
  	enum projection pro = projection_mg;
  	*name=NULL;
***************
*** 410,418 ****
  		return -3;
  	cp = buffer;
- 	if (*cp == 'p') {
- 		pro = strtol(cp+2, &ep, 10);
- 		cp = ep;
- 		cp += strcspn(cp, " \t");
- 	}
  	pos=coord_parse(cp, pro, &co);
  	if (!pos)
--- 424,427 ----

Index: track.c
===================================================================
RCS file: /cvsroot/navit/navit/src/track.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** track.c	20 Nov 2007 20:01:50 -0000	1.17
--- track.c	25 Nov 2007 01:32:14 -0000	1.18
***************
*** 84,94 ****
  {
  	struct item *item;
  	int result=0;
  	if (! _this->curr_line || ! _this->curr_line->street)
  		return 0;
  	item=&_this->curr_line->street->item;
! 	if (! item)
! 		return 0;
! 	struct map_rect *mr=map_rect_new(item->map,NULL);
  	item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
  	if (item_attr_get(item, type, attr))
--- 84,93 ----
  {
  	struct item *item;
+ 	struct map_rect *mr;
  	int result=0;
  	if (! _this->curr_line || ! _this->curr_line->street)
  		return 0;
  	item=&_this->curr_line->street->item;
! 	mr=map_rect_new(item->map,NULL);
  	item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
  	if (item_attr_get(item, type, attr))
***************
*** 133,138 ****
  				tl->next=tr->lines;
  				tr->lines=tl;
! 			} else 
! 				while (item_coord_get(item, &c, 1));
  		}
  		map_rect_destroy(mr);
--- 132,136 ----
  				tl->next=tr->lines;
  				tr->lines=tl;
! 			}
  		}
  		map_rect_destroy(mr);

[Navit-cvs-commit] navit/src/gui/gtk destination.c, 1.9, 1.10 gui_gtk.h, 1.7, 1.8 gui_gtk_window.c, 1.12, 1.13

[Alexander A. <za...@us...>]

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

Modified Files:
	destination.c gui_gtk.h gui_gtk_window.c 
Log Message:
Fix bookmarks with projections, add /usr/X11R6/lib/X11/fonts/TTF to font path and check for luximbi.ttf, remove useless coord iterations from track and some shame from the code there

Index: destination.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** destination.c	19 Nov 2007 19:58:19 -0000	1.9
--- destination.c	25 Nov 2007 01:32:14 -0000	1.10
***************
*** 81,85 ****
  static void button_bookmark(GtkWidget *widget, struct search_param *search)
  {
! 	struct coord *c=NULL;
  	GtkTreeIter iter;
  	char *desc;
--- 81,85 ----
  static void button_bookmark(GtkWidget *widget, struct search_param *search)
  {
! 	struct pcoord *c=NULL;
  	GtkTreeIter iter;
  	char *desc;

Index: gui_gtk_window.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gui_gtk_window.c	28 Aug 2007 17:31:19 -0000	1.12
--- gui_gtk_window.c	25 Nov 2007 01:32:15 -0000	1.13
***************
*** 97,101 ****
  
  static int
! gui_gtk_add_bookmark(struct gui_priv *gui, struct coord *c, char *description)
  {
          GtkWidget *button_ok,*button_cancel,*label,*vbox,*hbox;
--- 97,101 ----
  
  static int
! gui_gtk_add_bookmark(struct gui_priv *gui, struct pcoord *c, char *description)
  {
          GtkWidget *button_ok,*button_cancel,*label,*vbox,*hbox;

Index: gui_gtk.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gui_gtk.h	13 Jul 2007 11:48:12 -0000	1.7
--- gui_gtk.h	25 Nov 2007 01:32:14 -0000	1.8
***************
*** 12,16 ****
  	GtkWidget *dialog_win;
  	GtkWidget *dialog_entry;
! 	struct coord dialog_coord;
          GtkWidget *vbox;
  	GtkWidget *menubar;
--- 12,16 ----
  	GtkWidget *dialog_win;
  	GtkWidget *dialog_entry;
! 	struct pcoord dialog_coord;
          GtkWidget *vbox;
  	GtkWidget *menubar;

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.19, 1.20

[Alexander A. <za...@us...>]

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix bookmarks with projections, add /usr/X11R6/lib/X11/fonts/TTF to font path and check for luximbi.ttf, remove useless coord iterations from track and some shame from the code there

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** graphics_gtk_drawing_area.c	4 Nov 2007 21:11:44 -0000	1.19
--- graphics_gtk_drawing_area.c	25 Nov 2007 01:32:14 -0000	1.20
***************
*** 65,68 ****
--- 65,69 ----
  	"/usr/X11R6/lib/X11/fonts/msttcorefonts",
  	"/usr/X11R6/lib/X11/fonts/truetype",
+ 	"/usr/X11R6/lib/X11/fonts/TTF",
  	"/usr/share/fonts/truetype",
  	"/usr/share/fonts/truetype/msttcorefonts",
***************
*** 123,126 ****
--- 124,131 ----
  	    	if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
  			break;
+ 		sprintf(fontpath,"%s/luximbi.ttf",*filename);
+ 		dbg(1,("font : %s\n",fontpath));
+ 	    	if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
+ 			break;
  		filename++;
  	}

[Navit-cvs-commit] navit/src/gui/sdl cegui_keyboard.cpp, NONE, 1.1 cegui_keyboard.h, NONE, 1.1 Makefile.am, 1.8, 1.9 gui_sdl_window.cpp, 1.29, 1.30 sdl_events.cpp, 1.17, 1.18

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

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

Modified Files:
	Makefile.am gui_sdl_window.cpp sdl_events.cpp 
Added Files:
	cegui_keyboard.cpp cegui_keyboard.h 
Log Message:
Moved virtual keyboard to a seperate file (cleanup), and started using new naming for cegui (instead of sdl gui)

--- NEW FILE: cegui_keyboard.cpp ---
#include "CEGUI.h"
#include "sdl_events.h"


bool ShowKeyboard(const CEGUI::EventArgs& event){
	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard/Input")->setText("");
	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->show();
}



void Add_KeyBoard_key(CEGUI::String key,int x,int y,int w){
	
	using namespace CEGUI;
//	char button_name [5];
//	sprintf(button_name,"%s",key);
	FrameWindow* wnd = (FrameWindow*)WindowManager::getSingleton().createWindow("TaharezLook/Button", key);
	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->addChildWindow(wnd);
	wnd->setPosition(UVector2(cegui_absdim(x), cegui_absdim( y)));
	wnd->setSize(UVector2(cegui_absdim(w), cegui_absdim( 40)));
	wnd->setText(key);
	wnd->subscribeEvent(PushButton::EventClicked, Event::Subscriber(Handle_Virtual_Key_Down));
	
}	


void BuildKeyboard(){
	int w=55;
	int offset_x=10;
	int count_x=0;
	
	int y=25;
	Add_KeyBoard_key("A",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("Z",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("E",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("R",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("T",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("Y",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("U",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("I",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("O",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("P",offset_x+(count_x++)*w,y,w);
	count_x++;
	Add_KeyBoard_key("7",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("8",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("9",offset_x+(count_x++)*w,y,w);

	y=70;
	count_x=0;
	Add_KeyBoard_key("Q",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("S",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("D",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("F",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("G",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("H",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("J",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("K",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("L",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("M",offset_x+(count_x++)*w,y,w);
	count_x++;
	Add_KeyBoard_key("4",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("5",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("6",offset_x+(count_x++)*w,y,w);

	y=115;
	count_x=0;

	Add_KeyBoard_key("W",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("X",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("C",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("V",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("B",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("N",offset_x+(count_x++)*w,y,w);

	Add_KeyBoard_key(" ",offset_x+(count_x++)*w,y,w*2);
	count_x++;
	
	Add_KeyBoard_key("BACK",offset_x+(count_x++)*w,y,w*2);	
 	count_x+=2;
	
	Add_KeyBoard_key("1",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("2",offset_x+(count_x++)*w,y,w);
	Add_KeyBoard_key("3",offset_x+(count_x++)*w,y,w);
	
	y=160;
	count_x=11;
	Add_KeyBoard_key("0",offset_x+(count_x++)*w,y,w);
	
	Add_KeyBoard_key("OK",offset_x+(count_x++)*w,y,w*2);
	

}



--- NEW FILE: cegui_keyboard.h ---
bool ShowKeyboard(const CEGUI::EventArgs& event);
void Add_KeyBoard_key(CEGUI::String key,int x,int y,int w);
void BuildKeyboard();
bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event);
Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	26 Oct 2007 16:34:25 -0000	1.8
--- Makefile.am	23 Nov 2007 17:34:57 -0000	1.9
***************
*** 3,6 ****
  AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_sdl\"
  modulegui_LTLIBRARIES = libgui_sdl.la
! libgui_sdl_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h wmcontrol.c wmcontrol.h
  libgui_sdl_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@
--- 3,6 ----
  AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_sdl\"
  modulegui_LTLIBRARIES = libgui_sdl.la
! libgui_sdl_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h wmcontrol.c wmcontrol.h cegui_keyboard.cpp cegui_keyboard.h
  libgui_sdl_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** gui_sdl_window.cpp	16 Nov 2007 15:04:07 -0000	1.29
--- gui_sdl_window.cpp	23 Nov 2007 17:34:57 -0000	1.30
***************
*** 28,31 ****
--- 28,32 ----
  
  #include "sdl_events.h"
+ #include "cegui_keyboard.h"
  #include "wmcontrol.h"
  
***************
*** 299,304 ****
  int init_GL() {
  
- 	dbg(1,"init_GL()\n");
- 
  	// Blue sky
   	glClearColor(0.3,0.7,1.0,0);
--- 300,303 ----
***************
*** 367,457 ****
  }
  
- bool ShowKeyboard(const CEGUI::EventArgs& event){
- 	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard/Input")->setText("");
- 	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->show();
- }
- 
- void Add_KeyBoard_key(CEGUI::String key,int x,int y,int w){
- 	
- 	using namespace CEGUI;
- //	char button_name [5];
- //	sprintf(button_name,"%s",key);
- 	FrameWindow* wnd = (FrameWindow*)WindowManager::getSingleton().createWindow("TaharezLook/Button", key);
- 	CEGUI::WindowManager::getSingleton().getWindow("Navit/Keyboard")->addChildWindow(wnd);
- 	wnd->setPosition(UVector2(cegui_absdim(x), cegui_absdim( y)));
- 	wnd->setSize(UVector2(cegui_absdim(w), cegui_absdim( 40)));
- 	wnd->setText(key);
- 	wnd->subscribeEvent(PushButton::EventClicked, Event::Subscriber(Handle_Virtual_Key_Down));
- 	
- }	
  
  
- void BuildKeyboard(){
- 	int w=55;
- 	int offset_x=10;
- 	int count_x=0;
- 	
- 	int y=25;
- 	Add_KeyBoard_key("A",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("Z",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("E",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("R",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("T",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("Y",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("U",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("I",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("O",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("P",offset_x+(count_x++)*w,y,w);
- 	count_x++;
- 	Add_KeyBoard_key("7",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("8",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("9",offset_x+(count_x++)*w,y,w);
- 
- 	y=70;
- 	count_x=0;
- 	Add_KeyBoard_key("Q",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("S",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("D",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("F",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("G",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("H",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("J",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("K",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("L",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("M",offset_x+(count_x++)*w,y,w);
- 	count_x++;
- 	Add_KeyBoard_key("4",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("5",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("6",offset_x+(count_x++)*w,y,w);
- 
- 	y=115;
- 	count_x=0;
- 
- 	Add_KeyBoard_key("W",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("X",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("C",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("V",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("B",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("N",offset_x+(count_x++)*w,y,w);
- 
- 	Add_KeyBoard_key(" ",offset_x+(count_x++)*w,y,w*2);
- 	count_x++;
- 	
- 	Add_KeyBoard_key("BACK",offset_x+(count_x++)*w,y,w*2);	
-  	count_x+=2;
- 	
- 	Add_KeyBoard_key("1",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("2",offset_x+(count_x++)*w,y,w);
- 	Add_KeyBoard_key("3",offset_x+(count_x++)*w,y,w);
- 	
- 	y=160;
- 	count_x=11;
- 	Add_KeyBoard_key("0",offset_x+(count_x++)*w,y,w);
- 	
- 	Add_KeyBoard_key("OK",offset_x+(count_x++)*w,y,w*2);
- 	
- 
- }
- 
  static void init_sdlgui(char * skin_layout,int fullscreen)
  {
--- 366,371 ----
***************
*** 656,659 ****
--- 570,578 ----
  		exit(1);
  	}
+ 
+ 	// Force centering view on cursor
+ // 	navit_toggle_cursor(gui->nav);
+ 	// Force refresh on gps update
+ // 	navit_toggle_tracking(gui->nav);
  	
  }

Index: sdl_events.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sdl_events.cpp	22 Nov 2007 17:32:28 -0000	1.17
--- sdl_events.cpp	23 Nov 2007 17:34:57 -0000	1.18
***************
*** 66,69 ****
--- 66,111 ----
  }
  
+ bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event){
+ 	
+ 	using namespace CEGUI;
+ 
+ 	extern CEGUI::Window* myRoot;
+ 
+ 	const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);
+ 	String senderID = we.window->getName();
+ 
+ 	Window* editbox = myRoot->getChild("Navit/Keyboard")->getChild("Navit/Keyboard/Input");
+ 	String content=editbox->getText();
+ 
+ 
+ 	if(senderID=="OK"){
+ 		// dbg(1,"Validating : %s\n",content.c_str());
+ 		myRoot->getChild("Navit/Keyboard")->hide();
+ 		return 0;
+ 	} else if(senderID=="BACK"){
+ 		content=content.substr(0, content.length()-1);
+ 		editbox->setText(content);
+ 	} else {
+ 		content+=senderID;
+ 		editbox->setText(content);
+ 	}
+ 
+ 	Window* country_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox"));
+ 	Window* town_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/TownEditbox"));
+ 	Window* street_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/StreetEditbox"));
+ 
+ 	switch (SDL_dest.current_search) {
+ 		case SRCH_COUNTRY:
+ 			country_edit->setText(content);
+ 			break;
+ 		case SRCH_TOWN :
+ 			town_edit->setText(content);
+ 			break;
+ 		case SRCH_STREET :
+ 			street_edit->setText(content);
+ 			break;
+ 	}
+ 	handle_destination_change();
+ }
  
  bool handleItemSelect(int r)
***************
*** 143,147 ****
  }
  
! 
  
  bool ItemSelect(const CEGUI::EventArgs& event)
--- 185,192 ----
  }
  
! bool route_clear(const CEGUI::EventArgs& event)
! {
! // 	navit_set_destination(gui->nav, NULL, NULL);
! }
  
  bool ItemSelect(const CEGUI::EventArgs& event)
***************
*** 488,533 ****
  }
  
- bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event){
- 	
- 	using namespace CEGUI;
- 
- 	extern CEGUI::Window* myRoot;
- 
- 	const CEGUI::WindowEventArgs& we =  static_cast<const CEGUI::WindowEventArgs&>(event);
- 	String senderID = we.window->getName();
- 
- 	Window* editbox = myRoot->getChild("Navit/Keyboard")->getChild("Navit/Keyboard/Input");
- 	String content=editbox->getText();
- 
- 
- 	if(senderID=="OK"){
- 		// dbg(1,"Validating : %s\n",content.c_str());
- 		myRoot->getChild("Navit/Keyboard")->hide();
- 		return 0;
- 	} else if(senderID=="BACK"){
- 		content=content.substr(0, content.length()-1);
- 		editbox->setText(content);
- 	} else {
- 		content+=senderID;
- 		editbox->setText(content);
- 	}
- 
- 	Window* country_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox"));
- 	Window* town_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/TownEditbox"));
- 	Window* street_edit = static_cast<Window*>(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/StreetEditbox"));
- 
- 	switch (SDL_dest.current_search) {
- 		case SRCH_COUNTRY:
- 			country_edit->setText(content);
- 			break;
- 		case SRCH_TOWN :
- 			town_edit->setText(content);
- 			break;
- 		case SRCH_STREET :
- 			street_edit->setText(content);
- 			break;
- 	}
- 	handle_destination_change();
- }
  
  
--- 533,536 ----

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_action.c,1.20,1.21

[Alexander A. <za...@us...>]

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

Modified Files:
	gui_gtk_action.c 
Log Message:
Enable displaying of route graphpoints for debuging

Index: gui_gtk_action.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gui_gtk_action.c	4 Nov 2007 21:11:44 -0000	1.20
--- gui_gtk_action.c	24 Nov 2007 12:40:24 -0000	1.21
***************
*** 171,174 ****
--- 171,180 ----
  }
  
+ static void
+ visible_routegraph_action(GtkWidget *w, struct gui_priv *gui, void *dummy)
+ {
+ 	navit_toggle_routegraph_display(gui->nav);
+ }
+ 
  
  
***************
*** 217,221 ****
  	{ "VisiblePolysAction", NULL, _n("VisiblePolys"), NULL, NULL, G_CALLBACK(visible_polys_action) },
  	{ "VisibleStreetsAction", NULL, _n("VisibleStreets"), NULL, NULL, G_CALLBACK(visible_streets_action) },
! 	{ "VisiblePointsAction", NULL, _n("VisiblePoints"), NULL, NULL, G_CALLBACK(visible_points_action) }
  };
  
--- 223,228 ----
  	{ "VisiblePolysAction", NULL, _n("VisiblePolys"), NULL, NULL, G_CALLBACK(visible_polys_action) },
  	{ "VisibleStreetsAction", NULL, _n("VisibleStreets"), NULL, NULL, G_CALLBACK(visible_streets_action) },
! 	{ "VisiblePointsAction", NULL, _n("VisiblePoints"), NULL, NULL, G_CALLBACK(visible_points_action) },
! 	{ "VisiblePointsAction", NULL, _n("RouteGraph"), NULL, NULL, G_CALLBACK(visible_routegraph_action) }
  };
  

[Navit-cvs-commit] navit/src route.h, 1.13, 1.14 route.c, 1.25, 1.26 navit.xml, 1.17, 1.18 navit.c, 1.39, 1.40 item_def.h, 1.12, 1.13

[Alexander A. <za...@us...>]

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

Modified Files:
	route.h route.c navit.xml navit.c item_def.h 
Log Message:
Enable displaying of route graphpoints for debuging

Index: route.h
===================================================================
RCS file: /cvsroot/navit/navit/src/route.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** route.h	22 Nov 2007 19:37:27 -0000	1.13
--- route.h	24 Nov 2007 12:40:25 -0000	1.14
***************
*** 74,77 ****
--- 74,78 ----
  void route_draw(struct route *this, struct transformation *t, struct displaylist *dsp);
  struct map *route_get_map(struct route *route);
+ void route_toggle_routegraph_display(struct route *route);
  /* end of prototypes */
  

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** item_def.h	23 Nov 2007 12:30:39 -0000	1.12
--- item_def.h	24 Nov 2007 12:40:25 -0000	1.13
***************
*** 195,198 ****
--- 195,199 ----
  ITEM(poi_wrecker)
  ITEM(poi_zoo)
+ ITEM(rg_point)
  ITEM(point_unkn)
  ITEM2(0x80000000,line)

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** navit.xml	19 Nov 2007 20:33:55 -0000	1.17
--- navit.xml	24 Nov 2007 12:40:25 -0000	1.18
***************
*** 789,792 ****
--- 789,795 ----
  				<label label_size="5" /> 
  			</item>
+ 			<item type="rg_point" order="0-">
+ 				<circle color="#FF089C" radius="10"  />
+ 			</item>
  		</layer>
  	</layout>

Index: route.c
===================================================================
RCS file: /cvsroot/navit/navit/src/route.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** route.c	23 Nov 2007 10:43:14 -0000	1.25
--- route.c	24 Nov 2007 12:40:25 -0000	1.26
***************
*** 95,102 ****
--- 95,111 ----
  };
  
+ #define RF_FASTEST	(1<<0)
+ #define RF_SHORTEST	(1<<1)
+ #define RF_AVOIDHW	(1<<2)
+ #define RF_AVOIDPAID	(1<<3)
+ #define RF_LOCKONROAD	(1<<4)
+ #define RF_SHOWGRAPH	(1<<5)
+ 
+ 
  struct route {
  	int version;
  	struct mapset *ms;
  	struct map route_map;
+ 	unsigned flags;
  	struct route_info *pos;
  	struct route_info *dst;
***************
*** 366,370 ****
  route_graph_get_point(struct route_graph *this, struct coord *c)
  {
! 	struct route_graph_point *p=this->route_points;
  	int hashval=HASHCOORD(c);
  	p=this->hash[hashval];
--- 375,379 ----
  route_graph_get_point(struct route_graph *this, struct coord *c)
  {
! 	struct route_graph_point *p;
  	int hashval=HASHCOORD(c);
  	p=this->hash[hashval];
***************
*** 1099,1103 ****
  
  	return ret;
- 	
  }
  
--- 1108,1111 ----
***************
*** 1131,1135 ****
  	struct map_rect *mr;
  	struct item *item;
! 	struct coord lp, sc[1000];
  	struct street_data *sd;
  	struct coord c;
--- 1139,1143 ----
  	struct map_rect *mr;
  	struct item *item;
! 	struct coord lp;
  	struct street_data *sd;
  	struct coord c;
***************
*** 1448,1451 ****
--- 1456,1462 ----
  	unsigned int last_coord;
  	struct route_path_segment *seg;
+ 	int segsdone;
+ 	struct route_graph_point *point;
+ 	char *label;
  };
  
***************
*** 1492,1495 ****
--- 1503,1550 ----
  };
  
+ static int
+ rp_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
+ {
+ 	struct map_rect_priv *mr = priv_data;
+ 	struct route_graph_point *p = mr->point;
+ 	char buf[1024];
+ 	switch (attr_type) {
+ 		case attr_any:
+ 		case attr_label:
+ 			attr->type = attr_label;
+ 			sprintf(buf, "x=%d y=%d", p->c.x, p->c.y);
+ 			if (mr->label)
+ 				free(mr->label);
+ 			mr->label=strdup(buf);
+ 			attr->u.str = mr->label;
+ 			return 1;
+ 		default:
+ 			return 0;
+ 	}
+ }
+ 
+ static int
+ rp_coord_get(void *priv_data, struct coord *c, int count)
+ {
+ 	struct map_rect_priv *mr = priv_data;
+ 	struct route_graph_point *p = mr->point;
+ 	int rc = 0,i;
+ 	for (i=0; i < count; i++) {
+ 		if (mr->last_coord >= 1)
+ 			break;
+ 		c[i] = p->c;
+ 		mr->last_coord++;
+ 		rc++;
+ 	}
+ 	return rc;
+ }
+ 
+ static struct item_methods methods_point_item = {
+ 	rm_coord_rewind,
+ 	rp_coord_get,
+ 	rm_attr_rewind,
+ 	rp_attr_get,
+ };
+ 
  static void
  rm_destroy(struct map_priv *priv)
***************
*** 1511,1514 ****
--- 1566,1571 ----
  rm_rect_destroy(struct map_rect_priv *mr)
  {
+ 	if (mr->label)
+ 		free(mr->label);
  	free(mr);
  }
***************
*** 1520,1531 ****
  	struct route_path_segment *seg = mr->seg;
  
  	if (!seg)
  		seg = r->path2->path;
  	else
  		seg = seg->next;
! 	if (!seg)
  		return NULL;
  	mr->seg = seg;
  	mr->last_coord = 0;
  	mr->item = seg->item;
  	mr->item.priv_data = mr;
--- 1577,1621 ----
  	struct route_path_segment *seg = mr->seg;
  
+ rep:
+ 	if (mr->segsdone) {
+ 		if (!(r->flags & RF_SHOWGRAPH))
+ 			return NULL;
+ 		else {
+ 			struct route_graph_point *p = mr->point;
+ 			if (!p)
+ 				p = r->graph->route_points;
+ 			else
+ 				p = p->next;
+ 			if (!p)
+ 				return NULL;
+ 			mr->point = p;
+ 			mr->last_coord = 0;
+ 			mr->item.id_hi = 0;
+ 			mr->item.id_lo = 0;
+ 			mr->item.map = NULL;
+ //			mr->item = NULL;
+ 			mr->item.priv_data = mr;
+ 			mr->item.type = type_rg_point;
+ 			mr->item.meth = &methods_point_item;
+ 			return &mr->item;
+ 		}
+ 	}
+ 
+ 	/* FIXME: Generate items for segstart-dst/pos */
  	if (!seg)
  		seg = r->path2->path;
  	else
  		seg = seg->next;
! 	if (!seg) {
! 		mr->segsdone = 1;
! 		if (r->flags & RF_SHOWGRAPH)
! 			goto rep;
  		return NULL;
+ 	}
  	mr->seg = seg;
  	mr->last_coord = 0;
+ 	mr->item.id_hi = 0;
+ 	mr->item.id_lo = 0;
+ 	mr->item.map = NULL;
  	mr->item = seg->item;
  	mr->item.priv_data = mr;
***************
*** 1555,1559 ****
  };
  
! static void route_init_map(struct route *route)
  {
  	struct map *m = &route->route_map;
--- 1645,1650 ----
  };
  
! static void 
! route_init_map(struct route *route)
  {
  	struct map *m = &route->route_map;
***************
*** 1566,1570 ****
  }
  
! struct map *route_get_map(struct route *route)
  {
  	if (route->pos && route->dst && route->path2) {
--- 1657,1662 ----
  }
  
! struct map *
! route_get_map(struct route *route)
  {
  	if (route->pos && route->dst && route->path2) {
***************
*** 1574,1575 ****
--- 1666,1677 ----
  	return NULL;
  }
+ 
+ void 
+ route_toggle_routegraph_display(struct route *route)
+ {
+ 	if (route->flags & RF_SHOWGRAPH) {
+ 		route->flags &= ~RF_SHOWGRAPH;
+ 	} else {
+ 		route->flags |= RF_SHOWGRAPH;
+ 	}
+ }

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** navit.c	19 Nov 2007 19:58:17 -0000	1.39
--- navit.c	24 Nov 2007 12:40:25 -0000	1.40
***************
*** 1197,1198 ****
--- 1197,1206 ----
  }
  
+ void
+ navit_toggle_routegraph_display(struct navit *nav)
+ {
+ 	if (!nav->route)
+ 		return;
+ 	route_toggle_routegraph_display(nav->route);
+ 	navit_draw(nav);
+ }

[Navit-cvs-commit] navit configure.in,1.56,1.57

[Alexander A. <za...@us...>]

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

Modified Files:
	configure.in 
Log Message:
Enable by default building with -ffast-math

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** configure.in	20 Nov 2007 20:47:37 -0000	1.56
--- configure.in	23 Nov 2007 15:50:04 -0000	1.57
***************
*** 33,36 ****
--- 33,45 ----
  AM_CONDITIONAL(BUILD_SAMPLEMAP, [test "x$samplemap" = "xyes"])
  
+ AC_ARG_ENABLE(fastmath, [  --disable-fastmath             don't build with fastmath], fastmath=$enableval, fastmath=yes)
+ AM_CONDITIONAL(FASTMATH, [test "x$fastmath" = "xyes"])
+ 
+ if test x"$fastmath" = xyes; then
+ 	if eval "test x$GCC = xyes"; then
+ 		CFLAGS="$CFLAGS -ffast-math"
+ 	fi
+ fi
+ 
  AC_PATH_X
  if test x"$have_x" != xyes; then

[Navit-cvs-commit] navit/src navigation.c,1.26,1.27

[Alexander A. <za...@us...>]

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

Modified Files:
	navigation.c 
Log Message:
Fix possible segfault

Index: navigation.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navigation.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** navigation.c	5 Nov 2007 18:00:26 -0000	1.26
--- navigation.c	23 Nov 2007 13:40:37 -0000	1.27
***************
*** 232,236 ****
  		if (this_->first)
  			this_->first->prev=NULL;
! 		if (this_->cmd_first->itm == itm) {
  			cmd=this_->cmd_first;
  			this_->cmd_first=cmd->next;
--- 232,236 ----
  		if (this_->first)
  			this_->first->prev=NULL;
! 		if (this_->cmd_first && this_->cmd_first->itm == itm) {
  			cmd=this_->cmd_first;
  			this_->cmd_first=cmd->next;