Labelling: Segments: A bunch of improvements

[leo.git] / sym-text.c

diff --git a/sym-text.c b/sym-text.c
index ffcfc421d78a516ddd446644ac0a86a312368d41..96b3a50cd7a8d0fdb4a31308ac2f36651882c158 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -18,6 +18,8 @@
 #include "sym.h"
 #include "map.h"
 
+#include "labeller.h"
+
 /*** Fonts ***/
 
 struct text_font {
@@ -447,7 +449,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)
@@ -462,7 +464,14 @@ 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
+  {
+    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)