Labelling: Another bunch of changes

[leo.git] / sym-text.c

diff --git a/sym-text.c b/sym-text.c
index 66e834a05c42297f112792ae86708fc3d1ce538d..3188938a38fd151c92998fce6005a493b3cb7904 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -227,6 +227,7 @@ static void prepare_text_element(struct sym_text *t, struct svg *svg)
 static void sym_text_draw(struct symbol *sym, struct svg *svg)
 {
   struct sym_text *t = (struct sym_text *) sym;
+printf("Drawing %s at [%.2f; %.2f]\n", osm_val_decode(t->text), t->x, t->y);
 
   if (t->next_duplicate)
     {
@@ -442,7 +443,7 @@ static void sym_text_node(struct osm_object *o, struct style_info *si, osm_val_t
       return;
     }
 
-  sym_plan(&st->s, sym_zindex(o, si, 5));
+  //sym_plan(&st->s, sym_zindex(o, si, 5));
 }
 
 static void sym_text_center(struct osm_object *o, struct style_info *si, osm_val_t text, double x, double y)
@@ -459,11 +460,14 @@ static void sym_text_center(struct osm_object *o, struct style_info *si, osm_val
   text_fix_placement(st);
   if (o->type == OSM_TYPE_WAY && !osm_way_cyclic_p((struct osm_way *) o))
   {
+    //sym_plan(&st->s, sym_zindex(o, si, 4.9));
+    printf("[Sym] Labelling way %ju with %s\n", o->id, osm_val_decode(st->text));
     labeller_add_linelabel(&st->s, o, sym_zindex(o, si, 4.9));
   }
   else
   {
-//    sym_plan(&st->s, sym_zindex(o, si, 4.9));
+    //sym_plan(&st->s, sym_zindex(o, si, 4.9));
+    printf("[Sym] Labelling area %ju with %s\n", o->id, osm_val_decode(st->text));
     labeller_add_arealabel(&st->s, o, sym_zindex(o, si, 4.9));
   }
 }