X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=leo.c;h=d7a39bd0f18aea3456ead193fad04b618dd93b6c;hb=0850473d2dc324e35bcaabf246a865cf70b10da1;hp=69ee1e39167e501d61ff6c590d297b56ef7409e0;hpb=d531af0c0fa8028cab977298d65240fff7416cd8;p=leo.git

diff --git a/leo.c b/leo.c
index 69ee1e3..d7a39bd 100644
--- 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)
 {
@@ -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,8 +124,9 @@ int main(int argc UNUSED, char **argv)
   styles_init();
   map_load_styles();
   map_load_sources();
+  graph_build();
   map_set_scale();
-  map_generalize();
+  // map_generalize();
 
   struct svg *svg = svg_open(map_svg_output);
   if (!map_rotate)
@@ -138,6 +143,7 @@ int main(int argc UNUSED, char **argv)
   sym_init();
 
   map_apply_styles(svg);
+  simplify();
 
   if (map_clip)
     {
@@ -182,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);