X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=osm.c;h=6c11e67a6d035289c396f1c143c9622daa67983e;hb=b6cd4ac6f31faa85a0755ff0d5f6077d9b71aeaf;hp=c21e0d9e9ab72e75cf38f6b1b88299c67a699d5a;hpb=a8cc108c3efad9fb7f42b9871ac60a48cce0d335;p=leo.git

diff --git a/osm.c b/osm.c
index c21e0d9..6c11e67 100644
--- a/osm.c
+++ b/osm.c
@@ -4,7 +4,8 @@
  *	(c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw/stkstring.h>
@@ -16,7 +17,6 @@
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #include <proj_api.h>
 
-#include "leo.h"
 #include "osm.h"
 
 struct osm *osm_this;
@@ -449,7 +449,7 @@ static void osm_multipolygon_make(struct osm_relation *r)
 	  if (f->role != VALUE_INNER && f->role != VALUE_OUTER)
 	    {
 	      if (!inner)
-		osm_obj_warn(o, "Unknown role %s in multipolygon relation", osm_val_decode(f->role));
+		osm_obj_warn(o, "Unknown role %s in multipolygon relation", f->role ? osm_val_decode(f->role) : "<none>");
 	      continue;
 	    }
 	  if ((f->role == VALUE_INNER) != inner)