Mix of changes O:)

[leo.git] / sym-point.c

diff --git a/sym-point.c b/sym-point.c
index c7c2be0a01f8c470757ae9416c4dd387f2135e21..b3cb91119d407ed17086ae71d1c8cb5e3cc9d59d 100644 (file)
--- a/sym-point.c
+++ b/sym-point.c
@@ -13,6 +13,8 @@
 #include "sym.h"
 #include "svg.h"
 
+#include "labeller.h"
+
 static void sym_point_draw(struct symbol *sym, struct svg *svg)
 {
   struct sym_point *p = (struct sym_point *) sym;
@@ -29,9 +31,10 @@ static void sym_point_draw(struct symbol *sym, struct svg *svg)
     {
     case VALUE_CIRCLE:
       svg_push_element(svg, "circle");
-      svg_set_attr_dimen(svg, "cx", n->x);
-      svg_set_attr_dimen(svg, "cy", n->y);
-      svg_set_attr_dimen(svg, "r", p->size / 2);
+      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);
       break;
     // FIXME: Other shapes
     default:
@@ -91,7 +94,8 @@ 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));
+  //sym_plan(&sp->s, sym_zindex(o, si, 4));
+  labeller_add_point(&sp->s, o, sym_zindex(o, si, 4));
 }
 
 struct symbolizer symbolizer_point = {
@@ -138,7 +142,8 @@ static void sym_icon_gen(struct osm_object *o, struct style_info *si, struct svg
   // sir->opacity = 1;
   // style_get_number(si, PROP_ICON_OPACITY, &sir->opacity);
 
-  sym_plan(&sic->s, sym_zindex(o, si, 4));
+  labeller_add_point(&sic->s, o, sym_zindex(o, si, 4));
+  //sym_plan(&sic->s, sym_zindex(o, si, 4));
 }
 
 struct symbolizer symbolizer_icon = {