Labelling: Bugfixes in get_closure

[leo.git] / leo.c

diff --git a/leo.c b/leo.c
index 5d02f680a90c6e84fe69954e5e32bbf73a2df4d7..003a2c55024af9b1787ca739283a19ad60c4fb49 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -17,6 +17,7 @@
 #include "css.h"
 #include "sym.h"
 #include "map.h"
+#include "labeller.h"
 
 uns debug_dump_source, debug_dump_after_proj, debug_dump_after_scaling;
 uns debug_dump_multipolygons, debug_dump_css, debug_dump_styling, debug_dump_symbols;
@@ -55,7 +56,7 @@ static void draw_scale(struct svg *svg)
 
   svg_push_element(svg, "g");
   svg_set_attr(svg, "id", "scale");
-  svg_set_attr_format(svg, "transform", "translate(%.6g,%.6g)", x * svg->scale, y * svg->scale);
+  svg_set_attr_format(svg, "transform", "translate(%s,%s)", svg_format_dimen(svg, x), svg_format_dimen(svg, y));
 
   for (int outline=1; outline>=0; outline--)
     {
@@ -113,8 +114,14 @@ static void draw_scale(struct svg *svg)
 int main(int argc UNUSED, char **argv)
 {
   cf_def_file = "map.cf";
+// HACKING
+  cf_def_file = argv[1];
   cf_declare_section("Debug", &debug_cf, 0);
-  opt_parse(&options, argv+1);
+
+  labeller_conf();
+
+  opt_parse(&options, argv+2);
+// TILL HERE
 
   osm_init();
   styles_init();
@@ -135,6 +142,7 @@ int main(int argc UNUSED, char **argv)
     }
 
   sym_init();
+  labeller_init();
 
   map_apply_styles(svg);
 
@@ -165,6 +173,7 @@ int main(int argc UNUSED, char **argv)
   struct svg_icon *logo = svg_icon_load(svg, "../logo/kocka-s-okrajem.svg");
 #endif
 
+  labeller_label();
   sym_draw_all(svg);
 
   // Draw logo