From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Tue, 12 Jul 2011 19:22:32 +0000 (+0000)
Subject: Add:maptool:Removed experimental stat of boundary relations
X-Git-Tag: navit-0.5.0.5194svn~564
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=472e689d5cc287ae624386120af09c06b4e07181;p=profile%2Fivi%2Fnavit.git

Add:maptool:Removed experimental stat of boundary relations

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4631 ffa7fe5e-494d-0410-b361-a75ebd5db220
---

diff --git a/navit/navit/maptool/maptool.c b/navit/navit/maptool/maptool.c
index e00a482..f13420d 100644
--- a/navit/navit/maptool/maptool.c
+++ b/navit/navit/maptool/maptool.c
@@ -818,16 +818,12 @@ int main(int argc, char **argv)
 	if (p.start <= phase && p.end >= phase) {
 		FILE *towns=tempfile(suffix,"towns",0),*boundaries=NULL,*ways=NULL;
 		if (towns) {
-			if (experimental) {
-				boundaries=tempfile(suffix,"boundaries",0);
-				ways=tempfile(suffix,"ways_split",0);
-			}
+			boundaries=tempfile(suffix,"boundaries",0);
+			ways=tempfile(suffix,"ways_split",0);
 			fprintf(stderr,"PROGRESS: Phase %d: assinging towns to countries\n",phase);
 			osm_process_towns(towns,boundaries,ways);
-			if (experimental) {
-				fclose(ways);
-				fclose(boundaries);
-			}
+			fclose(ways);
+			fclose(boundaries);
 			fclose(towns);
 			if(!p.keep_tmpfiles)
 				tempfile_unlink(suffix,"towns");
diff --git a/navit/navit/maptool/osm.c b/navit/navit/maptool/osm.c
index 2f824cc..950a3a6 100644
--- a/navit/navit/maptool/osm.c
+++ b/navit/navit/maptool/osm.c
@@ -1541,12 +1541,10 @@ relation_add_tag(char *k, char *v)
 	} else if (!strcmp(k,"ISO3166-1")) {
 		strcpy(iso_code, v);
 	}
-	if (experimental) {
-		if (add_tag) {
-			char tag[strlen(k)+strlen(v)+2];
-			sprintf(tag,"%s=%s",k,v);
-			item_bin_add_attr_string(item_bin, attr_osm_tag, tag);
-		}
+	if (add_tag) {
+		char tag[strlen(k)+strlen(v)+2];
+		sprintf(tag,"%s=%s",k,v);
+		item_bin_add_attr_string(item_bin, attr_osm_tag, tag);
 	}
 }
 
@@ -1792,14 +1790,12 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways)
 	struct item_bin *ib;
 	GList *bl=NULL;
 
-	if (experimental) 
-		bl=process_boundaries(boundaries, ways);
+	bl=process_boundaries(boundaries, ways);
 	while ((ib=read_item(in)))  {
 		struct coord *c=(struct coord *)(ib+1);
 		struct country_table *result=NULL;
 		char *is_in=item_bin_get_attr(ib, attr_osm_is_in, NULL);
-		if (experimental)
-			result=osm_process_town_by_boundary(bl, ib, c);
+		result=osm_process_town_by_boundary(bl, ib, c);
 		if (!result)
 			result=osm_process_town_by_is_in(ib, is_in);
 		if (!result && unknown_country)
@@ -2172,7 +2168,7 @@ process_turn_restrictions(FILE *in, FILE *coords, FILE *ways, FILE *ways_index,
 	struct coord *fromc,*toc,*viafrom,*viato,*tmp;
 	int min_count;
 	fseek(in, 0, SEEK_SET);
-	if (experimental > 1) {
+	if (experimental) {
 		struct relations *relations=relations_new();
 		GList *turn_restrictions=process_turn_restrictions_setup(in, relations);
 		relations_process(relations, coords, ways, NULL);