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-01-16 20:41:10
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6759 Modified Files: osm2navit.c Log Message: Fix:Tools:Fixed crashes in osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** osm2navit.c 16 Jan 2008 17:26:48 -0000 1.31 --- osm2navit.c 16 Jan 2008 20:41:08 -0000 1.32 *************** *** 943,947 **** static void ! tile_extend(char *tile, struct item_bin *ib) { struct tile_head *th=NULL; --- 943,947 ---- static void ! tile_extend(char *tile, struct item_bin *ib, GList **tiles_list) { struct tile_head *th=NULL; *************** *** 964,967 **** --- 964,969 ---- if (tile_hash2) g_hash_table_insert(tile_hash2, th->name, th); + if (tiles_list) + *tiles_list=g_list_append(*tiles_list, th->name); processed_tiles++; if (debug_tile(tile)) *************** *** 1060,1063 **** --- 1062,1069 ---- th=g_hash_table_lookup(tile_hash, tile); if (th) { + if (th->process != 0 && th->process != 1) { + fprintf(stderr,"error with tile '%s' of length %d\n", tile, strlen(tile)); + abort(); + } if (! th->process) return; *************** *** 1154,1158 **** #endif if (phase == 3) ! tile_extend(buffer, ib); else write_item(buffer, ib); --- 1160,1164 ---- #endif if (phase == 3) ! tile_extend(buffer, ib, NULL); else write_item(buffer, ib); *************** *** 1171,1175 **** static void ! index_submap_add(int phase, struct tile_head *th) { struct index_item ii; --- 1177,1181 ---- static void ! index_submap_add(int phase, struct tile_head *th, GList **tiles_list) { struct index_item ii; *************** *** 1199,1203 **** if (phase == 3) ! tile_extend(index_tile, (struct item_bin *)&ii); else write_item(index_tile, (struct item_bin *)&ii); --- 1205,1209 ---- if (phase == 3) ! tile_extend(index_tile, (struct item_bin *)&ii, tiles_list); else write_item(index_tile, (struct item_bin *)&ii); *************** *** 1329,1333 **** } if (th->name[0]) ! index_submap_add(phase, th); processed_tiles++; } --- 1335,1339 ---- } if (th->name[0]) ! index_submap_add(phase, th, &tiles_list); processed_tiles++; } |
|
From: Martin S. <mar...@us...> - 2008-01-16 18:21:49
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10044 Modified Files: log.c Log Message: Fix:Core:Write a proper end to the logfiles even if navit crashes Index: log.c =================================================================== RCS file: /cvsroot/navit/navit/src/log.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** log.c 26 Dec 2007 10:39:48 -0000 1.6 --- log.c 16 Jan 2008 18:21:52 -0000 1.7 *************** *** 79,83 **** { if (this_->trailer.len) ! fwrite(this_->header.data, 1, this_->trailer.len, this_->f); fflush(this_->f); fclose(this_->f); --- 79,83 ---- { if (this_->trailer.len) ! fwrite(this_->trailer.data, 1, this_->trailer.len, this_->f); fflush(this_->f); fclose(this_->f); *************** *** 88,91 **** --- 88,92 ---- log_flush(struct log *this_) { + long pos; if (this_->empty) { if (this_->header.len) *************** *** 95,98 **** --- 96,107 ---- } fwrite(this_->data.data, 1, this_->data.len, this_->f); + if (this_->trailer.len) { + pos=ftell(this_->f); + if (pos > 0) { + fwrite(this_->trailer.data, 1, this_->trailer.len, this_->f); + fseek(this_->f, pos, SEEK_SET); + } + } + fflush(this_->f); g_free(this_->data.data); |
|
From: Martin S. <mar...@us...> - 2008-01-16 17:27:32
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18483 Modified Files: osm2navit.c Log Message: Fix:Tools:First step in making zoom out faster Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** osm2navit.c 15 Jan 2008 22:32:49 -0000 1.30 --- osm2navit.c 16 Jan 2008 17:26:48 -0000 1.31 *************** *** 1177,1180 **** --- 1177,1182 ---- char index_tile[len+1]; + ii.min=(len > 4) ? len-4 : 0; + ii.max=255; strcpy(index_tile, th->name); if (len > 6) *************** *** 1191,1196 **** ii.attr_order_limit.len=2; ii.attr_order_limit.type=attr_order_limit; - ii.min=0; - ii.max=0; ii.attr_zipfile_ref.len=2; --- 1193,1196 ---- |
|
From: Albert L F. <af...@us...> - 2008-01-15 22:32:46
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14168 Modified Files: osm2navit.c Log Message: Add:tools/osm2navit:Add --input-file option Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** osm2navit.c 15 Jan 2008 16:44:14 -0000 1.29 --- osm2navit.c 15 Jan 2008 22:32:49 -0000 1.30 *************** *** 262,266 **** int l; l=strlen(buffer)+1; ! while (l % 4) buffer[l++]='\0'; a->len=l/4+1; --- 262,266 ---- int l; l=strlen(buffer)+1; ! while (l % 4) buffer[l++]='\0'; a->len=l/4+1; *************** *** 342,346 **** level=5; } ! if (! strcmp(k,"note")) level=5; if (! strcmp(k,"name")) { --- 342,346 ---- level=5; } ! if (! strcmp(k,"note")) level=5; if (! strcmp(k,"name")) { *************** *** 371,379 **** node_is_tagged=1; } ! if (level < 6) node_is_tagged=1; if (level >= 5) return; ! if (in_way) value_hash=g_hash_table_lookup(way_key_hash, k); else --- 371,379 ---- node_is_tagged=1; } ! if (level < 6) node_is_tagged=1; if (level >= 5) return; ! if (in_way) value_hash=g_hash_table_lookup(way_key_hash, k); else *************** *** 467,471 **** exit(1); } ! } --- 467,471 ---- exit(1); } ! } *************** *** 478,482 **** int i,count=node_buffer.size/sizeof(struct node_item); struct node_item *ni=(struct node_item *)node_buffer.base; ! for (i = 0 ; i < count ; i++) g_hash_table_insert(node_hash, (gpointer)(ni[i].id), (gpointer)i); } --- 478,482 ---- int i,count=node_buffer.size/sizeof(struct node_item); struct node_item *ni=(struct node_item *)node_buffer.base; ! for (i = 0 ; i < count ; i++) g_hash_table_insert(node_hash, (gpointer)(ni[i].id), (gpointer)i); } *************** *** 487,491 **** add_node(int id, double lat, double lon) { ! if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced) extend_buffer(&node_buffer); node_is_tagged=0; --- 487,491 ---- add_node(int id, double lat, double lon) { ! if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced) extend_buffer(&node_buffer); node_is_tagged=0; *************** *** 513,517 **** } } else ! if (!g_hash_table_lookup(node_hash, (gpointer)(ni->id))) g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base)); else { --- 513,517 ---- } } else ! if (!g_hash_table_lookup(node_hash, (gpointer)(ni->id))) g_hash_table_insert(node_hash, (gpointer)(ni->id), (gpointer)(ni-(struct node_item *)node_buffer.base)); else { *************** *** 654,660 **** alen+=street_name_systematic_attr.len+1; if (debug_attr.len) ! alen+=debug_attr.len+1; if (flags_attr.len) ! alen+=flags_attr.len+1; item.clen=coord_count*2; item.len=item.clen+2+alen; --- 654,660 ---- alen+=street_name_systematic_attr.len+1; if (debug_attr.len) ! alen+=debug_attr.len+1; if (flags_attr.len) ! alen+=flags_attr.len+1; item.clen=coord_count*2; item.len=item.clen+2+alen; *************** *** 675,681 **** pad_text_attr(&debug_attr, debug_attr_buffer); if (label_attr.len) ! alen+=label_attr.len+1; if (debug_attr.len) ! alen+=debug_attr.len+1; item.clen=2; item.len=item.clen+2+alen; --- 675,681 ---- pad_text_attr(&debug_attr, debug_attr_buffer); if (label_attr.len) ! alen+=label_attr.len+1; if (debug_attr.len) ! alen+=debug_attr.len+1; item.clen=2; item.len=item.clen+2+alen; *************** *** 704,708 **** len=strlen(p); if (len > 0 && p[len-1]=='\n') ! p[len-1]='\0'; fprintf(stderr,"WARNING: way %d: node %d not found (%s)\n",wayid,ref,p); } --- 704,708 ---- len=strlen(p); if (len > 0 && p[len-1]=='\n') ! p[len-1]='\0'; fprintf(stderr,"WARNING: way %d: node %d not found (%s)\n",wayid,ref,p); } *************** *** 726,730 **** static void save_buffer(char *filename, struct buffer *b) ! { FILE *f; f=fopen(filename,"wb+"); --- 726,730 ---- static void save_buffer(char *filename, struct buffer *b) ! { FILE *f; f=fopen(filename,"wb+"); *************** *** 737,741 **** { FILE *f; ! if (b->base) free(b->base); b->malloced=0; --- 737,741 ---- { FILE *f; ! if (b->base) free(b->base); b->malloced=0; *************** *** 768,789 **** } else if (!strncmp(p, "<bound ",7)) { } else if (!strncmp(p, "<node ",6)) { ! if (!parse_node(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); in_node=1; processed_nodes++; } else if (!strncmp(p, "<tag ",5)) { ! if (!parse_tag(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); } else if (!strncmp(p, "<way ",5)) { in_way=1; ! if (!parse_way(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); processed_ways++; } else if (!strncmp(p, "<nd ",4)) { ! if (!parse_nd(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); } else if (!strncmp(p, "<relation ",10)) { in_relation=1; ! if (!parse_relation(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); processed_relations++; --- 768,789 ---- } else if (!strncmp(p, "<bound ",7)) { } else if (!strncmp(p, "<node ",6)) { ! if (!parse_node(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); in_node=1; processed_nodes++; } else if (!strncmp(p, "<tag ",5)) { ! if (!parse_tag(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); } else if (!strncmp(p, "<way ",5)) { in_way=1; ! if (!parse_way(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); processed_ways++; } else if (!strncmp(p, "<nd ",4)) { ! if (!parse_nd(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); } else if (!strncmp(p, "<relation ",10)) { in_relation=1; ! if (!parse_relation(p)) fprintf(stderr,"WARNING: failed to parse %s\n", buffer); processed_relations++; *************** *** 814,818 **** read_item(FILE *in) { ! struct item_bin *ib=(struct item_bin *) buffer; int r,s; r=fread(ib, sizeof(*ib), 1, in); --- 814,818 ---- read_item(FILE *in) { ! struct item_bin *ib=(struct item_bin *) buffer; int r,s; r=fread(ib, sizeof(*ib), 1, in); *************** *** 834,838 **** return; r->l=*c; ! r->h=*c; while (--count) { c++; --- 834,838 ---- return; r->l=*c; ! r->h=*c; while (--count) { c++; *************** *** 904,908 **** x0=x2; y0=y2; ! } else return; } --- 904,908 ---- x0=x2; y0=y2; ! } else return; } *************** *** 946,950 **** { struct tile_head *th=NULL; ! if (debug_tile(tile)) fprintf(stderr,"Tile:Writing %d bytes to '%s' (%p,%p)\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL); if (tile_hash2) --- 946,950 ---- { struct tile_head *th=NULL; ! if (debug_tile(tile)) fprintf(stderr,"Tile:Writing %d bytes to '%s' (%p,%p)\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL); if (tile_hash2) *************** *** 965,973 **** g_hash_table_insert(tile_hash2, th->name, th); processed_tiles++; ! if (debug_tile(tile)) fprintf(stderr,"new '%s'\n", tile); } th->total_size+=ib->len*4+4; ! if (debug_tile(tile)) fprintf(stderr,"New total size of %s(%p):%d\n", th->name, th, th->total_size); g_hash_table_insert(tile_hash, th->name, th); --- 965,973 ---- g_hash_table_insert(tile_hash2, th->name, th); processed_tiles++; ! if (debug_tile(tile)) fprintf(stderr,"new '%s'\n", tile); } th->total_size+=ib->len*4+4; ! if (debug_tile(tile)) fprintf(stderr,"New total size of %s(%p):%d\n", th->name, th, th->total_size); g_hash_table_insert(tile_hash, th->name, th); *************** *** 992,996 **** if (! ths) return 0; ! if (debug_tile(base) || debug_tile(sub)) fprintf(stderr,"merging '%s'(%p) (%d) with '%s'(%p) (%d)\n", base, thb, thb ? thb->total_size : 0, sub, ths, ths->total_size); if (! thb) { --- 992,996 ---- if (! ths) return 0; ! if (debug_tile(base) || debug_tile(sub)) fprintf(stderr,"merging '%s'(%p) (%d) with '%s'(%p) (%d)\n", base, thb, thb ? thb->total_size : 0, sub, ths, ths->total_size); if (! thb) { *************** *** 1000,1004 **** thb->name=g_strdup(base); g_hash_table_insert(tile_hash, thb->name, thb); ! } else { thb=realloc(thb, sizeof(*thb)+ths->size+thb->size); --- 1000,1004 ---- thb->name=g_strdup(base); g_hash_table_insert(tile_hash, thb->name, thb); ! } else { thb=realloc(thb, sizeof(*thb)+ths->size+thb->size); *************** *** 1062,1066 **** if (! th->process) return; ! if (debug_tile(tile)) fprintf(stderr,"Data:Writing %d bytes to '%s' (%p,%p)\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL); size=(ib->len+1)*4; --- 1062,1066 ---- if (! th->process) return; ! if (debug_tile(tile)) fprintf(stderr,"Data:Writing %d bytes to '%s' (%p,%p)\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL); size=(ib->len+1)*4; *************** *** 1198,1204 **** ii.zipfile_ref=th->zipnum; ! if (phase == 3) tile_extend(index_tile, (struct item_bin *)&ii); ! else write_item(index_tile, (struct item_bin *)&ii); #if 0 --- 1198,1204 ---- ii.zipfile_ref=th->zipnum; ! if (phase == 3) tile_extend(index_tile, (struct item_bin *)&ii); ! else write_item(index_tile, (struct item_bin *)&ii); #if 0 *************** *** 1208,1212 **** fprintf(stderr,"%08x ", c[i]); } ! fprintf(stderr,"\n"); #endif } --- 1208,1212 ---- fprintf(stderr,"%08x ", c[i]); } ! fprintf(stderr,"\n"); #endif } *************** *** 1255,1259 **** } ! static void create_tile_hash_list(GList *list) { --- 1255,1259 ---- } ! static void create_tile_hash_list(GList *list) { *************** *** 1277,1281 **** static void destroy_tile_hash(void) ! { g_hash_table_destroy(tile_hash2); tile_hash2=NULL; --- 1277,1281 ---- static void destroy_tile_hash(void) ! { g_hash_table_destroy(tile_hash2); tile_hash2=NULL; *************** *** 1298,1302 **** if (! maxlen) { while (next) { ! if (strlen(next->data) > maxlen) maxlen=strlen(next->data); next=g_list_next(next); --- 1298,1302 ---- if (! maxlen) { while (next) { ! if (strlen(next->data) > maxlen) maxlen=strlen(next->data); next=g_list_next(next); *************** *** 1322,1326 **** while (dlen > 0) { fprintf(out,":%s", data); ! while (*data++) dlen--; dlen--; --- 1322,1326 ---- while (dlen > 0) { fprintf(out,":%s", data); ! while (*data++) dlen--; dlen--; *************** *** 1347,1351 **** int i,i_min,len,size_all,size[5],size_min,work_done; long long zip_size; ! do { tiles_list_sorted=get_tiles_list(); --- 1347,1351 ---- int i,i_min,len,size_all,size[5],size_min,work_done; long long zip_size; ! do { tiles_list_sorted=get_tiles_list(); *************** *** 1431,1435 **** return 0; ! } --- 1431,1435 ---- return 0; ! } *************** *** 1638,1642 **** th=th->next; } ! if (size) fprintf(stderr,"Slice %d is of size %d\n", slices, size); th=tile_head_root; --- 1638,1642 ---- th=th->next; } ! if (size) fprintf(stderr,"Slice %d is of size %d\n", slices, size); th=tile_head_root; *************** *** 1659,1663 **** } fseek(dir_out, 0, SEEK_SET); ! cat(dir_out, out); eoc.zipenum=zipfiles; eoc.zipecenn=zipfiles; --- 1659,1663 ---- } fseek(dir_out, 0, SEEK_SET); ! cat(dir_out, out); eoc.zipenum=zipfiles; eoc.zipecenn=zipfiles; *************** *** 1667,1671 **** sig_alrm(0); alarm(0); ! return 0; } --- 1667,1671 ---- sig_alrm(0); alarm(0); ! return 0; } *************** *** 1686,1689 **** --- 1686,1690 ---- 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,"-i (--input-file) : specify the input file name (OSM), overrules default stdin\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"); *************** *** 1700,1703 **** --- 1701,1707 ---- int compression_level=9; char *result; + FILE* input_file = stdin; + + while (1) { #if 0 *************** *** 1714,1717 **** --- 1718,1722 ---- {"nodes-only", 0, 0, 'N'}, {"start", 1, 0, 's'}, + {"input-file", 1, 0, 'i'}, {"ways-only", 0, 0, 'W'}, {0, 0, 0, 0} *************** *** 1749,1752 **** --- 1754,1765 ---- dedupe_ways_hash=g_hash_table_new(NULL, NULL); break; + case 'i': + input_file = fopen( optarg, "r" ); + if ( input_file == NULL ) + { + fprintf( stderr, "\nInput file (%s) not found\n", optarg ); + exit( -1 ); + } + break; case 'z': compression_level=atoi(optarg); *************** *** 1757,1764 **** default: fprintf(stderr,"c=%d\n", c); ! } } ! if (optind != argc-1) usage(stderr); result=argv[optind]; --- 1770,1777 ---- default: fprintf(stderr,"c=%d\n", c); ! } } ! if (optind != argc-1) usage(stderr); result=argv[optind]; *************** *** 1773,1777 **** phase=1; fprintf(stderr,"PROGRESS: Phase 1: collecting data\n"); ! phase1(stdin,ways,nodes); if (ways) fclose(ways); --- 1786,1790 ---- phase=1; fprintf(stderr,"PROGRESS: Phase 1: collecting data\n"); ! phase1(input_file,ways,nodes); if (ways) fclose(ways); *************** *** 1779,1787 **** fclose(nodes); } ! if (end == 1 || dump_coordinates) save_buffer("coords.tmp",&node_buffer); if (end == 1) exit(0); ! if (start == 2) load_buffer("coords.tmp",&node_buffer); if (start <= 2) { --- 1792,1800 ---- fclose(nodes); } ! if (end == 1 || dump_coordinates) save_buffer("coords.tmp",&node_buffer); if (end == 1) exit(0); ! if (start == 2) load_buffer("coords.tmp",&node_buffer); if (start <= 2) { *************** *** 1796,1800 **** if(!keep_tmpfiles) remove("ways.tmp"); ! } else fprintf(stderr,"PROGRESS: Skipping Phase 2\n"); } --- 1809,1813 ---- if(!keep_tmpfiles) remove("ways.tmp"); ! } else fprintf(stderr,"PROGRESS: Skipping Phase 2\n"); } |
|
From: Albert L F. <af...@us...> - 2008-01-15 19:55:58
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10225 Modified Files: Navit.cbp Navit.workspace data_textfile.cbp Added Files: Gpx2Navit.cbp Log Message: Add:projs/CodeBlocks:support for data/textfile Index: data_textfile.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/data_textfile.cbp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** data_textfile.cbp 15 Jan 2008 19:36:12 -0000 1.1 --- data_textfile.cbp 15 Jan 2008 19:55:59 -0000 1.2 *************** *** 43,47 **** <Add option="-mms-bitfields" /> <Add option="-DBUILD_DLL" /> ! <Add option="-DMODULE=textfile" /> <Add directory="%GTK_DIR%\include\glib-2.0" /> <Add directory="%GTK_DIR%\lib\glib-2.0\include" /> --- 43,47 ---- <Add option="-mms-bitfields" /> <Add option="-DBUILD_DLL" /> ! <Add option="-DMODULE=data_textfile" /> <Add directory="%GTK_DIR%\include\glib-2.0" /> <Add directory="%GTK_DIR%\lib\glib-2.0\include" /> *************** *** 60,66 **** <Add directory="%GTK_DIR%\lib" /> </Linker> ! <Unit filename="..\..\src\data\poi_geodownload\poi_geodownload.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> --- 60,67 ---- <Add directory="%GTK_DIR%\lib" /> </Linker> ! <Unit filename="..\..\src\data\textfile\textfile.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="..\..\src\data\textfile\textfile.h" /> <Extensions> <code_completion /> --- NEW FILE: Gpx2Navit.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="Gpx2Navit" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="bin\Debug\gpx2navit" prefix_auto="1" extension_auto="1" /> <Option working_dir="bin\Debug" /> <Option object_output="obj\gpx2navit\Debug\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Option parameters="--input-file=d:\CB_Projects\netherlands.osm --attr-debug-level=0 -k netherlands.bin" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="%GTK_DIR%\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output="bin\Release\gpx2navit" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\gpx2navit\Release\" /> <Option type="1" /> <Option compiler="gcc" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="%GTK_DIR%\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields -DMODULE=osm2navit" /> <Add directory="%GTK_DIR%\include\glib-2.0" /> <Add directory="%GTK_DIR%\lib\glib-2.0\include" /> <Add directory="%GTK_DIR%\include" /> <Add directory="Win32Extra" /> <Add directory="..\..\src\tools\gpx2navit_txt\src" /> </Compiler> <Linker> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gdk-win32-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="fib" /> <Add library="freetype" /> <Add library="z" /> <Add library="gobject-2.0" /> <Add library="gmodule-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> <Add library="zdll" /> <Add directory="%GTK_DIR%\lib" /> </Linker> <Unit filename="Win32Extra\sys\mman.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\sys\mman.h" /> <Unit filename="Win32Extra\wordexp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\wordexp.h" /> <Unit filename="..\..\src\attr.h" /> <Unit filename="..\..\src\attr_def.h" /> <Unit filename="..\..\src\coord.h" /> <Unit filename="..\..\src\country.h" /> <Unit filename="..\..\src\debug.h" /> <Unit filename="..\..\src\file.h" /> <Unit filename="..\..\src\item.h" /> <Unit filename="..\..\src\map.h" /> <Unit filename="..\..\src\param.h" /> <Unit filename="..\..\src\plugin.h" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\Makefile.am" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\elementControl.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\emess.h" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\errorcode.h" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\geod_for.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\geod_inv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\geod_set.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\geodesic.h" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\gpx2navit_txt.h" /> <Unit filename="..\..\src\tools\gpx2navit_txt\src\main.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\misc.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\parser.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\setmeta.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\setpath.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\setwpt.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\tools\gpx2navit_txt\src\utils.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\transform.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Index: Navit.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Navit.cbp 12 Jan 2008 22:38:25 -0000 1.6 --- Navit.cbp 15 Jan 2008 19:55:59 -0000 1.7 *************** *** 28,31 **** --- 28,32 ---- <Add library="bin\Debug\libspeech_speech_dispatcher.la" /> <Add library="bin\Debug\libdata_mg.la" /> + <Add library="bin\Debug\libdata_textfile.la" /> <Add library="libgarmin.a" /> <Add library="ole32" /> *************** *** 67,70 **** --- 68,72 ---- <Add library="bin\Release\libspeech_speech_dispatcher.la" /> <Add library="bin\Release\libdata_mg.la" /> + <Add library="bin\Release\libdata_textfile.la" /> <Add library="libgarmin.a" /> <Add library="ole32" /> Index: Navit.workspace =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Navit.workspace 15 Jan 2008 19:36:11 -0000 1.6 --- Navit.workspace 15 Jan 2008 19:55:59 -0000 1.7 *************** *** 4,7 **** --- 4,8 ---- <Project filename="fib-1.1.cbp" /> <Project filename="Osm2Navit.cbp" /> + <Project filename="Gpx2Navit.cbp" /> <Project filename="gentypes.cbp" /> <Project filename="data_textfile.cbp" /> *************** *** 19,24 **** --- 20,28 ---- <Project filename="Navit.cbp" active="1"> <Depends filename="fib-1.1.cbp" /> + <Depends filename="Osm2Navit.cbp" /> <Depends filename="gentypes.cbp" /> + <Depends filename="data_textfile.cbp" /> <Depends filename="binfile.cbp" /> + <Depends filename="data_mg.cbp" /> <Depends filename="data_garmin.cbp" /> <Depends filename="mdb.cbp" /> *************** *** 27,31 **** <Depends filename="vehicle_file.cbp" /> <Depends filename="gtk_gui.cbp" /> - <Depends filename="data_mg.cbp" /> <Depends filename="gtk_graphics.cbp" /> <Depends filename="speech_speech_dispatcher.cbp" /> --- 31,34 ---- |
|
From: Albert L F. <af...@us...> - 2008-01-15 19:36:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32761/Win32Extra Modified Files: builtin.c Log Message: Add:projs/CodeBlocks:support for data/textfile Index: builtin.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/builtin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** builtin.c 12 Jan 2008 22:38:25 -0000 1.3 --- builtin.c 15 Jan 2008 19:36:12 -0000 1.4 *************** *** 1,2 **** --- 1,3 ---- + extern void module_data_textfile_init(void); extern void module_data_binfile_init(void); extern void module_data_mg_init(void); *************** *** 10,13 **** --- 11,15 ---- extern void builtin_init(void); void builtin_init(void) { + module_data_textfile_init(); module_data_binfile_init(); module_data_mg_init(); |
|
From: Albert L F. <af...@us...> - 2008-01-15 19:36:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32761 Modified Files: Navit.workspace Added Files: data_textfile.cbp Log Message: Add:projs/CodeBlocks:support for data/textfile --- NEW FILE: data_textfile.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="data_textfile" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libdata_textfile.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="%GTK_DIR%\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libdata_textfile.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="%GTK_DIR%\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=textfile" /> <Add directory="%GTK_DIR%\include\glib-2.0" /> <Add directory="%GTK_DIR%\lib\glib-2.0\include" /> <Add directory="..\..\" /> <Add directory="..\" /> <Add directory="D:\CB_Projects\Navit\src\" /> <Add directory="Win32Extra" /> <Add directory="..\..\src" /> <Add directory="..\..\src\data\poi_geodownload\libmdb\include" /> </Compiler> <Linker> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="%GTK_DIR%\lib" /> </Linker> <Unit filename="..\..\src\data\poi_geodownload\poi_geodownload.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Index: Navit.workspace =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Navit.workspace 12 Jan 2008 22:38:25 -0000 1.5 --- Navit.workspace 15 Jan 2008 19:36:11 -0000 1.6 *************** *** 5,8 **** --- 5,9 ---- <Project filename="Osm2Navit.cbp" /> <Project filename="gentypes.cbp" /> + <Project filename="data_textfile.cbp" /> <Project filename="binfile.cbp" /> <Project filename="data_mg.cbp" /> |
|
From: Martin S. <mar...@us...> - 2008-01-15 16:44:16
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22783 Modified Files: osm2navit.c Log Message: Fix:Tools:Added some new types to osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** osm2navit.c 15 Jan 2008 16:05:36 -0000 1.28 --- osm2navit.c 15 Jan 2008 16:44:14 -0000 1.29 *************** *** 124,127 **** --- 124,128 ---- "w landuse forest wood\n" "w landuse industrial industry_poly\n" + "w landuse residential town_poly\n" "w leisure park park_poly\n" "w natural wood wood\n" *************** *** 138,141 **** --- 139,143 ---- "w waterway stream water_line\n" "w waterway drain water_line\n" + "w sport golf golf_course\n" }; |
|
From: Martin S. <mar...@us...> - 2008-01-15 16:05:36
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6616 Modified Files: osm2navit.c Log Message: Fix:Tools:Avoid generating useless points Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** osm2navit.c 15 Jan 2008 13:27:10 -0000 1.27 --- osm2navit.c 15 Jan 2008 16:05:36 -0000 1.28 *************** *** 303,307 **** if (! strcmp(k,"created_by")) level=9; ! if (! strncmp(k,"tiger:",6)) level=9; if (! strcmp(k,"converted_by") || ! strcmp(k,"source")) --- 303,307 ---- if (! strcmp(k,"created_by")) level=9; ! if (! strncmp(k,"tiger:",6) || !strcmp(k,"AND_nodes")) level=9; if (! strcmp(k,"converted_by") || ! strcmp(k,"source")) |
|
From: Martin S. <mar...@us...> - 2008-01-15 13:32:31
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25530 Modified Files: binfile.c Log Message: Fix:data_binfile:Reduced verbosity Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** binfile.c 3 Jan 2008 11:13:34 -0000 1.13 --- binfile.c 15 Jan 2008 13:32:35 -0000 1.14 *************** *** 123,127 **** if (type == attr_type || attr_type == attr_any) { if (attr_type == attr_any) { ! dbg(0,"pos %p attr %s size %d\n", t->pos_attr-1, attr_to_name(type), size); } attr->type=type; --- 123,127 ---- if (type == attr_type || attr_type == attr_any) { if (attr_type == attr_any) { ! dbg(1,"pos %p attr %s size %d\n", t->pos_attr-1, attr_to_name(type), size); } attr->type=type; *************** *** 182,186 **** 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: --- 182,186 ---- strncpy(buffer, zipfn, lfh->zipfnln); buffer[lfh->zipfnln]='\0'; ! dbg(1,"0x%x '%s' %d %d,%d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl, lfh->zipsize, lfh->zipuncmp); switch (lfh->zipmthd) { case 0: |
|
From: Martin S. <mar...@us...> - 2008-01-15 13:27:08
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23007 Modified Files: osm2navit.c Log Message: Fix:Tools:Fixed bounding box calculation Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** osm2navit.c 15 Jan 2008 10:34:17 -0000 1.26 --- osm2navit.c 15 Jan 2008 13:27:10 -0000 1.27 *************** *** 833,838 **** r->l=*c; r->h=*c; - c++; while (--count) { if (c->x < r->l.x) r->l.x=c->x; --- 833,838 ---- r->l=*c; r->h=*c; while (--count) { + c++; if (c->x < r->l.x) r->l.x=c->x; |
|
From: Martin S. <mar...@us...> - 2008-01-15 11:52:57
|
Update of /cvsroot/navit/navit/src/plugins/poi_geodownload/libmdb/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5735/poi_geodownload/libmdb/include Removed Files: mdbtools.h Log Message: Fix:Core:removed obsolete poi_geodownload plugin --- mdbtools.h DELETED --- |
|
From: Martin S. <mar...@us...> - 2008-01-15 11:52:56
|
Update of /cvsroot/navit/navit/src/plugins/poi_geodownload/libmdb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5735/poi_geodownload/libmdb Removed Files: Makefile.am 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 Log Message: Fix:Core:removed obsolete poi_geodownload plugin --- like.c DELETED --- --- stats.c DELETED --- --- kkd.c DELETED --- --- sargs.c DELETED --- --- table.c DELETED --- --- mem.c DELETED --- --- props.c DELETED --- --- index.c DELETED --- --- file.c DELETED --- --- catalog.c DELETED --- --- backend.c DELETED --- --- worktable.c DELETED --- --- Makefile.am DELETED --- --- iconv.c DELETED --- --- write.c DELETED --- --- data.c DELETED --- --- dump.c DELETED --- --- money.c DELETED --- --- options.c DELETED --- --- map.c DELETED --- |
|
From: Martin S. <mar...@us...> - 2008-01-15 11:52:24
|
Update of /cvsroot/navit/navit/src/plugins/poi_geodownload In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5735/poi_geodownload Removed Files: Makefile.am poi.c Log Message: Fix:Core:removed obsolete poi_geodownload plugin --- poi.c DELETED --- --- Makefile.am DELETED --- |
|
From: Martin S. <mar...@us...> - 2008-01-15 11:52:21
|
Update of /cvsroot/navit/navit/src/plugins In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5735 Removed Files: Makefile.am Log Message: Fix:Core:removed obsolete poi_geodownload plugin --- Makefile.am DELETED --- |
|
From: Martin S. <mar...@us...> - 2008-01-15 10:34:13
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15203 Modified Files: osm2navit.c Log Message: Fix:Tools:Use right type for malloc argument to avoid failing realloc Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** osm2navit.c 7 Jan 2008 23:15:41 -0000 1.25 --- osm2navit.c 15 Jan 2008 10:34:17 -0000 1.26 *************** *** 409,415 **** struct buffer { int malloced_step; ! int malloced; unsigned char *base; ! int size; }; --- 409,415 ---- struct buffer { int malloced_step; ! size_t malloced; unsigned char *base; ! size_t size; }; *************** *** 461,465 **** b->malloced+=b->malloced_step; b->base=realloc(b->base, b->malloced); ! assert(b->base != NULL); } --- 461,468 ---- b->malloced+=b->malloced_step; b->base=realloc(b->base, b->malloced); ! if (b->base == NULL) { ! fprintf(stderr,"realloc of %d bytes failed\n",b->malloced); ! exit(1); ! } } |
|
From: Martin S. <mar...@us...> - 2008-01-14 23:45:11
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24342 Modified Files: gui_gtk_statusbar.c Log Message: Fix:GTK:Prevent statusbar from crashing if direction is unusual Index: gui_gtk_statusbar.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gui_gtk_statusbar.c 14 Jan 2008 23:25:21 -0000 1.11 --- gui_gtk_statusbar.c 14 Jan 2008 23:45:08 -0000 1.12 *************** *** 123,126 **** --- 123,128 ---- direction=*(attr.u.numd); direction=fmod(direction,360); + if (direction < 0) + direction+=360; dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; |
|
From: Albert L F. <af...@us...> - 2008-01-14 23:41:30
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22635 Modified Files: libgarmin.a libgarmin.h Log Message: Fix:projs/CodeBlocks:update win32 libgarmin library files Index: libgarmin.h =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin/libgarmin.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libgarmin.h 9 Jan 2008 19:44:03 -0000 1.1 --- libgarmin.h 14 Jan 2008 23:41:34 -0000 1.2 *************** *** 14,19 **** along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ! ! */ --- 14,19 ---- along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ! ! */ *************** *** 139,143 **** struct gobject *gar_get_object(struct gar *gar, void *ptr); ! int gar_get_objects(struct gmap *gm, int level, void *select, struct gobject **ret, int flags); void gar_free_objects(struct gobject *g); --- 139,143 ---- struct gobject *gar_get_object(struct gar *gar, void *ptr); ! int gar_get_objects(struct gmap *gm, int level, void *select, struct gobject **ret, int flags); void gar_free_objects(struct gobject *g); *************** *** 178,181 **** --- 178,190 ---- #define FEET2METER(x) ((x)/3.28084) + #define POI_STREET_NUM (1<<0) + #define POI_STREET (1<<1) + #define POI_CITY (1<<2) + #define POI_ZIP (1<<3) + #define POI_PHONE (1<<4) + #define POI_EXIT (1<<5) + #define POI_TIDE_PREDICT (1<<6) + #define POI_UNKNOW (1<<7) + #ifdef __cplusplus Index: libgarmin.a =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin/libgarmin.a,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsAizuZj and /tmp/cvsOJytfM differ |
|
From: Martin S. <mar...@us...> - 2008-01-14 23:25:19
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15509 Modified Files: gui_gtk_statusbar.c Log Message: Fix:GTK:Prevent statusbar from crashing if direction is unusual Index: gui_gtk_statusbar.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gui_gtk_statusbar.c 14 Jan 2008 23:15:52 -0000 1.10 --- gui_gtk_statusbar.c 14 Jan 2008 23:25:21 -0000 1.11 *************** *** 122,126 **** if (vehicle_position_attr_get(v, attr_position_direction, &attr)) direction=*(attr.u.numd); ! direction=direction%360; dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; --- 122,126 ---- if (vehicle_position_attr_get(v, attr_position_direction, &attr)) direction=*(attr.u.numd); ! direction=fmod(direction,360); dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; |
|
From: Alexander A. <za...@us...> - 2008-01-14 23:21:15
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13786 Modified Files: debug.c debug.h profile.c Log Message: Fix: avoid unecessery strlen/strcats for debug, pass lenghts as arguments so they can be calculated at compile time, module name and __PRITY_FUNCTION__ are constant strings Index: profile.c =================================================================== RCS file: /cvsroot/navit/navit/src/profile.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** profile.c 13 Jul 2007 07:34:46 -0000 1.8 --- profile.c 14 Jan 2008 23:21:16 -0000 1.9 *************** *** 27,36 **** sprintf(buffer, "profile:%s", module); ! debug_vprintf(1, buffer, function, 1, fmt, ap); if (msec >= 100) ! debug_printf(1, buffer, function, 0, " %d msec\n", msec); else { usec=(curr.tv_usec-last[level].tv_usec)+(curr.tv_sec-last[level].tv_sec)*1000*1000; ! debug_printf(1, buffer, function, 0, " %d.%d msec\n", usec/1000, usec%1000); } gettimeofday(&last[level], NULL); --- 27,36 ---- sprintf(buffer, "profile:%s", module); ! debug_vprintf(1, buffer, strlen(buffer), function, strlen(function), 1, fmt, ap); if (msec >= 100) ! debug_printf(1, buffer, strlen(buffer), function, strlen(function), 0, " %d msec\n", msec); else { usec=(curr.tv_usec-last[level].tv_usec)+(curr.tv_sec-last[level].tv_sec)*1000*1000; ! debug_printf(1, buffer, strlen(buffer), function, strlen(function), 0, " %d.%d msec\n", usec/1000, usec%1000); } gettimeofday(&last[level], NULL); Index: debug.h =================================================================== RCS file: /cvsroot/navit/navit/src/debug.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** debug.h 3 Jan 2008 11:13:34 -0000 1.11 --- debug.h 14 Jan 2008 23:21:16 -0000 1.12 *************** *** 11,15 **** #define dbg_str1(x) dbg_str2(x) #define dbg_module dbg_str1(MODULE) ! #define dbg(level,fmt...) ({ if (debug_level >= level) debug_printf(level,dbg_module,__PRETTY_FUNCTION__,1,fmt); }) /* prototypes */ --- 11,15 ---- #define dbg_str1(x) dbg_str2(x) #define dbg_module dbg_str1(MODULE) ! #define dbg(level,fmt...) ({ if (debug_level >= level) debug_printf(level,dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),1,fmt); }) /* prototypes */ *************** *** 17,22 **** void debug_level_set(const char *name, int level); int debug_level_get(const char *name); ! void debug_vprintf(int level, const char *module, const char *function, int prefix, const char *fmt, va_list ap); ! void debug_printf(int level, const char *module, const char *function, int prefix, const char *fmt, ...); /* end of prototypes */ --- 17,22 ---- void debug_level_set(const char *name, int level); int debug_level_get(const char *name); ! void debug_vprintf(int level, const char *module, const int mlen, const char *function, const int flen, int prefix, const char *fmt, va_list ap); ! void debug_printf(int level, const char *module, const int mlen, const char *function, const int flen, int prefix, const char *fmt, ...); /* end of prototypes */ Index: debug.c =================================================================== RCS file: /cvsroot/navit/navit/src/debug.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** debug.c 8 Jul 2007 20:41:32 -0000 1.7 --- debug.c 14 Jan 2008 23:21:15 -0000 1.8 *************** *** 63,80 **** void ! debug_vprintf(int level, const char *module, const char *function, int prefix, const char *fmt, va_list ap) { ! int module_len=strlen(module); ! int function_len=strlen(function); ! char buffer[module_len+function_len+3]; ! ! strcpy(buffer, module); ! buffer[module_len]=':'; ! strcpy(buffer+module_len+1, function); if (debug_level_get(module) >= level || debug_level_get(buffer) >= level) { - strcpy(buffer+module_len+function_len+1, ":"); if (prefix) ! printf("%s",buffer); vprintf(fmt, ap); } --- 63,74 ---- void ! debug_vprintf(int level, const char *module, const int mlen, const char *function, const int flen, int prefix, const char *fmt, va_list ap) { ! char buffer[mlen+flen+3]; + sprintf(buffer, "%s:%s", module, function); if (debug_level_get(module) >= level || debug_level_get(buffer) >= level) { if (prefix) ! printf("%s:",buffer); vprintf(fmt, ap); } *************** *** 82,90 **** void ! debug_printf(int level, const char *module, const char *function, int prefix, const char *fmt, ...) { va_list ap; va_start(ap, fmt); ! debug_vprintf(level, module, function, prefix, fmt, ap); va_end(ap); } --- 76,84 ---- void ! debug_printf(int level, const char *module, const int mlen,const char *function, const int flen, int prefix, const char *fmt, ...) { va_list ap; va_start(ap, fmt); ! debug_vprintf(level, module, mlen, function, flen, prefix, fmt, ap); va_end(ap); } |
|
From: Martin S. <mar...@us...> - 2008-01-14 23:15:56
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11051 Modified Files: gui_gtk_statusbar.c Log Message: Fix:GTK:Prevent statusbar from crashing if direction is unusual Index: gui_gtk_statusbar.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gui_gtk_statusbar.c 14 Jan 2008 22:34:43 -0000 1.9 --- gui_gtk_statusbar.c 14 Jan 2008 23:15:52 -0000 1.10 *************** *** 122,125 **** --- 122,126 ---- if (vehicle_position_attr_get(v, attr_position_direction, &attr)) direction=*(attr.u.numd); + direction=direction%360; dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; |
|
From: Albert L F. <af...@us...> - 2008-01-14 22:34:53
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26463 Added Files: navit.xml.distr Log Message: Add:gui/gtk:add status bar string to po file(s), fix wronly locale->utf8 conversions in the statusbar --- NEW FILE: navit.xml.distr --- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE navit SYSTEM "navit.dtd"> <plugins> <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/> <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" /> </plugins> <debug name="navit:do_draw" level="0" /> <!-- Center coordinates format: [D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W [-][D]D.d[d]... [-][D][D]D.d[d]... [-]0xX [-]0xX Change to your home coordinates. --> <navit center="4808 N 1134 E" zoom="256" tracking="1" cursor="1" orientation="0"> <gui type="gtk" /> <graphics type="gtk_drawing_area" /> <!-- For SDL, use rather the following lines <gui type="sdl" /> <graphics type="opengl" /> --> <!-- <vehicle name="Com4" enabled="yes" active="1" source="file:COM4 baud=115200 parity=N data=8 stop=1" color="#0000ff"/> --> <vehicle name="Demo" enabled="yes" active="1" source="demo" color="#0000ff"/> <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff"/> --> <!-- For SDL, you should add follow="1" refresh="1" to have the view centered on your position <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1" refresh="1"/> --> <vehicle name="Deins" enabled="no" source="gpsd://somehost" color="#0000aa"/> <tracking> </tracking> <route> <speed type="street_0,street_1_city" value="10" /> <speed type="street_2_city" value="30" /> <speed type="street_3_city" value="40" /> <speed type="street_4_city" value="50" /> <speed type="highway_city" value="80" /> <speed type="street_1_land" value="60" /> <speed type="street_2_land" value="65" /> <speed type="street_3_land" value="70" /> <speed type="street_4_land" value="80" /> <speed type="street_n_lanes" value="120" /> <speed type="highway_land" value="120" /> <speed type="ramp" value="40" /> <speed type="ferry" value="40" /> </route> <navigation> <announce type="street_0,street_1_city" level0="10" level1="100" level2="200" unit="m" /> <announce type="street_2_city,street_3_city,street_4_city,ramp" level0="20" level1="200" level2="500" unit="m" /> <announce type="highway_city,street_1_land,street_2_land,street_3_land,street_4_land" level0="40" level1="400" level2="1000" unit="m" /> <announce type="street_n_lanes,highway_land" level0="100" level1="1000" level2="2000" unit="m" /> </navigation> <speech type="speech_dispatcher" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" /> <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line --> <mapset enabled="no"> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map" /> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp" /> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp" /> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp" /> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp" /> <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp" /> </mapset> <!-- If you dont want to use the sample map, set enabled="no" in the next line --> <mapset enabled="yes"> <map type="binfile" enabled="yes" data="../maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/> </mapset> <!-- Sample mapset for garmin maps --> <mapset enabled="no"> <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> </mapset> <layout name="Tag"> <layer name="sea" details="0"> <item type="wood" order="0-"> <polygon color="#8ec78d" /> </item> <item type="town_poly" order="0-"> <polygon color="#ffc895" /> <polyline color="#ebb481" /> </item> <item type="water_poly" order="0-"> <polygon color="#82c8ea" /> <polyline color="#5096b8" /> <label label_size="5" /> </item> <item type="park_poly" order="0-"> <polygon color="#7cc334" /> <label label_size="5" /> </item> <item type="airport_poly" order="0-"> <polygon color="#a0a0a0" /> </item> <item type="sport_poly" order="0-"> <polygon color="#4af04f" /> </item> <item type="industry_poly,building_poly,place_poly" order="0-"> <polygon color="#e6e6e6" /> </item> <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> <label label_size="5" /> </item> <item type="rail" order="6-"> <polyline color="#808080" width="3" /> </item> <item type="ferry" order="5-"> <polyline color="#000000" width="1" /> </item> <item type="border_country" order="0-"> <polyline color="#b8434e" width="1" /> </item> <item type="border_state" order="0-"> <polyline color="#808080" width="1" /> </item> <item type="height_line_1" order="0-"> <polyline color="#000000" width="1" /> </item> <item type="height_line_2" order="0-"> <polyline color="#000000" width="2" /> </item> <item type="street_route" order="2"> <polyline color="#0000a0" width="4" /> </item> <item type="street_route" order="3-5"> <polyline color="#0000a0" width="8" /> </item> <item type="street_route" order="6"> <polyline color="#0000a0" width="10" /> </item> <item type="street_route" order="7-8"> <polyline color="#0000a0" width="16" /> </item> <item type="street_route" order="9-10"> <polyline color="#0000a0" width="20" /> </item> <item type="street_route" order="11"> <polyline color="#0000a0" width="28" /> </item> <item type="street_route" order="12"> <polyline color="#0000a0" width="32" /> </item> <item type="street_route" order="13"> <polyline color="#0000a0" width="52" /> </item> <item type="street_route" order="14"> <polyline color="#0000a0" width="64" /> </item> <item type="street_route" order="15"> <polyline color="#0000a0" width="68" /> </item> <item type="street_route" order="16"> <polyline color="#0000a0" width="132" /> </item> <item type="street_route" order="17"> <polyline color="#0000a0" width="268" /> </item> <item type="street_route" order="18"> <polyline color="#0000a0" width="530" /> </item> <item type="street_nopass" order="10-"> <polyline color="#000000" width="1" /> </item> <item type="street_0,street_1_city,street_1_land" order="10"> <polyline color="#d2d2d2" width="4" /> <polyline color="#ffffff" width="2" /> </item> <item type="street_0,street_1_city,street_1_land" order="11"> <polyline color="#d2d2d2" width="6" /> <polyline color="#ffffff" width="4" /> </item> <item type="street_0,street_1_city,street_1_land" order="12"> <polyline color="#d2d2d2" width="10" /> <polyline color="#ffffff" width="8" /> </item> <item type="street_0,street_1_city,street_1_land" order="13"> <polyline color="#d2d2d2" width="12" /> <polyline color="#ffffff" width="9" /> </item> <item type="street_0,street_1_city,street_1_land" order="14"> <polyline color="#d2d2d2" width="15" /> <polyline color="#ffffff" width="13" /> </item> <item type="street_0,street_1_city,street_1_land" order="15"> <polyline color="#d2d2d2" width="17" /> <polyline color="#ffffff" width="14" /> </item> <item type="street_0,street_1_city,street_1_land" order="16"> <polyline color="#d2d2d2" width="33" /> <polyline color="#ffffff" width="26" /> </item> <item type="street_0,street_1_city,street_1_land" order="17"> <polyline color="#d2d2d2" width="69" /> <polyline color="#ffffff" width="61" /> </item> <item type="street_0,street_1_city,street_1_land" order="18"> <polyline color="#d2d2d2" width="132" /> <polyline color="#ffffff" width="126" /> </item> <item type="street_2_city,street_2_land" order="7-8"> <polyline color="#c0c0c0" width="2" /> </item> <item type="street_2_city,street_2_land" order="9"> <polyline color="#c0c0c0" width="4" /> <polyline color="#ffff00" width="2" /> </item> <item type="street_2_city,street_2_land" order="10"> <polyline color="#c0c0c0" width="6" /> <polyline color="#ffff00" width="4" /> </item> <item type="street_2_city,street_2_land" order="11"> <polyline color="#c0c0c0" width="8" /> <polyline color="#ffff00" width="6" /> </item> <item type="street_2_city,street_2_land" order="12"> <polyline color="#c0c0c0" width="12" /> <polyline color="#ffff00" width="9" /> </item> <item type="street_2_city,street_2_land" order="13"> <polyline color="#c0c0c0" width="15" /> <polyline color="#ffff00" width="11" /> </item> <item type="street_2_city,street_2_land" order="14"> <polyline color="#c0c0c0" width="18" /> <polyline color="#ffff00" width="14" /> </item> <item type="street_2_city,street_2_land" order="15"> <polyline color="#c0c0c0" width="21" /> <polyline color="#ffff00" width="17" /> </item> <item type="street_2_city,street_2_land" order="16"> <polyline color="#c0c0c0" width="35" /> <polyline color="#ffff00" width="30" /> </item> <item type="street_2_city,street_2_land" order="17"> <polyline color="#c0c0c0" width="73" /> <polyline color="#ffff00" width="67" /> </item> <item type="street_2_city,street_2_land" order="18"> <polyline color="#c0c0c0" width="144" /> <polyline color="#ffff00" width="138" /> </item> <item type="street_3_city,street_3_land,ramp" order="7-8"> <polyline color="#a0a0a0" width="3" /> <polyline color="#ffff00" width="1" /> </item> <item type="street_3_city,street_3_land,ramp" order="9"> <polyline color="#a0a0a0" width="5" /> <polyline color="#ffff00" width="3" /> </item> <item type="street_3_city,street_3_land,ramp" order="10"> <polyline color="#a0a0a0" width="8" /> <polyline color="#ffff00" width="6" /> </item> <item type="street_3_city,street_3_land,ramp" order="11"> <polyline color="#a0a0a0" width="9" /> <polyline color="#ffff00" width="7" /> </item> <item type="street_3_city,street_3_land,ramp" order="12"> <polyline color="#a0a0a0" width="13" /> <polyline color="#ffff00" width="9" /> </item> <item type="street_3_city,street_3_land,ramp" order="13"> <polyline color="#a0a0a0" width="18" /> <polyline color="#ffff00" width="14" /> </item> <item type="street_3_city,street_3_land,ramp" order="14"> <polyline color="#a0a0a0" width="21" /> <polyline color="#ffff00" width="17" /> </item> <item type="street_3_city,street_3_land,ramp" order="15"> <polyline color="#a0a0a0" width="25" /> <polyline color="#ffff00" width="21" /> </item> <item type="street_3_city,street_3_land,ramp" order="16"> <polyline color="#a0a0a0" width="40" /> <polyline color="#ffff00" width="34" /> </item> <item type="street_3_city,street_3_land,ramp" order="17"> <polyline color="#a0a0a0" width="79" /> <polyline color="#ffff00" width="73" /> </item> <item type="street_3_city,street_3_land,ramp" order="18"> <polyline color="#a0a0a0" width="156" /> <polyline color="#ffff00" width="150" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="2-6"> <polyline color="#404040" width="1" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="7-8"> <polyline color="#404040" width="3" /> <polyline color="#ff0000" width="1" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="9"> <polyline color="#000000" width="5" /> <polyline color="#ff0000" width="3" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="10"> <polyline color="#000000" width="6" /> <polyline color="#ff0000" width="4" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="11"> <polyline color="#000000" width="9" /> <polyline color="#ff0000" width="7" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="12"> <polyline color="#000000" width="13" /> <polyline color="#ff0000" width="9" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="13"> <polyline color="#000000" width="18" /> <polyline color="#ff0000" width="14" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="14"> <polyline color="#000000" width="21" /> <polyline color="#ff0000" width="17" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="15"> <polyline color="#000000" width="24" /> <polyline color="#ff0000" width="20" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="16"> <polyline color="#000000" width="39" /> <polyline color="#ff0000" width="33" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="17"> <polyline color="#000000" width="78" /> <polyline color="#ff0000" width="72" /> </item> <item type="street_4_city,street_4_land,street_n_lanes" order="18"> <polyline color="#000000" width="156" /> <polyline color="#ff0000" width="150" /> </item> <item type="highway_city,highway_land" order="2"> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="3-5"> <polyline color="#ff0000" width="3" /> <polyline color="#ffff00" width="1" /> </item> <item type="highway_city,highway_land" order="6"> <polyline color="#ff0000" width="4" /> <polyline color="#ffff00" width="2" /> </item> <item type="highway_city,highway_land" order="7-8"> <polyline color="#ff0000" width="7" /> <polyline color="#ffff00" width="5" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="9-10"> <polyline color="#ff0000" width="9" /> <polyline color="#ffff00" width="5" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="11"> <polyline color="#ff0000" width="13" /> <polyline color="#ffff00" width="9" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="12"> <polyline color="#ff0000" width="15" /> <polyline color="#ffff00" width="10" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="13"> <polyline color="#ff0000" width="25" /> <polyline color="#ffff00" width="17" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="14"> <polyline color="#ff0000" width="31" /> <polyline color="#ffff00" width="24" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="15"> <polyline color="#ff0000" width="33" /> <polyline color="#ffff00" width="27" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="16"> <polyline color="#ff0000" width="65" /> <polyline color="#ffff00" width="59" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="17"> <polyline color="#ff0000" width="133" /> <polyline color="#ffff00" width="127" /> <polyline color="#ff0000" width="1" /> </item> <item type="highway_city,highway_land" order="18"> <polyline color="#ff0000" width="264" /> <polyline color="#ffff00" width="258" /> <polyline color="#ff0000" width="1" /> </item> <item type="street_unkn" order="0-"> <polyline color="#8080ff" width="3" /> </item> <item type="highway_exit_label" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes" order="10-18"> <label label_size="8" /> </item> <item type="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18"> <label label_size="9" /> </item> <item type="street_nopass,street_0,street_1_city,street_1_land" order="12-18"> <label label_size="9" /> </item> <item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="district_label_1e3,district_label_2e3,district_label_5e3" order="11-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="town_label_1e3,town_label_2e3,town_label_5e3" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="district_label_1e4,district_label_2e4,district_label_5e4" order="9-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="town_label_1e4,town_label_2e4,town_label_5e4" order="8-"> <circle color="#000000" radius="3" label_size="7" /> </item> <item type="district_label_1e5,district_label_2e5,district_label_5e5" order="6-"> <circle color="#000000" radius="3" label_size="10" /> </item> <item type="town_label_1e5,town_label_2e5,town_label_5e5" order="4-"> <circle color="#000000" radius="3" label_size="10" /> </item> <item type="district_label_1e6,district_label_2e6,district_label_5e6" order="3-"> <circle color="#000000" radius="3" label_size="15" /> </item> <item type="town_label_1e6,town_label_2e6,town_label_5e6" order="2-"> <circle color="#000000" radius="3" label_size="15" /> </item> <item type="town_label_1e7,district_label_1e7" order="1-"> <circle color="#000000" radius="3" label_size="15" /> </item> <item type="track" order="3-"> <polyline color="#3f3f3f" width="1" /> </item> <item type="poi_airport" order="0-"> <icon src="airport.xpm" /> </item> <item type="town_ghost" order="0-"> <icon src="ghost_town.xpm" /> </item> <item type="poi_hotel" order="0-"> <icon src="hotel.xpm" /> </item> <item type="poi_car_parking" order="0-"> <icon src="parking.xpm" /> </item> <item type="poi_car_dealer_parts" order="0-"> <icon src="car_dealer.xpm" /> </item> <item type="poi_fuel" order="0-"> <icon src="fuel.xpm" /> </item> <item type="poi_shopping" order="0-"> <icon src="shopping.xpm" /> </item> <item type="poi_attraction" order="0-"> <icon src="attraction.xpm" /> </item> <item type="poi_bar" order="0-"> <icon src="bar.xpm" /> </item> <item type="poi_bridge" order="0-"> <icon src="bridge.xpm" /> </item> <item type="highway_exit" order="0-"> <icon src="exit.xpm" /> </item> <item type="poi_camp_rv" order="0-"> <icon src="camping.xpm" /> </item> <item type="poi_museum_history" order="0-"> <icon src="museum.xpm" /> </item> <item type="poi_hospital" order="0-"> <icon src="hospital.xpm" /> </item> <item type="point_unkn" order="0-"> <circle color="#8080ff" radius="3" /> </item> <item type="poi_dining" order="0-"> <icon src="dining.xpm" /> </item> <item type="poi_fastfood" order="0-"> <icon src="fastfood.xpm" /> </item> <item type="poi_police" order="0-"> <icon src="police.xpm" /> </item> <item type="poi_auto_club" order="0-"> <icon src="auto_club.xpm" /> </item> <item type="poi_autoservice" order="0-"> <icon src="autoservice.xpm" /> </item> <item type="poi_bank" order="0-"> <icon src="bank.xpm" /> </item> <item type="poi_bay" order="0-"> <icon src="bay.xpm" /> </item> <item type="poi_bend" order="0-"> <icon src="bend.xpm" /> </item> <item type="poi_boat_ramp" order="0-"> <icon src="boat_ramp.xpm" /> </item> <item type="poi_border_station" order="0-"> <icon src="border_station.xpm" /> </item> <item type="poi_bowling" order="0-"> <icon src="bowling.xpm" /> </item> <item type="poi_bus_station" order="0-"> <icon src="bus_station.xpm" /> </item> <item type="poi_bus_stop" order="0-"> <icon src="bus_stop.xpm" /> </item> <item type="poi_bussines_service" order="0-"> <icon src="bussines_service.xpm" /> </item> <item type="poi_car_rent" order="0-"> <icon src="car_rent.xpm" /> </item> <item type="poi_car_wash" order="0-"> <icon src="car_wash.xpm" /> </item> <item type="poi_casino" order="0-"> <icon src="casino.xpm" /> </item> <item type="poi_cemetery" order="0-"> <icon src="cemetery.xpm" /> </item> <item type="poi_church" order="0-"> <icon src="church.xpm" /> </item> <item type="poi_cinema" order="0-"> <icon src="cinema.xpm" /> </item> <item type="poi_civil" order="0-"> <icon src="civil.xpm" /> </item> <item type="poi_communication" order="0-"> <icon src="communication.xpm" /> </item> <item type="poi_concert" order="0-"> <icon src="concert.xpm" /> </item> <item type="poi_cove" order="0-"> <icon src="cove.xpm" /> </item> <item type="poi_crossing" order="0-"> <icon src="crossing.xpm" /> </item> <item type="poi_dam" order="0-"> <icon src="dam.xpm" /> </item> <item type="poi_danger_area" order="0-"> <icon src="danger_area.xpm" /> </item> <item type="poi_dangerous" order="0-"> <icon src="dangerous.xpm" /> </item> <item type="poi_daymark" order="0-"> <icon src="daymark.xpm" /> </item> <item type="poi_diving" order="0-"> <icon src="diving.xpm" /> </item> <item type="poi_drinking_water" order="0-"> <icon src="drinking_water.xpm" /> </item> <item type="poi_emergency" order="0-"> <icon src="emergency.xpm" /> </item> <item type="poi_fair" order="0-"> <icon src="fair.xpm" /> </item> <item type="poi_firebrigade" order="0-"> <icon src="firebrigade.xpm" /> </item> <item type="poi_fish" order="0-"> <icon src="fish.xpm" /> </item> <item type="poi_forbiden_area" order="0-"> <icon src="forbiden_area.xpm" /> </item> <item type="poi_garmin" order="0-"> <icon src="garmin.xpm" /> </item> <item type="poi_golf" order="0-"> <icon src="golf.xpm" /> </item> <item type="poi_goverment_building" order="0-"> <icon src="goverment_building.xpm" /> </item> <item type="poi_height" order="0-"> <icon src="height.xpm" /> </item> <item type="poi_heliport" order="0-"> <icon src="heliport.xpm" /> </item> <item type="poi_hotspring" order="0-"> <icon src="hotspring.xpm" /> </item> <item type="poi_icesport" order="0-"> <icon src="icesport.xpm" /> </item> <item type="poi_information" order="0-"> <icon src="information.xpm" /> </item> <item type="poi_justice" order="0-"> <icon src="justice.xpm" /> </item> <item type="poi_landmark" order="0-"> <icon src="landmark.xpm" /> </item> <item type="poi_levee" order="0-"> <icon src="levee.xpm" /> </item> <item type="poi_library" order="0-"> <icon src="library.xpm" /> </item> <item type="poi_locale" order="0-"> <icon src="locale.xpm" /> </item> <item type="poi_loudspeaker" order="0-"> <icon src="loudspeaker.xpm" /> </item> <item type="poi_mall" order="0-"> <icon src="mall.xpm" /> </item> <item type="poi_manmade_feature" order="0-"> <icon src="manmade_feature.xpm" /> </item> <item type="poi_marine" order="0-"> <icon src="marine.xpm" /> </item> <item type="poi_marine_type" order="0-"> <icon src="marine_type.xpm" /> </item> <item type="poi_mark" order="0-"> <icon src="mark.xpm" /> </item> <item type="poi_military" order="0-"> <icon src="military.xpm" /> </item> <item type="poi_mine" order="0-"> <icon src="mine.xpm" /> </item> <item type="poi_nondangerous" order="0-"> <icon src="nondangerous.xpm" /> </item> <item type="poi_oil_field" order="0-"> <icon src="oil_field.xpm" /> </item> <item type="poi_personal_service" order="0-"> <icon src="personal_service.xpm" /> </item> <item type="poi_pharmacy" order="0-"> <icon src="pharmacy.xpm" /> </item> <item type="poi_post" order="0-"> <icon src="post.xpm" /> </item> <item type="poi_public_office" order="0-"> <icon src="public_office.xpm" /> </item> <item type="poi_repair_service" order="0-"> <icon src="repair_service.xpm" /> </item> <item type="poi_resort" order="0-"> <icon src="resort.xpm" /> </item> <item type="poi_rest_room" order="0-"> <icon src="rest_room.xpm" /> </item> <item type="poi_restaurant" order="0-"> <icon src="restaurant.xpm" /> </item> <item type="poi_restricted_area" order="0-"> <icon src="restricted_area.xpm" /> </item> <item type="poi_restroom" order="0-"> <icon src="restroom.xpm" /> </item> <item type="poi_sailing" order="0-"> <icon src="sailing.xpm" /> </item> <item type="poi_scenic_area" order="0-"> <icon src="scenic_area.xpm" /> </item> <item type="poi_school" order="0-"> <icon src="school.xpm" /> </item> <item type="poi_service" order="0-"> <icon src="service.xpm" /> </item> <item type="poi_shop_apparel" order="0-"> <icon src="shop_apparel.xpm" /> </item> <item type="poi_shop_computer" order="0-"> <icon src="shop_computer.xpm" /> </item> <item type="poi_shop_department" order="0-"> <icon src="shop_department.xpm" /> </item> <item type="poi_shop_furnish" order="0-"> <icon src="shop_furnish.xpm" /> </item> <item type="poi_shop_grocery" order="0-"> <icon src="shop_grocery.xpm" /> </item> <item type="poi_shop_handg" order="0-"> <icon src="shop_handg.xpm" /> </item> <item type="poi_shop_merchandise" order="0-"> <icon src="shop_merchandise.xpm" /> </item> <item type="poi_shop_retail" order="0-"> <icon src="shop_retail.xpm" /> </item> <item type="poi_shower" order="0-"> <icon src="shower.xpm" /> </item> <item type="poi_skiing" order="0-"> <icon src="skiing.xpm" /> </item> <item type="poi_social_service" order="0-"> <icon src="social_service.xpm" /> </item> <item type="poi_sounding" order="0-"> <icon src="sounding.xpm" /> </item> <item type="poi_sport" order="0-"> <icon src="sport.xpm" /> </item> <item type="poi_stadium" order="0-"> <icon src="stadium.xpm" /> </item> <item type="poi_subdivision" order="0-"> <icon src="subdivision.xpm" /> </item> <item type="poi_swimming" order="0-"> <icon src="swimming.xpm" /> </item> <item type="poi_telephone" order="0-"> <icon src="telephone.xpm" /> </item> <item type="poi_theater" order="0-"> <icon src="theater.xpm" /> </item> <item type="poi_tide" order="0-"> <icon src="tide.xpm" /> </item> <item type="poi_tower" order="0-"> <icon src="tower.xpm" /> </item> <item type="poi_trail" order="0-"> <icon src="trail.xpm" /> </item> <item type="poi_truck_stop" order="0-"> <icon src="truck_stop.xpm" /> </item> <item type="poi_tunnel" order="0-"> <icon src="tunnel.xpm" /> </item> <item type="poi_wine" order="0-"> <icon src="wine.xpm" /> </item> <item type="poi_worship" order="0-"> <icon src="worship.xpm" /> </item> <item type="poi_wrecker" order="0-"> <icon src="wrecker.xpm" /> </item> <item type="poi_zoo" order="0-"> <icon src="zoo.xpm" /> </item> <item type="poi_picnic" order="0-"> <icon src="picnic.xpm" /> </item> <item type="poi_gc_multi" order="0-"> <icon src="gc_multi.xpm" /> </item> <item type="poi_gc_tradi" order="0-"> <icon src="gc_tradi.xpm" /> </item> <item type="poi_gc_event" order="0-"> <icon src="gc_event.xpm" /> </item> <item type="poi_gc_mystery" order="0-"> <icon src="gc_mystery.xpm" /> </item> <item type="poi_gc_question" order="0-"> <icon src="gc_question.xpm" /> </item> <item type="poi_gc_stages" order="0-"> <icon src="gc_stages.xpm" /> </item> <item type="poi_gc_reference" order="0-"> <icon src="gc_reference.xpm" /> </item> <item type="poi_gc_webcam" order="0-"> <icon src="gc_webcam.xpm" /> </item> <item type="flats,scrub,military_zone,marine_poly,plantation,tundra" order="0-"> <polygon color="#a0a0a0" /> <label label_size="5" /> </item> <item type="rg_segment" order="0-"> <polyline color="#FF089C" width="1" /> </item> <item type="rg_point" order="0-"> <circle color="#FF089C" radius="10" label_size="7" /> </item> </layer> </layout> <layout name="Nacht"> </layout> </navit> |
|
From: Albert L F. <af...@us...> - 2008-01-14 22:34:42
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26446 Modified Files: gui_gtk_statusbar.c Log Message: Add:gui/gtk:add status bar string to po file(s), fix wronly locale->utf8 conversions in the statusbar Index: gui_gtk_statusbar.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gui_gtk_statusbar.c 5 Jan 2008 20:04:22 -0000 1.8 --- gui_gtk_statusbar.c 14 Jan 2008 22:34:43 -0000 1.9 *************** *** 4,7 **** --- 4,8 ---- #include <math.h> #include <gtk/gtk.h> + #include <libintl.h> #include "item.h" #include "coord.h" *************** *** 18,26 **** #include "statusbar.h" struct statusbar_priv { struct gui_priv *gui; GtkWidget *hbox; char gps_text[128]; ! GtkWidget *gps; char route_text[128]; GtkWidget *route; --- 19,30 ---- #include "statusbar.h" + + #define _(STRING) gettext(STRING) + struct statusbar_priv { struct gui_priv *gui; GtkWidget *hbox; char gps_text[128]; ! GtkWidget *gps; char route_text[128]; GtkWidget *route; *************** *** 29,32 **** --- 33,38 ---- + + static void statusbar_destroy(struct statusbar_priv *this) *************** *** 40,46 **** char lat_c='N'; char lng_c='E'; ! char *dirs[]={"N","NO","O","SO","S","SW","W","NW","N"}; char *dir; - char *utf8; int dir_idx; --- 46,51 ---- char lat_c='N'; char lng_c='E'; ! char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")}; char *dir; int dir_idx; *************** *** 55,63 **** dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; ! sprintf(this->gps_text,"GPS %2d/%1d %02.0f%07.4f%c %03.0f%07.4f%c %4.0fm %3.0f°%-2s %3.0fkm/h", sats, qual, floor(lat), fmod(lat*60,60), lat_c, floor(lng), fmod(lng*60,60), lng_c, height, direction, dir, speed); ! utf8=g_locale_to_utf8(this->gps_text,-1,NULL,NULL,NULL); ! gtk_label_set_text(GTK_LABEL(this->gps), utf8); ! g_free(utf8); ! } --- 60,66 ---- dir_idx=(direction+22.5)/45; dir=dirs[dir_idx]; ! sprintf(this->gps_text, "GPS %2d/%1d %02.0f%07.4f%c %03.0f%07.4f%c %4.0fm %3.0f°%-2s %3.0fkm/h", sats, qual, floor(lat), fmod(lat*60,60), lat_c, floor(lng), fmod(lng*60,60), lng_c, height, direction, dir, speed); ! gtk_label_set_text(GTK_LABEL(this->gps), this->gps_text); ! } *************** *** 74,83 **** struct tm *eta_tm=NULL; char buffer[128]; - char *utf8; double lng, lat, direction=0, height=0, speed=0; int sats=0, qual=0; char lat_c='N'; char lng_c='E'; ! char *dirs[]={"N","NO","O","SO","S","SW","W","NW","N"}; char *dir; int dir_idx; --- 77,85 ---- struct tm *eta_tm=NULL; char buffer[128]; double lng, lat, direction=0, height=0, speed=0; int sats=0, qual=0; char lat_c='N'; char lng_c='E'; ! char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")}; char *dir; int dir_idx; *************** *** 87,91 **** if (nav) map=navigation_get_map(nav); ! if (map) mr=map_rect_new(map, NULL); if (mr) --- 89,93 ---- if (nav) map=navigation_get_map(nav); ! if (map) mr=map_rect_new(map, NULL); if (mr) *************** *** 101,105 **** if (mr) map_rect_destroy(mr); ! sprintf(buffer,"Route %4.0fkm %02d:%02d ETA",route_len/1000, eta_tm ? eta_tm->tm_hour : 0 , eta_tm ? eta_tm->tm_min : 0); if (strcmp(buffer, this->route_text)) { strcpy(this->route_text, buffer); --- 103,107 ---- if (mr) map_rect_destroy(mr); ! sprintf(buffer,_("Route %4.0fkm %02d:%02d ETA" ),route_len/1000, eta_tm ? eta_tm->tm_hour : 0 , eta_tm ? eta_tm->tm_min : 0); if (strcmp(buffer, this->route_text)) { strcpy(this->route_text, buffer); *************** *** 131,137 **** qual=attr.u.num; sprintf(this->gps_text,"GPS %2d/%1d %02.0f%07.4f%c %03.0f%07.4f%c %4.0fm %3.0f°%-2s %3.0fkm/h", sats, qual, floor(lat), fmod(lat*60,60), lat_c, floor(lng), fmod(lng*60,60), lng_c, height, direction, dir, speed); ! utf8=g_locale_to_utf8(this->gps_text,-1,NULL,NULL,NULL); ! gtk_label_set_text(GTK_LABEL(this->gps), utf8); ! g_free(utf8); } --- 133,137 ---- qual=attr.u.num; sprintf(this->gps_text,"GPS %2d/%1d %02.0f%07.4f%c %03.0f%07.4f%c %4.0fm %3.0f°%-2s %3.0fkm/h", sats, qual, floor(lat), fmod(lat*60,60), lat_c, floor(lng), fmod(lng*60,60), lng_c, height, direction, dir, speed); ! gtk_label_set_text(GTK_LABEL(this->gps), this->gps_text); } *************** *** 144,148 **** { struct statusbar_priv *this=g_new0(struct statusbar_priv, 1); - char *utf8; this->gui=gui; --- 144,147 ---- *************** *** 150,158 **** this->hbox=gtk_hbox_new(FALSE, 1); ! utf8=g_locale_to_utf8("GPS 00/0 0000.0000N 00000.0000E 0000m 000°NO 000km/h",-1,NULL,NULL,NULL); ! this->gps=gtk_label_new(utf8); ! g_free(utf8); gtk_label_set_justify(GTK_LABEL(this->gps), GTK_JUSTIFY_LEFT); ! this->route=gtk_label_new("Route 0000km 0+00:00 ETA"); gtk_label_set_justify(GTK_LABEL(this->route), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(this->hbox), this->gps, TRUE, TRUE, 2); --- 149,155 ---- this->hbox=gtk_hbox_new(FALSE, 1); ! this->gps=gtk_label_new( "GPS 00/0 0000.0000N 00000.0000E 0000m 000°NO 000km/h" ); gtk_label_set_justify(GTK_LABEL(this->gps), GTK_JUSTIFY_LEFT); ! this->route=gtk_label_new( _( "Route 0000km 0+00:00 ETA" ) ); gtk_label_set_justify(GTK_LABEL(this->route), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(this->hbox), this->gps, TRUE, TRUE, 2); |
|
From: Albert L F. <af...@us...> - 2008-01-14 22:34:35
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26426 Modified Files: Makefile.am nl.po Log Message: Add:gui/gtk:add status bar string to po file(s), fix wronly locale->utf8 conversions in the statusbar Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/po/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 28 Dec 2007 17:00:24 -0000 1.9 --- Makefile.am 14 Jan 2008 22:34:36 -0000 1.10 *************** *** 13,17 **** $(top_srcdir)/src/country.c \ $(top_srcdir)/src/gui/gtk/destination.c \ ! $(top_srcdir)/src/gui/gtk/gui_gtk_action.c --- 13,18 ---- $(top_srcdir)/src/country.c \ $(top_srcdir)/src/gui/gtk/destination.c \ ! $(top_srcdir)/src/gui/gtk/gui_gtk_action.c \ ! $(top_srcdir)/src/gui/gtk/gui_gtk_statusbar.c Index: nl.po =================================================================== RCS file: /cvsroot/navit/navit/po/nl.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nl.po 7 Jan 2008 21:27:11 -0000 1.1 --- nl.po 14 Jan 2008 22:34:36 -0000 1.2 *************** *** 2,6 **** # Copyright (C) 2007 # This file is distributed under the same license as the navit package. ! # Albert Fabe, 2007. # msgid "" --- 2,6 ---- # Copyright (C) 2007 # This file is distributed under the same license as the navit package. ! # Albert Faber, 2007. # msgid "" *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+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.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-14 23:23+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" *************** *** 17,81 **** "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:94 #, c-format msgid "Running from source directory\n" msgstr "Gestart vanuit de source directory\n" ! #: ../src/main.c:110 #, c-format msgid "setting '%s' to '%s'\n" msgstr "setting '%s' naar '%s'\n" ! #: ../src/main.c:173 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Geen config file navit.xml, navit.xml.local gevonden\n" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Error bij het verwerken van '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Gebruik '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" ! msgstr "Geen instantie ge-creerd, beeindigen\n" ! #: ../src/navigation.c:173 #, c-format msgid "%d m" msgstr "%d Meter" ! #: ../src/navigation.c:175 #, c-format msgid "in %d m" msgstr "na %d meter" ! #: ../src/navigation.c:179 #, c-format msgid "%d meters" msgstr "%d Meter" ! #: ../src/navigation.c:181 #, c-format msgid "in %d meters" msgstr "na %d meter" ! #: ../src/navigation.c:187 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d kilometer" ! #: ../src/navigation.c:189 #, c-format msgid "in %d.%d kilometers" msgstr "na %d,%d kilometer" ! #: ../src/navigation.c:193 #, c-format msgid "one kilometer" --- 17,81 ---- "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:108 #, c-format msgid "Running from source directory\n" msgstr "Gestart vanuit de source directory\n" ! #: ../src/main.c:124 #, c-format msgid "setting '%s' to '%s'\n" msgstr "setting '%s' naar '%s'\n" ! #: ../src/main.c:202 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Geen config file navit.xml, navit.xml.local gevonden\n" ! #: ../src/main.c:206 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Error bij het verwerken van '%s': %s\n" ! #: ../src/main.c:209 #, c-format msgid "Using '%s'\n" msgstr "Gebruik '%s'\n" ! #: ../src/main.c:212 #, c-format msgid "No instance has been created, exiting\n" ! msgstr "Geen instantie ge-creerd, beëindigen\n" ! #: ../src/navigation.c:162 #, c-format msgid "%d m" msgstr "%d Meter" ! #: ../src/navigation.c:164 #, c-format msgid "in %d m" msgstr "na %d meter" ! #: ../src/navigation.c:168 #, c-format msgid "%d meters" msgstr "%d Meter" ! #: ../src/navigation.c:170 #, c-format msgid "in %d meters" msgstr "na %d meter" ! #: ../src/navigation.c:176 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d kilometer" ! #: ../src/navigation.c:178 #, c-format msgid "in %d.%d kilometers" msgstr "na %d,%d kilometer" ! #: ../src/navigation.c:182 #, c-format msgid "one kilometer" *************** *** 84,88 **** msgstr[1] "%d kilometer" ! #: ../src/navigation.c:195 #, c-format msgid "in one kilometer" --- 84,88 ---- msgstr[1] "%d kilometer" ! #: ../src/navigation.c:184 #, c-format msgid "in one kilometer" *************** *** 91,200 **** msgstr[1] "in %d kilometer" ! #: ../src/navigation.c:399 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:406 msgid "left" msgstr "links" ! #: ../src/navigation.c:410 msgid "easily " msgstr "flauwe " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "scherpe " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "niet bekend " # ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Wanneer mogelijk, omkeren" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Weg volgen voor %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "binnenkort" ! #: ../src/navigation.c:440 msgid "now" msgstr "nu" ! #: ../src/navigation.c:443 msgid "error" msgstr "error" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s afslaan" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" msgstr "%s bestemming bereikt" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Projectie" ! #: ../src/navit.c:685 msgid "Former Destinations" msgstr "Vorige bestemmingen" ! #: ../src/navit.c:695 msgid "Bookmarks" msgstr "Bookmarks" ! #: ../src/navit.c:733 msgid "Vehicle" msgstr "Voertuig" ! #: ../src/navit.c:768 msgid "Command" msgstr "Opdracht" ! #: ../src/navit.c:773 msgid "Length" msgstr "Lengte" ! #: ../src/navit.c:778 msgid "Time" msgstr "Tijd" ! #: ../src/navit.c:783 msgid "Destination Length" msgstr "Afstand" ! #: ../src/navit.c:788 msgid "Destination Time" msgstr "Aankomsttijd" ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Route" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 ! #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Kaart" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" #: ../src/country.c:24 msgid "Czech Republic" --- 91,223 ---- msgstr[1] "in %d kilometer" ! #: ../src/navigation.c:402 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:409 msgid "left" msgstr "links" ! #: ../src/navigation.c:413 msgid "easily " msgstr "flauwe " ! #: ../src/navigation.c:417 msgid "strongly " msgstr "scherpe " ! #: ../src/navigation.c:420 msgid "unknown " msgstr "niet bekend " # ! #: ../src/navigation.c:426 msgid "When possible, please turn around" msgstr "Wanneer mogelijk, omkeren" ! #: ../src/navigation.c:433 #, c-format msgid "Follow the road for the next %s" msgstr "Weg volgen voor %s" ! #: ../src/navigation.c:437 msgid "soon" msgstr "binnenkort" ! #: ../src/navigation.c:443 msgid "now" msgstr "nu" ! #: ../src/navigation.c:446 msgid "error" msgstr "error" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:450 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s afslaan" ! # over 200 meter links aanhouden ! #: ../src/navigation.c:453 #, c-format msgid "You have reached your destination %s" msgstr "%s bestemming bereikt" ! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:668 msgid "Projection" msgstr "Projectie" ! #: ../src/navit.c:723 msgid "Former Destinations" msgstr "Vorige bestemmingen" ! #: ../src/navit.c:733 msgid "Bookmarks" msgstr "Bookmarks" ! #: ../src/navit.c:771 msgid "Vehicle" msgstr "Voertuig" ! #: ../src/navit.c:821 msgid "Command" msgstr "Opdracht" ! #: ../src/navit.c:826 msgid "Length" msgstr "Lengte" ! #: ../src/navit.c:832 msgid "Time" msgstr "Tijd" ! #: ../src/navit.c:837 msgid "Destination Length" msgstr "Afstand" ! #: ../src/navit.c:843 msgid "Destination Time" msgstr "Aankomsttijd" ! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Route" ! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368 ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kaart" ! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" + #: ../src/popup.c:229 + #, c-format + msgid "Point 0x%x 0x%x" + msgstr "Punt 0x%x 0x%x" + + #: ../src/popup.c:230 + #, c-format + msgid "Screen %d %d" + msgstr "Scherm %d %d" + + #: ../src/popup.c:239 + msgid "Set as position" + msgstr "Zet als positie" + + #: ../src/popup.c:240 + msgid "Set as destination" + msgstr "Zet als bestemming" + + #: ../src/popup.c:241 + msgid "Add as bookmark" + msgstr "Opnemen als bladwijzer" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 446,629 **** msgstr "Svalbard und Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 msgid "Car" msgstr "Auto" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso2" msgstr "Iso2" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso3" msgstr "Iso3" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Land" # ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Postal" msgstr "Postcode" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Town" msgstr "Plaats" # ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "District" msgstr "District" ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 msgid "Street" msgstr "Straat" ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 msgid "Number" msgstr "Nummer" # ! #: ../src/gui/gtk/destination.c:326 msgid "Enter Destination" msgstr "Bestemming" ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Postcode" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Plaats" ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" ! msgstr "Ortsteil/Gemeinde" ! #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" msgstr "Markeren" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 msgid "Destination" msgstr "Bestemming" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Tonen" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Verkleinen" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "Vergroten" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Verversen" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Wissen" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" ! msgstr "beëindigen" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Cursor" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Volgen" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Oriëntatie" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Beeldvullend" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Data" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "Toon blokken" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Sichtbare Städte" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "Toon polygonen" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "Toon straten" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "Toon punten" ! #: ../src/gui/gtk/gui_gtk_action.c:225 ! msgid "RouteGraph" ! msgstr "Route-Graph" ! ! #~ msgid "Point 0x%x 0x%x" ! #~ msgstr "Punt 0x%x 0x%x" ! ! #~ msgid "Screen %d %d" ! #~ msgstr "Scherm %d %d" ! ! #~ msgid "Set as position" ! #~ msgstr "Zet als positie" ! ! #~ msgid "Set as destination" ! #~ msgstr "Zet als bestemming" ! #~ msgid "Add as bookmark" ! #~ msgstr "Opnemen als bladwijzer" ! #~ msgid "two kilometers" ! #~ msgstr "twee kilometer" ! #~ msgid "in two kilometers" ! #~ msgstr "in twee kilometer" ! #~ msgid "three kilometers" ! #~ msgstr "drie kilometer" ! #~ msgid "in three kilometers" ! #~ msgstr "in drie kilometers" ! #~ msgid "four kilometers" ! #~ msgstr "vier kilometer" ! #~ msgid "in four kilometers" ! #~ msgstr "in vier kilometer" ! #~ msgid "%d kilometers" ! #~ msgstr "%d kilometer" ! #~ msgid "in %d kilometers" ! #~ msgstr "in %d Kilometers" --- 469,650 ---- msgstr "Svalbard und Jan Mayen" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 msgid "Car" msgstr "Auto" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso2" msgstr "Iso2" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso3" msgstr "Iso3" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334 msgid "Country" msgstr "Land" # ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "Postal" msgstr "Postcode" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "Town" msgstr "Plaats" # ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "District" msgstr "District" ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 ! #: ../src/gui/gtk/destination.c:343 msgid "Street" msgstr "Straat" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:345 msgid "Number" msgstr "Nummer" # ! #: ../src/gui/gtk/destination.c:329 msgid "Enter Destination" msgstr "Bestemming" ! #: ../src/gui/gtk/destination.c:336 msgid "Zip Code" msgstr "Postcode" ! #: ../src/gui/gtk/destination.c:338 msgid "City" msgstr "Plaats" ! #: ../src/gui/gtk/destination.c:340 msgid "District/Township" ! msgstr "Gebied" ! #: ../src/gui/gtk/destination.c:369 msgid "Bookmark" msgstr "Markeren" ! #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208 msgid "Destination" msgstr "Bestemming" ! #: ../src/gui/gtk/gui_gtk_action.c:195 msgid "Display" msgstr "Tonen" ! #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "ZoomOut" msgstr "Verkleinen" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "ZoomIn" msgstr "Vergroten" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Refresh" msgstr "Verversen" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "Clear" msgstr "Wissen" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "_Quit" ! msgstr "Beëindigen" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "Cursor" msgstr "Cursor" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Tracking" msgstr "Volgen" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "Orientation" msgstr "Oriëntatie" ! #: ../src/gui/gtk/gui_gtk_action.c:222 ../src/gui/gtk/gui_gtk_action.c:224 msgid "Fullscreen" msgstr "Beeldvullend" ! #: ../src/gui/gtk/gui_gtk_action.c:232 msgid "Data" msgstr "Data" ! #: ../src/gui/gtk/gui_gtk_action.c:233 msgid "VisibleBlocks" msgstr "Toon blokken" ! #: ../src/gui/gtk/gui_gtk_action.c:234 msgid "VisibleTowns" msgstr "Sichtbare Städte" ! #: ../src/gui/gtk/gui_gtk_action.c:235 msgid "VisiblePolys" msgstr "Toon polygonen" ! #: ../src/gui/gtk/gui_gtk_action.c:236 msgid "VisibleStreets" msgstr "Toon straten" ! #: ../src/gui/gtk/gui_gtk_action.c:237 msgid "VisiblePoints" msgstr "Toon punten" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "N" ! msgstr "N" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "NE" ! msgstr "NO" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "E" ! msgstr "O" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SE" ! msgstr "ZO" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "S" ! msgstr "Z" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SW" ! msgstr "ZW" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "W" ! msgstr "W" ! #: ../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 Aankomsttijd" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:153 ! msgid "Route 0000km 0+00:00 ETA" ! msgstr "Route 0000km 0+00:00 Aankomsttijd" |
|
From: Martin S. <mar...@us...> - 2008-01-14 19:33:22
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14755 Modified Files: graphics_gtk_drawing_area.c Log Message: Fix:GTK:Added one more fontpath 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.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** graphics_gtk_drawing_area.c 9 Jan 2008 19:08:42 -0000 1.26 --- graphics_gtk_drawing_area.c 14 Jan 2008 19:33:24 -0000 1.27 *************** *** 76,79 **** --- 76,80 ---- "/usr/share/fonts/ttf", "/usr/share/fonts/corefonts", + "/usr/share/fonts/liberation", NULL, }; |
13 messages has been excluded from this view by a project administrator.
