diff options
Diffstat (limited to 'navit/map')
-rw-r--r-- | navit/map/garmin/garmin.c | 11 | ||||
-rw-r--r-- | navit/map/mg/block.c | 13 | ||||
-rw-r--r-- | navit/map/mg/street.c | 47 | ||||
-rw-r--r-- | navit/map/mg/town.c | 3 |
4 files changed, 0 insertions, 74 deletions
diff --git a/navit/map/garmin/garmin.c b/navit/map/garmin/garmin.c index 2e7263081..4ef32a28e 100644 --- a/navit/map/garmin/garmin.c +++ b/navit/map/garmin/garmin.c @@ -814,17 +814,6 @@ garmin_get_selection(struct map_rect_priv *map, struct map_selection *sel) } return -1; } -#if 0 - sl = (18-(gm->maxlevel - gm->minlevel))/2; - el = sl + (gm->maxlevel - gm->minlevel); - if (level < sl) - level = sl; - if (level > el) - level = el; - level = level - sl; - level = (gm->maxlevel - gm->minlevel) - level; - dlog(3, "sl=%d el=%d level=%d\n", sl, el, level); -#endif sl = (18-gm->zoomlevels)/2; el = sl + gm->zoomlevels; if (level < sl) diff --git a/navit/map/mg/block.c b/navit/map/mg/block.c index 7e7326908..747e49b15 100644 --- a/navit/map/mg/block.c +++ b/navit/map/mg/block.c @@ -219,12 +219,6 @@ block_next(struct map_rect_priv *mr) bt->order=0; dbg(lvl_debug,"size 0x%x next 0x%x", block_get_size(bt->b), block_get_next(bt->b)); if (! mr->b.bt.block_count) { -#if 0 - if (debug) { - printf("idx rect "); - block_rect_print(&mr->b.bt.b->r); - } -#endif block_get_r(bt->b, &bt->r); bt->r_curr=bt->r; coord=get_u32(&mr->b.bt.p); @@ -243,13 +237,6 @@ block_next(struct map_rect_priv *mr) r_w=bt->r_curr.rl.x-bt->r_curr.lu.x; r_h=bt->r_curr.lu.y-bt->r_curr.rl.y; -#if 0 - if (debug) { - printf(" rect1 "); - block_rect_print(&bt->r_curr); - printf(" %dx%d", r_w, r_h); - } -#endif mr->b.b=NULL; if (blk_num != -1) { block_mem+=8; diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c index 49f790e9c..cffd599ae 100644 --- a/navit/map/mg/street.c +++ b/navit/map/mg/street.c @@ -61,10 +61,6 @@ street_name_debug(struct street_name *sn, FILE *out) static void street_name_get(struct street_name *name, unsigned char **p) { -#if 0 - static FILE *out; - static GHashTable *hash; -#endif unsigned char *start=*p; name->len=get_u16_unal(p); name->country=get_u16_unal(p); @@ -79,18 +75,6 @@ street_name_get(struct street_name *name, unsigned char **p) name->tmp_len=name->aux_len; name->tmp_data=name->aux_data; *p=start+name->len; -#if 0 - if (! out) { - out=fopen("hn.txt","a"); - } - if (! hash) { - hash=g_hash_table_new(NULL,NULL); - } - if (! g_hash_table_lookup(hash, *p)) { - g_hash_table_insert(hash, *p, (void *)1); - street_name_debug(name, out); - } -#endif } static int @@ -414,13 +398,6 @@ street_get(struct map_rect_priv *mr, struct street_priv *street, struct item *it struct coord c; street_coord_get(street, &c, 1); } -#if 0 - if (street->housenumber) { - if (street_get_housenumber(mr, street, item)) - return 1; - street->housenumber=0; - } -#endif if (mr->b.p == mr->b.p_start) { street_get_data(street, &mr->b.p); street->name_file=mr->m->file[file_strname_stn]; @@ -445,16 +422,8 @@ street_get(struct map_rect_priv *mr, struct street_priv *street, struct item *it return 0; if (street_str_get_segid(street->str) < 0) street->type++; -#if 0 - dbg_assert(street->p != NULL); -#endif street->next=NULL; street->status_rewind=street->status=street_str_get_segid(&street->str[1]) >= 0 ? 0:1; -#if 0 - if (street->type->country != 0x31) { - printf("country=0x%x\n", street->type->country); - } -#endif item->id_hi=street_type_get_country(street->type) | (mr->current_file << 16); item->id_lo=street_str_get_segid(street->str) > 0 ? street_str_get_segid(street->str) : -street_str_get_segid(street->str); switch(street_str_get_type(street->str) & 0x1f) { @@ -530,13 +499,6 @@ street_get(struct map_rect_priv *mr, struct street_priv *street, struct item *it street->flags|=(street_str_get_limit(street->str) & 0x30) ? AF_ONEWAY:0; street->flags|=(street_str_get_limit(street->str) & 0x03) ? AF_ONEWAYREV:0; } -#if 0 - coord_debug=(street->str->unknown2 != 0x40 || street->str->unknown3 != 0x40); - if (coord_debug) { - item->type=type_street_unkn; - printf("%d %02x %02x %02x %02x\n", street->str->segid, street->str->type, street->str->limit, street->str->unknown2, street->str->unknown3); - } -#endif street->p_rewind=street->p; street->name.len=0; street->attr_next=attr_label; @@ -580,12 +542,6 @@ street_get_byid(struct map_rect_priv *mr, struct street_priv *street, int id_hi, street->str+=(res & 0xfff)-1; dbg(lvl_debug,"segid 0x%x", street_str_get_segid(&street->str[1])); return street_get(mr, street, item); -#if 0 - mr->b.p=mr->b.block_start+(res & 0xffff); - return town_get(mr, twn, item); -#endif - - return 0; } struct street_name_index { @@ -999,9 +955,6 @@ housenumber_search_setup(struct map_rect_priv *mr) mr->search_str=g_strdup(mr->search_attr->u.str); dbg(lvl_debug,"last %p",mr->b.p); street_name_get(&mr->street.name, &mr->b.p); -#if 0 - debug(mr); -#endif while (id > 0) { id--; dbg(lvl_debug,"loop"); diff --git a/navit/map/mg/town.c b/navit/map/mg/town.c index 1399bca33..ace353a1d 100644 --- a/navit/map/mg/town.c +++ b/navit/map/mg/town.c @@ -137,9 +137,6 @@ town_get_data(struct town_priv *twn, unsigned char **p) twn->unknown3=get_u8(p); twn->postal_code2=get_string(p); twn->unknown4=get_u32_unal(p); -#if 0 - printf("%s\t%s\t%s\t%d\t%d\t%d\n",twn->name,twn->district,twn->postal_code1,twn->order, twn->country, twn->type); -#endif } /*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */ static unsigned char limit[]={0,1,2,2,4,6,8,10,11,13,14,14,14,20,20,20,20,20,20}; |