Experiments with simplication of ways

[leo.git] / leo.c

diff --git a/leo.c b/leo.c
index 5d02f680a90c6e84fe69954e5e32bbf73a2df4d7..b62d21b8d7acfa93f29eb7b37333d4d525d03a03 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -4,19 +4,21 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 #include <ucw/opt.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "svg.h"
 #include "style.h"
 #include "css.h"
 #include "sym.h"
 #include "map.h"
+#include "graph.h"
+#include "simplify.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;
@@ -45,6 +47,7 @@ static const struct opt_section options = {
   }
 };
 
+#if 0
 // FIXME: Make generic
 static void draw_scale(struct svg *svg)
 {
@@ -55,7 +58,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--)
     {
@@ -109,6 +112,7 @@ static void draw_scale(struct svg *svg)
   scale_text(svg, width, 5, osm_val_encode("1 km"));
   svg_pop(svg);
 }
+#endif
 
 int main(int argc UNUSED, char **argv)
 {
@@ -120,7 +124,10 @@ int main(int argc UNUSED, char **argv)
   styles_init();
   map_load_styles();
   map_load_sources();
+  simplify();
+  graph_build();
   map_set_scale();
+  map_generalize();
 
   struct svg *svg = svg_open(map_svg_output);
   if (!map_rotate)
@@ -181,7 +188,9 @@ int main(int argc UNUSED, char **argv)
   svg_icon_put(svg, &sir);
 #endif
 
+#if 0
   draw_scale(svg);
+#endif
 
   if (map_clip)
     svg_pop(svg);