TODO

[leo.git] / leo.c

diff --git a/leo.c b/leo.c
index c884ae75777be65c9f7c1a8fdbecfd3ad9e8144c..3508cbdf1bdd4cd652f7d258cf8f453a53d42198 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -4,12 +4,6 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/conf.h>
-#include <ucw/opt.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "svg.h"
@@ -17,6 +11,12 @@
 #include "css.h"
 #include "sym.h"
 #include "map.h"
+#include "expr.h"
+
+#include <ucw/conf.h>
+#include <ucw/opt.h>
+
+#include <stdio.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,71 +45,6 @@ static const struct opt_section options = {
   }
 };
 
-// FIXME: Make generic
-static void draw_scale(struct svg *svg)
-{
-  double dist = 1000;
-  double width = dist * map_scale;
-  double x = page_width - 10 - width;
-  double y = 50;
-
-  svg_push_element(svg, "g");
-  svg_set_attr(svg, "id", "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--)
-    {
-      svg_push_element(svg, "g");
-      svg_set_attr(svg, "stroke-linecap", "square");
-      if (outline)
-       {
-         svg_set_attr_dimen(svg, "stroke-width", 1.5);
-         svg_set_attr_color(svg, "stroke", 0xffffff);
-       }
-      else
-       {
-         svg_set_attr_dimen(svg, "stroke-width", 0.5);
-         svg_set_attr_color(svg, "stroke", 0);
-       }
-
-      svg_push_element(svg, "line");
-      svg_set_attr_dimen(svg, "x1", 0);
-      svg_set_attr_dimen(svg, "y1", 0);
-      svg_set_attr_dimen(svg, "x2", width);
-      svg_set_attr_dimen(svg, "y2", 0);
-      svg_pop(svg);
-
-      for (int i=0; i<=10; i++)
-       {
-         double tick;
-         switch (i)
-           {
-           case 0:
-           case 10:
-             tick = 3;
-             break;
-           case 5:
-             tick = 2;
-             break;
-           default:
-             tick = 1;
-           }
-         svg_push_element(svg, "line");
-         svg_set_attr_dimen(svg, "x1", width * i/10);
-         svg_set_attr_dimen(svg, "y1", 0);
-         svg_set_attr_dimen(svg, "x2", width * i/10);
-         svg_set_attr_dimen(svg, "y1", -tick);
-         svg_pop(svg);
-       }
-
-      svg_pop(svg);
-    }
-
-  scale_text(svg, 0, 5, osm_val_encode("0"));
-  scale_text(svg, width, 5, osm_val_encode("1 km"));
-  svg_pop(svg);
-}
-
 int main(int argc UNUSED, char **argv)
 {
   cf_def_file = "map.cf";
@@ -118,6 +53,7 @@ int main(int argc UNUSED, char **argv)
 
   osm_init();
   styles_init();
+  expr_init();
   map_load_styles();
   map_load_sources();
   map_set_scale();
@@ -162,8 +98,6 @@ int main(int argc UNUSED, char **argv)
 
   sym_draw_all(svg);
 
-  draw_scale(svg);
-
   if (map_clip)
     svg_pop(svg);