diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-02-10 08:51:44 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-02-10 08:51:44 +0000 |
| commit | 71251f4acdd831f062b9f091a4611bd4772de953 (patch) | |
| tree | cbdb86a5c18e1db7551f00dada19a5ac0b6824ba /navit/maptool | |
| parent | 524943bbf4afc3d95e2a86b967bd83b8a65fd5e3 (diff) | |
| download | navit-71251f4acdd831f062b9f091a4611bd4772de953.tar.gz | |
Fix:maptool:Allow osm nodeid to corss 2^31 boundary.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5376 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
| -rw-r--r-- | navit/maptool/maptool.h | 4 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h index 84089597d..54eba2dc6 100644 --- a/navit/maptool/maptool.h +++ b/navit/maptool/maptool.h @@ -102,7 +102,7 @@ struct item_bin_sink { }; struct node_item { - int id; + unsigned int id; char ref_node; char ref_way; char ref_ref; @@ -114,7 +114,7 @@ struct zip_info; struct country_table; -typedef long int osmid; +typedef unsigned long int osmid; /* boundaries.c */ diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 87b318d2f..763357848 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -41,7 +41,7 @@ extern int doway2poi; static int in_way, in_node, in_relation; -static int nodeid,wayid; +osmid nodeid,wayid; long long current_id; static GHashTable *attr_hash,*country_table_hash,*attr_hash; @@ -1442,7 +1442,7 @@ node_item_get_from_file(FILE *coords, int id, struct node_item *ret) void osm_add_way(osmid id) { - static int wayid_last; + static osmid wayid_last; in_way=1; wayid=id; @@ -1456,7 +1456,7 @@ osm_add_way(osmid id) debug_attr_buffer[0]='\0'; osmid_attr_value=id; if (wayid < wayid_last && !way_hash) { - fprintf(stderr,"INFO: Ways out of sequence (new %d vs old %d), adding hash\n", wayid, wayid_last); + fprintf(stderr,"INFO: Ways out of sequence (new %lu vs old %lu), adding hash\n", wayid, wayid_last); way_hash=g_hash_table_new(NULL, NULL); } wayid_last=wayid; |