Labelling: Bugfixes in get_closure

[leo.git] / sym-point.c

diff --git a/sym-point.c b/sym-point.c
index 9c159bfe6e7af406f46699ecbe9d196b0d66a910..01b9180c7cee938fbce68641f5bc19822d00d70d 100644 (file)
--- a/sym-point.c
+++ b/sym-point.c
@@ -33,8 +33,7 @@ static void sym_point_draw(struct symbol *sym, struct svg *svg)
       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:
@@ -94,7 +93,6 @@ static void sym_point_gen(struct osm_object *o, struct style_info *si, struct sv
       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));
 }
 
@@ -148,13 +146,8 @@ static void sym_icon_gen(struct osm_object *o, struct style_info *si, struct svg
       labeller_add_point(&sic->s, o, sym_zindex(o, si, 4));
       break;
     case OSM_TYPE_WAY:
-      if (!osm_way_cyclic_p((struct osm_way *) o))
-      {
-      labeller_add_linelabel(&sic->s, o, sym_zindex(o, si, 4));
-      break;
-      }
     case OSM_TYPE_MULTIPOLYGON:
-      labeller_add_arealabel(&sic->s, o, sym_zindex(o, si, 4));
+      labeller_add_label(&sic->s, o, sym_zindex(o, si, 4));
       break;
   }
 }