svg_push_element(svg, "circle");
svg_set_attr_dimen(svg, "cx", p->x);
svg_set_attr_dimen(svg, "cy", p->y);
- // svg_set_attr_dimen(svg, "r", p->size / 2); // DEBUG HACK
- svg_set_attr_dimen(svg, "r", 3);
+ svg_set_attr_dimen(svg, "r", p->size / 2);
break;
// FIXME: Other shapes
default:
style_get_number(si, PROP_SYMBOL_FILL_OPACITY, &sp->fill_opacity);
}
- //sym_plan(&sp->s, sym_zindex(o, si, 4));
labeller_add_point(&sp->s, o, sym_zindex(o, si, 4));
}
// sir->opacity = 1;
// style_get_number(si, PROP_ICON_OPACITY, &sir->opacity);
- labeller_add_point(&sic->s, o, sym_zindex(o, si, 4));
- //sym_plan(&sic->s, sym_zindex(o, si, 4));
+ switch (o->type)
+ {
+ case OSM_TYPE_NODE:
+ labeller_add_point(&sic->s, o, sym_zindex(o, si, 4));
+ break;
+ case OSM_TYPE_WAY:
+ case OSM_TYPE_MULTIPOLYGON:
+ labeller_add_label(&sic->s, o, sym_zindex(o, si, 4));
+ break;
+ }
}
struct symbolizer symbolizer_icon = {