Refactor:maptool:Remove unused code.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5826 ffa7fe5e-494d-0410-b361-a75ebd5db220

3 files changed, 3 insertions, 30 deletions

diff --git a/navit/maptool/itembin.c b/navit/maptool/itembin.c
index 2a3a4575e..4b5a09d7b 100644
--- a/navit/maptool/itembin.c
+++ b/navit/maptool/itembin.c
@@ -283,18 +283,6 @@ item_bin_dup(struct item_bin *ib)
 }
 
 void
-item_bin_write_range(struct item_bin *ib, FILE *out, int min, int max)
-{
-	struct range r;
-
-	r.min=min;
-	r.max=max;
-	fwrite(&r, sizeof(r), 1, out);
-	item_bin_write(ib, out);
-}
-
-
-void
 item_bin_write_clipped(struct item_bin *ib, struct tile_parameter *param, struct item_bin_sink *out)
 {
 	struct tile_data tile_data;
diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h
index a6ea96e4d..b6807d1d4 100644
--- a/navit/maptool/maptool.h
+++ b/navit/maptool/maptool.h
@@ -220,7 +220,6 @@ void item_bin_add_attr_range(struct item_bin *ib, enum attr_type type, short min
 void item_bin_remove_attr(struct item_bin *ib, void *ptr);
 void item_bin_write(struct item_bin *ib, FILE *out);
 struct item_bin *item_bin_dup(struct item_bin *ib);
-void item_bin_write_range(struct item_bin *ib, FILE *out, int min, int max);
 void item_bin_write_clipped(struct item_bin *ib, struct tile_parameter *param, struct item_bin_sink *out);
 void item_bin_dump(struct item_bin *ib, FILE *out);
 void dump_itembin(struct item_bin *ib);
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 9296b2a3c..df210fa96 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -1537,7 +1537,6 @@ osm_add_way(osmid id)
 
 char relation_type[BUFFER_SIZE];
 char iso_code[BUFFER_SIZE];
-int admin_level;
 int boundary;
 
 void
@@ -1548,7 +1547,6 @@ osm_add_relation(osmid id)
 	debug_attr_buffer[0]='\0';
 	relation_type[0]='\0';
 	iso_code[0]='\0';
-	admin_level=-1;
 	boundary=0;
 	item_bin_init(tmp_item_bin, type_none);
 	item_bin_add_attr_longlong(tmp_item_bin, attr_osm_relationid, osmid_attr_value);
@@ -1605,16 +1603,6 @@ osm_end_relation(struct maptool_osm *osm)
 		type=type_none;
 
 	if ((!strcmp(relation_type, "multipolygon") || !strcmp(relation_type, "boundary")) && (boundary || type!=type_none)) {
-#if 0
-		if (admin_level == 2) {
-			FILE *f;
-			fprintf(stderr,"Multipolygon for %s\n", iso_code);
-			char *name=g_strdup_printf("country_%s.tmp",iso_code);
-			f=fopen(name,"w");
-			item_bin_write(tmp_item_bin, f);
-			fclose(f);
-		}
-#endif
 		item_bin_write(tmp_item_bin, osm->boundaries);
 	}
 
@@ -1661,8 +1649,6 @@ relation_add_tag(char *k, char *v)
 			tmp_item_bin->type=type_none;
 			osm_warning("relation", osmid_attr_value, 0, "Unknown restriction %s\n",v);
 		}
-	} else if (!strcmp(k,"admin_level")) {
-		admin_level=atoi(v);
 	} else if (!strcmp(k,"boundary")) {
 		if (!strcmp(v,"administrative") || !strcmp(v,"postal_code")) {
 			boundary=1;
@@ -1950,11 +1936,11 @@ osm_process_town_by_boundary(GList *bl, struct item_bin *ib, struct coord *c, st
 			l=matches;
 			while (l) {
 				struct boundary *b=l->data;
-				char *admin_level=osm_tag_value(b->ib, "admin_level");
+				char *boundary_admin_level_string=osm_tag_value(b->ib, "admin_level");
 				char *postal=osm_tag_value(b->ib, "postal_code");
-				if (admin_level) {
+				if (boundary_admin_level_string) {
 					char *name;
-					a=atoi(admin_level);
+					a=atoi(boundary_admin_level_string);
 					if (a > 2 && a < end) {
 						enum attr_type attr_type=attr_none;
 						switch(match->country->admin_levels[a-3]) {