[Labelling] Coding style fixes and cleanups in other modules

diff --git a/leo.c b/leo.c
index f22e5a50e2de10068658edcbae876840f70b6b30..5888fec7c4674de0cf4b3621c8b90be3c34a56cd 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -17,7 +17,6 @@
 #include "css.h"
 #include "sym.h"
 #include "map.h"
-
 #include "labeller.h"
 
 uns debug_dump_source, debug_dump_after_proj, debug_dump_after_scaling;

diff --git a/sym-line.c b/sym-line.c
index 20a26dcbcad553287c798d96800acad0c887a4c3..f7a617fdd636f12503f54a76b6d5ede34cf679b8 100644 (file)
--- a/sym-line.c
+++ b/sym-line.c
@@ -182,13 +182,12 @@ static void sym_line_gen(struct osm_object *o, struct style_info *si, struct svg
        osm_obj_warn(o, "Invalid dash pattern");
 
       if (o->type == OSM_TYPE_WAY)
-      {
-      if (casing)
-        sym_plan(&sl->s, sym_zindex(o, si, 2));
-      else
-      labeller_add_line(&sl->s, sym_zindex(o, si, casing ? 2 : 3));
-      }
-      //sym_plan(&sl->s, sym_zindex(o, si, casing ? 2 : 3));
+        {
+          if (casing)
+            sym_plan(&sl->s, sym_zindex(o, si, 2));
+          else
+            labeller_add_line(&sl->s, sym_zindex(o, si, casing ? 2 : 3));
+        }
     }
 }
 

diff --git a/sym-point.c b/sym-point.c
index 9c159bfe6e7af406f46699ecbe9d196b0d66a910..b891507f46cd975629e91327e284b5a2374bcf77 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));
 }
 
@@ -149,10 +147,10 @@ static void sym_icon_gen(struct osm_object *o, struct style_info *si, struct svg
       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;
-      }
+        {
+          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));
       break;

diff --git a/sym-text.c b/sym-text.c
index 96b3a50cd7a8d0fdb4a31308ac2f36651882c158..46ecaeeb56a271ea4ee9721c69ff49a7775776de 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -17,7 +17,6 @@
 #include "osm.h"
 #include "sym.h"
 #include "map.h"
-
 #include "labeller.h"
 
 /*** Fonts ***/
@@ -448,8 +447,6 @@ static void sym_text_node(struct osm_object *o, struct style_info *si, osm_val_t
       msg(L_DEBUG, "Text <%s> dropped as duplicate", osm_val_decode(text));
       return;
     }
-
-  //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)
@@ -465,13 +462,13 @@ static void sym_text_center(struct osm_object *o, struct style_info *si, osm_val
   st->y += st->th - (st->th + st->td) / 2;
   text_fix_placement(st);
   if (o->type == OSM_TYPE_WAY && !osm_way_cyclic_p((struct osm_way *) o))
-  {
-    labeller_add_linelabel(&st->s, o, sym_zindex(o, si, 4.9));
-  }
+    {
+      labeller_add_linelabel(&st->s, o, sym_zindex(o, si, 4.9));
+    }
   else
-  {
-    labeller_add_arealabel(&st->s, o, 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)