Průvodce: More styling

[leo.git] / shp.c

diff --git a/shp.c b/shp.c
index 383525e5fb46a2c49e11239b3b83ecc0be45f187..37530c880accf4451b2de086f61105546791c697 100644 (file)
--- a/shp.c
+++ b/shp.c
@@ -9,7 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 #include <ucw/fastbuf.h>
 #include <ucw/gary.h>
@@ -18,13 +19,11 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "map.h"
 #include "shp.h"
 
-// FIXME: Hack
-static osm_id_t shp_id_counter = 1000000000000;
+static osm_id_t shp_id_counter;
 
 static double shp_get_double(byte *p)
 {
@@ -69,6 +68,7 @@ void shp_parse(const char *name)
 {
   msg(L_INFO, "Loading shape file %s", name);
   struct fastbuf *fb = bopen_file(name, O_RDONLY, NULL);
+  shp_id_counter = 1;
 
   byte *buf;
   GARY_INIT(buf, 100);