Revert fixes I already did in trunk, so that they do not show onpublic_transport

diffs.



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

5 files changed, 13 insertions, 8 deletions

diff --git a/country.c b/country.c
index 1bcaad14..729349e6 100644
--- a/country.c
+++ b/country.c
@@ -282,7 +282,6 @@ static struct country country[]= {
   {710,	"ZA",	"ZA", "ZAF", /* 710 */ _n("South Africa") },
   {894,	"Z",	"ZM", "ZMB", /* 894 */ _n("Zambia")},
   {716,	"ZW",	"ZW", "ZWE", /* 716 */ _n("Zimbabwe")},
-  {999, "*",    "*",  "*",             _n("* Unknown, add is_in tags to those cities")},
 };
 
 
diff --git a/navigation.c b/navigation.c
index af019263..31844984 100644
--- a/navigation.c
+++ b/navigation.c
@@ -1389,9 +1389,6 @@ show_maneuver(struct navigation *nav, struct navigation_itm *itm, struct navigat
 		} else if (delta < 165) {
 			/* TRANSLATORS: Don't forget the ending space */
 			strength=_("strongly ");
-		} else if (delta < 180) {
-			/* TRANSLATORS: Don't forget the ending space */
-			strength=_("really strongly ");
 		} else {
 			dbg(1,"delta=%d\n", delta);
 			/* TRANSLATORS: Don't forget the ending space */
diff --git a/osm2navit.c b/osm2navit.c
index 0d01c458..b047d5fe 100644
--- a/osm2navit.c
+++ b/osm2navit.c
@@ -404,8 +404,7 @@ struct country_table {
 	{752,"Sweden,Sverige,Konungariket Sverige,SE"},
 	{756,"Schweiz"}, 
 	{826,"United Kingdom,UK"},
-	{840,"USA"},
-	{999,"Unknown"},
+	{840,"USA"} 
 };
 
 static GHashTable *country_table_hash;
@@ -1465,8 +1464,6 @@ end_node(FILE *out)
 	item_bin_write(item_bin,out);
 	if (item_is_town(*item_bin) && attr_strings[attr_string_label]) {
 		char *tok,*buf=is_in_buffer;
-		if (!buf[0])
-			strcpy(is_in_buffer, "Unknown");
 		while ((tok=strtok(buf, ","))) {
 			while (*tok==' ')
 				tok++;
diff --git a/route.c b/route.c
index 96910411..cf23bd06 100644
--- a/route.c
+++ b/route.c
@@ -195,6 +195,7 @@ struct route_path {
 #define RF_AVOIDHW	(1<<2)
 #define RF_AVOIDPAID	(1<<3)
 #define RF_LOCKONROAD	(1<<4)
+#define RF_SHOWGRAPH	(1<<5)
 
 /**
  * @brief A complete route
@@ -2909,6 +2910,16 @@ static struct map_methods route_graph_meth = {
 	NULL,
 };
 
+void 
+route_toggle_routegraph_display(struct route *route)
+{
+	if (route->flags & RF_SHOWGRAPH) {
+		route->flags &= ~RF_SHOWGRAPH;
+	} else {
+		route->flags |= RF_SHOWGRAPH;
+	}
+}
+
 static struct map_priv *
 route_map_new_helper(struct map_methods *meth, struct attr **attrs, int graph)
 {
diff --git a/route.h b/route.h
index 83d8bc92..19cf0697 100644
--- a/route.h
+++ b/route.h
@@ -117,6 +117,7 @@ void route_info_close(struct route_info_handle *h);
 void route_draw(struct route *this, struct transformation *t, struct displaylist *dsp);
 struct map *route_get_map(struct route *route);
 struct map *route_get_graph_map(struct route *route);
+void route_toggle_routegraph_display(struct route *route);
 void route_set_projection(struct route *this_, enum projection pro);
 int route_destination_reached(struct route *this);
 int route_set_attr(struct route *this_, struct attr *attr);