diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:36:24 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:36:24 +0000 |
commit | 15ed93bca6e29fafab036c05ea77c163ab2baebf (patch) | |
tree | 0118c6ec64520748c7daefd46e57c226343621d2 /navit/maptool | |
parent | 3f996b10edb6dfd66c7bbbc9c8f5447978c52600 (diff) | |
download | navit-svn-15ed93bca6e29fafab036c05ea77c163ab2baebf.tar.gz |
Fix:core:Change all logging at lvl_error/warning to lvl_debug, unless it looks like an error message.|#1269, part 5
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5967 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
-rw-r--r-- | navit/maptool/ch.c | 10 | ||||
-rw-r--r-- | navit/maptool/coastline.c | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/navit/maptool/ch.c b/navit/maptool/ch.c index dffee305..b1b0b1bf 100644 --- a/navit/maptool/ch.c +++ b/navit/maptool/ch.c @@ -252,7 +252,7 @@ ch_process_node(FILE *out, int node, int resolve) item_bin=init_item(type_ch_node); oldnode=GPOINTER_TO_INT(g_hash_table_lookup(newnode_hash, GINT_TO_POINTER(node))); #if 0 - dbg(lvl_error,"0x%x,0x%x\n",node_index[oldnode].x,node_index[oldnode].y); + dbg(lvl_debug,"0x%x,0x%x\n",node_index[oldnode].x,node_index[oldnode].y); #endif item_bin_add_coord(item_bin, &node_index[oldnode], 1); fwd.first=oldnode; @@ -279,7 +279,7 @@ ch_process_node(FILE *out, int node, int resolve) } else { ch_edge.middle=*id; #if 0 - dbg(lvl_error,"middle street id for is "ITEM_ID_FMT"\n",ITEM_ID_ARGS(*id)); + dbg(lvl_debug,"middle street id for is "ITEM_ID_FMT"\n",ITEM_ID_ARGS(*id)); #endif } } else { @@ -288,12 +288,12 @@ ch_process_node(FILE *out, int node, int resolve) dbg_assert(id != NULL); ch_edge.middle=*id; #if 0 - dbg(lvl_error,"middle node id for is "ITEM_ID_FMT"\n",ITEM_ID_ARGS(*id)); + dbg(lvl_debug,"middle node id for is "ITEM_ID_FMT"\n",ITEM_ID_ARGS(*id)); #endif } id=g_hash_table_lookup(sgr_nodes_hash, GINT_TO_POINTER((int)edge->target)); #if 0 - dbg(lvl_error,"id for %d is "ITEM_ID_FMT"\n",edge->target,ITEM_ID_ARGS(*id)); + dbg(lvl_debug,"id for %d is "ITEM_ID_FMT"\n",edge->target,ITEM_ID_ARGS(*id)); #endif if (id == NULL) { fprintf(stderr,"Failed to look up target %d\n",edge->target); @@ -511,7 +511,7 @@ ch_assemble_map(char *map_suffix, char *suffix, struct zip_info *zip_info) struct item_id *id2=g_slice_new(struct item_id); *id2=id; #if 0 - dbg(lvl_error,"%d is "ITEM_ID_FMT"\n",nodeid,ITEM_ID_ARGS(*id2)); + dbg(lvl_debug,"%d is "ITEM_ID_FMT"\n",nodeid,ITEM_ID_ARGS(*id2)); #endif g_hash_table_insert(sgr_nodes_hash, GINT_TO_POINTER(nodeid), id2); nodeid++; diff --git a/navit/maptool/coastline.c b/navit/maptool/coastline.c index 74c07aa9..4e17fd65 100644 --- a/navit/maptool/coastline.c +++ b/navit/maptool/coastline.c @@ -52,11 +52,11 @@ find_next(struct rect *bbox, GList *segments, struct coord *c, int exclude, stru for (i = 0 ; i < 2 ; i++) { curr=segments; - dbg(lvl_warning,"search distance %d\n",search); + dbg(lvl_debug,"search distance %d\n",search); while (curr) { struct geom_poly_segment *seg=curr->data; int dist=distance_from_ll(seg->first, bbox); - dbg(lvl_warning,"0x%x 0x%x dist %d\n",seg->first->x,seg->first->y,dist); + dbg(lvl_debug,"0x%x 0x%x dist %d\n",seg->first->x,seg->first->y,dist); if (dist != -1 && seg->first != seg->last && dist < min && (dist >= search)) { min=dist; ci[0]=*seg->first; @@ -255,7 +255,7 @@ tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_da for (;;) { search++; // item_bin_write_debug_point_to_sink(out, &end, "Search %d",search); - dbg(lvl_warning,"searching next polygon from 0x%x 0x%x\n",end.x,end.y); + dbg(lvl_debug,"searching next polygon from 0x%x 0x%x\n",end.x,end.y); first=find_next(&bbox, sorted_segments, &end, exclude, cn); exclude=1; if (!first) @@ -265,7 +265,7 @@ tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_da tile_start_valid=1; } else { if (cn[0].x == tile_start.x && cn[0].y == tile_start.y) { - dbg(lvl_warning,"end of tile reached\n"); + dbg(lvl_debug,"end of tile reached\n"); break; } } @@ -274,7 +274,7 @@ tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_da continue; } poly_start_valid=0; - dbg(lvl_warning,"start of polygon 0x%x 0x%x\n",cn[0].x,cn[0].y); + dbg(lvl_debug,"start of polygon 0x%x 0x%x\n",cn[0].x,cn[0].y); for (;;) { if (!poly_start_valid) { poly_start=cn[0]; @@ -283,7 +283,7 @@ tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_da } else { close_polygon(ib, &end, &cn[0], 1, &bbox, &edges); if (cn[0].x == poly_start.x && cn[0].y == poly_start.y) { - dbg(lvl_warning,"poly end reached\n"); + dbg(lvl_debug,"poly end reached\n"); item_bin_add_attr_longlong(ib, attr_osm_wayid, ct->wayid); item_bin_write_to_sink(ib, out, NULL); end=cn[0]; @@ -296,11 +296,11 @@ tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_da first->type=geom_poly_segment_type_none; end=cn[1]; if (distance_from_ll(&end, &bbox) == -1) { - dbg(lvl_warning,"incomplete\n"); + dbg(lvl_debug,"incomplete\n"); break; } first=find_next(&bbox, sorted_segments, &end, 1, cn); - dbg(lvl_warning,"next segment of polygon 0x%x 0x%x\n",cn[0].x,cn[0].y); + dbg(lvl_debug,"next segment of polygon 0x%x 0x%x\n",cn[0].x,cn[0].y); } if (search > 55) break; |