Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5960 ffa7fe5e-494d-0410-b361-a75ebd5db220

6 files changed, 107 insertions, 107 deletions

diff --git a/navit/map/mg/block.c b/navit/map/mg/block.c
index 988865728..f18e77863 100644
--- a/navit/map/mg/block.c
+++ b/navit/map/mg/block.c
@@ -77,7 +77,7 @@ block_get_byid(struct file *file, int id, unsigned char **p_ret)
 int
 block_get_byindex(struct file *file, int idx, struct block_priv *blk)
 {
-	dbg(1,"idx=%d\n", idx);
+	dbg(lvl_warning,"idx=%d\n", idx);
 	blk->b=block_get_byid(file, idx, &blk->p);
 	blk->block_start=(unsigned char *)(blk->b);
 	blk->p_start=blk->p;
@@ -177,7 +177,7 @@ block_next_lin(struct map_rect_priv *mr)
 		else
 			mr->b.p=mr->b.block_start+block_get_blocks(mr->b.b)*512;
 		if (mr->b.p >= mr->file->end) {
-			dbg(1,"end of blocks %p vs %p\n", mr->b.p, mr->file->end);
+			dbg(lvl_warning,"end of blocks %p vs %p\n", mr->b.p, mr->file->end);
 			return 0;
 		}
 		mr->b.block_start=mr->b.p;
@@ -185,17 +185,17 @@ block_next_lin(struct map_rect_priv *mr)
 		mr->b.p_start=mr->b.p;
 		mr->b.end=mr->b.block_start+block_get_size(mr->b.b);
 		if (block_get_count(mr->b.b) == -1) {
-			dbg(1,"empty blocks\n");
+			dbg(lvl_warning,"empty blocks\n");
 			return 0;
 		}
 		block_get_r(mr->b.b, &r);
 		if (!mr->cur_sel || coord_rect_overlap(&mr->cur_sel->u.c_rect, &r)) {
 			block_active_count++;
 			block_active_mem+=block_get_blocks(mr->b.b)*512-sizeof(struct block *);
-			dbg(1,"block ok\n");
+			dbg(lvl_warning,"block ok\n");
 			return 1;
 		}
-		dbg(2,"block not in cur_sel\n");
+		dbg(lvl_info,"block not in cur_sel\n");
 	}
 }
 
@@ -210,14 +210,14 @@ block_next(struct map_rect_priv *mr)
 		return block_next_lin(mr);
 	for (;;) {
 		if (! bt->p) {
-			dbg(1,"block 0x%x\n", bt->next);
+			dbg(lvl_warning,"block 0x%x\n", bt->next);
 			if (bt->next == -1)
 				return 0;
 			bt->b=block_get_byid(mr->file, bt->next, &bt->p);
 			bt->end=(unsigned char *)mr->b.bt.b+block_get_size(mr->b.bt.b);
 			bt->next=block_get_next(bt->b);
 			bt->order=0;
-			dbg(1,"size 0x%x next 0x%x\n", block_get_size(bt->b), block_get_next(bt->b));
+			dbg(lvl_warning,"size 0x%x next 0x%x\n", block_get_size(bt->b), block_get_next(bt->b));
 			if (! mr->b.bt.block_count) {
 #if 0
 				if (debug) {
@@ -238,8 +238,8 @@ block_next(struct map_rect_priv *mr)
 			blk_num=get_u32(&mr->b.bt.p);
 			coord=get_u32(&mr->b.bt.p); 
 			block_mem+=8;
-			dbg(1,"%p vs %p coord 0x%x ", mr->b.bt.end, mr->b.bt.p, coord);
-			dbg(1,"block 0x%x", blk_num);
+			dbg(lvl_warning,"%p vs %p coord 0x%x ", mr->b.bt.end, mr->b.bt.p, coord);
+			dbg(lvl_warning,"block 0x%x", blk_num);
 		
 			r_w=bt->r_curr.rl.x-bt->r_curr.lu.x;
 			r_h=bt->r_curr.lu.y-bt->r_curr.rl.y;
diff --git a/navit/map/mg/map.c b/navit/map/mg/map.c
index 682b6917c..b5a67fd09 100644
--- a/navit/map/mg/map.c
+++ b/navit/map/mg/map.c
@@ -289,7 +289,7 @@ map_rect_get_item_mg(struct map_rect_priv *mr)
 		}
 		if (file_next(mr))
 			continue;
-		dbg(1,"lin_count %d idx_count %d active_count %d %d kB (%d kB)\n", block_lin_count, block_idx_count, block_active_count, (block_mem+block_active_mem)/1024, block_active_mem/1024);
+		dbg(lvl_warning,"lin_count %d idx_count %d active_count %d %d kB (%d kB)\n", block_lin_count, block_idx_count, block_active_count, (block_mem+block_active_mem)/1024, block_active_mem/1024);
 		return NULL;
 	}
 }
@@ -361,7 +361,7 @@ map_search_mg_convert_special(char *str)
 			*c++='u';
 			break;
 		default:
-			dbg(1,"0x%x\n", *str);
+			dbg(lvl_warning,"0x%x\n", *str);
 			*c++=*str;
 			break;
 		}
@@ -375,11 +375,11 @@ static int
 map_search_setup(struct map_rect_priv *mr)
 {
 	char *prefix;
-	dbg(1,"%s\n", attr_to_name(mr->search_type));
+	dbg(lvl_warning,"%s\n", attr_to_name(mr->search_type));
 	switch (mr->search_type) {
 	case attr_town_postal:
 		if (mr->search_item.type != type_country_label) {
-			dbg(0,"wrong parent type %s\n", item_to_name(mr->search_item.type));
+			dbg(lvl_error,"wrong parent type %s\n", item_to_name(mr->search_item.type));
 			return 0;
 		}
 		prefix=mg_country_postal_prefix(mr->search_item.id_lo);
@@ -388,12 +388,12 @@ map_search_setup(struct map_rect_priv *mr)
 		tree_search_init(mr->m->dirname, "town.b1", &mr->ts, 0);
 		mr->current_file=file_town_twn;
 		mr->search_str=g_strdup_printf("%s%s",prefix,mr->search_attr->u.str);
-		dbg(0,"search_str='%s'\n",mr->search_str);
+		dbg(lvl_error,"search_str='%s'\n",mr->search_str);
 		mr->search_country=mg_country_from_isonum(mr->search_item.id_lo);
 		break;
 	case attr_town_name:
 		if (mr->search_item.type != type_country_label) {
-			dbg(0,"wrong parent type %s\n", item_to_name(mr->search_item.type));
+			dbg(lvl_error,"wrong parent type %s\n", item_to_name(mr->search_item.type));
 			return 0;
 		}
 		tree_search_init(mr->m->dirname, "town.b2", &mr->ts, 0x1000);
@@ -403,7 +403,7 @@ map_search_setup(struct map_rect_priv *mr)
 		break;
 	case attr_district_name:
 		if (mr->search_item.type != type_country_label) {
-			dbg(0,"wrong parent type %s\n", item_to_name(mr->search_item.type));
+			dbg(lvl_error,"wrong parent type %s\n", item_to_name(mr->search_item.type));
 			return 0;
 		}
 		tree_search_init(mr->m->dirname, "town.b3", &mr->ts, 0x1000);
@@ -434,11 +434,11 @@ map_search_setup(struct map_rect_priv *mr)
 					return 0;
 				}
 			} else {
-				dbg(0,"wrong parent type %s %p 0x%x 0x%x\n", item_to_name(mr->search_item.type), item, mr->search_item.id_hi, mr->search_item.id_lo);
+				dbg(lvl_error,"wrong parent type %s %p 0x%x 0x%x\n", item_to_name(mr->search_item.type), item, mr->search_item.id_hi, mr->search_item.id_lo);
 				return 0;
 			}
 		}
-		dbg(1,"street_assoc=0x%x\n", mr->search_item.id_lo);
+		dbg(lvl_warning,"street_assoc=0x%x\n", mr->search_item.id_lo);
 		tree_search_init(mr->m->dirname, "strname.b1", &mr->ts, 0);
 		mr->current_file=file_strname_stn;
 		mr->search_str=g_strdup(mr->search_attr->u.str);
@@ -447,12 +447,12 @@ map_search_setup(struct map_rect_priv *mr)
 		if (!map_priv_is(mr->search_item.map, mr->m))
 			return 0;
 		if (!housenumber_search_setup(mr)) {
-			dbg(0,"failed to search for attr_house_number\n");
+			dbg(lvl_error,"failed to search for attr_house_number\n");
 			return 0;
 		}
 		break;
 	default:
-		dbg(0,"unknown search %s\n",attr_to_name(mr->search_type));
+		dbg(lvl_error,"unknown search %s\n",attr_to_name(mr->search_type));
 		return 0;
 	}
 	mr->file=mr->m->file[mr->current_file];
@@ -467,9 +467,9 @@ static struct map_search_priv *
 map_search_new_mg(struct map_priv *map, struct item *item, struct attr *search, int partial)
 {
 	struct map_rect_priv *mr=g_new0(struct map_rect_priv, 1);
-	dbg(1,"searching for %s '%s'\n", attr_to_name(search->type), search->u.str);
-	dbg(1,"id_lo=0x%x\n", item->id_lo);
-	dbg(1,"search=%s\n", search->u.str);
+	dbg(lvl_warning,"searching for %s '%s'\n", attr_to_name(search->type), search->u.str);
+	dbg(lvl_warning,"id_lo=0x%x\n", item->id_lo);
+	dbg(lvl_warning,"search=%s\n", search->u.str);
 	mr->m=map;
 	mr->search_attr=attr_dup(search);
 	mr->search_type=search->type;
@@ -480,7 +480,7 @@ map_search_new_mg(struct map_priv *map, struct item *item, struct attr *search,
 		mr->search_type_next=attr_district_name;	
 	}
 	if (!map_search_setup(mr)) {
-		dbg(1,"map_search_new_mg failed\n");
+		dbg(lvl_warning,"map_search_new_mg failed\n");
 		g_free(mr);
 		return NULL;
 	}
@@ -507,7 +507,7 @@ map_search_destroy_mg(struct map_search_priv *ms)
 {
 	struct map_rect_priv *mr=(struct map_rect_priv *)ms;
 
-	dbg(1,"mr=%p\n", mr);
+	dbg(lvl_warning,"mr=%p\n", mr);
 	if (! mr)
 		return;
 	map_search_cleanup(mr);
@@ -538,7 +538,7 @@ map_search_get_item_mg(struct map_search_priv *ms)
 		ret=housenumber_search_get_item(mr);
 		break;
 	default:
-		dbg(0,"unknown search %s\n",attr_to_name(mr->search_type));
+		dbg(lvl_error,"unknown search %s\n",attr_to_name(mr->search_type));
 		break;
 	}
 	if (!ret && mr->search_type_next != attr_none) {
@@ -595,7 +595,7 @@ map_new_mg(struct map_methods *meth, struct attr **attrs, struct callback_list *
 			if (! m->file[i]) {
 				maybe_missing=(i == file_border_ply || i == file_height_ply || i == file_sea_ply);
 				if (! maybe_missing)
-					dbg(0,"Failed to load %s\n", filename);
+					dbg(lvl_error,"Failed to load %s\n", filename);
 			} else
 				file_mmap(m->file[i]);
 			g_free(filename);
diff --git a/navit/map/mg/poly.c b/navit/map/mg/poly.c
index 5bd08303f..43256a295 100644
--- a/navit/map/mg/poly.c
+++ b/navit/map/mg/poly.c
@@ -225,7 +225,7 @@ poly_get(struct map_rect_priv *mr, struct poly_priv *poly, struct item *item)
 				item->type=type_rail;
 				break;
 			default:
-				dbg(0,"Unknown poly type 0x%x '%s' 0x%x,0x%x\n", poly->type,poly->name,r.lu.x,r.lu.y);
+				dbg(lvl_error,"Unknown poly type 0x%x '%s' 0x%x,0x%x\n", poly->type,poly->name,r.lu.x,r.lu.y);
 				item->type=type_street_unkn;
 			}
 			if (!map_selection_contains_item(mr->cur_sel, 0, item->type)) {
@@ -235,10 +235,10 @@ poly_get(struct map_rect_priv *mr, struct poly_priv *poly, struct item *item)
 			}
 		} else 
 			mr->b.p=poly->subpoly_next;
-		dbg(1,"%d %d %s\n", poly->subpoly_num_all, mr->b.block_num, poly->name);
+		dbg(lvl_warning,"%d %d %s\n", poly->subpoly_num_all, mr->b.block_num, poly->name);
 		item->id_lo=poly->subpoly_num_all | (mr->b.block_num << 16);
 		item->id_hi=(mr->current_file << 16);
-		dbg(1,"0x%x 0x%x\n", item->id_lo, item->id_hi);
+		dbg(lvl_warning,"0x%x 0x%x\n", item->id_lo, item->id_hi);
 		poly->subpoly_next=mr->b.p+L(poly->count[poly->subpoly_num])*sizeof(struct coord);
 		poly->subpoly_num++;
 		poly->subpoly_num_all++;
diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c
index 363980be4..9a43ca14a 100644
--- a/navit/map/mg/street.c
+++ b/navit/map/mg/street.c
@@ -208,7 +208,7 @@ static int street_get_coord(unsigned char **pos, int bytes, struct coord_rect *r
 	if (f) {
 		f->x=ref->lu.x+x;
 		f->y=ref->rl.y+y;
-		dbg(1,"0x%x,0x%x + 0x%x,0x%x = 0x%x,0x%x\n", x, y, ref->lu.x, ref->rl.y, f->x, f->y);
+		dbg(lvl_warning,"0x%x,0x%x + 0x%x,0x%x = 0x%x,0x%x\n", x, y, ref->lu.x, ref->rl.y, f->x, f->y);
 	}
 	*pos=p;
 	return flags;
@@ -282,14 +282,14 @@ street_coord_get(void *priv_data, struct coord *c, int count)
 	if (segid == 0x15)
 		debug=1;
 	if (debug) {
-		dbg(0,"enter 0x%x\n",segid);
+		dbg(lvl_error,"enter 0x%x\n",segid);
 	}
 #endif
 	while (count > 0) {
 		if (street_coord_get_helper(street, c)) {
 #ifdef DEBUG_COORD_GET
 			if (debug) {
-				dbg(0,"0x%x,0x%x\n", c->x, c->y);
+				dbg(lvl_error,"0x%x,0x%x\n", c->x, c->y);
 			}
 #endif
 			c++;
@@ -316,7 +316,7 @@ street_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
 	struct street_priv *street=priv_data;
 	int nameid;
 
-	dbg(1,"segid 0x%x\n", street_str_get_segid(street->str));
+	dbg(lvl_warning,"segid 0x%x\n", street_str_get_segid(street->str));
 	attr->type=attr_type;
 	switch (attr_type) {
 	case attr_any:
@@ -516,7 +516,7 @@ street_get(struct map_rect_priv *mr, struct street_priv *street, struct item *it
 			break;
 		default:
 			item->type=type_street_unkn;
-			dbg(0,"unknown type 0x%x\n",street_str_get_type(street->str));
+			dbg(lvl_error,"unknown type 0x%x\n",street_str_get_type(street->str));
 		}
 		flags=item_get_default_flags(item->type);
 		if (flags)
@@ -557,12 +557,12 @@ street_get_byid(struct map_rect_priv *mr, struct street_priv *street, int id_hi,
         int country=id_hi & 0xffff;
         int res;
 	struct coord_rect r;
-	dbg(1,"enter(%p,%p,0x%x,0x%x,%p)\n", mr, street, id_hi, id_lo, item);
+	dbg(lvl_warning,"enter(%p,%p,0x%x,0x%x,%p)\n", mr, street, id_hi, id_lo, item);
 	if (! country)
 		return 0;
         if (! tree_search_hv(mr->m->dirname, "street", (id_lo >> 8) | (country << 24), id_lo & 0xff, &res))
 		return 0;
-	dbg(1,"res=0x%x (blk=0x%x)\n", res, res >> 12);
+	dbg(lvl_warning,"res=0x%x (blk=0x%x)\n", res, res >> 12);
         block_get_byindex(mr->m->file[mr->current_file], res >> 12, &mr->b);
 	street_get_data(street, &mr->b.p);
 	street->name_file=mr->m->file[file_strname_stn];
@@ -578,7 +578,7 @@ street_get_byid(struct map_rect_priv *mr, struct street_priv *street, int id_hi,
 	item->meth=&street_meth;
 	item->priv_data=street;
 	street->str+=(res & 0xfff)-1;
-	dbg(1,"segid 0x%x\n", street_str_get_segid(&street->str[1]));
+	dbg(lvl_warning,"segid 0x%x\n", street_str_get_segid(&street->str[1]));
 	return street_get(mr, street, item);
 #if 0
         mr->b.p=mr->b.block_start+(res & 0xffff);
@@ -620,7 +620,7 @@ latin1_tolower_ascii(unsigned char c)
 		return 'u';
 	default:
 		if (ret >= 0x80)
-			dbg(1,"ret=0x%x\n",c);
+			dbg(lvl_warning,"ret=0x%x\n",c);
 		return ret;
 	}
 }
@@ -662,27 +662,27 @@ street_search_compare_do(struct map_rect_priv *mr, int country, int town_assoc,
 {
         int d,len;
 
-	dbg(1,"enter");
-	dbg(1,"country 0x%x town_assoc 0x%x name '%s'\n", country, town_assoc, name);
+	dbg(lvl_warning,"enter");
+	dbg(lvl_warning,"country 0x%x town_assoc 0x%x name '%s'\n", country, town_assoc, name);
 	d=(mr->search_item.id_hi & 0xffff)-country;
-	dbg(1,"country %d (%d vs %d)\n", d, mr->search_item.id_hi & 0xffff, country);
+	dbg(lvl_warning,"country %d (%d vs %d)\n", d, mr->search_item.id_hi & 0xffff, country);
 	if (!d) {
 		if (mr->search_item.id_lo == town_assoc ) {
-			dbg(1,"town_assoc match (0x%x)\n", town_assoc);
+			dbg(lvl_warning,"town_assoc match (0x%x)\n", town_assoc);
 			len=mr->search_partial ? strlen(mr->search_str):INT_MAX;
 			d=strncasecmp_latin1(mr->search_str, name, len);
 			if (!strncasecmp_latin1_ascii(mr->search_str, name, len))
 				d=0;
-			dbg(1,"string %d\n", d);
+			dbg(lvl_warning,"string %d\n", d);
 		} else {
 			if (town_assoc < mr->search_item.id_lo)
 				d=1;
 			else
 				d=-1;
-			dbg(1,"assoc %d 0x%x-0x%x\n",d, mr->search_item.id_lo, town_assoc);
+			dbg(lvl_warning,"assoc %d 0x%x-0x%x\n",d, mr->search_item.id_lo, town_assoc);
 		}
 	}
-	dbg(1,"d=%d\n", d);
+	dbg(lvl_warning,"d=%d\n", d);
 	return d;	
 }
 
@@ -692,11 +692,11 @@ street_search_compare(unsigned char **p, struct map_rect_priv *mr)
 	struct street_name_index *i;
 	int ret;
 
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	i=(struct street_name_index *)(*p);
 	*p+=sizeof(*i)+strlen(i->name)+1;
 
-	dbg(1,"block 0x%x\n", i->block);
+	dbg(lvl_warning,"block 0x%x\n", i->block);
 	
 	ret=street_search_compare_do(mr, i->country, i->town_assoc, i->name);
 	if (ret <= 0)
@@ -725,7 +725,7 @@ street_name_coord_get(void *priv_data, struct coord *c, int count)
 	struct street_name_numbers snns;
 	unsigned char *p=mr->street.name.aux_data;
 
-	dbg(1,"aux_data=%p\n", p);
+	dbg(lvl_warning,"aux_data=%p\n", p);
 	if (count) {
 		street_name_numbers_get(&snns, &p);
 		street_name_numbers_get_coord(&snns, c);
@@ -801,7 +801,7 @@ street_name_attr_get(void *priv_data, enum attr_type attr_type, struct attr *att
 			return 0;
 		return item_attr_get(mr->search_item_tmp, attr_type, attr);
 	default:
-		dbg(0,"unknown attr %s\n",attr_to_name(attr_type));
+		dbg(lvl_error,"unknown attr %s\n",attr_to_name(attr_type));
 		return 0;
 	}
 }
@@ -830,7 +830,7 @@ street_name_get_byid(struct map_rect_priv *mr, struct street_priv *street, int i
 	item->map=NULL;
 	item->priv_data=mr;
 	mr->b.p=street->name_file->begin+item->id_lo;
-	dbg(1,"last %p map %p file %d begin %p\n", mr->b.p, mr->m, mr->current_file, mr->m->file[mr->current_file]->begin);
+	dbg(lvl_warning,"last %p map %p file %d begin %p\n", mr->b.p, mr->m, mr->current_file, mr->m->file[mr->current_file]->begin);
 	street_name_get(&street->name, &mr->b.p);
 	return 1;
 }
@@ -841,30 +841,30 @@ street_search_get_item_street_name(struct map_rect_priv *mr)
 	int dir=1,leaf;
 	unsigned char *last;
 
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	if (! mr->search_blk_count) {
-		dbg(1,"partial 0x%x '%s' ***\n", mr->town.street_assoc, mr->search_str);
+		dbg(lvl_warning,"partial 0x%x '%s' ***\n", mr->town.street_assoc, mr->search_str);
 		if (mr->search_linear)
 			return NULL;
-		dbg(1,"tree_search_next\n");
+		dbg(lvl_warning,"tree_search_next\n");
 		mr->search_block=-1;
 		while ((leaf=tree_search_next(&mr->ts, &mr->search_p, dir)) != -1) {
 			dir=street_search_compare(&mr->search_p, mr);
 		}
-		dbg(1,"dir=%d mr->search_block=0x%x\n", dir, mr->search_block);
+		dbg(lvl_warning,"dir=%d mr->search_block=0x%x\n", dir, mr->search_block);
 		if (mr->search_block == -1)
 			return NULL;
 		mr->search_blk_count=1;
 		block_get_byindex(mr->m->file[file_strname_stn], mr->search_block, &mr->b);
 		mr->b.p=mr->b.block_start+12;
 	}
-	dbg(1,"name id %td\n", mr->b.p-mr->m->file[file_strname_stn]->begin);
+	dbg(lvl_warning,"name id %td\n", mr->b.p-mr->m->file[file_strname_stn]->begin);
 	if (! mr->search_blk_count)
 		return NULL;
 	for (;;) {
 		if (mr->b.p >= mr->b.end) {
 			if (!block_next_lin(mr)) {
-				dbg(1,"end of blocks in %p, %p\n", mr->m->file[file_strname_stn]->begin, mr->m->file[file_strname_stn]->end);
+				dbg(lvl_warning,"end of blocks in %p, %p\n", mr->m->file[file_strname_stn]->begin, mr->m->file[file_strname_stn]->end);
 				return NULL;
 			}
 			mr->b.p=mr->b.block_start+12;
@@ -873,23 +873,23 @@ street_search_get_item_street_name(struct map_rect_priv *mr)
 			last=mr->b.p;
 			street_name_get(&mr->street.name, &mr->b.p);
 			dir=street_search_compare_do(mr, mr->street.name.country, mr->street.name.townassoc, mr->street.name.name2);
-			dbg(1,"country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir);
+			dbg(lvl_warning,"country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir);
 			if (dir < 0) {
-				dbg(1,"end of data\n");
+				dbg(lvl_warning,"end of data\n");
 				mr->search_blk_count=0;
 				return NULL;
 			}
 			if (!dir) {
-				dbg(1,"result country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d aux_data=%p len=0x%x\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir, mr->street.name.aux_data, mr->street.name.aux_len);
+				dbg(lvl_warning,"result country 0x%x assoc 0x%x name1 '%s' name2 '%s' dir=%d aux_data=%p len=0x%x\n", mr->street.name.country, mr->street.name.townassoc, mr->street.name.name1, mr->street.name.name2, dir, mr->street.name.aux_data, mr->street.name.aux_len);
 				mr->item.type = type_street_name;
 				mr->item.id_hi=(file_strname_stn << 16);
 				mr->item.id_lo=last-mr->m->file[file_strname_stn]->begin;
-				dbg(1,"id 0x%x 0x%x last %p map %p file %d begin %p\n", mr->item.id_hi, mr->item.id_lo, last, mr->m, mr->current_file, mr->m->file[mr->current_file]->begin);
+				dbg(lvl_warning,"id 0x%x 0x%x last %p map %p file %d begin %p\n", mr->item.id_hi, mr->item.id_lo, last, mr->m, mr->current_file, mr->m->file[mr->current_file]->begin);
 				mr->item.meth=&street_name_meth;
 				mr->item.map=NULL;
 				mr->item.priv_data=mr;
 				/* debug(mr); */
-				dbg(1,"last %p\n",last);
+				dbg(lvl_warning,"last %p\n",last);
 				return &mr->item;
 			}
 		}
@@ -920,7 +920,7 @@ street_name_numbers_next(struct map_rect_priv *mr)
 {
 	if (street_name_eod(&mr->street.name))
 		return 0;
-	dbg(1,"%p vs %p\n",mr->street.name.tmp_data, mr->street.name.aux_data);
+	dbg(lvl_warning,"%p vs %p\n",mr->street.name.tmp_data, mr->street.name.aux_data);
 	street_name_numbers_get(&mr->street.name_numbers, &mr->street.name.tmp_data);
 	return 1;
 }
@@ -975,7 +975,7 @@ housenumber_attr_get(void *priv_data, enum attr_type attr_type, struct attr *att
 			return 0;
 		return item_attr_get(mr->search_item_tmp, attr_type, attr);
 	default:
-		dbg(0,"unknown attr %s\n",attr_to_name(attr_type));
+		dbg(lvl_error,"unknown attr %s\n",attr_to_name(attr_type));
 		return 0;
 	}
 }
@@ -991,20 +991,20 @@ static struct item_methods housenumber_meth = {
 int
 housenumber_search_setup(struct map_rect_priv *mr)
 {
-	dbg(1,"enter (0x%x,0x%x)\n",mr->search_item.id_hi,mr->search_item.id_lo);
+	dbg(lvl_warning,"enter (0x%x,0x%x)\n",mr->search_item.id_hi,mr->search_item.id_lo);
 	int id=mr->search_item.id_hi & 0xff;
 	mr->current_file=file_strname_stn;
 	mr->street.name_file=mr->m->file[mr->current_file];
 	mr->b.p=mr->street.name_file->begin+mr->search_item.id_lo;
 	mr->search_str=g_strdup(mr->search_attr->u.str);
-	dbg(1,"last %p\n",mr->b.p);
+	dbg(lvl_warning,"last %p\n",mr->b.p);
 	street_name_get(&mr->street.name, &mr->b.p);
 #if 0
 	debug(mr);
 #endif
 	while (id > 0) {
 		id--;
-		dbg(1,"loop\n");
+		dbg(lvl_warning,"loop\n");
 		if (!street_name_numbers_next(mr))
 			return 0;
 	}
@@ -1015,10 +1015,10 @@ housenumber_search_setup(struct map_rect_priv *mr)
 	if (!id)
 		mr->item.id_hi+=1;
 	mr->item.id_lo=mr->search_item.id_lo;
-	dbg(1,"getting name_number %p vs %p + %d\n",mr->street.name_numbers.tmp_data,mr->street.name_numbers.aux_data, mr->street.name_numbers.aux_len);
+	dbg(lvl_warning,"getting name_number %p vs %p + %d\n",mr->street.name_numbers.tmp_data,mr->street.name_numbers.aux_data, mr->street.name_numbers.aux_len);
 	if (!street_name_number_next(mr)) 
 		return 0;
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	// debug(mr);
 	return 1;
 }
@@ -1055,7 +1055,7 @@ struct item *
 housenumber_search_get_item(struct map_rect_priv *mr)
 {
 	int d;
-	dbg(1,"enter %s %s\n",mr->street.first_number,mr->street.last_number);
+	dbg(lvl_warning,"enter %s %s\n",mr->street.first_number,mr->street.last_number);
 	for (;;) {
 		if (!house_number_next(mr->street.current_number, mr->street.first_number, mr->street.last_number, 0, NULL)) {
 			if (!street_name_number_next(mr))
diff --git a/navit/map/mg/town.c b/navit/map/mg/town.c
index 8ef5e808e..ab7a19786 100644
--- a/navit/map/mg/town.c
+++ b/navit/map/mg/town.c
@@ -105,7 +105,7 @@ town_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
 		twn->attr_next=attr_none;
 		return 1;
 	default:
-                dbg(1, "Don't know about attribute %d[%04X]=%s yet\n",
+                dbg(lvl_warning, "Don't know about attribute %d[%04X]=%s yet\n",
 			attr_type, attr_type, attr_to_name(attr_type));
 		return 0;
 	}
@@ -222,12 +222,12 @@ town_search_compare(unsigned char **p, struct map_rect_priv *mr)
 		d=0;
 	} else {
 		country=get_u16_unal(p);
-		dbg(1,"country 0x%x ", country);
+		dbg(lvl_warning,"country 0x%x ", country);
 		name=get_string(p);
-		dbg(1,"name '%s' ",name);
+		dbg(lvl_warning,"name '%s' ",name);
 		mr->search_blk_count=get_u32_unal(p);
 		mr->search_blk_off=(struct block_offset *)(*p);
-		dbg(1,"len %d ", mr->search_blk_count);
+		dbg(lvl_warning,"len %d ", mr->search_blk_count);
 		(*p)+=mr->search_blk_count*4;
 		d=mr->search_country-country;
 	}
@@ -237,7 +237,7 @@ town_search_compare(unsigned char **p, struct map_rect_priv *mr)
 		else
 			d=strcasecmp(mr->search_str, name);
 	}
-	dbg(1,"%d \n",d);
+	dbg(lvl_warning,"%d \n",d);
 	return d;
 
 }
@@ -250,7 +250,7 @@ town_search_get_item(struct map_rect_priv *mr)
 	int dir=1,leaf;
 
 	if (! mr->search_blk_count) {
-		dbg(1,"partial %d 0x%x '%s' ***\n", mr->search_partial, mr->search_country, mr->search_str);
+		dbg(lvl_warning,"partial %d 0x%x '%s' ***\n", mr->search_partial, mr->search_country, mr->search_str);
 		if (! mr->search_linear) {
 			while ((leaf=tree_search_next(&mr->ts, &mr->search_p, dir)) != -1) {
 				dir=town_search_compare(&mr->search_p, mr);
@@ -261,23 +261,23 @@ town_search_get_item(struct map_rect_priv *mr)
 				}
 			}
 			if (! mr->search_linear) {
-				dbg(1,"not found\n");
+				dbg(lvl_warning,"not found\n");
 				return NULL;
 			}
 		}
 		if (! tree_search_next_lin(&mr->ts, &mr->search_p)) {
-			dbg(1,"linear not found\n");
+			dbg(lvl_warning,"linear not found\n");
 			return NULL;
 		}
 		if (town_search_compare(&mr->search_p, mr)) {
-			dbg(1,"no match\n");
+			dbg(lvl_warning,"no match\n");
 			return NULL;
 		}
-		dbg(1,"found %d blocks\n",mr->search_blk_count);
+		dbg(lvl_warning,"found %d blocks\n",mr->search_blk_count);
 	}
 	if (! mr->search_blk_count)
 		return NULL;
-	dbg(1,"block 0x%x offset 0x%x\n", block_offset_get_block(mr->search_blk_off), block_offset_get_offset(mr->search_blk_off));
+	dbg(lvl_warning,"block 0x%x offset 0x%x\n", block_offset_get_block(mr->search_blk_off), block_offset_get_offset(mr->search_blk_off));
 	block_get_byindex(mr->m->file[mr->current_file], block_offset_get_block(mr->search_blk_off), &mr->b);
 	mr->b.p=mr->b.block_start+block_offset_get_offset(mr->search_blk_off);
 	town_get(mr, &mr->town, &mr->item);
diff --git a/navit/map/mg/tree.c b/navit/map/mg/tree.c
index 3b6a2c2d0..27100007c 100644
--- a/navit/map/mg/tree.c
+++ b/navit/map/mg/tree.c
@@ -78,22 +78,22 @@ tree_search_h(struct file *file, unsigned int search)
 	struct tree_hdr_h *thdr;
 	struct tree_leaf_h *tleaf;
 
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	while (i++ < 1000) {
 		thdr=(struct tree_hdr_h *)p;
 		p+=sizeof(*thdr);
 		end=p+tree_hdr_h_get_size(thdr);
-		dbg(1,"@%td\n", p-file->begin);
+		dbg(lvl_warning,"@%td\n", p-file->begin);
 		last=0;
 		while (p < end) {
 			tleaf=(struct tree_leaf_h *)p;
 			p+=sizeof(*tleaf);
-			dbg(1,"low:0x%x high:0x%x match:0x%x val:0x%x search:0x%x\n", tree_leaf_h_get_lower(tleaf), tree_leaf_h_get_higher(tleaf), tree_leaf_h_get_match(tleaf), tree_leaf_h_get_value(tleaf), search);
+			dbg(lvl_warning,"low:0x%x high:0x%x match:0x%x val:0x%x search:0x%x\n", tree_leaf_h_get_lower(tleaf), tree_leaf_h_get_higher(tleaf), tree_leaf_h_get_match(tleaf), tree_leaf_h_get_value(tleaf), search);
 			value=tree_leaf_h_get_value(tleaf);
 			if (value == search)
 				return tree_leaf_h_get_match(tleaf);
 			if (value > search) {
-				dbg(1,"lower\n");
+				dbg(lvl_warning,"lower\n");
 				lower=tree_leaf_h_get_lower(tleaf);
 				if (lower)
 					last=lower;
@@ -119,11 +119,11 @@ tree_search_v(struct file *file, int offset, int search)
 		thdr=(struct tree_hdr_v *)p;
 		p+=sizeof(*thdr);
 		count=tree_hdr_v_get_count(thdr);
-		dbg(1,"offset=%td count=0x%x\n", p-file->begin, count);
+		dbg(lvl_warning,"offset=%td count=0x%x\n", p-file->begin, count);
 		while (count--) {
 			tleaf=(struct tree_leaf_v *)p;
 			p+=sizeof(*tleaf);
-			dbg(1,"0x%x 0x%x\n", tleaf->key, search);
+			dbg(lvl_warning,"0x%x 0x%x\n", tleaf->key, search);
 			if (tleaf->key == search)
 				return tree_leaf_v_get_value(tleaf);
 		}
@@ -142,32 +142,32 @@ tree_search_hv(char *dirname, char *filename, unsigned int search_h, unsigned in
 	char buffer[4096];
 	int h,v;
 
-	dbg(1,"enter(%s, %s, 0x%x, 0x%x, %p)\n",dirname, filename, search_h, search_v, result);
+	dbg(lvl_warning,"enter(%s, %s, 0x%x, 0x%x, %p)\n",dirname, filename, search_h, search_v, result);
 	sprintf(buffer, "%s/%s.h1", dirname, filename);
 	f_idx_h=file_create_caseinsensitive(buffer, 0);
 	if ((!f_idx_h) || (!file_mmap(f_idx_h)))
 		return 0;
 	sprintf(buffer, "%s/%s.v1", dirname, filename);
 	f_idx_v=file_create_caseinsensitive(buffer, 0);
-	dbg(1,"%p %p\n", f_idx_h, f_idx_v);
+	dbg(lvl_warning,"%p %p\n", f_idx_h, f_idx_v);
 	if ((!f_idx_v) || (!file_mmap(f_idx_v))) {
 		file_destroy(f_idx_h);
 		return 0;
 	}
 	if ((h=tree_search_h(f_idx_h, search_h))) {
-		dbg(1,"h=0x%x\n", h);
+		dbg(lvl_warning,"h=0x%x\n", h);
 		if ((v=tree_search_v(f_idx_v, h, search_v))) {
-			dbg(1,"v=0x%x\n", v);
+			dbg(lvl_warning,"v=0x%x\n", v);
 			*result=v;
 			file_destroy(f_idx_v);
 			file_destroy(f_idx_h);
-			dbg(1,"return 1\n");
+			dbg(lvl_warning,"return 1\n");
 			return 1;
 		}
 	}
 	file_destroy(f_idx_v);
 	file_destroy(f_idx_h);
-	dbg(1,"return 0\n");
+	dbg(lvl_warning,"return 0\n");
 	return 0;
 }
 
@@ -183,7 +183,7 @@ tree_search_enter(struct tree_search *ts, int offset)
 	tsn->end=p+tree_hdr_get_size(tsn->hdr);
 	tsn->low=tree_hdr_get_low(tsn->hdr);
 	tsn->high=tree_hdr_get_low(tsn->hdr);
-	dbg(1,"pos %td addr 0x%ux size 0x%ux low 0x%ux end %tu\n", p-ts->f->begin, tree_hdr_get_addr(tsn->hdr), tree_hdr_get_size(tsn->hdr), tree_hdr_get_low(tsn->hdr), tsn->end-ts->f->begin);
+	dbg(lvl_warning,"pos %td addr 0x%ux size 0x%ux low 0x%ux end %tu\n", p-ts->f->begin, tree_hdr_get_addr(tsn->hdr), tree_hdr_get_size(tsn->hdr), tree_hdr_get_low(tsn->hdr), tsn->end-ts->f->begin);
 	return tsn;
 }
 
@@ -193,17 +193,17 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
 
 	if (! *p) 
 		*p=tsn->p;
-	dbg(1,"next *p=%p dir=%d\n", *p, dir);
-	dbg(1,"low1=0x%x high1=0x%x\n", tsn->low, tsn->high);
+	dbg(lvl_warning,"next *p=%p dir=%d\n", *p, dir);
+	dbg(lvl_warning,"low1=0x%x high1=0x%x\n", tsn->low, tsn->high);
 	if (dir <= 0) {
-		dbg(1,"down 0x%x\n", tsn->low);
+		dbg(lvl_warning,"down 0x%x\n", tsn->low);
 		if (tsn->low != 0xffffffff) {
 			tsn=tree_search_enter(ts, tsn->low);
 			*p=tsn->p;
 			tsn->high=get_u32(p);
 			ts->last_node=ts->curr_node;
-			dbg(1,"saving last2 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
-			dbg(1,"high2=0x%x\n", tsn->high);
+			dbg(lvl_warning,"saving last2 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
+			dbg(lvl_warning,"high2=0x%x\n", tsn->high);
 			return 0;
 		}
 		return -1;
@@ -211,18 +211,18 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
 	tsn->low=tsn->high;
 	tsn->last=*p;
 	tsn->high=get_u32_unal(p);
-	dbg(1,"saving last3 %d %p\n", ts->curr_node, tsn->last);
+	dbg(lvl_warning,"saving last3 %d %p\n", ts->curr_node, tsn->last);
 	if (*p < tsn->end)
 		return (tsn->low == 0xffffffff ? 1 : 0);
-	dbg(1,"end reached high=0x%x\n",tsn->high);
+	dbg(lvl_warning,"end reached high=0x%x\n",tsn->high);
 	if (tsn->low != 0xffffffff) {
-		dbg(1,"low 0x%x\n", tsn->low);
+		dbg(lvl_warning,"low 0x%x\n", tsn->low);
 		tsn=tree_search_enter(ts, tsn->low);
 		*p=tsn->p;
 		tsn->high=get_u32_unal(p);
 		ts->last_node=ts->curr_node;
-		dbg(1,"saving last4 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
-		dbg(1,"high4=0x%x\n", tsn->high);
+		dbg(lvl_warning,"saving last4 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
+		dbg(lvl_warning,"high4=0x%x\n", tsn->high);
 		return 0;
 	}
 	return -1;
@@ -233,7 +233,7 @@ int tree_search_next_lin(struct tree_search *ts, unsigned char **p)
 	struct tree_search_node *tsn=&ts->nodes[ts->curr_node];
 	int high;
 	
-	dbg(1,"pos=%d %td\n", ts->curr_node, *p-ts->f->begin);
+	dbg(lvl_warning,"pos=%d %td\n", ts->curr_node, *p-ts->f->begin);
 	if (*p)
 		ts->nodes[ts->last_node].last=*p;
 	*p=tsn->last;
@@ -243,12 +243,12 @@ int tree_search_next_lin(struct tree_search *ts, unsigned char **p)
 			ts->last_node=ts->curr_node;
 			while (high != 0xffffffff) {
 				tsn=tree_search_enter(ts, high);
-				dbg(1,"reload %d\n",ts->curr_node);
+				dbg(lvl_warning,"reload %d\n",ts->curr_node);
 				high=tsn->low;
 			}
 			return 1;
 		}
-		dbg(1,"eon %d %td %td\n", ts->curr_node, *p-ts->f->begin, tsn->end-ts->f->begin);
+		dbg(lvl_warning,"eon %d %td %td\n", ts->curr_node, *p-ts->f->begin, tsn->end-ts->f->begin);
 		if (! ts->curr_node)
 			break;
 		ts->curr_node--;