Labelling: A bit of work done

[leo.git] / sym-text.c

diff --git a/sym-text.c b/sym-text.c
index 2666acd9f5d2e6f5984183750ad77b0a1ef2b7c8..66e834a05c42297f112792ae86708fc3d1ce538d 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -17,6 +17,8 @@
 #include "sym.h"
 #include "map.h"
 
+#include "labeller.h"
+
 /*** Fonts ***/
 
 struct text_font {
@@ -455,7 +457,15 @@ static void sym_text_center(struct osm_object *o, struct style_info *si, osm_val
   st->x -= st->tw / 2;
   st->y += st->th - (st->th + st->td) / 2;
   text_fix_placement(st);
-  sym_plan(&st->s, sym_zindex(o, si, 4.9));
+  if (o->type == OSM_TYPE_WAY && !osm_way_cyclic_p((struct osm_way *) o))
+  {
+    labeller_add_linelabel(&st->s, o, sym_zindex(o, si, 4.9));
+  }
+  else
+  {
+//    sym_plan(&st->s, sym_zindex(o, si, 4.9));
+    labeller_add_arealabel(&st->s, o, sym_zindex(o, si, 4.9));
+  }
 }
 
 static void sym_text_way(struct osm_object *o, struct style_info *si, osm_val_t text)