#include <ucw/lib.h>
#include <ucw/stkstring.h>
+#include <math.h>
#include <stdio.h>
#include <ft2build.h>
#include FT_FREETYPE_H
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)
{
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)
svg_pop(svg);
#endif
- if (t->opacity != 1)
+ if (use_group)
svg_pop(svg);
}
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));
- 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));
}
}