Fix:maptool:Correct output for is_in warning
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Wed, 20 Jul 2011 20:18:44 +0000 (20:18 +0000)
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Wed, 20 Jul 2011 20:18:44 +0000 (20:18 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4651 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/maptool/osm.c

index 0c6aa4c..cde2a1a 100644 (file)
@@ -1751,7 +1751,8 @@ osm_process_town_by_is_in(struct item_bin *ib,char *is_in)
                lookup=g_hash_table_lookup(country_table_hash,tok);
                if (lookup) {
                        if (result && result->countryid != lookup->countryid) {
-                               osm_warning("node",item_bin_get_nodeid(ib),0,"conflict for %s %s country %d vs %d\n", attr_strings[attr_string_label], debug_attr_buffer, lookup->countryid, result->countryid);
+                               char *label=item_bin_get_attr(ib, attr_town_name, NULL);
+                               osm_warning("node",item_bin_get_nodeid(ib),0,"conflict for %s is_in=%s country %d vs %d\n", label, is_in, lookup->countryid, result->countryid);
                                conflict=1;
                        }
                        result=lookup;