Add:maptool:Merge to mainstream current experimental features to convert town border relations to town polygones.

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

2 files changed, 10 insertions, 15 deletions

diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 4800a286c..6ae091504 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -832,7 +832,7 @@ int main(int argc, char **argv)
 			exit(0);
 		}
 	}
-#if 0
+#if 1
 	if (experimental) {
 		fprintf(stderr,"No experimental features available\n");
 		exit(0);
@@ -922,6 +922,8 @@ int main(int argc, char **argv)
 	if (p.process_relations) {
 		filenames[filename_count]="relations";
 		referencenames[filename_count++]=NULL;
+		filenames[filename_count]="towns_poly";
+		referencenames[filename_count++]=NULL;
 	}
 	if (p.process_ways) {
 		filenames[filename_count]="ways_split";
@@ -935,10 +937,6 @@ int main(int argc, char **argv)
 		filenames[filename_count]="way2poi_result";
 		referencenames[filename_count++]=NULL;
 	}
-	if(experimental) {
-		filenames[filename_count]="towns_poly";
-		referencenames[filename_count++]=NULL;
-	}
 	for (i = suffix_start ; i < suffix_count ; i++) {
 		suffix=suffixes[i];
 		if (start_phase(&p,"generating tiles")) {
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 568a2e97d..a72bd7fef 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -1552,7 +1552,7 @@ osm_end_relation(struct maptool_osm *osm)
 
 	in_relation=0;
 
-	if(experimental && attr_longest_match(attr_mapping_rel2poly_place, attr_mapping_rel2poly_place_count, &type, 1)) {
+	if(attr_longest_match(attr_mapping_rel2poly_place, attr_mapping_rel2poly_place_count, &type, 1)) {
 		item_bin->type=type;
 	}
 	else 
@@ -1627,8 +1627,7 @@ relation_add_tag(char *k, char *v)
 		item_bin_add_attr_string(item_bin, attr_osm_tag, tag);
 	}
 
-	if(experimental)
-		osm_update_attr_present(k,v);
+	osm_update_attr_present(k,v);
 }
 
 
@@ -1907,8 +1906,7 @@ osm_process_town_by_boundary(GList *bl, struct item_bin *ib, struct coord *c, st
 							attr_type=attr_county_name;
 							break;
 						case 'M':
-							if(experimental)
-								b->ib->type=type_poly_place6;
+							b->ib->type=type_poly_place6;
 						case 'm':
 							attr_type=attr_municipality_name;
 							break;
@@ -1981,6 +1979,7 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways)
 	GList *bl;
 	GHashTable *town_hash;
 	struct attr attrs[11];
+	FILE *towns_poly;
 
 	profile(0,NULL);
 	bl=process_boundaries(boundaries, ways);
@@ -2058,11 +2057,9 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways)
 		}
 	}
 
-	if(experimental) {
-		FILE *f=tempfile("","towns_poly",1);
-		osm_town_relations_to_poly(bl, f);
-		fclose(f);
-	}
+	towns_poly=tempfile("","towns_poly",1);
+	osm_town_relations_to_poly(bl, towns_poly);
+	fclose(towns_poly);
 	
 	g_hash_table_destroy(town_hash);
 	profile(0, "Finished processing towns\n");