TODO

[leo.git] / map.c

diff --git a/map.c b/map.c
index 3dbf7194b3b79468088bf8bb12eeaeb729999fa6..41bf483eeeddb7f2149f761c719470c4287b2c32 100644 (file)
--- a/map.c
+++ b/map.c
@@ -4,15 +4,6 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/conf.h>
-#include <ucw/gary.h>
-#include <ucw/mempool.h>
-#include <ucw/simple-lists.h>
-
-#include <stdio.h>
-#include <math.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "shp.h"
@@ -21,6 +12,14 @@
 #include "sym.h"
 #include "fixed.h"
 
+#include <ucw/conf.h>
+#include <ucw/gary.h>
+#include <ucw/mempool.h>
+#include <ucw/simple-lists.h>
+
+#include <stdio.h>
+#include <math.h>
+
 double map_min_x, map_min_y;
 double map_max_x, map_max_y;
 double page_width, page_height;
@@ -310,7 +309,7 @@ static void map_apply_inline_styles(struct osm_object *o, struct style_results *
            }
 
          if (!name)
-           name = mp_printf(r->pool, "Inline style in object #%ju", (uintmax_t) o->id);
+           name = mp_printf(r->pool, "inline style of object #%ju", (uintmax_t) o->id);
          struct style_prop *p= css_parse_prop(r->pool, name, key, osm_val_decode(t->val));
          style_set_by_layer(r, layer, p);
 skip: ;
@@ -352,5 +351,5 @@ void map_apply_styles(struct svg *svg)
          }
     }
 
-  // FIXME: Ought to destroy the style_results
+  style_cleanup(&r);
 }