#include "sym.h"
#include "map.h"
+#include "labeller.h"
+
/*** Fonts ***/
struct text_font {
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)
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))
+ {
+ //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));
+ }
}
static void sym_text_way(struct osm_object *o, struct style_info *si, osm_val_t text)