Inline styles get better error reporting

diff --git a/css-lex.c b/css-lex.c
index ae6727168b5315161f8df805c770bb544e63059c..daad578e77236971be858d785f08c9f77151dc7c 100644 (file)
--- a/css-lex.c
+++ b/css-lex.c
@@ -43,6 +43,7 @@ void css_lex_string(const char *str)
 {
   fbbuf_init_read(&fbbuf, (char *) str, strlen(str), 0);
   fb = &fbbuf;
 {
   fbbuf_init_read(&fbbuf, (char *) str, strlen(str), 0);
   fb = &fbbuf;

+  lino = 1;

 }
 
 int css_lex(void)
 }
 
 int css_lex(void)

diff --git a/map.c b/map.c
index 5279d3748f964990301e7084416365fa59dbaf38..af586c46b15bf8e86bc3de5914c96bed2d5b344e 100644 (file)
--- a/map.c
+++ b/map.c
@@ -310,7 +310,7 @@ static void map_apply_inline_styles(struct osm_object *o, struct style_results *
            }
 
          if (!name)
            }
 
          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: ;
          struct style_prop *p= css_parse_prop(r->pool, name, key, osm_val_decode(t->val));
          style_set_by_layer(r, layer, p);
 skip: ;