Labelling: Segments: A bunch of improvements

[leo.git] / sym-text.c

diff --git a/sym-text.c b/sym-text.c
index f2f901e978270a7e364569750020842a0f483891..96b3a50cd7a8d0fdb4a31308ac2f36651882c158 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -7,6 +7,7 @@
 #include <ucw/lib.h>
 #include <ucw/stkstring.h>
 
+#include <math.h>
 #include <stdio.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -243,10 +244,16 @@ static void sym_text_draw(struct symbol *sym, struct svg *svg)
       t->y = sy / nn;
     }
 
-  if (t->opacity != 1)
+  bool use_group = 0;
+  bool want_rotate = (fabs(t->rotate) > 1e-5);
+  if (t->opacity != 1 || want_rotate)
     {
+      use_group = 1;
       svg_push_element(svg, "g");
-      svg_set_attr_float(svg, "opacity", t->opacity);
+      if (t->opacity != 1)
+       svg_set_attr_float(svg, "opacity", t->opacity);
+      if (want_rotate)
+       svg_set_attr_format(svg, "transform", "rotate(%.2f %s %s)", -t->rotate, svg_format_dimen(svg, t->x), svg_format_dimen(svg, t->y));
     }
 
   if (t->halo_radius)
@@ -294,7 +301,7 @@ static void sym_text_draw(struct symbol *sym, struct svg *svg)
   svg_pop(svg);
 #endif
 
-  if (t->opacity != 1)
+  if (use_group)
     svg_pop(svg);
 }
 
@@ -459,12 +466,10 @@ 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));
     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));
   }
 }