Labelling: Let's use generic make_bitmap everywhere

diff --git a/labeller.c b/labeller.c
index de09dc95e469cf7c0aee2224972068e709d67d84..c93fd1e0864208c5794396c122e65cd6878d1cff 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -325,20 +325,14 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t
   struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
   r->x = n->x;
   r->y = n->y;
   struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
   r->x = n->x;
   r->y = n->y;

+  make_bitmap(v, sym);

   switch (sym->type)
   {
     case SYMBOLIZER_ICON:
   switch (sym->type)
   {
     case SYMBOLIZER_ICON:

-      make_bitmap_icon(v, (struct sym_icon *) sym);
+      // FIXME: Really?

       r->x = ((struct sym_icon *)sym)->sir.x;
       r->y = ((struct sym_icon *)sym)->sir.y;
       break;
       r->x = ((struct sym_icon *)sym)->sir.x;
       r->y = ((struct sym_icon *)sym)->sir.y;
       break;

-    case SYMBOLIZER_POINT:
-      make_bitmap_point(v, (struct sym_point *) sym);
-      break;
-    case SYMBOLIZER_TEXT: ;
-      struct sym_text *st = (struct sym_text *) sym;
-      struct osm_node *n = (struct osm_node *) object;
-      make_bitmap_label(v, st);

     default:
       // FIXME
       return;
     default:
       // FIXME
       return;


@@ -390,21 +384,7 @@ void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t
 
   GARY_INIT(r->request.variants, 0);
   struct variant *v = GARY_PUSH(r->request.variants);
 
   GARY_INIT(r->request.variants, 0);
   struct variant *v = GARY_PUSH(r->request.variants);

-  switch (sym->type)
-  {
-    case SYMBOLIZER_ICON:
-      if (dbg_requests)
-        printf("DEBUG: Icon label\n");
-      make_bitmap_icon(v, (struct sym_icon *) sym);
-      break;
-    case SYMBOLIZER_TEXT:
-      if (dbg_requests)
-        printf("DEBUG: Text label\n");
-      make_bitmap_label(v, (struct sym_text *) sym);
-    default:
-      // FIXME
-      ;
-  }
+  make_bitmap(v, sym);

 }
 
 void make_graph(void)
 }
 
 void make_graph(void)