Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Martin S. <mar...@us...> - 2008-02-26 08:54:50
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16308/graphics/gtk_drawing_area Modified Files: Makefile.am graphics_gtk_drawing_area.c Log Message: New:data_textfile:Let textfile read from pipe if filename ends in | 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.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** graphics_gtk_drawing_area.c 17 Feb 2008 19:52:03 -0000 1.32 --- graphics_gtk_drawing_area.c 26 Feb 2008 08:54:49 -0000 1.33 *************** *** 523,527 **** void *image; int w,h; ! printf("draw_image_warp data=%s\n", data); image = imlib_load_image(data); imlib_context_set_display(gdk_x11_drawable_get_xdisplay(gr->widget->window)); --- 523,527 ---- void *image; int w,h; ! dbg(1,"draw_image_warp data=%s\n", data); image = imlib_load_image(data); imlib_context_set_display(gdk_x11_drawable_get_xdisplay(gr->widget->window)); Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 1 Feb 2008 07:08:32 -0000 1.10 --- Makefile.am 26 Feb 2008 08:54:48 -0000 1.11 *************** *** 3,5 **** modulegraphics_LTLIBRARIES = libgraphics_gtk_drawing_area.la libgraphics_gtk_drawing_area_la_SOURCES = graphics_gtk_drawing_area.c ! libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ --- 3,5 ---- modulegraphics_LTLIBRARIES = libgraphics_gtk_drawing_area.la libgraphics_gtk_drawing_area_la_SOURCES = graphics_gtk_drawing_area.c ! libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @IMLIB2_LIBS@ |
|
From: Martin S. <mar...@us...> - 2008-02-26 08:54:50
|
Update of /cvsroot/navit/navit/src/data/textfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16308/data/textfile Modified Files: textfile.c textfile.h Log Message: New:data_textfile:Let textfile read from pipe if filename ends in | Index: textfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** textfile.c 3 Jan 2008 11:13:37 -0000 1.10 --- textfile.c 26 Feb 2008 08:54:47 -0000 1.11 *************** *** 198,202 **** mr->item.meth=&methods_textfile; mr->item.priv_data=mr; ! mr->f=fopen(map->filename, "r"); if(!mr->f) { printf("map_rect_new_textfile unable to open textfile %s\n",map->filename); --- 198,221 ---- mr->item.meth=&methods_textfile; mr->item.priv_data=mr; ! if (map->is_pipe) { ! char *oargs,*args=g_strdup(map->filename),*sep=" "; ! enum layer_type lay; ! while (sel) { ! oargs=args; ! args=g_strdup_printf("%s 0x%x 0x%x 0x%x 0x%x", oargs, sel->u.c_rect.lu.x, sel->u.c_rect.lu.y, sel->u.c_rect.rl.x, sel->u.c_rect.rl.y); ! g_free(oargs); ! for (lay=layer_town ; lay < layer_end ; lay++) { ! oargs=args; ! args=g_strdup_printf("%s%s%d", oargs, sep, sel->order[lay]); ! g_free(oargs); ! sep=","; ! } ! sel=sel->next; ! } ! dbg(1,"popen args %s\n", args); ! mr->f=popen(args, "r"); ! } else { ! mr->f=fopen(map->filename, "r"); ! } if(!mr->f) { printf("map_rect_new_textfile unable to open textfile %s\n",map->filename); *************** *** 211,215 **** { if (mr->f) { ! fclose(mr->f); } g_free(mr); --- 230,237 ---- { if (mr->f) { ! if (mr->m->is_pipe) ! pclose(mr->f); ! else ! fclose(mr->f); } g_free(mr); *************** *** 307,317 **** struct attr *charset=attr_search(attrs, NULL, attr_charset); struct file_wordexp *wexp; char **wexp_data; if (! data) return NULL; ! ! wexp=file_wordexp_new(data->u.str); wexp_data=file_wordexp_get_array(wexp); - dbg(1,"map_new_textfile %s\n", data->u.str); *meth=map_methods_textfile; --- 329,346 ---- struct attr *charset=attr_search(attrs, NULL, attr_charset); struct file_wordexp *wexp; + int len,is_pipe=0; + char *wdata; char **wexp_data; if (! data) return NULL; ! dbg(0,"map_new_textfile %s\n", data->u.str); ! wdata=g_strdup_printf(data->u.str); ! len=strlen(wdata); ! if (len && wdata[len-1] == '|') { ! wdata[len-1]='\0'; ! is_pipe=1; ! } ! wexp=file_wordexp_new(wdata); wexp_data=file_wordexp_get_array(wexp); *meth=map_methods_textfile; *************** *** 319,322 **** --- 348,353 ---- m->id=++map_id; m->filename=g_strdup(wexp_data[0]); + m->is_pipe=is_pipe; + dbg(1,"map_new_textfile %s %s\n", m->filename, wdata); if (charset) { m->charset=g_strdup(charset->u.str); Index: textfile.h =================================================================== RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** textfile.h 2 Dec 2007 16:29:01 -0000 1.5 --- textfile.h 26 Feb 2008 08:54:48 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- char *filename; char *charset; + int is_pipe; }; |
|
From: Martin S. <mar...@us...> - 2008-02-26 08:54:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16308 Modified Files: graphics.c navit.xml Log Message: New:data_textfile:Let textfile read from pipe if filename ends in | Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** graphics.c 17 Feb 2008 20:33:12 -0000 1.32 --- graphics.c 26 Feb 2008 08:54:46 -0000 1.33 *************** *** 410,414 **** break; case element_image: ! printf("image: '%s'\n", di->label); gra->meth.draw_image_warp(gra->priv, gra->gc[0]->priv, di->pnt, di->count, di->label); break; --- 410,414 ---- break; case element_image: ! dbg(1,"image: '%s'\n", di->label); gra->meth.draw_image_warp(gra->priv, gra->gc[0]->priv, di->pnt, di->count, di->label); break; *************** *** 498,504 **** } } else { ! if (! map_selection_contains_polygon(sel, ca, count)) { ! dbg(1,"polygon not visible\n"); ! continue; } } --- 498,514 ---- } } else { ! if (item->type == type_image && count == 2) { ! struct coord_rect r; ! r.lu=ca[0]; ! r.rl=ca[1]; ! if (! map_selection_contains_rect(sel, &r)) { ! dbg(1,"image not visible\n"); ! continue; ! } ! } else { ! if (! map_selection_contains_polygon(sel, ca, count)) { ! dbg(1,"polygon not visible\n"); ! continue; ! } } } Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** navit.xml 15 Feb 2008 10:27:31 -0000 1.39 --- navit.xml 26 Feb 2008 08:54:47 -0000 1.40 *************** *** 73,76 **** --- 73,79 ---- <layout name="Tag" color= "#ffefb7"> <layer name="sea" details="0"> + <item type="image" order="0-"> + <image /> + </item> <item type="poly_wood" order="0-"> <polygon color="#8ec78d" /> |
|
From: Martin S. <mar...@us...> - 2008-02-26 08:52:45
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13774 Modified Files: osm2navit.c Log Message: Add:Tools:Make index generation a default, added nl and at is_in definitions Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** osm2navit.c 23 Feb 2008 18:23:14 -0000 1.60 --- osm2navit.c 26 Feb 2008 08:52:33 -0000 1.61 *************** *** 20,24 **** #define BUFFER_SIZE 1280 ! /* #define GENERATE_INDEX */ #if 1 --- 20,24 ---- #define BUFFER_SIZE 1280 ! #define GENERATE_INDEX #if 1 *************** *** 196,200 **** --- 196,202 ---- struct rect r; } country_table[] = { + { 40,"Austria,Ãsterreich,AUT"}, {276,"Germany,Deutschland,Bundesrepublik Deutschland"}, + {518,"Nederland,The Netherlands,Niederlande,NL"}, }; |
|
From: Martin S. <mar...@us...> - 2008-02-23 19:26:18
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28767 Modified Files: destination.c Log Message: Fix:graphics_gtk:Fixed segfault when no LANG is set Index: destination.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** destination.c 13 Jan 2008 22:47:57 -0000 1.14 --- destination.c 23 Feb 2008 19:26:21 -0000 1.15 *************** *** 421,429 **** if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr)) country_attr=&search_attr; ! cs=country_search_new(country_attr, 0); ! item=country_search_get_item(cs); ! if (item && item_attr_get(item, attr_country_name, &country_name)) ! gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str); ! country_search_destroy(cs); return 0; } --- 421,433 ---- if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr)) country_attr=&search_attr; ! if (country_attr) { ! cs=country_search_new(country_attr, 0); ! item=country_search_get_item(cs); ! if (item && item_attr_get(item, attr_country_name, &country_name)) ! gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str); ! country_search_destroy(cs); ! } else { ! dbg(0,"warning: no default country found\n"); ! } return 0; } |
|
From: Martin S. <mar...@us...> - 2008-02-23 18:23:12
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32413 Modified Files: osm2navit.c Log Message: Fix:Tools:Fixed generation of country index tile when no data is available Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** osm2navit.c 22 Feb 2008 13:54:52 -0000 1.59 --- osm2navit.c 23 Feb 2008 18:23:14 -0000 1.60 *************** *** 1762,1771 **** for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { co=&country_table[i]; ! tilename[0]='\0'; ! tile(&co->r, tilename, max); ! sprintf(searchtile,"%ss%d", tilename, 0); ! sprintf(filename,"country_%d.bin", co->countryid); ! zipnum=add_aux_tile(phase, searchtile, filename, co->size); ! index_country_add(phase,co->countryid,zipnum); } } --- 1762,1773 ---- for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { co=&country_table[i]; ! if (co->size) { ! tilename[0]='\0'; ! tile(&co->r, tilename, max); ! sprintf(searchtile,"%ss%d", tilename, 0); ! sprintf(filename,"country_%d.bin", co->countryid); ! zipnum=add_aux_tile(phase, searchtile, filename, co->size); ! index_country_add(phase,co->countryid,zipnum); ! } } } |
|
From: Plum <pl...@us...> - 2008-02-22 14:58:04
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24641/src/data/binfile Modified Files: binfile.c Log Message: Fix:mapdriver:code cleaning Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** binfile.c 22 Feb 2008 14:46:41 -0000 1.18 --- binfile.c 22 Feb 2008 14:58:01 -0000 1.19 *************** *** 395,427 **** binmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial) { - struct map_selection *ms = NULL; - if (ms == NULL) - ms = g_new(struct map_selection, 1); - int i = 0; - ms->next = NULL; - for (i = 0; i < layer_end; i++) - { - ms->order[i] = 18; - } - ms->u.c_rect.lu.x = 0; - ms->u.c_rect.lu.y = 100000000; - ms->u.c_rect.rl.x = 100000000; - ms->u.c_rect.rl.y = 0; - struct map_rect_priv *map_rec; ! search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); switch (search->type) { case attr_country_name: break; case attr_town_name: ! map_rec = map_rect_new_binfile(map, ms); ! int country = item->id_lo; ! int country_ref = 0; ! struct item *it; ! struct map_rect_priv *temp = map_rect_new_binfile(map, NULL); ! temp->country_id = country; struct map_search_priv *msp = g_new(struct map_search_priv, 1); ! msp->mr = temp; msp->search = search; return msp; --- 395,411 ---- binmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial) { struct map_rect_priv *map_rec; ! int country = item->id_lo; ! switch (search->type) { case attr_country_name: break; case attr_town_name: ! search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); struct item *it; ! map_rec = map_rect_new_binfile(map, NULL); ! map_rec->country_id = country; struct map_search_priv *msp = g_new(struct map_search_priv, 1); ! msp->mr = map_rec; msp->search = search; return msp; *************** *** 430,433 **** --- 414,426 ---- break; case attr_street_name: + search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + struct map_selection *ms = NULL; + ms = g_new(struct map_selection, 1); + int i = 0; + ms->next = NULL; + for (i = 0; i < layer_end; i++) + { + ms->order[i] = 18; + } map_rec = map_rect_new_binfile(map, ms); struct item *town = map_rect_get_item_byid_binfile(map_rec, item->id_hi, item->id_lo); *************** *** 465,473 **** } map_rect_destroy_binfile(map_rec); break; default: break; } - g_free(ms); return NULL; } --- 458,466 ---- } map_rect_destroy_binfile(map_rec); + g_free(ms); break; default: break; } return NULL; } |
|
From: Plum <pl...@us...> - 2008-02-22 14:46:38
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20012/src/data/binfile Modified Files: binfile.c Log Message: Add:mapdriver:index support for town search Fix:mapdriver:memory leaks Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** binfile.c 22 Feb 2008 10:24:49 -0000 1.17 --- binfile.c 22 Feb 2008 14:46:41 -0000 1.18 *************** *** 61,64 **** --- 61,65 ---- struct tile tiles[8]; struct tile *t; + int country_id; }; *************** *** 307,311 **** } ! static struct item * --- 308,325 ---- } ! static void ! map_parse_country_binfile(struct map_rect_priv *mr) ! { ! struct attr at; ! if (binfile_attr_get(mr->item.priv_data, attr_country_id, &at)) { ! if (at.u.num == mr->country_id) ! { ! if (binfile_attr_get(mr->item.priv_data, attr_zipfile_ref, &at)) ! { ! push_zipfile_tile(mr, at.u.num); ! } ! } ! } ! } static struct item * *************** *** 330,334 **** mr->street_name_systematic_attr=NULL; setup_pos(mr); ! if (mr->item.type == type_submap) { struct coord_rect r; r.lu.x=t->pos_coord[0]; --- 344,348 ---- mr->street_name_systematic_attr=NULL; setup_pos(mr); ! if ((mr->item.type == type_submap) && (!mr->country_id)) { struct coord_rect r; r.lu.x=t->pos_coord[0]; *************** *** 345,348 **** --- 359,374 ---- } + if (mr->country_id) + { + if (mr->item.type == type_countryindex) { + map_parse_country_binfile(mr); + } + if (mr->item.type >= type_town_label && mr->item.type <= type_district_label_1e7) + { + return &mr->item; + } else { + continue; + } + } return &mr->item; } *************** *** 379,388 **** } ms->u.c_rect.lu.x = 0; ! ms->u.c_rect.lu.y = 10000000; ! ms->u.c_rect.rl.x = 10000000; ms->u.c_rect.rl.y = 0; struct map_rect_priv *map_rec; ! search_results = g_hash_table_new(g_str_hash, g_str_equal); switch (search->type) { case attr_country_name: --- 405,414 ---- } ms->u.c_rect.lu.x = 0; ! ms->u.c_rect.lu.y = 100000000; ! ms->u.c_rect.rl.x = 100000000; ms->u.c_rect.rl.y = 0; struct map_rect_priv *map_rec; ! search_results = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); switch (search->type) { case attr_country_name: *************** *** 391,396 **** map_rec = map_rect_new_binfile(map, ms); int country = item->id_lo; struct map_search_priv *msp = g_new(struct map_search_priv, 1); ! msp->mr = map_rec; msp->search = search; return msp; --- 417,427 ---- map_rec = map_rect_new_binfile(map, ms); int country = item->id_lo; + int country_ref = 0; + + struct item *it; + struct map_rect_priv *temp = map_rect_new_binfile(map, NULL); + temp->country_id = country; struct map_search_priv *msp = g_new(struct map_search_priv, 1); ! msp->mr = temp; msp->search = search; return msp; *************** *** 438,441 **** --- 469,473 ---- break; } + g_free(ms); return NULL; } *************** *** 445,449 **** { struct item* it; - if (strlen(map_search->search->u.str) <= 2) { return NULL; } while ((it = map_rect_get_item_binfile(map_search->mr))) { if (map_search->search->type == attr_town_name) { --- 477,480 ---- *************** *** 479,483 **** --- 510,516 ---- { g_hash_table_destroy(search_results); + g_free(ms->mr->sel); map_rect_destroy_binfile(ms->mr); + g_free(ms); } |
|
From: Martin S. <mar...@us...> - 2008-02-22 13:54:48
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31029 Modified Files: osm2navit.c Log Message: Fix:Tools:Added missing #ifdef Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** osm2navit.c 22 Feb 2008 12:23:12 -0000 1.58 --- osm2navit.c 22 Feb 2008 13:54:52 -0000 1.59 *************** *** 1940,1945 **** --- 1940,1947 ---- while (th) { if (th->process) { + #ifdef GENERATE_INDEX if (! strlen(th->name)) zipfiles+=write_aux_tiles(out, dir_out, compression_level, maxnamelen); + #endif if (th->total_size != th->total_size_used) { fprintf(stderr,"Size error '%s': %d vs %d\n", th->name, th->total_size, th->total_size_used); |
|
From: KaZeR <ka...@us...> - 2008-02-22 12:50:59
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27346 Modified Files: fr.po Log Message: Add:Translations:Updated french translation Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** fr.po 14 Feb 2008 20:16:25 -0000 1.38 --- fr.po 22 Feb 2008 12:50:56 -0000 1.39 *************** *** 8,12 **** "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-17 14:17+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" [...1515 lines suppressed...] #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "NW" ! msgstr "NW" #: ../src/gui/gtk/gui_gtk_statusbar.c:105 #, c-format msgid "Route %4.0fkm %02d:%02d ETA" ! msgstr "Route %4.0fkm %02d:%02d ETA" #: ../src/gui/gtk/gui_gtk_statusbar.c:156 msgid "Route 0000km 0+00:00 ETA" ! msgstr "Route 0000km 0+00:00 ETA" ! ! #~ msgid "Moldova" ! #~ msgstr "Moldavie" ! ! #~ msgid "Palestinia" ! #~ msgstr "Palestine" #~ msgid "RouteGraph" |
|
From: Martin S. <mar...@us...> - 2008-02-22 12:23:11
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8559 Modified Files: osm2navit.c Log Message: Fix:Tools:Set correct zip_ref Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** osm2navit.c 22 Feb 2008 11:43:10 -0000 1.57 --- osm2navit.c 22 Feb 2008 12:23:12 -0000 1.58 *************** *** 1542,1545 **** --- 1542,1547 ---- static int zipnum; + static void write_countrydir(int phase, int maxnamelen); + static void write_tilesdir(int phase, int maxlen, FILE *out) *************** *** 1549,1552 **** --- 1551,1555 ---- char **data; struct tile_head *th,**last=NULL; + zipnum=0; tiles_list=get_tiles_list(); *************** *** 1567,1570 **** --- 1570,1577 ---- fprintf(stderr,"PROGRESS: collecting tiles with len=%d\n", len); #endif + #ifdef GENERATE_INDEX + if (! len) + write_countrydir(phase, maxlen); + #endif next=g_list_first(tiles_list); while (next) { *************** *** 1575,1579 **** last=&th->next; th->next=NULL; ! th->zipnum=zipnum++; fprintf(out,"%s:%d",(char *)next->data,th->total_size); --- 1582,1586 ---- last=&th->next; th->next=NULL; ! th->zipnum=zipnum; fprintf(out,"%s:%d",(char *)next->data,th->total_size); *************** *** 1587,1590 **** --- 1594,1598 ---- if (th->name[0]) index_submap_add(phase, th, &tiles_list); + zipnum++; processed_tiles++; } *************** *** 1694,1698 **** if (phase == 3) tile_extend(index_tile, (struct item_bin *)&ii, NULL); ! else write_item(index_tile, (struct item_bin *)&ii); } --- 1702,1706 ---- if (phase == 3) tile_extend(index_tile, (struct item_bin *)&ii, NULL); ! else write_item(index_tile, (struct item_bin *)&ii); } *************** *** 1782,1790 **** sig_alrm(0); alarm(0); - zipnum=0; write_tilesdir(phase, maxnamelen, tilesdir_out); - #ifdef GENERATE_INDEX - write_countrydir(phase, maxnamelen); - #endif return 0; --- 1790,1794 ---- *************** *** 1936,1939 **** --- 1940,1945 ---- while (th) { if (th->process) { + if (! strlen(th->name)) + zipfiles+=write_aux_tiles(out, dir_out, compression_level, maxnamelen); if (th->total_size != th->total_size_used) { fprintf(stderr,"Size error '%s': %d vs %d\n", th->name, th->total_size, th->total_size_used); *************** *** 1943,1949 **** write_zipmember(out, dir_out, th->name, maxnamelen, th->zip_data, th->total_size, compression_level); else { - #ifdef GENERATE_INDEX - zipfiles+=write_aux_tiles(out, dir_out, compression_level, maxnamelen); - #endif write_zipmember(out, dir_out, "index", sizeof("index")-1, th->zip_data, th->total_size, compression_level); } --- 1949,1952 ---- |
|
From: Martin S. <mar...@us...> - 2008-02-22 11:43:09
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18909 Modified Files: osm2navit.c Log Message: Fix:Tools:Set correct zip_ref Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** osm2navit.c 22 Feb 2008 08:40:18 -0000 1.56 --- osm2navit.c 22 Feb 2008 11:43:10 -0000 1.57 *************** *** 1705,1709 **** }; ! static void add_aux_tile(int phase, char *name, char *filename, int size) { --- 1705,1709 ---- }; ! static int add_aux_tile(int phase, char *name, char *filename, int size) { *************** *** 1716,1720 **** aux_tile_list=g_list_append(aux_tile_list, at); } ! zipnum++; } --- 1716,1720 ---- aux_tile_list=g_list_append(aux_tile_list, at); } ! return zipnum++; } *************** *** 1746,1750 **** write_countrydir(int phase, int maxnamelen) { ! int i; int max=11; char tilename[32]; --- 1746,1750 ---- write_countrydir(int phase, int maxnamelen) { ! int i,zipnum; int max=11; char tilename[32]; *************** *** 1754,1763 **** for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { co=&country_table[i]; - index_country_add(phase,co->countryid,0); tilename[0]='\0'; tile(&co->r, tilename, max); sprintf(searchtile,"%ss%d", tilename, 0); sprintf(filename,"country_%d.bin", co->countryid); ! add_aux_tile(phase, searchtile, filename, co->size); } } --- 1754,1763 ---- for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { co=&country_table[i]; tilename[0]='\0'; tile(&co->r, tilename, max); sprintf(searchtile,"%ss%d", tilename, 0); sprintf(filename,"country_%d.bin", co->countryid); ! zipnum=add_aux_tile(phase, searchtile, filename, co->size); ! index_country_add(phase,co->countryid,zipnum); } } |
|
From: Plum <pl...@us...> - 2008-02-22 10:36:42
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22085/src Modified Files: search.c Log Message: Fix:core:no town name was displayed in search Index: search.c =================================================================== RCS file: /cvsroot/navit/navit/src/search.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** search.c 28 Jan 2008 08:55:44 -0000 1.10 --- search.c 22 Feb 2008 10:36:45 -0000 1.11 *************** *** 140,144 **** else ret->item=*item; ! if (item_attr_get(item, attr_town_name, &attr)) ret->name=map_convert_string(item->map,attr.u.str); if (item_attr_get(item, attr_town_postal, &attr)) --- 140,144 ---- else ret->item=*item; ! if (item_attr_get(item, attr_label, &attr)) ret->name=map_convert_string(item->map,attr.u.str); if (item_attr_get(item, attr_town_postal, &attr)) |
|
From: Plum <pl...@us...> - 2008-02-22 10:24:53
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13536/src/data/binfile Modified Files: binfile.c Log Message: Add:mapdriver:search functions for osm maps|ToDo: indexing for town names) Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** binfile.c 22 Jan 2008 19:01:18 -0000 1.16 --- binfile.c 22 Feb 2008 10:24:49 -0000 1.17 *************** *** 19,22 **** --- 19,24 ---- static int map_id; + static GHashTable *search_results; + struct minmax { short min; *************** *** 61,64 **** --- 63,72 ---- }; + struct map_search_priv { + struct map_rect_priv *mr; + struct attr *search; + struct map_selection *ms; + }; + static void *************** *** 358,361 **** --- 366,485 ---- } + static struct map_search_priv * + binmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial) + { + struct map_selection *ms = NULL; + if (ms == NULL) + ms = g_new(struct map_selection, 1); + int i = 0; + ms->next = NULL; + for (i = 0; i < layer_end; i++) + { + ms->order[i] = 18; + } + ms->u.c_rect.lu.x = 0; + ms->u.c_rect.lu.y = 10000000; + ms->u.c_rect.rl.x = 10000000; + ms->u.c_rect.rl.y = 0; + + struct map_rect_priv *map_rec; + search_results = g_hash_table_new(g_str_hash, g_str_equal); + switch (search->type) { + case attr_country_name: + break; + case attr_town_name: + map_rec = map_rect_new_binfile(map, ms); + int country = item->id_lo; + struct map_search_priv *msp = g_new(struct map_search_priv, 1); + msp->mr = map_rec; + msp->search = search; + return msp; + break; + case attr_town_postal: + break; + case attr_street_name: + map_rec = map_rect_new_binfile(map, ms); + struct item *town = map_rect_get_item_byid_binfile(map_rec, item->id_hi, item->id_lo); + if (town) { + struct map_search_priv *msp = g_new(struct map_search_priv, 1); + struct coord *c = g_new(struct coord, 1); + int size = 10000; + switch (town->type) { + case type_town_label_2e5: + size = 10000; + break; + case type_town_label_2e4: + size = 2500; + break; + case type_town_label_2e3: + size = 1000; + break; + case type_town_label_2e2: + size = 1000; + break; + default: + break; + } + item_coord_get(town, c, 1); + ms->u.c_rect.lu.x = c->x-size; + ms->u.c_rect.lu.y = c->y+size; + ms->u.c_rect.rl.x = c->x+size; + ms->u.c_rect.rl.y = c->y-size; + + map_rect_destroy_binfile(map_rec); + map_rec = map_rect_new_binfile(map, ms); + msp->mr = map_rec; + msp->search = search; + return msp; + } + map_rect_destroy_binfile(map_rec); + break; + default: + break; + } + return NULL; + } + + struct item * + binmap_search_get_item(struct map_search_priv *map_search) + { + struct item* it; + if (strlen(map_search->search->u.str) <= 2) { return NULL; } + while ((it = map_rect_get_item_binfile(map_search->mr))) { + if (map_search->search->type == attr_town_name) { + if ((it->type >= type_town_label) && (it->type <= type_town_label_1e7)) { + struct attr at; + if (binfile_attr_get(it->priv_data, attr_label, &at)) { + char* tmp = g_strdup(at.u.str); + if (g_ascii_strncasecmp(tmp, map_search->search->u.str, strlen(map_search->search->u.str)) == 0) { + return it; + } + } + } + } else if (map_search->search->type == attr_street_name) { + if ((it->type == type_street_3_city) || (it->type == type_street_2_city) || (it->type == type_street_1_city)) { + struct attr at; + if (binfile_attr_get(it->priv_data, attr_label, &at)) { + char* tmp = g_strdup(at.u.str); + if (g_ascii_strncasecmp(tmp, map_search->search->u.str, strlen(map_search->search->u.str)) == 0) { + if (!g_hash_table_lookup(search_results, at.u.str)) { + g_hash_table_insert(search_results, tmp, ""); + return it; + } + } + } + } + } + } + return NULL; + } + + static void + binmap_search_destroy(struct map_search_priv *ms) + { + g_hash_table_destroy(search_results); + map_rect_destroy_binfile(ms->mr); + } + static struct map_methods map_methods_binfile = { projection_mg, *************** *** 366,369 **** --- 490,496 ---- map_rect_get_item_binfile, map_rect_get_item_byid_binfile, + binmap_search_new, + binmap_search_destroy, + binmap_search_get_item }; |
|
From: Martin S. <mar...@us...> - 2008-02-22 09:08:39
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25719 Modified Files: item_def.h Log Message: Add:Core:Added new item countryindex for searching Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** item_def.h 21 Feb 2008 09:04:19 -0000 1.25 --- item_def.h 22 Feb 2008 09:08:39 -0000 1.26 *************** *** 311,312 **** --- 311,313 ---- ITEM(poly_apron) ITEM(poly_terminal) + ITEM(countryindex) |
|
From: Martin S. <mar...@us...> - 2008-02-22 08:40:26
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13953 Modified Files: osm2navit.c Log Message: Add:Tools:Further working on search Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** osm2navit.c 21 Feb 2008 08:41:54 -0000 1.55 --- osm2navit.c 22 Feb 2008 08:40:18 -0000 1.56 *************** *** 168,177 **** --- 168,198 ---- }; + struct coord { + int x; + int y; + } coord_buffer[65536]; + + #define IS_REF(c) ((c).x >= (1 << 30)) + #define REF(c) ((c).y) + #define SET_REF(c,ref) do { (c).x = 1 << 30; (c).y = ref ; } while(0) + + struct rect { + struct coord l,h; + }; + + static void bbox_extend(struct coord *c, struct rect *r); + #ifdef GENERATE_INDEX + static GHashTable *aux_tile_hash; + GList *aux_tile_list; + struct country_table { int countryid; char *names; FILE *file; + int size; + int count; + struct rect r; } country_table[] = { {276,"Germany,Deutschland,Bundesrepublik Deutschland"}, *************** *** 338,341 **** --- 359,364 ---- + static void write_zipmember(FILE *out, FILE *dir_out, char *name, int filelen, char *data, int data_size, int compression_level); + static void pad_text_attr(struct attr_bin *a, char *buffer) *************** *** 534,550 **** - struct coord { - int x; - int y; - } coord_buffer[65536]; - - #define IS_REF(c) ((c).x >= (1 << 30)) - #define REF(c) ((c).y) - #define SET_REF(c,ref) do { (c).x = 1 << 30; (c).y = ref ; } while(0) - - struct rect { - struct coord l,h; - }; - int coord_count; --- 557,560 ---- *************** *** 817,822 **** if (result && !conflict) { if (!result->file) { ! char *name=g_strdup_printf("country_%d.bin", result->countryid); result->file=fopen(name,"w"); } if (result->file) { --- 827,833 ---- if (result && !conflict) { if (!result->file) { ! char *name=g_strdup_printf("country_%d.bin.unsorted", result->countryid); result->file=fopen(name,"w"); + g_free(name); } if (result->file) { *************** *** 826,829 **** --- 837,842 ---- fwrite(&ni->c, 1*sizeof(struct coord), 1, result->file); write_attr(result->file, &label_attr, label_attr_buffer); + result->count++; + result->size+=(item.clen+3+label_attr.len+1)*4; } *************** *** 834,837 **** --- 847,923 ---- } + static int + sort_countries_compare(const void *p1, const void *p2) + { + struct item_bin *ib1=*((struct item_bin **)p1),*ib2=*((struct item_bin **)p2); + struct attr_bin *attr1,*attr2; + char *s1,*s2; + assert(ib1->clen==2); + assert(ib2->clen==2); + attr1=(struct attr_bin *)((int *)(ib1+1)+ib1->clen); + attr2=(struct attr_bin *)((int *)(ib2+1)+ib1->clen); + assert(attr1->type == attr_label); + assert(attr2->type == attr_label); + s1=(char *)(attr1+1); + s2=(char *)(attr2+1); + return strcmp(s1, s2); + #if 0 + fprintf(stderr,"sort_countries_compare p1=%p p2=%p %s %s\n",p1,p2,s1,s2); + #endif + return 0; + } + + #ifdef GENERATE_INDEX + static void + sort_countries(void) + { + int i,j; + struct country_table *co; + struct coord *c; + struct item_bin *ib; + FILE *f; + char *p,*buffer,**idx,*name; + for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { + co=&country_table[i]; + if (co->file) { + fclose(co->file); + co->file=NULL; + } + if (co->size) { + buffer=malloc(co->size); + assert(buffer != NULL); + idx=malloc(co->count*4); + assert(idx != NULL); + name=g_strdup_printf("country_%d.bin.unsorted", co->countryid); + f=fopen(name,"r"); + assert(f != NULL); + fread(buffer, co->size, 1, f); + fclose(f); + unlink(name); + g_free(name); + p=buffer; + for (j = 0 ; j < co->count ; j++) { + idx[j]=p; + p+=(*((int *)p)+1)*4; + } + qsort(idx, co->count, 4, sort_countries_compare); + name=g_strdup_printf("country_%d.bin", co->countryid); + f=fopen(name,"w"); + for (j = 0 ; j < co->count ; j++) { + ib=(struct item_bin *)(idx[j]); + c=(struct coord *)(ib+1); + fwrite(ib, (ib->len+1)*4, 1, f); + if (j) + bbox_extend(c, &co->r); + else + co->r.l=*c; + co->r.h=*c; + } + fclose(f); + } + } + } + #endif + static void add_nd(char *p, int ref) *************** *** 977,980 **** --- 1063,1079 ---- static void + bbox_extend(struct coord *c, struct rect *r) + { + if (c->x < r->l.x) + r->l.x=c->x; + if (c->y < r->l.y) + r->l.y=c->y; + if (c->x > r->h.x) + r->h.x=c->x; + if (c->y > r->h.y) + r->h.y=c->y; + } + + static void bbox(struct coord *c, int count, struct rect *r) { *************** *** 985,996 **** while (--count) { c++; ! if (c->x < r->l.x) ! r->l.x=c->x; ! if (c->y < r->l.y) ! r->l.y=c->y; ! if (c->x > r->h.x) ! r->h.x=c->x; ! if (c->y > r->h.y) ! r->h.y=c->y; } } --- 1084,1088 ---- while (--count) { c++; ! bbox_extend(c, r); } } *************** *** 1165,1168 **** --- 1257,1261 ---- } + static void get_tiles_list_func(char *key, struct tile_head *th, GList **list) *************** *** 1447,1455 **** } static void write_tilesdir(int phase, int maxlen, FILE *out) { ! int idx,len,zipnum=0; GList *tiles_list,*next; char **data; --- 1540,1549 ---- } + static int zipnum; static void write_tilesdir(int phase, int maxlen, FILE *out) { ! int idx,len; GList *tiles_list,*next; char **data; *************** *** 1572,1575 **** --- 1666,1766 ---- } + struct country_index_item { + struct item_bin item; + struct attr_bin attr_country_id; + int country_id; + struct attr_bin attr_zipfile_ref; + int zipfile_ref; + }; + + static void + index_country_add(int phase, int country_id, int zipnum) + { + struct country_index_item ii; + char *index_tile=""; + + ii.item.len=sizeof(ii)/4-1; + ii.item.type=type_countryindex; + ii.item.clen=0; + + ii.attr_country_id.len=2; + ii.attr_country_id.type=attr_country_id; + ii.country_id=country_id; + + ii.attr_zipfile_ref.len=2; + ii.attr_zipfile_ref.type=attr_zipfile_ref; + ii.zipfile_ref=zipnum; + + if (phase == 3) + tile_extend(index_tile, (struct item_bin *)&ii, NULL); + else + write_item(index_tile, (struct item_bin *)&ii); + } + + #ifdef GENERATE_INDEX + struct aux_tile { + char *name; + char *filename; + int size; + }; + + static void + add_aux_tile(int phase, char *name, char *filename, int size) + { + struct aux_tile *at; + if (phase == 3) { + at=g_new0(struct aux_tile, 1); + at->name=g_strdup(name); + at->filename=g_strdup(filename); + at->size=size; + aux_tile_list=g_list_append(aux_tile_list, at); + } + zipnum++; + } + + static int + write_aux_tiles(FILE *out, FILE *dir_out, int compression_level, int namelen) + { + GList *l=aux_tile_list; + struct aux_tile *at; + char *buffer; + FILE *f; + int count=0; + + while (l) { + at=l->data; + buffer=malloc(at->size); + assert(buffer != NULL); + f=fopen(at->filename,"r"); + assert(f != NULL); + fread(buffer, at->size, 1, f); + fclose(f); + write_zipmember(out, dir_out, at->name, namelen, buffer, at->size, compression_level); + count++; + l=g_list_next(l); + } + return count; + } + + static void + write_countrydir(int phase, int maxnamelen) + { + int i; + int max=11; + char tilename[32]; + char searchtile[32]; + char filename[32]; + struct country_table *co; + for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { + co=&country_table[i]; + index_country_add(phase,co->countryid,0); + tilename[0]='\0'; + tile(&co->r, tilename, max); + sprintf(searchtile,"%ss%d", tilename, 0); + sprintf(filename,"country_%d.bin", co->countryid); + add_aux_tile(phase, searchtile, filename, co->size); + } + } + #endif static int *************** *** 1591,1595 **** --- 1782,1790 ---- sig_alrm(0); alarm(0); + zipnum=0; write_tilesdir(phase, maxnamelen, tilesdir_out); + #ifdef GENERATE_INDEX + write_countrydir(phase, maxnamelen); + #endif return 0; *************** *** 1747,1752 **** 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++; } --- 1942,1951 ---- if (strlen(th->name)) write_zipmember(out, dir_out, th->name, maxnamelen, th->zip_data, th->total_size, compression_level); ! else { ! #ifdef GENERATE_INDEX ! zipfiles+=write_aux_tiles(out, dir_out, compression_level, maxnamelen); ! #endif write_zipmember(out, dir_out, "index", sizeof("index")-1, th->zip_data, th->total_size, compression_level); + } zipfiles++; } *************** *** 1967,1970 **** --- 2166,2173 ---- if (nodes) fclose(nodes); + #ifdef GENERATE_INDEX + fprintf(stderr,"PROGRESS: Phase 1: sorting countries\n"); + sort_countries(); + #endif } if (end == 1 || dump_coordinates) |
|
From: Martin S. <mar...@us...> - 2008-02-21 16:59:33
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30232 Modified Files: nl.po no.po Log Message: Add:NLS:Added new translations for nl and no Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** no.po 20 Feb 2008 16:55:25 -0000 1.18 --- no.po 21 Feb 2008 16:59:33 -0000 1.19 *************** *** 1,6 **** # Norwegian translations for navit ! # Copyright (C) 2007 # This file is distributed under the same license as the navit package. ! # Bendik Brenne <be...@xp...>, 2007. # Helge Hafting <hel...@ai...> # --- 1,6 ---- # Norwegian translations for navit ! # Copyright (C) 2008 # This file is distributed under the same license as the navit package. [...2268 lines suppressed...] ! msgstr "SV" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "W" ! msgstr "V" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "NW" ! msgstr "NV" #: ../src/gui/gtk/gui_gtk_statusbar.c:105 #, c-format msgid "Route %4.0fkm %02d:%02d ETA" ! msgstr "Rute %4.0fkm %02d:%02d ETA" #: ../src/gui/gtk/gui_gtk_statusbar.c:156 msgid "Route 0000km 0+00:00 ETA" ! msgstr "Rute 0000km 0+00:00 ETA" #~ msgid "Moldova" Index: nl.po =================================================================== RCS file: /cvsroot/navit/navit/po/nl.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nl.po 14 Feb 2008 20:16:25 -0000 1.5 --- nl.po 21 Feb 2008 16:59:33 -0000 1.6 *************** *** 8,12 **** "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-21 17:53+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" [...1718 lines suppressed...] + msgstr "" + + #. 716 + #: ../src/country.c:269 + msgid "Zimbabwe" + msgstr "" + #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 *************** *** 657,658 **** --- 1684,1691 ---- msgid "Route 0000km 0+00:00 ETA" msgstr "Route 0000km 0+00:00 Aankomsttijd" + + #~ msgid "Moldova" + #~ msgstr "Moldavië" + + #~ msgid "Palestinia" + #~ msgstr "Palestina" |
|
From: Martin S. <mar...@us...> - 2008-02-21 09:04:30
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20875 Modified Files: item_def.h Log Message: Add:Core:Added new item definitions from wiki Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** item_def.h 11 Feb 2008 09:17:01 -0000 1.24 --- item_def.h 21 Feb 2008 09:04:19 -0000 1.25 *************** *** 207,210 **** --- 207,234 ---- ITEM(poi_gc_webcam) ITEM(poi_cafe) + ITEM(nav_straight) + ITEM(nav_turnaround) + ITEM(nav_right_1) + ITEM(nav_right_2) + ITEM(nav_right_3) + ITEM(nav_left_1) + ITEM(nav_left_2) + ITEM(nav_left_3) + ITEM(nav_roundabout_r1) + ITEM(nav_roundabout_r2) + ITEM(nav_roundabout_r3) + ITEM(nav_roundabout_r4) + ITEM(nav_roundabout_r5) + ITEM(nav_roundabout_r6) + ITEM(nav_roundabout_r7) + ITEM(nav_roundabout_r8) + ITEM(nav_roundabout_l1) + ITEM(nav_roundabout_l2) + ITEM(nav_roundabout_l3) + ITEM(nav_roundabout_l4) + ITEM(nav_roundabout_l5) + ITEM(nav_roundabout_l6) + ITEM(nav_roundabout_l7) + ITEM(nav_roundabout_l8) /* Line */ ITEM2(0x80000000,line) |
|
From: Martin S. <mar...@us...> - 2008-02-21 08:41:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3949 Modified Files: osm2navit.c Log Message: Add:Tools:Added first works on generating a town index to osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** osm2navit.c 14 Feb 2008 18:07:40 -0000 1.54 --- osm2navit.c 21 Feb 2008 08:41:54 -0000 1.55 *************** *** 18,21 **** --- 18,25 ---- #include "config.h" + #define BUFFER_SIZE 1280 + + /* #define GENERATE_INDEX */ + #if 1 #define debug_tile(x) 0 *************** *** 164,167 **** --- 168,184 ---- }; + #ifdef GENERATE_INDEX + + struct country_table { + int countryid; + char *names; + FILE *file; + } country_table[] = { + {276,"Germany,Deutschland,Bundesrepublik Deutschland"}, + }; + + static GHashTable *country_table_hash; + #endif + static GHashTable *way_key_hash, *node_key_hash; *************** *** 249,252 **** --- 266,289 ---- } + #ifdef GENERATE_INDEX + static void + build_countrytable(void) + { + int i; + char *names,*str,*tok; + country_table_hash=g_hash_table_new(g_str_hash, g_str_equal); + for (i = 0 ; i < sizeof(country_table)/sizeof(struct country_table) ; i++) { + names=g_strdup(country_table[i].names); + str=names; + while ((tok=strtok(str, ","))) { + str=NULL; + g_hash_table_insert(country_table_hash, tok, (gpointer)&country_table[i]); + } + } + } + #endif + + + static int processed_nodes, processed_nodes_out, processed_ways, processed_relations, processed_tiles; static int in_way, in_node, in_relation; *************** *** 276,295 **** 0, attr_label }; ! char label_attr_buffer[1024]; struct attr_bin street_name_attr = { 0, attr_street_name }; ! char street_name_attr_buffer[1024]; struct attr_bin street_name_systematic_attr = { 0, attr_street_name_systematic }; ! char street_name_systematic_attr_buffer[1024]; struct attr_bin debug_attr = { 0, attr_debug }; ! char debug_attr_buffer[1024]; struct attr_bin flags_attr = { --- 313,332 ---- 0, attr_label }; ! char label_attr_buffer[BUFFER_SIZE]; struct attr_bin street_name_attr = { 0, attr_street_name }; ! char street_name_attr_buffer[BUFFER_SIZE]; struct attr_bin street_name_systematic_attr = { 0, attr_street_name_systematic }; ! char street_name_systematic_attr_buffer[BUFFER_SIZE]; struct attr_bin debug_attr = { 0, attr_debug }; ! char debug_attr_buffer[BUFFER_SIZE]; struct attr_bin flags_attr = { *************** *** 298,301 **** --- 335,341 ---- int flags_attr_value; + char is_in_buffer[BUFFER_SIZE]; + + static void pad_text_attr(struct attr_bin *a, char *buffer) *************** *** 325,330 **** if (! i) return 0; ! if (i - pos > buffer_size) return 0; strncpy(buffer, pos, i-pos); buffer[i-pos]='\0'; --- 365,372 ---- if (! i) return 0; ! if (i - pos > buffer_size) { ! fprintf(stderr,"Buffer overflow %d vs %d\n", i-pos, buffer_size); return 0; + } strncpy(buffer, pos, i-pos); buffer[i-pos]='\0'; *************** *** 405,408 **** --- 447,451 ---- } if (! strcmp(k,"is_in")) { + strcpy(is_in_buffer, v); level=5; } *************** *** 460,468 **** parse_tag(char *p) { ! char k_buffer[1024]; ! char v_buffer[1024]; ! if (!xml_get_attribute(p, "k", k_buffer, 1024)) return 0; ! if (!xml_get_attribute(p, "v", v_buffer, 1024)) return 0; add_tag(k_buffer, v_buffer); --- 503,511 ---- parse_tag(char *p) { ! char k_buffer[BUFFER_SIZE]; ! char v_buffer[BUFFER_SIZE]; ! if (!xml_get_attribute(p, "k", k_buffer, BUFFER_SIZE)) return 0; ! if (!xml_get_attribute(p, "v", v_buffer, BUFFER_SIZE)) return 0; add_tag(k_buffer, v_buffer); *************** *** 563,566 **** --- 606,610 ---- label_attr.len=0; debug_attr.len=0; + is_in_buffer[0]='\0'; sprintf(debug_attr_buffer,"nodeid=%d", nodeid); ni=(struct node_item *)(node_buffer.base+node_buffer.size); *************** *** 594,605 **** parse_node(char *p) { ! char id_buffer[1024]; ! char lat_buffer[1024]; ! char lon_buffer[1024]; ! if (!xml_get_attribute(p, "id", id_buffer, 1024)) return 0; ! if (!xml_get_attribute(p, "lat", lat_buffer, 1024)) return 0; ! if (!xml_get_attribute(p, "lon", lon_buffer, 1024)) return 0; add_node(atoi(id_buffer), atof(lat_buffer), atof(lon_buffer)); --- 638,649 ---- parse_node(char *p) { ! char id_buffer[BUFFER_SIZE]; ! char lat_buffer[BUFFER_SIZE]; ! char lon_buffer[BUFFER_SIZE]; ! if (!xml_get_attribute(p, "id", id_buffer, BUFFER_SIZE)) return 0; ! if (!xml_get_attribute(p, "lat", lat_buffer, BUFFER_SIZE)) return 0; ! if (!xml_get_attribute(p, "lon", lon_buffer, BUFFER_SIZE)) return 0; add_node(atoi(id_buffer), atof(lat_buffer), atof(lon_buffer)); *************** *** 682,687 **** parse_way(char *p) { ! char id_buffer[1024]; ! if (!xml_get_attribute(p, "id", id_buffer, 1024)) return 0; add_way(atoi(id_buffer)); --- 726,731 ---- parse_way(char *p) { ! char id_buffer[BUFFER_SIZE]; ! if (!xml_get_attribute(p, "id", id_buffer, BUFFER_SIZE)) return 0; add_way(atoi(id_buffer)); *************** *** 740,743 **** --- 784,789 ---- { int alen=0; + int conflict=0; + struct country_table *result=NULL, *lookup; if (!out || ! node_is_tagged || ! nodeid) return; *************** *** 753,756 **** --- 799,834 ---- write_attr(out, &label_attr, label_attr_buffer); write_attr(out, &debug_attr, debug_attr_buffer); + #ifdef GENERATE_INDEX + if (item.type >= type_town_label && item.type <= type_town_label_1e7 && label_attr.len) { + char *tok,*buf=is_in_buffer; + while ((tok=strtok(buf, ","))) { + while (*tok==' ') + tok++; + lookup=g_hash_table_lookup(country_table_hash,tok); + if (lookup) { + if (result && result->countryid != lookup->countryid) { + fprintf(stderr,"conflict for %s %s country %d vs %d\n", label_attr_buffer, debug_attr_buffer, lookup->countryid, result->countryid); + conflict=1; + } else + result=lookup; + } + buf=NULL; + } + if (result && !conflict) { + if (!result->file) { + char *name=g_strdup_printf("country_%d.bin", result->countryid); + result->file=fopen(name,"w"); + } + if (result->file) { + item.clen=2; + item.len=item.clen+2+label_attr.len+1; + fwrite(&item, sizeof(item), 1, result->file); + fwrite(&ni->c, 1*sizeof(struct coord), 1, result->file); + write_attr(result->file, &label_attr, label_attr_buffer); + } + + } + } + #endif processed_nodes_out++; } *************** *** 785,790 **** parse_nd(char *p) { ! char ref_buffer[1024]; ! if (!xml_get_attribute(p, "ref", ref_buffer, 1024)) return 0; add_nd(p, atoi(ref_buffer)); --- 863,868 ---- parse_nd(char *p) { ! char ref_buffer[BUFFER_SIZE]; ! if (!xml_get_attribute(p, "ref", ref_buffer, BUFFER_SIZE)) return 0; add_nd(p, atoi(ref_buffer)); *************** *** 1872,1875 **** --- 1950,1956 ---- result=argv[optind]; build_attrmap(map); + #ifdef GENERATE_INDEX + build_countrytable(); + #endif |
|
From: Michael F. <ho...@us...> - 2008-02-20 22:22:24
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9620 Modified Files: shopping.xpm bar.xpm museum.xpm cinema.xpm telephone.xpm Added Files: heliport.xpm Log Message: Core:Add:Add new and improved POI icons|Thanks to Helge Hafting. Index: cinema.xpm =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/cinema.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cinema.xpm 14 Dec 2007 18:57:41 -0000 1.1 --- cinema.xpm 20 Feb 2008 22:22:24 -0000 1.2 *************** *** 1,136 **** /* XPM */ ! static char *cinema[] = { ! /* columns rows colors chars-per-pixel */ ! "12 16 114 2", ! " c gray4", ! ". c #0B0B0B", ! "X c #0C0C0C", ! "o c gray5", ! "O c #0E0E0E", ! "+ c gray6", ! "@ c #101010", ! "# c #111111", ! "$ c #161616", ! "% c #191919", ! "& c #1E1E1E", ! "* c gray13", ! "= c #282828", ! "- c gray16", ! "; c gray17", ! ": c #2D2D2D", ! "> c #2F2F2F", ! ", c gray19", ! "< c gray20", ! "1 c #3A3A3A", ! "2 c gray23", ! "3 c #384B50", ! "4 c #3F4D51", ! "5 c #345158", ! "6 c #3A6B77", ! "7 c gray25", ! "8 c #414141", ! "9 c #464646", ! "0 c #404648", ! "q c #4C4C4C", ! "w c #4E4E4E", ! "e c gray32", ! "r c #585858", ! "t c gray36", ! "y c #466D76", ! "u c #576F75", ! "i c #5A7278", ! "p c #606060", ! "a c #646464", ! "s c gray40", ! "d c DimGray", ! "f c gray42", ! "g c #607478", ! "h c #66797E", ! "j c gray44", ! "k c #747474", ! "l c gray46", ! "z c #707A7C", ! "x c #7C7C7C", ! "c c #6B7F83", ! "v c #3E9FB7", ! "b c #2CA5C3", ! "n c #34A8C5", ! "m c #3CABC7", ! "M c #588894", ! "N c #5F8F9B", ! "B c #4299AF", ! "V c #5FA8BA", ! "C c #658B95", ! "Z c #69909A", ! "A c #7B8E93", ! "S c #739097", ! "D c #7D959B", ! "F c #619BAA", ! "G c #679CAA", ! "H c #6C9CA8", ! "J c #7C9EA6", ! "K c #67A1AF", ! "L c #60A8BA", ! "P c #69ACBD", ! "I c #72A3AF", ! "U c #70AAB9", ! "Y c #47A8C0", ! "T c #4BACC4", ! "R c #48AFC8", ! "E c #4BB1CA", ! "W c #56B7CF", ! "Q c #6AB3C5", ! "! c #79BDCE", ! "~ c #78C1D3", ! "^ c #78C5D9", ! "/ c gray51", ! "( c gray52", ! ") c #989898", ! "_ c gray65", ! "` c #AAAAAA", ! "' c #ACACAC", ! "] c #AEAEAE", ! "[ c gray70", ! "{ c #B7B7B7", ! "} c gray74", ! "| c #89CDDD", ! " . c #AADBE7", ! ".. c #ABDBE7", ! "X. c #C5C5C5", ! "o. c gray80", ! "O. c gray82", ! "+. c gainsboro", ! "@. c #DDDDDD", ! "#. c #CCE9F1", ! "$. c #DAEEF2", ! "%. c #E4E4E4", ! "&. c #EAEAEA", ! "*. c #ECECEC", ! "=. c #EEF8FA", ! "-. c #F3F3F3", ! ";. c #F4F4F4", ! ":. c #F6F6F6", ! ">. c gray97", ! ",. c #F8F8F8", ! "<. c gray99", ! "1. c #FDFDFD", ! "2. c #FEFEFE", ! "3. c gray100", ! /* pixels */ ! "3.3.3.3.3.3.3.:.O.,.3.3.", ! "3.3.3.3.#. .^ K d @.3.3.", ! ",.j A B B N y e O [ 3.3.", ! "1.x > : # @ ; e , ) 3.3.", ! "3.A * c G Q E b l a 3.3.", ! "<.[ p v b b b b h : 3.3.", ! "<.+.o I b b b m Z a *.3.", ! "3.-.s S L J i 0 = o.3.", ! "3.3.2 O $ < 3 i t ] 3.", ! "3.3.l 9 H P T n E 0 d 3.", ! "3.3._ 9 ~ b b b b u ( ,.", ! "3.3.X.8 V b b b b D ; &.", ! "3.3.%.2 C U M z q & w O.", ! "3.3.:.2 % @ # > 5 6 = ` ", ! "3.3.3./ r F ! W | .} &.", ! "3.3.3.` ) $.=.3.3.3.3.3." ! }; --- 1,116 ---- /* XPM */ ! static char * cinema_xpm[] = { ! "12 16 97 2", ! " c None", ! ". c #FFFFFF", ! "+ c #F6F6F6", ! "@ c #D1D1D1", ! "# c #F8F8F8", ! "$ c #CCE9F1", ! "% c #AADBE7", ! "& c #78C5D9", ! "* c #67A1AF", ! "= c #696969", ! "- c #DDDDDD", ! "; c #707070", ! "> c #7B8E93", ! ", c #4299AF", ! "' c #5F8F9B", ! ") c #466D76", ! "! c #525252", ! "~ c #0E0E0E", ! "{ c #B3B3B3", ! "] c #FDFDFD", ! "^ c #7C7C7C", ! "/ c #2F2F2F", ! "( c #2D2D2D", ! "_ c #111111", ! ": c #101010", ! "< c #2B2B2B", ! "[ c #303030", ! "} c #989898", ! "| c #212121", ! "1 c #6B7F83", ! "2 c #679CAA", ! "3 c #6AB3C5", ! "4 c #4BB1CA", ! "5 c #2CA5C3", ! "6 c #757575", ! "7 c #646464", ! "8 c #FCFCFC", ! "9 c #606060", ! "0 c #3E9FB7", ! "a c #66797E", ! "b c #DCDCDC", ! "c c #0D0D0D", ! "d c #72A3AF", ! "e c #3CABC7", ! "f c #69909A", ! "g c #ECECEC", ! "h c #F3F3F3", ! "i c #666666", ! "j c #739097", ! "k c #60A8BA", ! "l c #7C9EA6", ! "m c #5A7278", ! "n c #404648", ! "o c #282828", ! "p c #0A0A0A", ! "q c #CCCCCC", ! "r c #3B3B3B", ! "s c #161616", ! "t c #333333", ! "u c #384B50", ! "v c #5C5C5C", ! "w c #AEAEAE", ! "x c #464646", ! "y c #6C9CA8", ! "z c #69ACBD", ! "A c #4BACC4", ! "B c #34A8C5", ! "C c #A6A6A6", ! "D c #78C1D3", ! "E c #576F75", ! "F c #858585", ! "G c #C5C5C5", ! "H c #414141", ! "I c #5FA8BA", ! "J c #7D959B", ! "K c #EAEAEA", ! "L c #E4E4E4", ! "M c #658B95", ! "N c #70AAB9", ! "O c #588894", ! "P c #707A7C", ! "Q c #4C4C4C", ! "R c #1E1E1E", ! "S c #4E4E4E", ! "T c #191919", ! "U c #345158", ! "V c #3A6B77", ! "W c #AAAAAA", ! "X c #828282", ! "Y c #585858", ! "Z c #619BAA", ! "` c #79BDCE", ! " . c #56B7CF", ! ".. c #89CDDD", ! "+. c #BDBDBD", ! "@. c #DAEEF2", ! "#. c #EEF8FA", ! " . . . + @ # ", ! " . . . $ % & * = - . ", ! "# ; > , , ' ) ! ~ { . ", ! "] ^ / ( _ : < ! [ } . ", ! ". > | 1 2 3 4 5 6 7 . ", ! "8 { 9 0 5 5 5 5 a ( . ", ! "8 b c d 5 5 5 e f 7 g . ", ! " h i j k l m n o p q . ", ! " . r ~ p s t u m v w . ", ! " . 6 x y z A B 4 n = . ", ! " . C x D 5 5 5 5 E F # ", ! " . G H I 5 5 5 5 J < K ", ! " . L r M N O P Q R S @ ", ! " . + r T : _ / U V o W ", ! " . X Y Z ` ...% +.K ", ! " . W } @.#.. . . . . "}; Index: museum.xpm =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/museum.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** museum.xpm 14 Dec 2007 18:57:41 -0000 1.1 --- museum.xpm 20 Feb 2008 22:22:24 -0000 1.2 *************** *** 1,102 **** /* XPM */ ! static char *museum[] = { ! /* columns rows colors chars-per-pixel */ ! "16 15 81 1", ! " c black", ! ". c #010101", ! "X c #020202", ! "o c #040404", ! "O c #070707", ! "+ c gray3", ! "@ c gray4", ! "# c gray6", ! "$ c gray7", ! "% c gray8", ! "& c gray9", ! "* c gray10", ! "= c #1E1E1E", ! "- c gray13", ! "; c #222222", ! ": c #232323", ! "> c #313131", ! ", c #353535", ! "< c #3A3A3A", ! "1 c #3E3E3E", ! "2 c #3F3F3F", ! "3 c #444444", ! "4 c gray27", ! "5 c gray28", ! "6 c #494949", ! "7 c gray30", ! "8 c #515151", ! "9 c #565656", ! "0 c #5D5D5D", ! "q c #626262", ! "w c #646464", ! "e c #656565", ! "r c #676767", ! "t c #686868", ! "y c #6D6D6D", ! "u c gray43", ! "i c #747474", ! "p c #7C7C7C", ! "a c gray49", ! "s c #7E7E7E", ! "d c #848484", ! "f c gray53", ! "g c gray54", ! "h c gray55", ! "j c #909090", ! "k c gray57", ! "l c #929292", ! "z c gray58", ! "x c gray59", ! "c c #989898", ! "v c #9B9B9B", ! "b c gray61", ! "n c gray63", ! "m c #A2A2A2", ! "M c gray66", ! "N c #A9A9A9", ! "B c #AAAAAA", ! "V c gray67", ! "C c #ACACAC", ! "Z c #B2B2B2", ! "A c gray71", ! "S c gray72", ! "D c #B9B9B9", ! "F c #BCBCBC", ! "G c #C6C6C6", ! "H c #C8C8C8", ! "J c #CACACA", ! "K c #D8D8D8", ! "L c #DADADA", ! "P c gainsboro", ! "I c #E6E6E6", ! "U c #ECECEC", ! "Y c #EEEEEE", ! "T c gray94", ! "R c #F3F3F3", ! "E c #F4F4F4", ! "W c #F8F8F8", ! "Q c gray99", ! "! c #FDFDFD", ! "~ c #FEFEFE", ! "^ c gray100", ! /* pixels */ ! "^^^^^^^^^^^^^^^^", ! "^^^^^Ym9<fL^^^^^", ! "^^Iz4+ >fL^^", ! "^L+ A^", ! "^^bjjjjjjjjjjv^^", ! "^^y1D^W44R^J1i^^", ! "^^y%T^^8w^^^*V^^", ! "^^f$^^^0t^^^=V^^", ! "^^h*^^^wq^^^=V^^", ! "^^j%^^^ww^^^;V^^", ! "^^m$^^^tw^^^;V^^", ! "^^t$T^I,4^^G#p^^", ! "^T+ j^J L^j ;^^", ! "^U76gJDaaDJZzz^^", ! "^TDDDDDDDDDDDFW^" ! }; --- 1,67 ---- /* XPM */ ! static char * museum_xpm[] = { ! "16 15 49 1", ! " c None", ! ". c #FFFFFF", ! "+ c #EEEEEE", ! "@ c #A2A2A2", ! "# c #565656", ! "$ c #3A3A3A", ! "% c #878787", ! "& c #DADADA", ! "* c #E6E6E6", ! "= c #949494", ! "- c #454545", ! "; c #080808", ! "> c #000000", ! ", c #313131", ! "' c #B5B5B5", ! ") c #9C9C9C", ! "! c #909090", ! "~ c #9B9B9B", ! "{ c #6D6D6D", ! "] c #3E3E3E", ! "^ c #B9B9B9", ! "/ c #F8F8F8", ! "( c #F3F3F3", ! "_ c #CACACA", ! ": c #747474", ! "< c #141414", ! "[ c #F0F0F0", ! "} c #515151", ! "| c #646464", ! "1 c #1A1A1A", ! "2 c #ABABAB", ! "3 c #121212", ! "4 c #5D5D5D", ! "5 c #686868", ! "6 c #1E1E1E", ! "7 c #8C8C8C", ! "8 c #626262", ! "9 c #222222", ! "0 c #353535", ! "a c #C6C6C6", ! "b c #0F0F0F", ! "c c #7C7C7C", ! "d c #ECECEC", ! "e c #4D4D4D", ! "f c #494949", ! "g c #8A8A8A", ! "h c #7D7D7D", ! "i c #B2B2B2", ! "j c #BCBCBC", ! " ...... ", ! " ...+@#$%&... ", ! " .*=-;>>>>>,%&. ", ! ".&;>>>>>>>>>>>'.", ! " .)!!!!!!!!!!~. ", ! " .{]^./--(._]:. ", ! " .{<[..}|. .12. ", ! " .%3. .45. .62. ", ! " .71. .|8. .62. ", ! " .!<. .||. .92. ", ! " .@3. .5|. .92. ", ! " .53[.*0-..abc. ", ! ".[;>!._>>&.!>9. ", ! ".defg_^hh^_i==. ", ! ".[^^^^^^^^^^^j/ "}; --- NEW FILE: heliport.xpm --- /* XPM */ static char * heliport_xpm[] = { "20 12 4 1", " c None", ". c #FFFFFF", "+ c #000000", "@ c #000070", " .+. ", " ...... .+. ", ".++++++....+.. ", " ......+++++++......", ". ..++...++++++", "@. .+@@@@@......", "@. .+@@@@ @@@. ", "@@....@@@@@@ @. ", "@@@@@@@@@@@@ @.", "........@@@@ @.", " .@@@@@ @@.", " ..@@@@@@@. "}; Index: shopping.xpm =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/shopping.xpm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shopping.xpm 19 Feb 2008 00:42:46 -0000 1.2 --- shopping.xpm 20 Feb 2008 22:22:24 -0000 1.3 *************** *** 1,22 **** /* XPM */ static char * shopping_xpm[] = { ! "16 16 3 1", " c None", ". c #FFFFFF", "+ c #000000", ! " ", ! " ..... ", ! " .+++.......... ", ! " .+..+++++++++. ", ! " .+.........+. ", ! " .+.+.+.+.+.+. ", ! " .+.........+. ", ! " .+..+.+.+.+. ", ! " .+.......+. ", ! " .++++++++. ", ! " ......... ", ! " .+........ ", ! " .++++++++. ", ! " .++....++. ", ! " .... .... ", ! " "}; --- 1,20 ---- /* XPM */ static char * shopping_xpm[] = { ! "14 14 3 1", " c None", ". c #FFFFFF", "+ c #000000", ! " ... ", ! ".+++......... ", ! ".+..+++++++++.", ! " .+.........+.", ! " .+.+.+.+.+.+.", ! " .+.........+.", ! " .+..+.+.+.+. ", ! " .+.......+. ", ! " .++++++++. ", ! " ........ ", ! " .+....... ", ! " .++++++++. ", ! " .++....++. ", ! " .. .. "}; Index: bar.xpm =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/bar.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bar.xpm 14 Dec 2007 18:57:41 -0000 1.1 --- bar.xpm 20 Feb 2008 22:22:24 -0000 1.2 *************** *** 1,70 **** /* XPM */ ! static char *bar[] = { ! /* columns rows colors chars-per-pixel */ ! "16 16 48 1", ! " c #2D63D2", ! ". c #2D63D3", ! "X c #2F65D3", ! "o c #3869CF", ! "O c #3066D3", ! "+ c #3166D3", ! "@ c #3368D4", ! "# c #3B6CD2", ! "$ c #3D6ED1", ! "% c #4172D5", ! "& c #4273D6", ! "* c #4374D7", ! "= c #4474D7", ! "- c #688FDF", ! "; c #6990DF", ! ": c #8FA1C4", ! "> c #8CAAE6", ! ", c #95B0E8", ! "< c #97B2E9", ! "1 c #98B3E9", ! "2 c #99B4E9", ! "3 c #B0BBD2", ! "4 c #BDC8DF", ! "5 c #AFC0E4", ! "6 c #AAC0EC", ! "7 c #ACC2ED", ! "8 c #B0C2E8", ! "9 c #B3C6EB", ! "0 c #B4C6EA", ! "q c #B8CAEE", ! "w c #B9CBEE", ! "e c #B9CBEF", ! "r c #BACCEF", ! "t c #BACCF0", ! "y c #F4F4F3", ! "u c gray97", ! "i c #F3F5F9", ! "p c #F5F8FD", ! "a c #F9F8F7", ! "s c #F9F9F8", ! "d c #FBFBFB", ! "f c #FCFDFD", ! "g c #FDFDFD", ! "h c #FDFEFD", ! "j c #FEFEFD", ! "k c #FEFEFE", ! "l c #FEFEFF", ! "z c gray100", ! /* pixels */ ! "zzzzzzzzzzzzzzzz", ! "zzi6222222222<7p", ! "zzz9o.XXXXXXXo8z", ! "zzzu:$+@@@@O%5dz", ! "zzzzuw*X@@O$tzzz", ! "zzzzzzw%OO%9zzzz", ! "zzzzzzzw==qzzzzz", ! "zzzzzzzz>>zzzzzz", ! "zzzzzzzz<,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzzz,,zzzzzz", ! "zzzzzzu4--3yzzzz" ! }; --- 1,52 ---- /* XPM */ ! static char * bar_xpm[] = { ! "14 16 33 1", ! " c None", ! ". c #FFFFFF", ! "+ c #F3F5F9", ! "@ c #AAC0EC", ! "# c #99B4E9", ! "$ c #97B2E9", ! "% c #ACC2ED", ! "& c #F5F8FD", ! "* c #B3C6EB", ! "= c #3869CF", ! "- c #2D63D3", ! "; c #2F65D3", ! "> c #B0C2E8", ! ", c #F7F7F7", ! "' c #8FA1C4", ! ") c #3D6ED1", ! "! c #3166D3", ! "~ c #3368D4", ! "{ c #3066D3", ! "] c #4172D5", ! "^ c #AFC0E4", ! "/ c #FBFBFB", ! "( c #B9CBEE", ! "_ c #4374D7", ! ": c #BACCF0", ! "< c #4474D7", ! "[ c #B8CAEE", ! "} c #8CAAE6", ! "| c #95B0E8", ! "1 c #BDC8DF", ! "2 c #688FDF", ! "3 c #B0BBD2", ! "4 c #F4F4F3", ! " ............ ", ! "+@#########$%&", ! ".*=-;;;;;;;=>.", ! " ,')!~~~~{]^/ ", ! " ,(_;~~{):. ", ! " .(]{{]*. ", ! " .(<<[. ", ! " .}}. ", ! " .$|. ", ! " .||. ", ! " .||. ", ! " .||. ", ! " .||. ", ! " .||. ", ! " .||. ", ! " ,12234 "}; Index: telephone.xpm =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/telephone.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** telephone.xpm 14 Dec 2007 18:57:41 -0000 1.1 --- telephone.xpm 20 Feb 2008 22:22:24 -0000 1.2 *************** *** 1,51 **** /* XPM */ ! static char *telephone[] = { ! /* columns rows colors chars-per-pixel */ ! "9 10 35 1", ! " c black", ! ". c gray6", ! "X c #161616", ! "o c gray15", ! "O c #282828", ! "+ c #373737", ! "@ c gray25", ! "# c #464646", ! "$ c #515151", ! "% c #535353", ! "& c #555555", ! "* c #606060", ! "= c gray46", ! "- c gray50", ! "; c #838383", ! ": c #9B9B9B", ! "> c gray63", ! ", c #A2A2A2", ! "< c #A9A9A9", ! "1 c #C8C8C8", ! "2 c gray83", ! "3 c #DDDDDD", ! "4 c #DFDFDF", ! "5 c #E4E4E4", ! "6 c #E9E9E9", ! "7 c #EEEEEE", ! "8 c gray96", ! "9 c #F6F6F6", ! "0 c gray97", ! "q c #F9F9F9", ! "w c gray98", ! "e c gray99", ! "r c #FDFDFD", ! "t c #FEFEFE", ! "y c gray100", ! /* pixels */ ! "yyy88yyyy", ! "yy;#&yyyy", ! "y7X@=yyyy", ! "y4 1wyyyy", ! "y6.:yyyyy", ! "yy+owyyyy", ! "yy> <y5yy", ! "yy8%o-%>y", ! "yyy8% o-y", ! "yyyyy42yy" ! }; --- 1,38 ---- /* XPM */ ! static char * telephone_xpm[] = { ! "9 10 25 1", ! " c None", ! ". c #FFFFFF", ! "+ c #F5F5F5", ! "@ c #838383", ! "# c #464646", ! "$ c #555555", ! "% c #EEEEEE", ! "& c #161616", ! "* c #404040", ! "= c #757575", ! "- c #DFDFDF", ! "; c #000000", ! "> c #C8C8C8", ! ", c #FAFAFA", ! "' c #E9E9E9", ! ") c #0F0F0F", ! "! c #9B9B9B", ! "~ c #373737", ! "{ c #262626", ! "] c #A1A1A1", ! "^ c #A9A9A9", ! "/ c #E4E4E4", ! "( c #535353", ! "_ c #7F7F7F", ! ": c #D4D4D4", ! " ..++. ", ! "..@#$.. ", ! ".%&*=.. ", ! ".-;>,. ", ! ".')!... ", ! "..~{,... ", ! "..];^./..", ! " .+({_(].", ! " ..+(;{_.", ! " ...-:.."}; |
|
From: Martin S. <mar...@us...> - 2008-02-20 17:04:13
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2065 Modified Files: main.c Log Message: Add:Core:Issue a warning when LC_ALL is set Index: main.c =================================================================== RCS file: /cvsroot/navit/navit/src/main.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** main.c 18 Feb 2008 15:40:13 -0000 1.28 --- main.c 20 Feb 2008 17:04:16 -0000 1.29 *************** *** 186,189 **** --- 186,191 ---- debug_init(); + if (getenv("LC_ALL")) + dbg(0,"Warning: LC_ALL is set, this might lead to problems\n"); #ifndef USE_PLUGINS extern void builtin_init(void); |
|
From: Martin S. <mar...@us...> - 2008-02-20 16:55:23
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30427 Modified Files: no.po Log Message: Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** no.po 14 Feb 2008 20:16:25 -0000 1.17 --- no.po 20 Feb 2008 16:55:25 -0000 1.18 *************** *** 9,13 **** "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2008-01-11 09:52+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" --- 9,13 ---- "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-18 18:06+0100\n" "PO-Revision-Date: 2008-01-11 09:52+0100\n" [...1592 lines suppressed...] + #. 716 + #: ../src/country.c:269 + msgid "Zimbabwe" + msgstr "" + #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 *************** *** 656,659 **** --- 1684,1693 ---- msgstr "" + #~ msgid "Moldova" + #~ msgstr "Moldova" + + #~ msgid "Palestinia" + #~ msgstr "Palestina" + #~ msgid "RouteGraph" #~ msgstr "Rutegraf" |
|
From: Matt C. <mat...@us...> - 2008-02-20 12:12:23
|
Update of /cvsroot/navit/navit/src/speech/speech_dispatcher In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4387 Modified Files: Makefile.am Log Message: Fix:speech:Fix dependencies for speechd Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/speech/speech_dispatcher/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 3 Jan 2008 11:13:38 -0000 1.2 --- Makefile.am 20 Feb 2008 12:12:21 -0000 1.3 *************** *** 3,4 **** --- 3,6 ---- modulespeech_LTLIBRARIES = libspeech_speech_dispatcher.la libspeech_speech_dispatcher_la_SOURCES = speech_speech_dispatcher.c + libspeech_speech_dispatcher_la_LIBADD = @SPEECHD_LIBS@ + |
|
From: Michael F. <ho...@us...> - 2008-02-19 13:32:26
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29669 Modified Files: navit.c Log Message: Core:Fix:Remove dead code Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** navit.c 19 Feb 2008 13:23:24 -0000 1.83 --- navit.c 19 Feb 2008 13:32:28 -0000 1.84 *************** *** 609,653 **** struct navit *global_navit; - - /** - * Deprecated - */ - static void - navit_debug(struct navit *this_) - { - #if 0 - struct attr attr; - #include "search.h" - struct search_list *sl; - struct search_list_result *res; - - debug_level_set("data_mg:town_search_get_item",9); - debug_level_set("data_mg:town_search_compare",9); - debug_level_set("data_mg:tree_search_next",9); - debug_level_set("data_mg:map_search_new_mg",9); - sl=search_list_new(this_->mapsets->data); - attr.type=attr_country_all; - attr.u.str="Fra"; - search_list_search(sl, &attr, 1); - while ((res=search_list_get_result(sl))) { - printf("country result\n"); - } - attr.type=attr_town_name; - attr.u.str="seclin"; - search_list_search(sl, &attr, 1); - while ((res=search_list_get_result(sl))) { - printf("town result\n"); - } - attr.type=attr_street_name; - attr.u.str="rue"; - search_list_search(sl, &attr, 1); - while ((res=search_list_get_result(sl))) { - printf("street result\n"); - } - search_list_destroy(sl); - exit(0); - #endif - } - void navit_add_menu_layouts(struct navit *this_, struct menu *men) --- 609,612 ---- *************** *** 1193,1197 **** navit_window_items_new(this_); #endif - navit_debug(this_); callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_); } --- 1152,1155 ---- |
|
From: KaZeR <ka...@us...> - 2008-02-19 13:23:23
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25856/src Modified Files: item.h Log Message: Fix:Core:Fix compilation issues after merging callback lists Index: item.h =================================================================== RCS file: /cvsroot/navit/navit/src/item.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** item.h 20 Nov 2007 20:01:50 -0000 1.8 --- item.h 19 Feb 2008 13:23:26 -0000 1.9 *************** *** 61,67 **** /* end of prototypes */ - #endif #ifdef __cplusplus } #endif --- 61,70 ---- /* end of prototypes */ #ifdef __cplusplus } + /* __cplusplus */ + #endif + + /* NAVIT_ITEM_H */ #endif |
13 messages has been excluded from this view by a project administrator.
