navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] SF.net SVN: navit:[5931] trunk/navit/navit/item.c

[<mvg...@us...>]

Revision: 5931
          http://sourceforge.net/p/navit/code/5931
Author:   mvglasow
Date:     2014-11-08 22:29:23 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Refactoring:core:Improve documentation in item.c

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/item.c

Modified: trunk/navit/navit/item.c
===================================================================
--- trunk/navit/navit/item.c	2014-11-08 15:40:55 UTC (rev 5930)
+++ trunk/navit/navit/item.c	2014-11-08 22:29:23 UTC (rev 5931)
@@ -135,6 +135,9 @@
  *
  * This function resets the "coordinate pointer" of an item to point to the first coordinate pair,
  * so that at the next call to {@code item_coord_get()} the first coordinates will be returned.
+ *
+ * @param it The map item whose pointer is to be reset. This must be the active item, i.e. the last one retrieved from the
+ * {@code map_rect}. There can only be one active item per {@code map_rect}.
  */
 void
 item_coord_rewind(struct item *it)
@@ -148,7 +151,11 @@
  * This function returns a list of coordinates from an item and advances the "coordinate pointer"
  * by the number of coordinates returned, so that at the next call the next coordinates will be returned.
  *
- * @param it The item
+ * Coordinates are stored in the projection of the item's map. If you need them in a different projection,
+ * call {@code item_coord_get_pro()} instead.
+ *
+ * @param it The map item whose coordinates to retrieve. This must be the active item, i.e. the last one retrieved from the
+ * {@code map_rect}. There can only be one active item per {@code map_rect}.
  * @param c Points to a buffer that will receive the coordinates.
  * The buffer must be at least {@code count * sizeof(struct coord)} bytes in size.
  * @param count The number of coordinates to retrieve. Attempts to read past the
@@ -202,6 +209,23 @@
         return 0;
 }
 
+/**
+ * @brief Gets the next coordinates from an item and reprojects them
+ *
+ * This function returns a list of coordinates from an item and advances the "coordinate pointer"
+ * by the number of coordinates returned, so that at the next call the next coordinates will be returned.
+ *
+ * @param it The map item whose coordinates to retrieve. This must be the active item, i.e. the last one retrieved from the
+ * {@code map_rect}. There can only be one active item per {@code map_rect}.
+ * @param c Points to a buffer that will receive the coordinates.
+ * The buffer must be at least {@code count * sizeof(struct coord)} bytes in size.
+ * @param count The number of coordinates to retrieve. Attempts to read past the
+ * end are handled gracefully and only the available number of coordinates is
+ * returned.
+ * @param projection The projection into which the coordinates will be transformed
+ *
+ * @return The number of coordinates actually retrieved and stored in {@code c}
+ */
 int
 item_coord_get_pro(struct item *it, struct coord *c, int count, enum projection to)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5930] trunk/navit/navit

[<mvg...@us...>]

Revision: 5930
          http://sourceforge.net/p/navit/code/5930
Author:   mvglasow
Date:     2014-11-08 15:40:55 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Refactoring:core:Add doxygen comments

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/attr.c
    trunk/navit/navit/item.c
    trunk/navit/navit/route.c

Modified: trunk/navit/navit/attr.c
===================================================================
--- trunk/navit/navit/attr.c	2014-11-08 15:14:34 UTC (rev 5929)
+++ trunk/navit/navit/attr.c	2014-11-08 15:40:55 UTC (rev 5930)
@@ -401,6 +401,15 @@
 	return g_strdup_printf("(no text[%s])", attr_to_name(type));	
 }
 
+/**
+ * @brief Converts an attribute to a string that can be displayed
+ *
+ * This function is just a wrapper around {@code attr_to_text_ext()}.
+ *
+ * @param attr The attribute to convert
+ * @param map
+ * @param pretty Not used
+ */
 char *
 attr_to_text(struct attr *attr, struct map *map, int pretty)
 {

Modified: trunk/navit/navit/item.c
===================================================================
--- trunk/navit/navit/item.c	2014-11-08 15:14:34 UTC (rev 5929)
+++ trunk/navit/navit/item.c	2014-11-08 15:40:55 UTC (rev 5930)
@@ -130,12 +130,33 @@
 		g_hash_table_destroy(default_flags_hash);
 }
 
+/**
+ * @brief Resets the "coordinate pointer" of an item
+ *
+ * This function resets the "coordinate pointer" of an item to point to the first coordinate pair,
+ * so that at the next call to {@code item_coord_get()} the first coordinates will be returned.
+ */
 void
 item_coord_rewind(struct item *it)
 {
 	it->meth->item_coord_rewind(it->priv_data);
 }
 
+/**
+ * @brief Gets the next coordinates from an item
+ *
+ * This function returns a list of coordinates from an item and advances the "coordinate pointer"
+ * by the number of coordinates returned, so that at the next call the next coordinates will be returned.
+ *
+ * @param it The item
+ * @param c Points to a buffer that will receive the coordinates.
+ * The buffer must be at least {@code count * sizeof(struct coord)} bytes in size.
+ * @param count The number of coordinates to retrieve. Attempts to read past the
+ * end are handled gracefully and only the available number of coordinates is
+ * returned.
+ *
+ * @return The number of coordinates actually retrieved and stored in {@code c}
+ */
 int
 item_coord_get(struct item *it, struct coord *c, int count)
 {

Modified: trunk/navit/navit/route.c
===================================================================
--- trunk/navit/navit/route.c	2014-11-08 15:14:34 UTC (rev 5929)
+++ trunk/navit/navit/route.c	2014-11-08 15:40:55 UTC (rev 5930)
@@ -2135,7 +2135,7 @@
 }
 
 /**
- * @brief Adds a route distortion item to the route graph
+ * @brief Adds a turn restriction item to the route graph
  *
  * @param this The route graph to add to
  * @param item The item to add

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5929] trunk/navit/navit

[<mvg...@us...>]

Revision: 5929
          http://sourceforge.net/p/navit/code/5929
Author:   mvglasow
Date:     2014-11-08 15:14:34 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Fix:core:Refine criteria for announcing maneuvers|Partial fix for #660

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/navigation.c
    trunk/navit/navit/util.h

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-11-08 12:21:56 UTC (rev 5928)
+++ trunk/navit/navit/navigation.c	2014-11-08 15:14:34 UTC (rev 5929)
@@ -283,7 +283,7 @@
 	int angle_end;
 	struct coord start,end;
 	int time;
-	int length;
+	int length;                         /**< Length of {@code way} */
 	int speed;
 	int dest_time;
 	int dest_length;
@@ -1147,6 +1147,15 @@
 	
 }
 
+/**
+ * @brief Checks whether a way is allowed
+ *
+ * This function checks whether a given vehicle is permitted to enter a given way by comparing the
+ * access and one-way restrictions of the way against the settings in {@code nav->vehicleprofile}.
+ * Turn restrictions are not taken into account.
+ *
+ * @return True if entry is permitted, false otherwise. If {@code nav->vehicleprofile} is null, true is returned.
+ */
 static int
 is_way_allowed(struct navigation *nav, struct navigation_way *way, int mode)
 {
@@ -1194,11 +1203,16 @@
 static int
 maneuver_required2(struct navigation *nav, struct navigation_itm *old, struct navigation_itm *new, int *delta, char **reason)
 {
-	int ret=0,d,dw,dlim;
+	int ret=0,d,dw,dlim,dc;
 	char *r=NULL;
 	struct navigation_way *w;
-	int cat,ncat,wcat,maxcat,left=-180,right=180,is_unambigous=0,is_same_street;
-	int curve_limit=25;
+	int cat,ncat,wcat,maxcat,left=-180,right=180,is_unambiguous=0,is_same_street;
+	int curve_limit=25; /* any angle less than this is considered straight */
+	int junction_limit = 100; /* maximum distance between two carriageways at a junction */
+	int num_similar = 0; /* number of ways in a category similar to current one */
+	int num_options = 0; /* number of permitted ways */
+	int num_new_motorways = 0; /* number of motorway-like ways */
+	int num_other = 0; /* number of ways which are neither motorway-like nor ramps */
 
 	dbg(1,"enter %p %p %p\n",old, new, delta);
 	d=angle_delta(old->angle_end, new->way.angle2);
@@ -1222,12 +1236,103 @@
 			r="no: staying in roundabout";
 		}
 	}
+	cat=maneuver_category(old->way.item.type);
 	if (!r) {
-		if (new->way.item.type == type_ramp) {
-			/* If new is a ramp, ANNOUNCE */
-			r="yes: entering ramp";
-			ret=1;
-		} else if (is_motorway_like(&(old->way))) {
+		/* Analyze all options (including new->way).
+		 * Anything that iterates over the whole set of options should be done here. This avoids
+		 * looping over the entire set of ways multiple times, which aims to improve performance
+		 * and predictability (because the same filter is applied to the ways being analyzed).
+		 */
+		struct navigation_way *w = &(new->way);
+		int through_segments = 0;
+		dc=d;
+		maxcat=-1;
+		/* Check whether the street keeps its name */
+		is_same_street=is_same_street2(old->way.name1, old->way.name2, new->way.name1, new->way.name2);
+		while (w) {
+			if (is_way_allowed(nav,w,1)) {
+				num_options++;
+				/* ways of similar category */
+				if (maneuver_category(w->item.type) == cat) {
+					// TODO: decide if a maneuver_category difference of 1 is still similar
+					num_similar++;
+				}
+				/* motorway-like ways */
+				if (is_motorway_like(w)) {
+					num_new_motorways++;
+				} else if (w->item.type != type_ramp) {
+					num_other++;
+				}
+				if (w != &(new->way)) {
+					dw=angle_delta(old->angle_end, w->angle2);
+					if (dw < 0) {
+						if (dw > left)
+							left=dw;
+						if (dw > -curve_limit && d < 0 && d > -curve_limit)
+							dc=dw;
+					} else {
+						if (dw < right)
+							right=dw;
+						if (dw < curve_limit && d > 0 && d < curve_limit)
+							dc=dw;
+					}
+					wcat=maneuver_category(w->item.type);
+					/* If any other street has the same name, we can't use the same name criterion.
+					 * Exceptions apply if we're coming from a motorway-like road and:
+					 * - the other road is motorway-like (a motorway might split up temporarily) or
+					 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
+					 * The second one is really a workaround for bad tagging practice in OSM. Since entering
+					 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
+					 * side effects.
+					 */
+					if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
+						is_same_street=0;
+					/* Mark if the street has a higher or the same category */
+					if (wcat > maxcat)
+						maxcat=wcat;
+				} /* if w != new->way */
+			} /* if is_way_allowed */
+			//if ((w->flags & AF_ONEWAYMASK) && is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
+			if (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
+				// FIXME: for some reason new->way has no flags set (at least in my test case), so we can't test for oneway
+				/* count through_segments (even if they are not allowed) to check if we are at a complex T junction */
+				through_segments++;
+			w = w->next;
+		}
+		if (num_options <= 1) {
+			if ((abs(d) >= curve_limit) && (through_segments == 2)) {
+				// FIXME: maybe there are cases with more than 2 through_segments...?
+				/* If we have to make a considerable turn (curve_limit or more),
+				 * check whether we are approaching a complex T junction from the "stem"
+				 * (which would need an announcement).
+				 * Complex means that the through road is a dual-carriageway road.
+				 * To find this out, we need to analyze the previous maneuvers.
+				 */
+				int hist_through_segments = 0;
+				int hist_dist = old->length; /* distance between previous and current maneuver */
+				struct navigation_itm *ni = old;
+				while (ni && (hist_through_segments == 0) && (hist_dist <= junction_limit)) {
+					struct navigation_way *w = ni->way.next;
+					while (w) {
+						if ((w->flags & AF_ONEWAYMASK) && (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2)))
+							hist_through_segments++;
+						w = w->next;
+					}
+					ni = ni->prev;
+					if (ni)
+						hist_dist += ni->length;
+				}
+				if (hist_through_segments == 2)
+					// FIXME: see above for number of through_segments
+					ret=1;
+					r="yes: turning into dual-carriageway through-road of T junction";
+			}
+			if (!r)
+				r="no: only one option permitted";
+		}
+	}
+	if (!r) {
+		if (is_motorway_like(&(old->way)) && (num_other == 0) && (num_new_motorways > 1)) {
 			/* If we are at a motorway interchange, ANNOUNCE
 			 * We are assuming a motorway interchange when old way and at least
 			 * two possible ways are motorway-like and allowed.
@@ -1236,29 +1341,28 @@
 			 * at a motorway interchange.
 			 */
 			// FIXME: motorway junctions could have service roads
-			int num_new_motorways = 0;
-			int num_other = 0;
-			struct navigation_way *cur_itm = &(new->way);
-			while (cur_itm) {
-				if ((is_motorway_like(cur_itm)) && is_way_allowed(nav,cur_itm,1)) {
-					num_new_motorways++;
-				} else if (cur_itm->item.type != type_ramp) {
-					num_other++;
-				}
-				cur_itm = cur_itm->next;
-			}
-			if ((num_other == 0) && (num_new_motorways > 1)) {
-				r="yes: motorway interchange";
-				ret=1;
-			}
+			r="yes: motorway interchange";
+			ret=1;
+		} else if ((new->way.item.type == type_ramp) && ((num_other == 0) || (abs(d) >= curve_limit))) {
+			/* Motorway ramps can be confusing, therefore announce each maneuver.
+			 * We'll assume a motorway ramp when all available ways are either
+			 * motorway-like or ramps.
+			 * We will also generate a maneuver whenever we have to make a turn
+			 * (of curve_limit or more) to enter the ramp.
+			 * Going straight on a ramp that crosses non-motorway roads does not
+			 * per se create a maneuver. This is to avoid superfluous maneuvers
+			 * when the minor road of a complex T junction is a ramp.
+			 */
+			r="yes: entering ramp";
+			ret=1;
 		}
 	}
-	cat=maneuver_category(old->way.item.type);
 	if (!r && abs(d) > 75) {
 		/* always make an announcement if you have to make a sharp turn */
 		r="yes: delta over 75";
 		ret=1;
 	} else if (!r && abs(d) > 22) {
+		//FIXME: use abs(d) >= curve_limit
 		/* When coming from street_2_* or higher category road, check if
 		 * - we have multiple options of the same category and
 		 * - we have to make a considerable turn (more than 22 degrees)
@@ -1267,15 +1371,6 @@
 		 * closer to 45 than to 0 degrees.
 		 */
 		if (cat >= maneuver_category(type_street_2_city)) {
-			int num_similar = 0;
-			struct navigation_way *cur_itm = &(new->way);
-			while (cur_itm) {
-				if (maneuver_category(cur_itm->item.type) == cat) {
-					// TODO: decide if a maneuver_category difference of 1 is still similar
-					num_similar++;
-				}
-				cur_itm = cur_itm->next;
-			}
 			if (num_similar > 1) {
 				ret=1;
 				r="yes: more than one similar road and delta over 22";
@@ -1284,40 +1379,6 @@
 	}
 	ncat=maneuver_category(new->way.item.type);
 	if (!r) {
-		int dc=d;
-		/* Check whether the street keeps its name */
-		is_same_street=is_same_street2(old->way.name1, old->way.name2, new->way.name1, new->way.name2);
-		w = new->way.next;
-		maxcat=-1;
-		while (w) {
-			dw=angle_delta(old->angle_end, w->angle2);
-			if (dw < 0) {
-				if (dw > left)
-					left=dw;
-				if (dw > -curve_limit && d < 0 && d > -curve_limit)
-					dc=dw;
-			} else {
-				if (dw < right)
-					right=dw;
-				if (dw < curve_limit && d > 0 && d < curve_limit)
-					dc=dw;
-			}
-			wcat=maneuver_category(w->item.type);
-			/* If any other street has the same name, we can't use the same name criterion.
-			 * Exceptions apply if we're coming from a motorway-like road and:
-			 * - the other road is motorway-like (a motorway might split up temporarily) or
-			 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
-			 * The second one is really a workaround for bad tagging practice in OSM. Since entering
-			 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
-			 * side effects.
-			 */
-			if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
-				is_same_street=0;
-			/* Mark if the street has a higher or the same category */
-			if (wcat > maxcat)
-				maxcat=wcat;
-			w = w->next;
-		}
 		/* get the delta limit for checking for other streets. It is lower if the street has no other
 		   streets of the same or higher category */
 		if (ncat < cat)
@@ -1327,30 +1388,42 @@
 		/* if the street is really straight, the others might be closer to straight */
 		if (abs(d) < 20)
 			dlim/=2;
+		/* if both old and new way have a category of 0, or if both ways and at least one other way are
+		 * in the same category and no other ways are higher,
+		 * dlim is 620/256 (roughly 2.5) times the delta of the maneuver */
 		if ((maxcat == ncat && maxcat == cat) || (ncat == 0 && cat == 0)) 
 			dlim=abs(d)*620/256;
+		/* if both old, new and highest other category differ by no more than 1,
+		 * dlim is just higher than the delta (so another way with a delta of exactly -d will be treated as ambiguous) */
+		else if (max(max(cat, ncat), maxcat) - min(min(cat, ncat), maxcat) <= 1)
+			dlim = abs(d) + 1;
+		/* if both old and new way are in higher than highest encountered category,
+		 * dlim is 128/256 times (i.e. one half) the delta of the maneuver */
 		else if (maxcat < ncat && maxcat < cat)
 			dlim=abs(d)*128/256;
+		/* if no other ways are within +/-dlim, the maneuver is unambiguous */
 		if (left < -dlim && right > dlim) 
-			is_unambigous=1;
+			is_unambiguous=1;
 		if (dc != d) {
 			dbg(1,"d %d vs dc %d\n",d,dc);
 			d-=(dc+d+1)/2;
 			dbg(1,"result %d\n",d);
-			is_unambigous=0;
+			is_unambiguous=0;
 		}
-		if (!is_same_street && is_unambigous < 1) {
+		if (!is_same_street && is_unambiguous < 1) {
 			ret=1;
-			r="yes: not same street or ambigous";
+			r="yes: different street and ambiguous";
 		} else
-			r="no: same street and unambigous";
+			r="no: same street or unambiguous";
 #ifdef DEBUG
-		r=g_strdup_printf("yes: d %d left %d right %d dlim=%d cat old:%d new:%d max:%d unambigous=%d same_street=%d", d, left, right, dlim, cat, ncat, maxcat, is_unambigous, is_same_street);
+		r=g_strdup_printf("%s: d %d left %d right %d dlim=%d cat old:%d new:%d max:%d unambiguous=%d same_street=%d", ret==1?"yes":"no", d, left, right, dlim, cat, ncat, maxcat, is_unambiguous, is_same_street);
 #endif
 	}
 	*delta=d;
 	if (reason)
 		*reason=r;
+	if (r)
+		dbg(1, "%s %s -> %s %s: %s\n", old->way.name2, old->way.name1, new->way.name2, new->way.name1, r);
 	return ret;
 	
 

Modified: trunk/navit/navit/util.h
===================================================================
--- trunk/navit/navit/util.h	2014-11-08 12:21:56 UTC (rev 5928)
+++ trunk/navit/navit/util.h	2014-11-08 15:14:34 UTC (rev 5929)
@@ -23,6 +23,9 @@
 #include <ctype.h>
 #include "config.h"
 
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#define min(a,b) ((a) < (b) ? (a) : (b))
+
 void strtoupper(char *dest, const char *src);
 void strtolower(char *dest, const char *src);
 int navit_utf8_strcasecmp(const char *s1, const char *s2);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5928] trunk/navit

[<md...@us...>]

Revision: 5928
          http://sourceforge.net/p/navit/code/5928
Author:   mdankov
Date:     2014-11-08 12:21:56 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Add:core:Set CPACK parameters to produce ready to use packages with default settings.

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt
    trunk/navit/navit/maps/CMakeLists.txt

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2014-11-06 18:54:16 UTC (rev 5927)
+++ trunk/navit/CMakeLists.txt	2014-11-08 12:21:56 UTC (rev 5928)
@@ -13,8 +13,11 @@
 
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.6)
+set(NAVIT_VERSION_MAJOR "0")
+set(NAVIT_VERSION_MINOR "5")
+set(NAVIT_VERSION_PATCH "0")
+set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_VERSION_PATCH}")
 
-set(PACKAGE_VERSION "0.5.0")
 set(PACKAGE_NAME "navit-svn")
 set(PACKAGE "navit")
 set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}")
@@ -99,8 +102,34 @@
 add_module(autoload/osso "Default" FALSE)
 add_module(map/garmin "Garmin library not found" FALSE)
 add_feature(USE_NATIVE_LANGUAGE_SUPPORT "Gettext not found and not on Windows" FALSE)
+set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cpack.cmake")
+set(CPACK_PACKAGE_VENDOR "Navit team")
+set(CPACK_PACKAGE_VERSION_MAJOR ${NAVIT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${NAVIT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH "${NAVIT_VERSION_PATCH}")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/GPL-2")
+set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}")
+set(CPACK_PACKAGE_FILE_NAME ${PACKAGE})
+set(CPACK_PACKAGE_EXECUTABLES "navit;Navit")
+set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+set(CPACK_NSIS_HELP_LINK "http://www.navit-project.org/?page=contact")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://www.navit-project.org")
+if(WIN32)
+    add_feature(USE_NSIS "makensis not found" FALSE)
+    FIND_PROGRAM(NSIS_EXECUTABLE NAMES makensis makensis.exe)
+    if(NSIS_EXECUTABLE)
+    	set(USE_NSIS TRUE)
+    endif(NSIS_EXECUTABLE)
 
+    set(CPACK_GENERATOR ZIP)
+    if(USE_NSIS)
+        list(APPEND CPACK_GENERATOR NSIS)
+    endif(USE_NSIS)
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY Navit)
+endif(WIN32)
 INCLUDE (CPack)
+
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 INCLUDE (CheckFunctionExists)
@@ -520,7 +549,6 @@
 if (WIN32 AND NOT WINCE)
    set(HAVE_API_WIN32 1)
    set(HAVE_STDINT_H 1)
-   set(SAMPLE_MAP FALSE)
    list(APPEND NAVIT_LIBS winmm)
 endif()
 if(WINCE)

Modified: trunk/navit/navit/maps/CMakeLists.txt
===================================================================
--- trunk/navit/navit/maps/CMakeLists.txt	2014-11-06 18:54:16 UTC (rev 5927)
+++ trunk/navit/navit/maps/CMakeLists.txt	2014-11-08 12:21:56 UTC (rev 5928)
@@ -38,4 +38,7 @@
 	 VERBATIM
       )
    endif()
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
+        DESTINATION ${SHARE_DIR}/maps
+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 endif()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5927] trunk/navit/po/ru.po.in

[<ka...@us...>]

Revision: 5927
          http://sourceforge.net/p/navit/code/5927
Author:   kazer_
Date:     2014-11-06 18:54:16 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
Fix:Core:Fixed plural form for Russian|Thanks tryagain for your help

Modified Paths:
--------------
    trunk/navit/po/ru.po.in

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2014-11-06 18:13:31 UTC (rev 5926)
+++ trunk/navit/po/ru.po.in	2014-11-06 18:54:16 UTC (rev 5927)
@@ -136,14 +136,14 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "одна миля"
+msgstr[0] "%d мили"
 msgstr[1] "%d мили"
 msgstr[2] "%d миль"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "через одну милю"
+msgstr[0] "через %d мили"
 msgstr[1] "через %d мили"
 msgstr[2] "через %d миль"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5926] trunk/navit/po

[<ka...@us...>]

Revision: 5926
          http://sourceforge.net/p/navit/code/5926
Author:   kazer_
Date:     2014-11-06 18:13:31 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
Fix:Core:Removed one translated string, breaking the build because of the plural form

Modified Paths:
--------------
    trunk/navit/po/be.po.in
    trunk/navit/po/hi.po.in
    trunk/navit/po/lv.po.in
    trunk/navit/po/sk.po.in

Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in	2014-11-06 16:33:00 UTC (rev 5925)
+++ trunk/navit/po/be.po.in	2014-11-06 18:13:31 UTC (rev 5926)
@@ -124,8 +124,8 @@
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "адзін кіламетр"
-msgstr[1] "%d кіламетраў"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
 msgid "in one kilometer"

Modified: trunk/navit/po/hi.po.in
===================================================================
--- trunk/navit/po/hi.po.in	2014-11-06 16:33:00 UTC (rev 5925)
+++ trunk/navit/po/hi.po.in	2014-11-06 18:13:31 UTC (rev 5926)
@@ -124,13 +124,13 @@
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ek kilometer"
-msgstr[1] "kai kilometero"
+msgstr[1] "%d kilometero"
 
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "ek kilometer mein"
-msgstr[1] "kai kilometero mein"
+msgstr[1] "%d kilometero mein"
 
 msgid "exit"
 msgstr "nikas"

Modified: trunk/navit/po/lv.po.in
===================================================================
--- trunk/navit/po/lv.po.in	2014-11-06 16:33:00 UTC (rev 5925)
+++ trunk/navit/po/lv.po.in	2014-11-06 18:13:31 UTC (rev 5926)
@@ -115,21 +115,21 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "viena jūdze"
+msgstr[0] "%d jūdze"
 msgstr[1] "%d jūdzes"
 msgstr[2] "%d jūdzes"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "pēc vienas jūdzes"
+msgstr[0] "pēc %d jūdzes"
 msgstr[1] "pēc %d jūdzēm"
 msgstr[2] "pēc %d jūdzēm"
 
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "kilometru"
+msgstr[0] "%d kilometru"
 msgstr[1] "%d kilometrus"
 msgstr[2] "%d kilometri"
 

Modified: trunk/navit/po/sk.po.in
===================================================================
--- trunk/navit/po/sk.po.in	2014-11-06 16:33:00 UTC (rev 5925)
+++ trunk/navit/po/sk.po.in	2014-11-06 18:13:31 UTC (rev 5926)
@@ -120,14 +120,14 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "jedna míľa"
+msgstr[0] "%d míľa"
 msgstr[1] "%d míle"
 msgstr[2] "%d míľ"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "o jednu míľu"
+msgstr[0] "o %d míľu"
 msgstr[1] "o %d míle"
 msgstr[2] "o %d míľ"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5925] trunk/navit/po

[<ka...@us...>]

Revision: 5925
          http://sourceforge.net/p/navit/code/5925
Author:   kazer_
Date:     2014-11-06 16:33:00 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
Update:Core:massive translation update from launchpad, and removed some header to reduce noise during importation

Modified Paths:
--------------
    trunk/navit/po/es.po.in
    trunk/navit/po/fi.po.in
    trunk/navit/po/fr.po.in
    trunk/navit/po/fr_CH.po.in
    trunk/navit/po/mk.po.in
    trunk/navit/po/nb.po.in

Modified: trunk/navit/po/es.po.in
===================================================================
--- trunk/navit/po/es.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/es.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -20,7 +20,6 @@
 # pataquets https://launchpad.net/~pataquets
 # singesang https://launchpad.net/~singesang
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -33,8 +32,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: \n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/fi.po.in
===================================================================
--- trunk/navit/po/fi.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/fi.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -10,7 +10,6 @@
 # Roadrunner IN https://launchpad.net/~online
 # Timo Jyrinki https://launchpad.net/~timo-jyrinki
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -23,8 +22,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/fr.po.in
===================================================================
--- trunk/navit/po/fr.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/fr.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -22,7 +22,6 @@
 # pierre https://launchpad.net/~pmghost4
 # yannick56 https://launchpad.net/~yleny
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -35,8 +34,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-11 19:08+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/fr_CH.po.in
===================================================================
--- trunk/navit/po/fr_CH.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/fr_CH.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -4,7 +4,6 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/mk.po.in
===================================================================
--- trunk/navit/po/mk.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/mk.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -7,7 +7,6 @@
 # Robert Mileski https://launchpad.net/~mileski
 # goran.cvetkovski https://launchpad.net/~goran-cvetkovski
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -20,8 +19,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: mk\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/nb.po.in
===================================================================
--- trunk/navit/po/nb.po.in	2014-11-06 16:06:11 UTC (rev 5924)
+++ trunk/navit/po/nb.po.in	2014-11-06 16:33:00 UTC (rev 5925)
@@ -9,7 +9,6 @@
 # Thor H. Johansen https://launchpad.net/~thorhajo
 # burner https://launchpad.net/~bendik-xplore
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -22,8 +21,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5924] trunk/navit/po

[<ka...@us...>]

Revision: 5924
          http://sourceforge.net/p/navit/code/5924
Author:   kazer_
Date:     2014-11-06 16:06:11 +0000 (Thu, 06 Nov 2014)
Log Message:
-----------
Update:Core:massive translation update from launchpad, and removed some header to reduce noise during importation

Modified Paths:
--------------
    trunk/navit/po/af.po.in
    trunk/navit/po/ar.po.in
    trunk/navit/po/ast.po.in
    trunk/navit/po/be.po.in
    trunk/navit/po/bg.po.in
    trunk/navit/po/bs.po.in
    trunk/navit/po/ca.po.in
    trunk/navit/po/ckb.po.in
    trunk/navit/po/cs.po.in
    trunk/navit/po/cy.po.in
    trunk/navit/po/da.po.in
    trunk/navit/po/de.po.in
    trunk/navit/po/de_CH.po.in
    trunk/navit/po/el.po.in
    trunk/navit/po/en_AU.po.in
    trunk/navit/po/en_CA.po.in
    trunk/navit/po/en_GB.po.in
    trunk/navit/po/eo.po.in
    trunk/navit/po/et.po.in
    trunk/navit/po/eu.po.in
    trunk/navit/po/fa.po.in
    trunk/navit/po/fil.po.in
    trunk/navit/po/fo.po.in
    trunk/navit/po/fy.po.in
    trunk/navit/po/gl.po.in
    trunk/navit/po/he.po.in
    trunk/navit/po/hi.po.in
    trunk/navit/po/hr.po.in
    trunk/navit/po/hu.po.in
    trunk/navit/po/id.po.in
    trunk/navit/po/it.po.in
    trunk/navit/po/ja.po.in
    trunk/navit/po/jv.po.in
    trunk/navit/po/kk.po.in
    trunk/navit/po/kn.po.in
    trunk/navit/po/ku.po.in
    trunk/navit/po/lb.po.in
    trunk/navit/po/lt.po.in
    trunk/navit/po/lv.po.in
    trunk/navit/po/mr.po.in
    trunk/navit/po/nds.po.in
    trunk/navit/po/nl.po.in
    trunk/navit/po/nn.po.in
    trunk/navit/po/pl.po.in
    trunk/navit/po/pms.po.in
    trunk/navit/po/pt.po.in
    trunk/navit/po/pt_BR.po.in
    trunk/navit/po/ro.po.in
    trunk/navit/po/ru.po.in
    trunk/navit/po/sc.po.in
    trunk/navit/po/si.po.in
    trunk/navit/po/sk.po.in
    trunk/navit/po/sl.po.in
    trunk/navit/po/sr.po.in
    trunk/navit/po/sv.po.in
    trunk/navit/po/sw.po.in
    trunk/navit/po/ta.po.in
    trunk/navit/po/te.po.in
    trunk/navit/po/th.po.in
    trunk/navit/po/tr.po.in
    trunk/navit/po/uk.po.in
    trunk/navit/po/ur.po.in
    trunk/navit/po/vi.po.in
    trunk/navit/po/zh_CN.po.in
    trunk/navit/po/zh_HK.po.in

Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/af.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Afrikaans translation for navit
+# Afrikaans translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -9,7 +9,6 @@
 # Wimpie Hall https://launchpad.net/~gotek
 # mdhull https://launchpad.net/~mark-emsafrica
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -22,8 +21,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/ar.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Arabic translation for navit
+# Arabic translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -7,7 +7,6 @@
 # drsaudi https://launchpad.net/~mon7b6
 # metehyi https://launchpad.net/~metehyi
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -21,8 +20,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/ast.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Asturian translation for navit
+# Asturian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Xuacu Saturio https://launchpad.net/~xuacusk8
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/be.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Belarusian translation for navit
+# Belarusian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Anatoli Putseyeu https://launchpad.net/~st-shadow-by
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -18,8 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -127,8 +124,8 @@
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "адзін кіламетр"
+msgstr[1] "%d кіламетраў"
 
 #, c-format
 msgid "in one kilometer"

Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/bg.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Bulgarian translation for navit
+# Bulgarian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -8,7 +8,6 @@
 # Lyudmil Bonev https://launchpad.net/~bonev-j
 # MalamiR https://launchpad.net/~mamut-killer
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -21,8 +20,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: bg\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/bs.po.in
===================================================================
--- trunk/navit/po/bs.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/bs.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,25 +1,24 @@
-# Bosnian translation for navit
+# Bosnian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# KaZeR https://launchpad.net/~kazer
 # Kenan https://launchpad.net/~kahrickenan
 
-
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2012-01-15 18:27+0000\n"
-"Last-Translator: Kenan <Unknown>\n"
+"PO-Revision-Date: 2014-08-08 23:15+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Bosnian <bs...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-08-08 22:21+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"Language: bs\n"
 
 msgid "Running from source directory\n"
 msgstr ""

Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/ca.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Catalan translation for navit
+# Catalan translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -14,7 +14,6 @@
 # kualsevol https://launchpad.net/~ojuanv
 # per...@gm... https://launchpad.net/~peremayol
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -27,8 +26,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/ckb.po.in
===================================================================
--- trunk/navit/po/ckb.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/ckb.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Kurdish (Sorani) translation for navit
+# Kurdish (Sorani) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # kosar https://launchpad.net/~kosar-belana
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""

Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/cs.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# translation of navit_cs.po to Čeština
+# # translation of navit_cs.po to Čeština translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -15,7 +15,6 @@
 # stritek https://launchpad.net/~stritek
 # talmik https://launchpad.net/~mikatom
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -28,8 +27,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/cy.po.in
===================================================================
--- trunk/navit/po/cy.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/cy.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,16 +1,15 @@
-# Welsh translation for navit
+# Welsh translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Simon Hewison https://launchpad.net/~simon-hewison-6
 
-
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2013-02-19 14:30+0000\n"
+"PO-Revision-Date: 2014-08-08 23:15+0000\n"
 "Last-Translator: Simon Hewison <sim...@zy...>\n"
 "Language-Team: Welsh <cy...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2014-08-08 22:21+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"Language: cy\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -137,8 +135,6 @@
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 msgid "exit"
 msgstr "allanfa"

Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/da.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Danish translation for Navit
+# # Danish translation for Navit translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -12,7 +12,6 @@
 # Tomas Groth https://launchpad.net/~tomasgroth
 # Uffe Kjems https://launchpad.net/~uffekjems
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -25,8 +24,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/de.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Achim Behrens https://launchpad.net/~k1l
+# Artem Anufrij https://launchpad.net/~artem-anufrij
 # Bernhard Reiter https://launchpad.net/~ockham-razor
 # Christian Moll https://launchpad.net/~christian-chrmoll
 # Clemens Kiener https://launchpad.net/~clemens-kiener
@@ -32,21 +33,18 @@
 # spaetz https://launchpad.net/~spaetz
 # vsandre https://launchpad.net/~riedel-andre
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2013-12-12 16:07+0000\n"
-"Last-Translator: Martin Schaller <Unknown>\n"
+"PO-Revision-Date: 2014-09-12 20:49+0000\n"
+"Last-Translator: Artem Anufrij <Unknown>\n"
 "Language-Team: Martin Schaller <mar...@so...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1371,7 +1369,7 @@
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgstr "Fehler: Keine Konfiguration in der Datei '%s' gefunden\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
@@ -1754,7 +1752,7 @@
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Breitengrad Längengrad"
 
 msgid "Enter coordinates, for example:"
 msgstr "Koordinaten eingeben, z.B.:"
@@ -1960,7 +1958,7 @@
 msgstr "Poitou-Charentes"
 
 msgid "Provence-Alpes-Cote-d-Azur"
-msgstr ""
+msgstr "Provence-Alpes-Cote-d-Azur"
 
 msgid "Rhone-Alpes"
 msgstr "Rhone-Alpen"

Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/de_CH.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,9 +1,8 @@
-# German (Switzerland) translation for navit
+# German (Switzerland) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -16,8 +15,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/el.po.in
===================================================================
--- trunk/navit/po/el.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/el.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Greek translation for navit
+# Greek translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -9,7 +9,6 @@
 # okiroi https://launchpad.net/~g-theodoroy
 # vassilis https://launchpad.net/~kagemarou
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -22,8 +21,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/en_AU.po.in
===================================================================
--- trunk/navit/po/en_AU.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/en_AU.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,11 +1,10 @@
-# English (Australia) translation for navit
+# English (Australia) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Athol Mullen https://launchpad.net/~athol-mullen
 # KaZeR https://launchpad.net/~kazer
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -18,8 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/en_CA.po.in
===================================================================
--- trunk/navit/po/en_CA.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/en_CA.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# English (Canada) translation for navit
+# English (Canada) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Frank Bax https://launchpad.net/~drw06g0w-qaens-52bk9e55
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr "Running from source directory\n"

Modified: trunk/navit/po/en_GB.po.in
===================================================================
--- trunk/navit/po/en_GB.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/en_GB.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,7 +1,8 @@
-# English (United Kingdom) translation for navit
+# English (United Kingdom) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Andi Chandler https://launchpad.net/~bing
 # Jeff Bailes https://launchpad.net/~thepizzaking
 # Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak
 # Matthew Gall https://launchpad.net/~matthewgall
@@ -10,21 +11,18 @@
 # half_monkey https://launchpad.net/~d-r-williams-01
 # lopho https://launchpad.net/~lopho
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2013-09-28 01:41+0000\n"
-"Last-Translator: Matthew Gall <Unknown>\n"
+"PO-Revision-Date: 2014-09-23 23:26+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -88,11 +86,11 @@
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d feet"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "in %d feet"
 
 #, c-format
 msgid "%d meters"
@@ -104,11 +102,11 @@
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d miles"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "in %d.%d miles"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -121,14 +119,14 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "one mile"
+msgstr[1] "%d miles"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "in one mile"
+msgstr[1] "in %d miles"
 
 #, c-format
 msgid "one kilometer"
@@ -206,7 +204,7 @@
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Enter the roundabout %s"
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -289,10 +287,10 @@
 
 #, c-format
 msgid "Waypoint %d"
-msgstr ""
+msgstr "Waypoint %d"
 
 msgid "Visit before..."
-msgstr ""
+msgstr "Visit before..."
 
 msgid "Set as position"
 msgstr "Set as position"
@@ -433,7 +431,7 @@
 
 #. 535
 msgid "Bonaire, Sint Eustatius and Saba"
-msgstr ""
+msgstr "Bonaire, Sint Eustatius and Saba"
 
 #. 076
 msgid "Brazil"
@@ -525,7 +523,7 @@
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "Curacao"
 
 #. 162
 msgid "Christmas Island"
@@ -857,7 +855,7 @@
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Libya"
 
 #. 504
 msgid "Morocco"
@@ -1145,7 +1143,7 @@
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "South Sudan"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1157,7 +1155,7 @@
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (Dutch part)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1323,36 +1321,44 @@
 "\t-h: print this usage info and exit.\n"
 "\t-v: Print the version and exit.\n"
 msgstr ""
+"navit usage:\n"
+"navit [options] [configfile]\n"
+"\t-c <file>: use <file> as config file\n"
+"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
+"from config file.\n"
+"\t-h: print this usage info and exit.\n"
+"\t-v: Print the version and exit.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
+msgstr "No config file navit.xml, navit.xml.local found\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
-msgstr ""
+msgstr "Error parsing config file '%s': %s\n"
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "Using config file '%s'\n"
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgstr "Error: No configuration found in config file '%s'\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
 msgstr ""
+"Internal initialisation failed, exiting. Check previous error messages.\n"
 
 msgid "unknown street"
-msgstr ""
+msgstr "unknown street"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Unnamed vehicle"
 
 msgid "Failed to write bookmarks file"
-msgstr ""
+msgstr "Failed to write bookmarks file"
 
 #. Strings from navit_shipped.xml
 msgid "Map Point"
@@ -1453,7 +1459,7 @@
 msgstr "Info"
 
 msgid "Set _destination"
-msgstr ""
+msgstr "Set _destination"
 
 msgid "Opens address search dialog"
 msgstr "Opens address search dialogue"
@@ -1471,13 +1477,13 @@
 msgstr "Quit the application"
 
 msgid "Show position _cursor"
-msgstr ""
+msgstr "Show position _cursor"
 
 msgid "_Lock on Road"
 msgstr "Lock on road"
 
 msgid "_Keep orientation to the North"
-msgstr ""
+msgstr "_Keep orientation to the North"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Switches map orientation to the north or the vehicle"
@@ -1549,16 +1555,16 @@
 
 #, c-format
 msgid "Waypoint %s"
-msgstr ""
+msgstr "Waypoint %s"
 
 msgid "Select waypoint to insert the new one before"
-msgstr ""
+msgstr "Select waypoint to insert the new one before"
 
 msgid "View in Browser"
 msgstr "View in browser"
 
 msgid "Item type"
-msgstr ""
+msgstr "Item type"
 
 #. Android resource: @strings/address_search_streets
 msgid "Streets"
@@ -1571,7 +1577,7 @@
 msgstr "View attributes"
 
 msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Set as position (and deactivate vehicle)"
 
 msgid "POIs"
 msgstr "POIs"
@@ -1580,10 +1586,10 @@
 msgstr "View on map"
 
 msgid "Remove search results from the map"
-msgstr ""
+msgstr "Remove search results from the map"
 
 msgid "Show results on the map"
-msgstr ""
+msgstr "Show results on the map"
 
 msgid "Cut Bookmark"
 msgstr "Cut bookmark"
@@ -1601,22 +1607,22 @@
 msgstr "Delete bookmark"
 
 msgid "Delete waypoint"
-msgstr ""
+msgstr "Delete waypoint"
 
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
 msgid "Bookmarks as waypoints"
-msgstr ""
+msgstr "Bookmarks as waypoints"
 
 msgid "Save waypoints"
-msgstr ""
+msgstr "Save waypoints"
 
 msgid "Replace with waypoints"
-msgstr ""
+msgstr "Replace with waypoints"
 
 msgid "Delete Folder"
-msgstr ""
+msgstr "Delete Folder"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
@@ -1632,19 +1638,19 @@
 
 #, c-format
 msgid "Download %s"
-msgstr ""
+msgstr "Download %s"
 
 msgid "Map Download"
-msgstr ""
+msgstr "Map Download"
 
 msgid "Active"
-msgstr ""
+msgstr "Active"
 
 msgid "Download Enabled"
-msgstr ""
+msgstr "Download Enabled"
 
 msgid "Download completely"
-msgstr ""
+msgstr "Download completely"
 
 msgid "Show Satellite Status"
 msgstr "Show satellite status"
@@ -1705,10 +1711,10 @@
 msgstr "members and contributors."
 
 msgid "Waypoints"
-msgstr ""
+msgstr "Waypoints"
 
 msgid "Enter Coordinates"
-msgstr ""
+msgstr "Enter Coordinates"
 
 #. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1717,10 +1723,10 @@
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Latitude Longitude"
 
 msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Enter coordinates, for example:"
 
 msgid "Vehicle"
 msgstr "Vehicle"
@@ -1738,7 +1744,7 @@
 msgstr "Map follows vehicle"
 
 msgid "Plan with Waypoints"
-msgstr ""
+msgstr "Plan with Waypoints"
 
 msgid "Maps"
 msgstr "Maps"
@@ -1759,7 +1765,7 @@
 msgstr "Former Destinations"
 
 msgid "- No former destinations available -"
-msgstr ""
+msgstr "- No former destinations available -"
 
 msgid "Message"
 msgstr "Message"
@@ -1777,436 +1783,436 @@
 msgstr "House number"
 
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 msgid "Prev"
-msgstr ""
+msgstr "Prev"
 
 msgid "Return to route!"
-msgstr ""
+msgstr "Return to route!"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr ""
+msgstr "Look out! Camera!"
 
 #. warning told
 msgid "Please decrease your speed"
-msgstr ""
+msgstr "Please decrease your speed"
 
 msgid "partial match"
-msgstr ""
+msgstr "partial match"
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
-msgstr ""
+msgstr "Towns"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
-msgstr ""
+msgstr "Route to here"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgstr "Map data (c) OpenStreetMap contributors, ODBL"
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "Downloaded maps"
 
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Whole Planet"
 
 msgid "Africa"
-msgstr ""
+msgstr "Africa"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Canary Islands"
 
 msgid "Asia"
-msgstr ""
+msgstr "Asia"
 
 msgid "Korea"
-msgstr ""
+msgstr "Korea"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "UAE+Other"
 
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Tasmania"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Victoria"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "New South Wales"
 
 msgid "Europe"
-msgstr ""
+msgstr "Europe"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Western Europe"
 
 msgid "Azores"
-msgstr ""
+msgstr "Azores"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "BeNeLux"
 
 msgid "Alsace"
-msgstr ""
+msgstr "Alsace"
 
 msgid "Aquitaine"
-msgstr ""
+msgstr "Aquitaine"
 
 msgid "Auvergne"
-msgstr ""
+msgstr "Auvergne"
 
 msgid "Basse-Normandie"
-msgstr ""
+msgstr "Basse-Normandie"
 
 msgid "Bourgogne"
-msgstr ""
+msgstr "Bourgogne"
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Bretagne"
 
 msgid "Centre"
-msgstr ""
+msgstr "Centre"
 
 msgid "Champagne-Ardenne"
-msgstr ""
+msgstr "Champagne-Ardenne"
 
 msgid "Corse"
-msgstr ""
+msgstr "Corse"
 
 msgid "Franche-Comte"
-msgstr ""
+msgstr "Franche-Comte"
 
 msgid "Haute-Normandie"
-msgstr ""
+msgstr "Haute-Normandie"
 
 msgid "Ile-de-France"
-msgstr ""
+msgstr "Ile-de-France"
 
 msgid "Languedoc-Roussillon"
-msgstr ""
+msgstr "Languedoc-Roussillon"
 
 msgid "Limousin"
-msgstr ""
+msgstr "Limousin"
 
 msgid "Lorraine"
-msgstr ""
+msgstr "Lorraine"
 
 msgid "Midi-Pyrenees"
-msgstr ""
+msgstr "Midi-Pyrenees"
 
 msgid "Nord-pas-de-Calais"
-msgstr ""
+msgstr "Nord-pas-de-Calais"
 
 msgid "Pays-de-la-Loire"
-msgstr ""
+msgstr "Pays-de-la-Loire"
 
 msgid "Picardie"
-msgstr ""
+msgstr "Picardie"
 
 msgid "Poitou-Charentes"
-msgstr ""
+msgstr "Poitou-Charentes"
 
 msgid "Provence-Alpes-Cote-d-Azur"
-msgstr ""
+msgstr "Provence-Alpes-Cote-d-Azur"
 
 msgid "Rhone-Alpes"
-msgstr ""
+msgstr "Rhone-Alpes"
 
 msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Wuerttemberg"
 
 msgid "Bayern"
-msgstr ""
+msgstr "Bayern"
 
 msgid "Mittelfranken"
-msgstr ""
+msgstr "Mittelfranken"
 
 msgid "Niederbayern"
-msgstr ""
+msgstr "Niederbayern"
 
 msgid "Oberbayern"
-msgstr ""
+msgstr "Oberbayern"
 
 msgid "Oberfranken"
-msgstr ""
+msgstr "Oberfranken"
 
 msgid "Oberpfalz"
-msgstr ""
+msgstr "Oberpfalz"
 
 msgid "Schwaben"
-msgstr ""
+msgstr "Schwaben"
 
 msgid "Unterfranken"
-msgstr ""
+msgstr "Unterfranken"
 
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Brandenburg"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 msgid "Hessen"
-msgstr ""
+msgstr "Hessen"
 
 msgid "Mecklenburg-Vorpommern"
-msgstr ""
+msgstr "Mecklenburg-Vorpommern"
 
 msgid "Niedersachsen"
-msgstr ""
+msgstr "Niedersachsen"
 
 msgid "Nordrhein-westfalen"
-msgstr ""
+msgstr "Nordrhein-westfalen"
 
 msgid "Rheinland-Pfalz"
-msgstr ""
+msgstr "Rheinland-Pfalz"
 
 msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
 
 msgid "Sachsen-Anhalt"
-msgstr ""
+msgstr "Sachsen-Anhalt"
 
 msgid "Sachsen"
-msgstr ""
+msgstr "Sachsen"
 
 msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
 
 msgid "Thueringen"
-msgstr ""
+msgstr "Thueringen"
 
 msgid "Mallorca"
-msgstr ""
+msgstr "Mallorca"
 
 msgid "Galicia"
-msgstr ""
+msgstr "Galicia"
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "Scandinavia"
 
 msgid "England"
-msgstr ""
+msgstr "England"
 
 msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
 
 msgid "Cambridgeshire"
-msgstr ""
+msgstr "Cambridgeshire"
 
 msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
 
 msgid "East yorkshire with hull"
-msgstr ""
+msgstr "East Yorkshire with Hull"
 
 msgid "Essex"
-msgstr ""
+msgstr "Essex"
 
 msgid "Herefordshire"
-msgstr ""
+msgstr "Herefordshire"
 
 msgid "Kent"
-msgstr ""
+msgstr "Kent"
 
 msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
 
 msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
 
 msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
 
 msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
 
 msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
 
 msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
 
 msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
 
 msgid "South yorkshire"
-msgstr ""
+msgstr "South Yorkshire"
 
 msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
 
 msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
 
 msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
 
 msgid "Scotland"
-msgstr ""
+msgstr "Scotland"
 
 msgid "Wales"
-msgstr ""
+msgstr "Wales"
 
 msgid "Crete"
-msgstr ""
+msgstr "Crete"
 
 msgid "North America"
-msgstr ""
+msgstr "North America"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Alaska"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Hawaii"
 
 msgid "USA"
-msgstr ""
+msgstr "USA"
 
 msgid " (except Alaska and Hawaii)"
-msgstr ""
+msgstr " (except Alaska and Hawaii)"
 
 msgid "Midwest"
-msgstr ""
+msgstr "Midwest"
 
 msgid "Michigan"
-msgstr ""
+msgstr "Michigan"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Ohio"
 
 msgid "Northeast"
-msgstr ""
+msgstr "Northeast"
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Massachusetts"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Vermont"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Pacific"
 
 msgid "South"
-msgstr ""
+msgstr "South"
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Arkansas"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "District of Columbia"
 
 msgid "Florida"
-msgstr ""
+msgstr "Florida"
 
 msgid "Louisiana"
-msgstr ""
+msgstr "Louisiana"
 
 msgid "Maryland"
-msgstr ""
+msgstr "Maryland"
 
 msgid "Mississippi"
-msgstr ""
+msgstr "Mississippi"
 
 msgid "Oklahoma"
-msgstr ""
+msgstr "Oklahoma"
 
 msgid "Texas"
-msgstr ""
+msgstr "Texas"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Virginia"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "West Virginia"
 
 msgid "West"
-msgstr ""
+msgstr "West"
 
 msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
 
 msgid "California"
-msgstr ""
+msgstr "California"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Colorado"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Idaho"
 
 msgid "Montana"
-msgstr ""
+msgstr "Montana"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "New Mexico"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Oregon"
 
 msgid "Utah"
-msgstr ""
+msgstr "Utah"
 
 msgid "Washington State"
-msgstr ""
+msgstr "Washington State"
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "South+Middle America"
 
 msgid "Guyane Francaise"
-msgstr ""
+msgstr "Guyane Francaise"
 
 msgid "downloading"
-msgstr ""
+msgstr "downloading"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
-msgstr ""
+msgstr "ready"
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Error downloading map!"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
-msgstr ""
+msgstr "Not enough free space"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Error writing map!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Map download aborted!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr ""
+msgstr "ETA"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr ""
+msgstr "Map download"
 
 msgid "Vehicle Position"
 msgstr "Vehicle Position"
@@ -2241,9 +2247,11 @@
 "Former\n"
 "Destinations"
 msgstr ""
+"Former\n"
+"Destinations"
 
 msgid "Coordinates"
-msgstr ""
+msgstr "Coordinates"
 
 msgid ""
 "Stop\n"
@@ -2266,49 +2274,53 @@
 "Drop last \n"
 "Waypoint"
 msgstr ""
+"Drop last \n"
+"Waypoint"
 
 msgid ""
 "Drop next \n"
 "Waypoint"
 msgstr ""
+"Drop next \n"
+"Waypoint"
 
 msgid "Satellite Status"
-msgstr ""
+msgstr "Satellite Status"
 
 msgid "NMEA Data"
-msgstr ""
+msgstr "NMEA Data"
 
 msgid "car_shortest"
-msgstr ""
+msgstr "car_shortest"
 
 msgid "car_avoid_tolls"
-msgstr ""
+msgstr "car_avoid_tolls"
 
 msgid "car_pedantic"
-msgstr ""
+msgstr "car_pedantic"
 
 msgid "horse"
 msgstr "horse"
 
 msgid "Truck"
-msgstr ""
+msgstr "Truck"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
-msgstr ""
+msgstr "Navit started"
 
 #. Android resource: @strings/notification_event_default
 msgid "Navit running"
-msgstr ""
+msgstr "Navit running"
 
 #. Android resource: @strings/initial_info_box_title
 msgid "Welcome to Navit"
-msgstr ""
+msgstr "Welcome to Navit"
 
 #. Android resource: @strings/initial_info_box_message
 msgid ""
@@ -2321,161 +2333,171 @@
 "\n"
 "Enjoy Navit!"
 msgstr ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map file size may be large (>50MB) - a WiFi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
-msgstr ""
+msgstr "More info"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Zoom in"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Zoom out"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
-msgstr ""
+msgstr "Download maps"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr ""
+msgstr "Toggle POIs"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
-msgstr ""
+msgstr "Exit Navit"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
-msgstr ""
+msgstr "Backup / Restore"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr ""
+msgstr "Delete this map?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr ""
+msgstr "Downloading:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
-msgstr ""
+msgstr "Error downloading map."
 
 #. Android resource: @strings/map_download_download_aborted
 msgid "Map download aborted"
-msgstr ""
+msgstr "Map download aborted"
 
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
-msgstr ""
+msgstr "No location. Reopen after location fix."
 
 #. Android resource: @strings/maps_for_current_location
 msgid "Maps containing current location"
-msgstr ""
+msgstr "Maps containing current location"
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr ""
+msgstr "Address search"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
-msgstr ""
+msgstr "Enter destination"
 
 #. Android resource: @strings/address_partial_match
 msgid "Match partial address"
-msgstr ""
+msgstr "Match partial address"
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Searching..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
-msgstr ""
+msgstr "Address not found"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
-msgstr ""
+msgstr "Getting search results"
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr ""
+msgstr "Loading search results"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "No results found"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr ""
+msgstr "No text entered"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
-msgstr ""
+msgstr "Setting destination to:"
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Choose an action"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr ""
+msgstr "Please insert an SD Card"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Backing up..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Restoring..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
-msgstr ""
+msgstr "Failed to create backup directory"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr ""
+msgstr "Backup failed"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr ""
+msgstr "No backup found"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
-msgstr ""
+msgstr "Failed to restore"
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr ""
+msgstr "Backup successful"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
 "Restore Successful\n"
 "Please restart Navit"
 msgstr ""
+"Restore Successful\n"
+"Please restart Navit"
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr ""
+msgstr "Backup not found"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
-msgstr ""
+msgstr "Restore failed"
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr ""
+msgstr "Select backup"
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr ""
+msgstr "Backup"
 
 #. Android resource: @strings/restore
 msgid "Restore"
-msgstr ""
+msgstr "Restore"

Modified: trunk/navit/po/eo.po.in
===================================================================
--- trunk/navit/po/eo.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/eo.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Esperanto translation for navit
+# Esperanto translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -7,7 +7,6 @@
 # Michael Moroni https://launchpad.net/~airon90
 # OlivierWeb https://launchpad.net/~olivierweb
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -20,8 +19,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: eo\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/et.po.in
===================================================================
--- trunk/navit/po/et.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/et.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Estonian translation for navit
+# Estonian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -8,7 +8,6 @@
 # lyyser https://launchpad.net/~lyyser
 # thucar https://launchpad.net/~rait
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -21,8 +20,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/eu.po.in
===================================================================
--- trunk/navit/po/eu.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/eu.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,11 +1,10 @@
-# Basque translation for navit
+# Basque translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Inaki Saez https://launchpad.net/~inaki-saez
 # mikel https://launchpad.net/~mikel85
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -18,8 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/fa.po.in
===================================================================
--- trunk/navit/po/fa.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/fa.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,11 +1,10 @@
-# Persian translation for navit
+# Persian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # salix https://launchpad.net/~s-shahsa
 # the_cephalex https://launchpad.net/~ali-rashidi
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -18,8 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""

Modified: trunk/navit/po/fil.po.in
===================================================================
--- trunk/navit/po/fil.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/fil.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Filipino translation for navit
+# Filipino translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # chito https://launchpad.net/~cnuarin
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""

Modified: trunk/navit/po/fo.po.in
===================================================================
--- trunk/navit/po/fo.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/fo.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,11 +1,10 @@
-# Faroese translation for navit
+# Faroese translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Cyberish https://launchpad.net/~cyberish
 # Gunleif Joensen https://launchpad.net/~gunleif
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -18,8 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: fo\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/fy.po.in
===================================================================
--- trunk/navit/po/fy.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/fy.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Frisian translation for navit
+# Frisian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # 205 https://launchpad.net/~205-z
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""

Modified: trunk/navit/po/gl.po.in
===================================================================
--- trunk/navit/po/gl.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/gl.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Galician translation for navit
+# Galician translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -7,7 +7,6 @@
 # Xosé https://launchpad.net/~ubuntu-galizaweb
 # andreout https://launchpad.net/~andre-outeiro
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -20,8 +19,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: gl\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/he.po.in
===================================================================
--- trunk/navit/po/he.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/he.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Hebrew translation for navit
+# Hebrew translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -9,7 +9,6 @@
 # Yaron https://launchpad.net/~sh-yaron
 # rintintin https://launchpad.net/~yonatanhak-gmail
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -22,8 +21,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/hi.po.in
===================================================================
--- trunk/navit/po/hi.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/hi.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Hindi translation for navit
+# Hindi translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # desh deep https://launchpad.net/~singhdeepdesh
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -126,14 +123,14 @@
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ek kilometer"
+msgstr[1] "kai kilometero"
 
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ek kilometer mein"
+msgstr[1] "kai kilometero mein"
 
 msgid "exit"
 msgstr "nikas"

Modified: trunk/navit/po/hr.po.in
===================================================================
--- trunk/navit/po/hr.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/hr.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Croatian translation for navit
+# Croatian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -6,7 +6,6 @@
 # Marjan Vrban https://launchpad.net/~mvrban
 # klajo https://launchpad.net/~klaudio
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -20,8 +19,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/hu.po.in
===================================================================
--- trunk/navit/po/hu.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/hu.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Hungarian translation for navit
+# Hungarian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -10,7 +10,6 @@
 # dandor https://launchpad.net/~dandorfs
 # kalmarzs https://launchpad.net/~kalmarzs
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -23,8 +22,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/id.po.in
===================================================================
--- trunk/navit/po/id.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/id.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# Indonesian translation for navit
+# Indonesian translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -7,7 +7,6 @@
 # M Bambang I https://launchpad.net/~mbi-lawang
 # Steve Kartantya https://launchpad.net/~jack-haz
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -20,8 +19,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/it.po.in
===================================================================
--- trunk/navit/po/it.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/it.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,4 +1,4 @@
-# translation of it.po to Italiano
+# # translation of it.po to Italiano translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -20,7 +20,6 @@
 # jackyes https://launchpad.net/~jackthebest
 # tomas https://launchpad.net/~tracks-tomyt
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -33,8 +32,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:36+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"

Modified: trunk/navit/po/ja.po.in
===================================================================
--- trunk/navit/po/ja.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/ja.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,11 +1,10 @@
-# Japanese translation for navit
+# Japanese translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # MontBlanc https://launchpad.net/~osm-gatinho
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -18,8 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: ja\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/jv.po.in
===================================================================
--- trunk/navit/po/jv.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/jv.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Javanese translation for navit
+# Javanese translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 0;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "exit"

Modified: trunk/navit/po/kk.po.in
===================================================================
--- trunk/navit/po/kk.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/kk.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,9 +1,8 @@
-# Kazakh translation for navit
+# Kazakh translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
@@ -16,8 +15,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-08-08 16:37+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
 "Language: kk\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 

Modified: trunk/navit/po/kn.po.in
===================================================================
--- trunk/navit/po/kn.po.in	2014-11-05 18:11:09 UTC (rev 5923)
+++ trunk/navit/po/kn.po.in	2014-11-06 16:06:11 UTC (rev 5924)
@@ -1,10 +1,9 @@
-# Kannada translation for navit
+# Kannada translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Mahesh Venom https://launchpad.net/~mahesh-venom-73
 
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
@@ -17,8 +16,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n...
 
[truncated message content]

[Navit-cvs-commit] SF.net SVN: navit:[5923] trunk/navit/po/nl.po.in

[<ka...@us...>]

Revision: 5923
          http://sourceforge.net/p/navit/code/5923
Author:   kazer_
Date:     2014-11-05 18:11:09 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
Update:Core:Updated Dutch translation from launchpad

Modified Paths:
--------------
    trunk/navit/po/nl.po.in

Modified: trunk/navit/po/nl.po.in
===================================================================
--- trunk/navit/po/nl.po.in	2014-11-03 15:18:15 UTC (rev 5922)
+++ trunk/navit/po/nl.po.in	2014-11-05 18:11:09 UTC (rev 5923)
@@ -19,23 +19,21 @@
 # jan https://launchpad.net/~jandegr1
 # rob https://launchpad.net/~rvdb
 # worldcitizen https://launchpad.net/~joop-boonen
-
-
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2014-08-16 06:43+0000\n"
-"Last-Translator: Christopher <cst...@sr...>\n"
+"PO-Revision-Date: 2014-10-31 17:14+0000\n"
+"Last-Translator: rob <lin...@gm...>\n"
 "Language-Team: afaber\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-16 19:48+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-"Language: \n"
+"X-Launchpad-Export-Date: 2014-11-02 17:16+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
+"Language: nl\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "soon"
@@ -160,7 +158,7 @@
 msgstr "afslag"
 
 msgid "into the ramp"
-msgstr "naar de afslag"
+msgstr "naar de oprit"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -261,7 +259,7 @@
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "daarna, ga na %3$s wegen %1$s%2$s naar %4$s"
+msgstr "daarna ga %3$s %1$s naar %2$s %4$s"
 
 #, c-format
 msgid "You have reached your destination %s"
@@ -1740,7 +1738,7 @@
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Breedtegraad Lengtegraad"
 
 msgid "Enter coordinates, for example:"
 msgstr "voer coordinaat in, bijvorbeeld:"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5922] trunk/navit/navit/font/freetype/font_freetype.c

[<sl...@us...>]

Revision: 5922
          http://sourceforge.net/p/navit/code/5922
Author:   sleske
Date:     2014-11-03 15:18:15 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
Fix:font/freetype:Do not call FcFini on shutdown, it will assert() anyway.

Modified Paths:
--------------
    trunk/navit/navit/font/freetype/font_freetype.c

Modified: trunk/navit/navit/font/freetype/font_freetype.c
===================================================================
--- trunk/navit/navit/font/freetype/font_freetype.c	2014-11-03 15:02:34 UTC (rev 5921)
+++ trunk/navit/navit/font/freetype/font_freetype.c	2014-11-03 15:18:15 UTC (rev 5922)
@@ -782,14 +782,13 @@
 
 static void
 font_freetype_destroy(void) {
+	// Do not call FcFini here: GdkPixbuf also (indirectly) uses fontconfig (for SVGs with
+	// text), but does not properly deallocate all objects, so FcFini assert()s.
 	if (!library_deinit) {
-#ifdef HAVE_FONTCONFIG
-			FcFini();
-#endif
 #if USE_CACHING
-			FTC_Manager_Done(manager);
+		FTC_Manager_Done(manager);
 #endif
-			FT_Done_FreeType(library);
+		FT_Done_FreeType(library);
 	}
 	library_deinit = 1;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5921] trunk/navit/navit/gui/internal/gui_internal_search .c

[<sl...@us...>]

Revision: 5921
          http://sourceforge.net/p/navit/code/5921
Author:   sleske
Date:     2014-11-03 15:02:34 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
Fix:gui_internal:Don't show "county" name if it is identical to town name.

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal_search.c

Modified: trunk/navit/navit/gui/internal/gui_internal_search.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_search.c	2014-11-03 15:02:13 UTC (rev 5920)
+++ trunk/navit/navit/gui/internal/gui_internal_search.c	2014-11-03 15:02:34 UTC (rev 5921)
@@ -161,7 +161,7 @@
 		postal_sep=postal="";
 	if (!district || (flags & 1))
 		district_begin=district_end=district="";
-	if (!county)
+	if (!county || !strcmp(county, town))
 		county_sep=county="";
 
 	if(level==1 ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5920] trunk/navit/navit/gui/internal/gui_internal_search .c

[<sl...@us...>]

Revision: 5920
          http://sourceforge.net/p/navit/code/5920
Author:   sleske
Date:     2014-11-03 15:02:13 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
Fix:gui_internal:Don't show "Co." for "county", as "county" means different things in different countries. | Fixes #1244.

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal_search.c

Modified: trunk/navit/navit/gui/internal/gui_internal_search.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_search.c	2014-11-03 00:28:45 UTC (rev 5919)
+++ trunk/navit/navit/gui/internal/gui_internal_search.c	2014-11-03 15:02:13 UTC (rev 5920)
@@ -154,7 +154,7 @@
 	char *postal_sep=" ";
 	char *district_begin=" (";
 	char *district_end=")";
-	char *county_sep = ", Co. ";
+	char *county_sep = ", ";
 	char *county = res->town->common.county_name;
 	
 	if (!postal)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5919] trunk/navit/navit/map/binfile/binfile.c

[<md...@us...>]

Revision: 5919
          http://sourceforge.net/p/navit/code/5919
Author:   mdankov
Date:     2014-11-03 00:28:45 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
Add:map_binfile:Limit housenumber search region by town boundary. Removes false positives when a single street flows through a few adjacent towns. Related to #1243| great work jandegr

Modified Paths:
--------------
    trunk/navit/navit/map/binfile/binfile.c

Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c	2014-11-02 21:57:43 UTC (rev 5918)
+++ trunk/navit/navit/map/binfile/binfile.c	2014-11-03 00:28:45 UTC (rev 5919)
@@ -131,6 +131,8 @@
 	struct map_download *download;
 	int redirect;
 	long download_enabled;
+	int last_searched_town_id_hi;	
+	int last_searched_town_id_lo;
 };
 
 struct map_rect_priv {
@@ -1932,25 +1934,11 @@
 	return NULL;
 }
 
-static struct map_rect_priv *
-binmap_search_street_by_estimate(struct map_priv *map, struct item *town, struct coord *c, struct map_selection *sel)
+static int
+binmap_get_estimated_town_size(struct item *town)
 {
 	int size = 10000;
 	switch (town->type) {
-		case type_town_label_1e7:
-		case type_town_label_5e6:
-		case type_town_label_2e6:
-		case type_town_label_1e6:
-		case type_town_label_5e5:
-		case type_town_label_2e5:
-		case type_district_label_1e7:
-		case type_district_label_5e6:
-		case type_district_label_2e6:
-		case type_district_label_1e6:
-		case type_district_label_5e5:
-		case type_district_label_2e5:
-			size = 10000;
-			break;
 		case type_town_label_1e5:
 		case type_town_label_5e4:
 		case type_town_label_2e4:
@@ -1994,6 +1982,14 @@
 		default:
 			break;
 	}
+	return size;
+}
+
+static struct map_rect_priv *
+binmap_search_street_by_estimate(struct map_priv *map, struct item *town, struct coord *c, struct map_selection *sel)
+{
+	int size = binmap_get_estimated_town_size(town);
+
 	sel->u.c_rect.lu.x = c->x-size;
 	sel->u.c_rect.lu.y = c->y+size;
 	sel->u.c_rect.rl.x = c->x+size;
@@ -2016,6 +2012,38 @@
 	return map_rect_new_binfile(map, sel);
 }
 
+
+static int
+binmap_get_estimated_boundaries (struct item *town, GList **boundaries)
+{
+	int size = binmap_get_estimated_town_size(town);
+	struct coord tc;
+
+	if (item_coord_get(town, &tc, 1))
+	{
+		struct geom_poly_segment *bnd;
+		struct coord *c;
+		c=g_new(struct coord,5);
+		bnd=g_new(struct geom_poly_segment,1);
+		c[0].x = tc.x + size;
+		c[0].y = tc.y - size;
+		c[1].x = tc.x - size;
+		c[1].y = tc.y - size;
+		c[2].x = tc.x - size;
+		c[2].y = tc.y + size;
+		c[3].x = tc.x + size;
+		c[3].y = tc.y + size;
+		c[4].x = c[0].x;
+		c[4].y = c[0].y;
+		bnd->first=&c[0];
+		bnd->last=&c[4];
+		bnd->type=geom_poly_segment_type_way_outer;
+		*boundaries=g_list_prepend(*boundaries,bnd);
+		return 1;
+	}
+	return 0;
+}
+
 static struct map_search_priv *
 binmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial)
 {
@@ -2061,6 +2089,8 @@
 				if (binmap_search_by_index(map, town, &msp->mr))
 					msp->mode = 1;
 				else {
+					map->last_searched_town_id_hi = town->id_hi;
+					map->last_searched_town_id_lo = town->id_lo;
 					if (item_coord_get(town, &c, 1)) {
 						if ((msp->mr=binmap_search_street_by_place(map, town, &c, &msp->ms, &msp->boundaries)))
 							msp->mode = 2;
@@ -2089,11 +2119,26 @@
 			idx=binmap_search_by_index(map, msp->item, &msp->mr);
 			if (idx)
 				msp->mode = 1;
-			else {
+			else
+			{
 				struct coord c;
 				if (item_coord_get(msp->item, &c, 1))
 				{
 					struct attr attr;
+					map_rec = map_rect_new_binfile(map, NULL);
+					town = map_rect_get_item_byid_binfile(map_rec, map->last_searched_town_id_hi, map->last_searched_town_id_lo);
+					if (town)
+						msp->mr = binmap_search_street_by_place(map, town, &c, &msp->ms, &msp->boundaries);
+					map_rect_destroy_binfile(map_rec);
+					if (msp->boundaries)
+						dbg(0, "using map town boundaries\n");
+					if (!msp->boundaries && town)
+						{
+							binmap_get_estimated_boundaries(town, &msp->boundaries);
+							if (msp->boundaries)
+								dbg(0, "using estimated boundaries\n");
+						}
+					/* start searching in area around the street segment even if town boundaries are available */
 					msp->mr=binmap_search_housenumber_by_estimate(map, &c, &msp->ms);
 					msp->mode = 2;
 					msp->rect_new=msp->ms.u.c_rect;
@@ -2317,37 +2362,64 @@
 				break;
 			case attr_house_number:
 				has_house_number=binfile_attr_get(it->priv_data, attr_house_number, &at);
-				if (has_house_number || it->type == type_house_number
+				if ((has_house_number
 					|| it->type == type_house_number_interpolation_even || it->type == type_house_number_interpolation_odd
 					|| it->type == type_house_number_interpolation_all
-					|| (map_search->mode == 1 && item_is_street(*it))
-				   	)
+					|| (map_search->mode == 1 && item_is_street(*it))|| it->type == type_house_number)
+				   	 && !(map_search->boundaries && !item_inside_poly_list(it,map_search->boundaries)))
 				{
 					if (has_house_number)
 					{
 						struct attr at2;
-						if ( (map_search->mode!=2 || binfile_attr_get(it->priv_data, attr_street_name, &at2)) && !linguistics_compare(at.u.str, map_search->search.u.str, mode))
+						if ((binfile_attr_get(it->priv_data, attr_street_name, &at2) || map_search->mode!=2) && !linguistics_compare(at.u.str, map_search->search.u.str, mode)
+								&& !strcmp(at2.u.str, map_search->parent_name))
+							{
+								if (!duplicate(map_search, it, attr_house_number))
+								{
+									binfile_attr_rewind(it->priv_data);
+									return it;
+								}
+							}
+					}
+					else
+					{
+						struct attr at2;
+						if ((binfile_attr_get(it->priv_data, attr_street_name, &at2) || map_search->mode!=2) && !strcmp(at2.u.str, map_search->parent_name))
 						{
-							if (!duplicate(map_search, it, attr_house_number))
+							if (!duplicate(map_search, it, attr_house_number_interpolation_no_ends_incrmt_2))
 							{
 								binfile_attr_rewind(it->priv_data);
 								return it;
 							}
+							else if (!duplicate(map_search, it, attr_house_number_interpolation_no_ends_incrmt_1))
+							{
+								binfile_attr_rewind(it->priv_data);
+								return it;
+							}
+						} else {
+							if (!( it->type == type_house_number_interpolation_even || it->type == type_house_number_interpolation_odd
+									|| it->type == type_house_number_interpolation_all))
+								return it;
 						}
-					} else
-						return it;
-				} else if(map_search->mode==2 && map_search->parent_name && item_is_street(*it) && binfile_attr_get(it->priv_data, attr_street_name, &at) && !strcmp(at.u.str, map_search->parent_name) ) {
-					/* If matching street segment found, prepare to expand house number search region +100m around each way point */
-					struct coord c;
-					while(item_coord_get(it,&c,1)) {
-						c.x-=100;
-						c.y-=100;
-						coord_rect_extend(&map_search->rect_new,&c);
-						c.x+=200;
-						c.y+=200;
-						coord_rect_extend(&map_search->rect_new,&c);
+
 					}
-				}
+				} else if( item_is_street(*it) && map_search->mode==2 && map_search->parent_name && binfile_attr_get(it->priv_data, attr_street_name, &at) && !strcmp(at.u.str, map_search->parent_name) )
+						{
+						/* If matching street segment found, prepare to expand house number search region +100m around each way point */
+							if (!(map_search->boundaries && !item_inside_poly_list(it,map_search->boundaries)))
+							{
+								struct coord c;
+								while(item_coord_get(it,&c,1))
+								{
+									c.x-=100;
+									c.y-=100;
+									coord_rect_extend(&map_search->rect_new,&c);
+									c.x+=200;
+									c.y+=200;
+									coord_rect_extend(&map_search->rect_new,&c);
+								}
+							}
+						}
 				continue;
 			default:
 				return NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5918] trunk/navit/navit

[<md...@us...>]

Revision: 5918
          http://sourceforge.net/p/navit/code/5918
Author:   mdankov
Date:     2014-11-02 21:57:43 +0000 (Sun, 02 Nov 2014)
Log Message:
-----------
Add:gui_internal:New POI filtering to include zipcode in address search|thanks bafplus for zipcode.svg

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal_command.c
    trunk/navit/navit/gui/internal/gui_internal_poi.c
    trunk/navit/navit/gui/internal/gui_internal_poi.h

Added Paths:
-----------
    trunk/navit/navit/xpm/zipcode.svg

Modified: trunk/navit/navit/gui/internal/gui_internal_command.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_command.c	2014-10-29 19:32:53 UTC (rev 5917)
+++ trunk/navit/navit/gui/internal/gui_internal_command.c	2014-11-02 21:57:43 UTC (rev 5918)
@@ -642,7 +642,7 @@
 	if (in[1] && ATTR_IS_STRING(in[1]->type)) {
 		gui_internal_poi_param_set_filter(param, in[1]->u.str);
 		if (in[2] && ATTR_IS_INT(in[2]->type))
-			param->isAddressFilter=in[2]->u.num;
+			param->AddressFilterType=in[2]->u.num;
 	}
 	
 	transform_from_geo(pro.u.projection,in[0]->u.coord_geo,&c);

Modified: trunk/navit/navit/gui/internal/gui_internal_poi.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_poi.c	2014-10-29 19:32:53 UTC (rev 5917)
+++ trunk/navit/navit/gui/internal/gui_internal_poi.c	2014-11-02 21:57:43 UTC (rev 5918)
@@ -301,6 +301,8 @@
 	type=item_to_name(item->type);
 
 	icon=gui_internal_poi_icon(this,item);
+	if(!icon && item->type==type_house_number)
+		icon=image_new_xs(this,"post");
 	if(!icon) {
 		icon=image_new_xs(this,"gui_inactive");
 		text=g_strdup_printf("%s%s%s%s %s", distbuf, dirbuf, routedistbuf, type, name);
@@ -332,10 +334,12 @@
  */
 
 char *
-gui_internal_compose_item_address_string(struct item *item)
+gui_internal_compose_item_address_string(struct item *item, int prependPostal)
 {
 	char *s=g_strdup("");
 	struct attr attr;
+	if(prependPostal && item_attr_get(item, attr_postal, &attr)) 
+		s=g_strjoin(" ",s,map_convert_string_tmp(item->map,attr.u.str),NULL);
 	if(item_attr_get(item, attr_house_number, &attr)) 
 		s=g_strjoin(" ",s,map_convert_string_tmp(item->map,attr.u.str),NULL);
 	if(item_attr_get(item, attr_street_name, &attr)) 
@@ -383,8 +387,8 @@
 		char *long_name, *s;
 		GList *f;
 		int i;
-		if (param->isAddressFilter) {
-			s=gui_internal_compose_item_address_string(item);
+		if (param->AddressFilterType>0) {
+			s=gui_internal_compose_item_address_string(item,param->AddressFilterType==2?1:0);
 		} else if (item_attr_get(item, attr_label, &attr)) {
 			s=g_strdup_printf("%s %s", item_to_name(item->type), map_convert_string_tmp(item->map,attr.u.str));
 		} else {
@@ -455,7 +459,12 @@
 	} else {
 		param=g_new0(struct poi_param,1);
 	}
-	param->isAddressFilter=strcmp(wm->name,"AddressFilter")==0;
+	if(!strcmp(wm->name,"AddressFilter"))
+		param->AddressFilterType=1;
+	else if(!strcmp(wm->name,"AddressFilterZip"))
+		param->AddressFilterType=2;
+	else
+		param->AddressFilterType=0;
 
 	gui_internal_poi_param_set_filter(param, w->text);
 
@@ -516,6 +525,11 @@
 	wb->name=g_strdup("AddressFilter");
 	wb->func = gui_internal_cmd_pois_filter_do;
 	wb->data=wk;
+	gui_internal_widget_append(we, wb=gui_internal_image_new(this, image_new_xs(this, "zipcode")));
+	wb->state |= STATE_SENSITIVE;
+	wb->name=g_strdup("AddressFilterZip");
+	wb->func = gui_internal_cmd_pois_filter_do;
+	wb->data=wk;
 	
 	if (this->keyboard)
 		gui_internal_widget_append(w, gui_internal_keyboard(this,keyboard_mode));
@@ -559,7 +573,7 @@
 	char buffer[32];
 	struct poi_param *paramnew;
 	struct attr route;
-
+dbg(0,"POIs...");
 	if(data) {
 	  param = data;
 	} else {
@@ -582,8 +596,8 @@
 	items= g_new0( struct item_data, maxitem);
 	
 	
-	dbg(2, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, isAddressFilter= %d\n",
-		param->sel, param->selnb, param->pagenb, param->dist, param->filterstr, param->isAddressFilter);
+	dbg(2, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, AddressFilterType= %d\n",
+		param->sel, param->selnb, param->pagenb, param->dist, param->filterstr, param->AddressFilterType);
 
 	wb=gui_internal_menu(this, isel ? isel->name : _("POIs"));
 	w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
@@ -612,7 +626,7 @@
 					char *label;
 					item_attr_rewind(item);
 					if (item->type==type_house_number) {
-						label=gui_internal_compose_item_address_string(item);
+						label=gui_internal_compose_item_address_string(item,1);
 					} else if (item_attr_get(item, attr_label, &attr)) {
 						label=map_convert_string(item->map,attr.u.str);
 						// Buildings which label is equal to addr:housenumber value

Modified: trunk/navit/navit/gui/internal/gui_internal_poi.h
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_poi.h	2014-10-29 19:32:53 UTC (rev 5917)
+++ trunk/navit/navit/gui/internal/gui_internal_poi.h	2014-11-02 21:57:43 UTC (rev 5918)
@@ -25,9 +25,9 @@
 		unsigned char dist;
 		/**
  		 * Should filter phrase be compared to postal address of the POI.
- 		 * =1 - address filter, =0 - name filter
+ 		 * =0 - name filter, =1 - address filter, =2 - address filter, including postal code
 		 */		
-		unsigned char isAddressFilter;
+		unsigned char AddressFilterType;
 		/**
  		 * Filter string, casefold()ed and divided into substrings at the spaces, which are replaced by ASCII 0*.
 		 */		
@@ -51,7 +51,7 @@
 void gui_internal_poi_param_free(void *p);
 void gui_internal_poi_param_set_filter(struct poi_param *param, char *text);
 struct widget *gui_internal_cmd_pois_item(struct gui_priv *this, struct coord *center, struct item *item, struct coord *c, struct route *route, int dist, char *name);
-char *gui_internal_compose_item_address_string(struct item *item);
+char *gui_internal_compose_item_address_string(struct item *item, int prependPostal);
 void gui_internal_cmd_pois_filter(struct gui_priv *this, struct widget *wm, void *data);
 void gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data);
 /* end of prototypes */

Added: trunk/navit/navit/xpm/zipcode.svg
===================================================================
--- trunk/navit/navit/xpm/zipcode.svg	                        (rev 0)
+++ trunk/navit/navit/xpm/zipcode.svg	2014-11-02 21:57:43 UTC (rev 5918)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.4 r9939"
+   version="1.0"
+   sodipodi:docname="post.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/post.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="12.393787"
+     inkscape:cy="25.782283"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="943"
+     inkscape:window-height="682"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#d8d8d8;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2381"
+       width="19"
+       height="13.0625"
+       x="1.5"
+       y="4.375" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#787878;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.5,16.4375 L 11.0625,9.625 L 19.4375,16.4375"
+       id="path3158"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 1.5,4.375 L 20.5,4.375 L 11,12.625 L 1.5,4.375 z"
+       id="rect3153"
+       sodipodi:nodetypes="cccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.90231133px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="3.2706933"
+       y="13.758551"
+       id="text2987"
+       sodipodi:linespacing="125%"
+       transform="scale(0.9172367,1.0902311)"><tspan
+         sodipodi:role="line"
+         id="tspan2989"
+         x="3.2706933"
+         y="13.758551"
+         style="font-size:9.81208038px;fill:#0000ff">ZIP</tspan></text>
+  </g>
+</svg>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5917] trunk/navit/navit/map/csv/csv.c

[<md...@us...>]

Revision: 5917
          http://sourceforge.net/p/navit/code/5917
Author:   mdankov
Date:     2014-10-29 19:32:53 +0000 (Wed, 29 Oct 2014)
Log Message:
-----------
Fix:map/csv:Do not use g_hash_table_get_values function to keep compatibility with glib 2.0 found on Maemo4 @ N810. Fixes #1263

Modified Paths:
--------------
    trunk/navit/navit/map/csv/csv.c

Modified: trunk/navit/navit/map/csv/csv.c
===================================================================
--- trunk/navit/navit/map/csv/csv.c	2014-10-27 22:31:06 UTC (rev 5916)
+++ trunk/navit/navit/map/csv/csv.c	2014-10-29 19:32:53 UTC (rev 5917)
@@ -489,29 +489,28 @@
 	g_free(data);
 }
 
+static void map_csv_debug_dump_hash_item(gpointer key, gpointer value, gpointer user_data)
+{
+	struct quadtree_item *qi=value;
+	GList *attrs;
+	dbg(3,"%p del=%d ref=%d\n", qi,qi->deleted, qi->ref_count);
+	attrs=((struct quadtree_data *)qi->data)->attr_list;
+	while(attrs) {
+		if(((struct attr*)attrs->data)->type==attr_label)
+			dbg(3,"... %s\n",((struct attr*)attrs->data)->u.str);
+		attrs=g_list_next(attrs);
+	}
+}
+
 /**
  * Dump all map data (including deleted items) to the log.
  */
 static void map_csv_debug_dump(struct map_priv *map)
 {
-	GList *l=g_hash_table_get_values(map->qitem_hash);
-	GList *ll=l;
-	while(ll) {
-		struct quadtree_item *qi;
-		GList *attrs;
-		qi=ll->data;
-		dbg(0,"%p del=%d ref=%d\n", qi,qi->deleted, qi->ref_count);
-		attrs=((struct quadtree_data *)qi->data)->attr_list;
-		while(attrs) {
-			if(((struct attr*)attrs->data)->type==attr_label)
-				dbg(0,"... %s\n",((struct attr*)attrs->data)->u.str);
-			attrs=g_list_next(attrs);
-		}
-		ll=g_list_next(ll);
-	}
-	g_list_free(l);
+	g_hash_table_foreach(map->qitem_hash, map_csv_debug_dump_hash_item, NULL);
 }
 
+
 static struct map_rect_priv *
 map_rect_new_csv(struct map_priv *map, struct map_selection *sel)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5916] trunk/navit/Toolchain/mingw32.cmake

[<wog...@us...>]

Revision: 5916
          http://sourceforge.net/p/navit/code/5916
Author:   woglinde
Date:     2014-10-27 22:31:06 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Fix:build/cmake:fix mingw support for ubuntu 14.04 and above

Modified Paths:
--------------
    trunk/navit/Toolchain/mingw32.cmake

Modified: trunk/navit/Toolchain/mingw32.cmake
===================================================================
--- trunk/navit/Toolchain/mingw32.cmake	2014-10-26 20:10:39 UTC (rev 5915)
+++ trunk/navit/Toolchain/mingw32.cmake	2014-10-27 22:31:06 UTC (rev 5916)
@@ -1,14 +1,14 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
-FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-w64-mingw32-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc)
-FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-w64-mingw32-g++ i686-mingw32-g++ i586-mingw32-gcc i386-mingw32-gcc mingw32-g++)
+FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-w64-mingw32-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc i586-mingw32msvc-gcc mingw32-gcc)
+FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-w64-mingw32-g++ i686-mingw32-g++ i586-mingw32-g++ i386-mingw32-g++ i586-mingw32msvc-g++ mingw32-g++)
 
-FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres windres.exe)
+FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres i586-mingw32msvc-windres windres.exe)
 
-FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar ar.exe)
+FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar i586-mingw32msvc-ar mingw32-ar ar.exe)
 
 IF (NOT CMAKE_FIND_ROOT_PATH)
-EXECUTE_PROCESS( 
+EXECUTE_PROCESS(
    COMMAND ${CMAKE_C_COMPILER} -print-sysroot
    OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH
 )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5915] trunk/navit/navit/android/src/org/navitproject/ navit/NavitGraphics.java

[<mvg...@us...>]

Revision: 5915
          http://sourceforge.net/p/navit/code/5915
Author:   mvglasow
Date:     2014-10-26 20:10:39 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
Fix:port/android:Update bitmap dimensions when resizing overlay|Fixes #1267

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java

Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2014-10-24 16:40:07 UTC (rev 5914)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2014-10-26 20:10:39 UTC (rev 5915)
@@ -965,11 +965,16 @@
 		}
 	}
 
-	protected void overlay_resize(int x, int y, int w, int h, int alpha, int wraparond)
+	protected void overlay_resize(int x, int y, int w, int h, int alpha, int wraparound)
 	{
 		//Log.e("NavitGraphics","overlay_resize");
+		draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+		bitmap_w = w;
+		bitmap_h = h;
 		pos_x = x;
 		pos_y = y;
+		pos_wraparound = wraparound;
+		draw_canvas.setBitmap(draw_bitmap);
 	}
 
 	public static String getLocalizedString(String text)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5914] trunk/navit/navit/xpm/navit_svg2png

[<ka...@us...>]

Revision: 5914
          http://sourceforge.net/p/navit/code/5914
Author:   kazer_
Date:     2014-10-24 16:40:07 +0000 (Fri, 24 Oct 2014)
Log Message:
-----------
Fix:Core:Fixed background transparency for xpm generation using ImageMagick-6.6.2-5, fixes #614|Thanks Richt for the fix

Modified Paths:
--------------
    trunk/navit/navit/xpm/navit_svg2png

Modified: trunk/navit/navit/xpm/navit_svg2png
===================================================================
--- trunk/navit/navit/xpm/navit_svg2png	2014-10-23 14:55:17 UTC (rev 5913)
+++ trunk/navit/navit/xpm/navit_svg2png	2014-10-24 16:40:07 UTC (rev 5914)
@@ -13,7 +13,7 @@
 		$svgtopng --without-gui --export-width=$1 --export-height=$2 --export-png=$BUILDDIR/$4 $3
 		;;
 	*convert)
-		$svgtopng $3 -resize $1x$2 $4
+		$svgtopng -alpha on -background none $3 -resize $1x$2 $4
 		;;
 	esac
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5913] trunk/navit/navit/navigation.c

[<ka...@us...>]

Revision: 5913
          http://sourceforge.net/p/navit/code/5913
Author:   kazer_
Date:     2014-10-23 14:55:17 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
Fix:Core:Enhanced navigation, especially for motorways. Fixes #660|Thanks mvglasow for the patch

Modified Paths:
--------------
    trunk/navit/navit/navigation.c

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-10-23 14:52:09 UTC (rev 5912)
+++ trunk/navit/navit/navigation.c	2014-10-23 14:55:17 UTC (rev 5913)
@@ -1156,6 +1156,30 @@
 }
 
 /**
+ * @brief Checks whether a way has motorway-like characteristics
+ *
+ * Motorway-like means one of the following:
+ * <ul>
+ * <li>
+ * item type is {@code highway_land} or {@code highway_city} (OSM: {@code highway=motorway})
+ * </li>
+ * <li>
+ * item type is {@code street_n_lanes} (OSM: {@code highway=trunk}) and way is one-way
+ * </li>
+ * </ul>
+ *
+ * @param way The way to examine
+ * @return True for motorway-like, false otherwise
+ */
+static int
+is_motorway_like(struct navigation_way *way)
+{
+	if ((way->item.type == type_highway_land) || (way->item.type == type_highway_city)  || ((way->item.type == type_street_n_lanes) && (way->flags & AF_ONEWAYMASK)))
+		return 1;
+	return 0;
+}
+
+/**
  * @brief Checks if navit has to create a maneuver to drive from old to new
  *
  * This function checks if it has to create a "maneuver" - i.e. guide the user - to drive 
@@ -1185,18 +1209,28 @@
 		/* If the other way is only a ramp and it is one-way in the wrong direction, no announcement necessary */
 		r="no: Only ramp";
 	}
+	if (! r) {
+		/* Announce exit from roundabout, but not entry or staying in it */
+		if ((old->way.flags & AF_ROUNDABOUT) && ! (new->way.flags & AF_ROUNDABOUT)) {
+			r="yes: leaving roundabout";
+			ret=1;
+		} else 	if (!new->way.next->next && !(old->way.flags & AF_ROUNDABOUT) && (new->way.flags & AF_ROUNDABOUT) && (new->way.next->flags & AF_ROUNDABOUT)) {
+			/* this rather complicated construct makes sure we suppress announcements
+			 * only when we're entering a roundabout AND there are no other options */
+			r="no: entering roundabout";
+		} else if ((old->way.flags & AF_ROUNDABOUT) && (new->way.flags & AF_ROUNDABOUT)) {
+			r="no: staying in roundabout";
+		}
+	}
 	if (!r) {
 		if (new->way.item.type == type_ramp) {
 			/* If new is a ramp, ANNOUNCE */
 			r="yes: entering ramp";
 			ret=1;
-		} else if ((old->way.item.type == type_highway_land) || (old->way.item.type == type_highway_city)  || ((old->way.item.type == type_street_n_lanes) && (old->way.flags & AF_ONEWAYMASK))) {
+		} else if (is_motorway_like(&(old->way))) {
 			/* If we are at a motorway interchange, ANNOUNCE
 			 * We are assuming a motorway interchange when old way and at least
 			 * two possible ways are motorway-like and allowed.
-			 * Motorway-like means one of the following:
-			 * - item type is highway_land or highway_city
-			 * - item type is street_n_lanes (trunk in OSM) and way is one-way
 			 * If any of the possible ways is neither motorway-like nor a ramp,
 			 * we are probably on a trunk road with level crossings and not
 			 * at a motorway interchange.
@@ -1206,7 +1240,7 @@
 			int num_other = 0;
 			struct navigation_way *cur_itm = &(new->way);
 			while (cur_itm) {
-				if (((cur_itm->item.type == type_highway_land) || (cur_itm->item.type == type_highway_city) || ((cur_itm->item.type == type_street_n_lanes) && (cur_itm->flags & AF_ONEWAYMASK))) && is_way_allowed(nav,cur_itm,1)) {
+				if ((is_motorway_like(cur_itm)) && is_way_allowed(nav,cur_itm,1)) {
 					num_new_motorways++;
 				} else if (cur_itm->item.type != type_ramp) {
 					num_other++;
@@ -1219,16 +1253,6 @@
 			}
 		}
 	}
-	if (! r) {
-		/* Announce exit from roundabout, but not entry or staying in it */
-		if ((old->way.flags & AF_ROUNDABOUT) && ! (new->way.flags & AF_ROUNDABOUT)) {
-			r="yes: leaving roundabout";
-			ret=1;
-		} else 	if (!(old->way.flags & AF_ROUNDABOUT) && (new->way.flags & AF_ROUNDABOUT)) {
-			r="no: entering roundabout";
-		} else if ((old->way.flags & AF_ROUNDABOUT) && (new->way.flags & AF_ROUNDABOUT)) 
-			r="no: staying in roundabout";
-	}
 	cat=maneuver_category(old->way.item.type);
 	if (!r && abs(d) > 75) {
 		/* always make an announcement if you have to make a sharp turn */
@@ -1279,13 +1303,16 @@
 					dc=dw;
 			}
 			wcat=maneuver_category(w->item.type);
-			/* If any other street has the same name but isn't a highway (a highway might split up temporarily), then
-			   we can't use the same name criterium  */
-			if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (cat != 7 || wcat != 7) && is_way_allowed(nav,w,2))
+			/* If any other street has the same name, we can't use the same name criterion.
+			 * Exceptions apply if we're coming from a motorway-like road and:
+			 * - the other road is motorway-like (a motorway might split up temporarily) or
+			 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
+			 * The second one is really a workaround for bad tagging practice in OSM. Since entering
+			 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
+			 * side effects.
+			 */
+			if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
 				is_same_street=0;
-			/* Even if the ramp has the same name, announce it */
-			if (new->way.item.type == type_ramp && old->way.item.type != type_ramp)
-				is_same_street=0;
 			/* Mark if the street has a higher or the same category */
 			if (wcat > maxcat)
 				maxcat=wcat;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5912] trunk/navit/navit/binding/dbus/binding_dbus.c

[<ka...@us...>]

Revision: 5912
          http://sourceforge.net/p/navit/code/5912
Author:   kazer_
Date:     2014-10-23 14:52:09 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
Add:Bindings:Added a dbus method to dump a route to a gpx

Modified Paths:
--------------
    trunk/navit/navit/binding/dbus/binding_dbus.c

Modified: trunk/navit/navit/binding/dbus/binding_dbus.c
===================================================================
--- trunk/navit/navit/binding/dbus/binding_dbus.c	2014-10-17 22:50:50 UTC (rev 5911)
+++ trunk/navit/navit/binding/dbus/binding_dbus.c	2014-10-23 14:52:09 UTC (rev 5912)
@@ -1290,6 +1290,77 @@
 }
 
 static DBusHandlerResult
+request_navit_route_export_gpx(DBusConnection *connection, DBusMessage *message)
+{
+	char * filename;
+	struct point p, *pp=NULL;
+	struct navit *navit;
+	DBusMessageIter iter;
+
+	navit = object_get_from_message(message, "navit");
+	if (! navit)
+		return dbus_error_invalid_object_path(connection, message);
+
+	dbus_message_iter_init(message, &iter);
+
+	dbus_message_iter_get_basic(&iter, &filename);
+
+	if (dbus_message_iter_has_next(&iter))
+	{
+		dbus_message_iter_next(&iter);
+		if (!point_get_from_message(message, &iter, &p))
+			return dbus_error_invalid_parameter(connection, message);
+		pp=&p;
+	}
+
+	dbg(1,"Dumping route from dbus to %s\n", filename);
+
+	struct map * map=NULL;
+	struct navigation * nav = NULL;
+	struct map_rect * mr=NULL;
+	struct item * item =NULL;
+	struct attr attr,route;
+	struct coord c;
+	struct coord_geo g;
+	struct transformation *trans;
+	
+        char *header = "<?xml version='1.0' encoding='UTF-8'?>\n"
+                        "<gpx version='1.1' creator='Navit http://navit.sourceforge.net'\n"
+                        "     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
+                        "     xmlns:navit='http://www.navit-project.org/schema/navit'\n"
+                        "     xmlns='http://www.topografix.com/GPX/1/1'\n"
+                        "     xsi:schemaLocation='http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd'>\n"
+                        "<rte>\n";
+        char *trailer = "</rte>\n</gpx>\n";
+
+        nav = navit_get_navigation(navit);
+        if(!nav) {
+                return;
+        }
+        map = navigation_get_map(nav);
+        if(map)
+          mr = map_rect_new(map,NULL);
+  	trans = navit_get_trans (nav);
+
+        FILE *fp;
+        fp = fopen(filename,"w");
+        fprintf(fp, "%s", header);
+
+	while((item = map_rect_get_item(mr))) {
+		if(item_attr_get(item,attr_navigation_long,&attr)) {
+			item_coord_get(item, &c, 1);
+			transform_to_geo (projection_mg, &c, &g);
+			fprintf(fp,"<rtept lon='%4.16f' lat='%4.16f'><name>%s</name></rtept>\n",g.lng, g.lat, map_convert_string_tmp(item->map,attr.u.str));
+		}
+	}
+	fprintf(fp,"%s",trailer);
+	
+         fclose(fp);
+
+	return empty_reply(connection, message);
+}
+
+static DBusHandlerResult
 request_navit_block(DBusConnection *connection, DBusMessage *message)
 {
 	int mode;
@@ -1730,6 +1801,7 @@
 	{".navit",  "set_layout",          "s",       "layoutname",                              "",   "",      request_navit_set_layout},
 	{".navit",  "zoom",                "i(ii)",   "factor(pixel_x,pixel_y)",                 "",   "",      request_navit_zoom},
 	{".navit",  "zoom",                "i",       "factor",                                  "",   "",      request_navit_zoom},
+	{".navit",  "export_as_gpx",       "s",       "filename",                                "",   "",      request_navit_route_export_gpx},
 	{".navit",  "block",               "i",       "mode",                                    "",   "",      request_navit_block},
 	{".navit",  "resize",              "ii",      "upperleft,lowerright",                    "",   "",      request_navit_resize},
 	{".navit",  "attr_iter",           "",        "",                                        "o",  "attr_iter",  request_navit_attr_iter},

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5911] trunk/navit/navit/navigation.c

[<ka...@us...>]

Revision: 5911
          http://sourceforge.net/p/navit/code/5911
Author:   kazer_
Date:     2014-10-17 22:50:50 +0000 (Fri, 17 Oct 2014)
Log Message:
-----------
Fix:Core:Enhanced navigation, trac #660|Thanks mvglasow

Modified Paths:
--------------
    trunk/navit/navit/navigation.c

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-10-16 18:09:34 UTC (rev 5910)
+++ trunk/navit/navit/navigation.c	2014-10-17 22:50:50 UTC (rev 5911)
@@ -1185,7 +1185,42 @@
 		/* If the other way is only a ramp and it is one-way in the wrong direction, no announcement necessary */
 		r="no: Only ramp";
 	}
+	if (!r) {
+		if (new->way.item.type == type_ramp) {
+			/* If new is a ramp, ANNOUNCE */
+			r="yes: entering ramp";
+			ret=1;
+		} else if ((old->way.item.type == type_highway_land) || (old->way.item.type == type_highway_city)  || ((old->way.item.type == type_street_n_lanes) && (old->way.flags & AF_ONEWAYMASK))) {
+			/* If we are at a motorway interchange, ANNOUNCE
+			 * We are assuming a motorway interchange when old way and at least
+			 * two possible ways are motorway-like and allowed.
+			 * Motorway-like means one of the following:
+			 * - item type is highway_land or highway_city
+			 * - item type is street_n_lanes (trunk in OSM) and way is one-way
+			 * If any of the possible ways is neither motorway-like nor a ramp,
+			 * we are probably on a trunk road with level crossings and not
+			 * at a motorway interchange.
+			 */
+			// FIXME: motorway junctions could have service roads
+			int num_new_motorways = 0;
+			int num_other = 0;
+			struct navigation_way *cur_itm = &(new->way);
+			while (cur_itm) {
+				if (((cur_itm->item.type == type_highway_land) || (cur_itm->item.type == type_highway_city) || ((cur_itm->item.type == type_street_n_lanes) && (cur_itm->flags & AF_ONEWAYMASK))) && is_way_allowed(nav,cur_itm,1)) {
+					num_new_motorways++;
+				} else if (cur_itm->item.type != type_ramp) {
+					num_other++;
+				}
+				cur_itm = cur_itm->next;
+			}
+			if ((num_other == 0) && (num_new_motorways > 1)) {
+				r="yes: motorway interchange";
+				ret=1;
+			}
+		}
+	}
 	if (! r) {
+		/* Announce exit from roundabout, but not entry or staying in it */
 		if ((old->way.flags & AF_ROUNDABOUT) && ! (new->way.flags & AF_ROUNDABOUT)) {
 			r="yes: leaving roundabout";
 			ret=1;
@@ -1194,12 +1229,35 @@
 		} else if ((old->way.flags & AF_ROUNDABOUT) && (new->way.flags & AF_ROUNDABOUT)) 
 			r="no: staying in roundabout";
 	}
+	cat=maneuver_category(old->way.item.type);
 	if (!r && abs(d) > 75) {
 		/* always make an announcement if you have to make a sharp turn */
 		r="yes: delta over 75";
 		ret=1;
+	} else if (!r && abs(d) > 22) {
+		/* When coming from street_2_* or higher category road, check if
+		 * - we have multiple options of the same category and
+		 * - we have to make a considerable turn (more than 22 degrees)
+		 * If both is the case, ANNOUNCE.
+		 * Note: 22.5 degrees is the threshold because anything higher is
+		 * closer to 45 than to 0 degrees.
+		 */
+		if (cat >= maneuver_category(type_street_2_city)) {
+			int num_similar = 0;
+			struct navigation_way *cur_itm = &(new->way);
+			while (cur_itm) {
+				if (maneuver_category(cur_itm->item.type) == cat) {
+					// TODO: decide if a maneuver_category difference of 1 is still similar
+					num_similar++;
+				}
+				cur_itm = cur_itm->next;
+			}
+			if (num_similar > 1) {
+				ret=1;
+				r="yes: more than one similar road and delta over 22";
+			}
+		}
 	}
-	cat=maneuver_category(old->way.item.type);
 	ncat=maneuver_category(new->way.item.type);
 	if (!r) {
 		int dc=d;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5910] trunk/navit/navit

[<ka...@us...>]

Revision: 5910
          http://sourceforge.net/p/navit/code/5910
Author:   kazer_
Date:     2014-10-16 18:09:34 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
Fix:osd:Fixed OSD items display garbage when resized|thank you mvglasow

Modified Paths:
--------------
    trunk/navit/navit/navit.c
    trunk/navit/navit/osd/core/osd_core.c
    trunk/navit/navit/osd.c
    trunk/navit/navit/osd.h

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2014-10-11 23:13:33 UTC (rev 5909)
+++ trunk/navit/navit/navit.c	2014-10-16 18:09:34 UTC (rev 5910)
@@ -1855,7 +1855,7 @@
         return;
 
     // announce that the speech attribute has changed
-    callback_list_call_attr_0(this_->attr_cbl, attr_speech);
+    callback_list_call_attr_1(this_->attr_cbl, attr_speech, this_);
 }
 
 void

Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c	2014-10-11 23:13:33 UTC (rev 5909)
+++ trunk/navit/navit/osd/core/osd_core.c	2014-10-16 18:09:34 UTC (rev 5910)
@@ -1435,12 +1435,42 @@
 {
 	struct osd_button *this = (struct osd_button *)opc->data;
 
-	struct point bp = opc->osd_item.p;
-	if (!opc->osd_item.configured)
-		return;
-	osd_wrap_point(&bp, nav);
-	if(this->img)
-		graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &bp, this->img);
+	// FIXME: Do we need this check?
+	if(navit_get_blocked(nav)&1)
+	        return;
+
+	struct point p;
+
+	if (this->use_overlay) {
+		struct graphics_image *img;
+		img=graphics_image_new(opc->osd_item.gr, this->src);
+		p.x=(opc->osd_item.w-img->width)/2;
+		p.y=(opc->osd_item.h-img->height)/2;
+		osd_std_draw(&opc->osd_item);
+		graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, img);
+		graphics_image_free(opc->osd_item.gr, img);
+	} else {
+		struct graphics *gra;
+		gra = navit_get_graphics(nav);
+		this->img = graphics_image_new(gra, this->src);
+		if (!this->img) {
+			dbg(1, "failed to load '%s'\n", this->src);
+			return;
+		}
+
+		osd_std_calculate_sizes(&opc->osd_item, navit_get_width(nav), navit_get_height(nav));
+
+		p = opc->osd_item.p;
+		p.x+=(opc->osd_item.w-this->img->width)/2;
+		p.y+=(opc->osd_item.h-this->img->height)/2;
+
+		if (!opc->osd_item.configured)
+			return;
+		osd_wrap_point(&p, nav);
+
+		if(this->img)
+			graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, this->img);
+	}
 }
 
 static void
@@ -1521,16 +1551,6 @@
 		if(navit_get_blocked(nav)&1)
 		        return 1;
 
-		if (this_->use_overlay) {
-			struct graphics_image *img;
-			struct point p;
-			img=graphics_image_new(opc->osd_item.gr, this_->src);
-			p.x=(opc->osd_item.w-this_->img->width)/2;
-			p.y=(opc->osd_item.h-this_->img->height)/2;
-			osd_std_draw(&opc->osd_item);
-			graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, img);
-			graphics_image_free(opc->osd_item.gr, img);
-		} 
 		osd_button_draw(opc,nav);
 		navit_draw(opc->osd_item.navit);
 		return 1;
@@ -1678,7 +1698,7 @@
 	struct nav_next_turn *this = (struct nav_next_turn *)opc->data;
 
 	struct point p;
-	int do_draw = 0;
+	int do_draw = opc->osd_item.do_draw;
 	struct navigation *nav = NULL;
 	struct map *map = NULL;
 	struct map_rect *mr = NULL;
@@ -1831,20 +1851,16 @@
 	struct nav_toggle_announcer *this = (struct nav_toggle_announcer *)opc->data;
 
 	struct point p;
-	int do_draw = 0;
+	int do_draw = opc->osd_item.do_draw;
 	struct graphics_image *gr_image;
 	char *path;
 	char *gui_sound_off = "gui_sound_off";
 	char *gui_sound_on = "gui_sound";
     struct attr attr, speechattr;
 
-    if (this->last_state == -1)
-    {
-        if (!navit_get_attr(navit, attr_speech, &speechattr, NULL) || !speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL))
-            attr.u.num = 1;
-        this->active = attr.u.num;
-    } else
-        this->active = !this->active;
+    if (!navit_get_attr(navit, attr_speech, &speechattr, NULL) || !speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL))
+        attr.u.num = 1;
+    this->active = attr.u.num;
 
     if(this->active != this->last_state)
     {
@@ -2704,7 +2720,7 @@
 	struct osd_text *this = (struct osd_text *)opc->data;
 	struct point p, p2[4];
 	char *str,*last,*next,*value,*absbegin;
-	int do_draw = 0;
+	int do_draw = opc->osd_item.do_draw;
 	struct attr attr, vehicle_attr, maxspeed_attr, imperial_attr;
 	struct navigation *nav = NULL;
 	struct tracking *tracking = NULL;
@@ -2838,9 +2854,7 @@
 		oti=oti->next;
 	}
 
-	if ( this->last && str && !strcmp(this->last, str) ) {
-		do_draw=0;
-	} else {
+	if ( !this->last || !str || strcmp(this->last, str) ) {
 		do_draw=1;
 		if (this->last)
 			g_free(this->last);
@@ -3139,7 +3153,7 @@
 	struct gps_status *this = (struct gps_status *)opc->data;
 
 	struct point p;
-	int do_draw = 0;
+	int do_draw = opc->osd_item.do_draw;
 	struct graphics_image *gr_image;
 	char *image;
 	struct attr attr, vehicle_attr;
@@ -3532,6 +3546,17 @@
 		return;
 	p.x=opc->osd_item.w/2;
 	p.y=opc->osd_item.h/2;
+
+	if (opc->osd_item.rel_h || opc->osd_item.rel_w) {
+		struct map_selection sel;
+		memset(&sel, 0, sizeof(sel));
+		sel.u.p_rect.rl.x=opc->osd_item.w;
+		sel.u.p_rect.rl.y=opc->osd_item.h;
+		dbg(1,"osd_auxmap_draw: sel.u.p_rect.rl=(%d, %d)\n", opc->osd_item.w, opc->osd_item.h);
+		transform_set_screen_selection(this->trans, &sel);
+		graphics_set_rect(opc->osd_item.gr, &sel.u.p_rect);
+	}
+
 	transform_set_center(this->trans, transform_get_center(this->ntrans));
 	transform_set_scale(this->trans, 64);
 	transform_set_yaw(this->trans, transform_get_yaw(this->ntrans));

Modified: trunk/navit/navit/osd.c
===================================================================
--- trunk/navit/navit/osd.c	2014-10-11 23:13:33 UTC (rev 5909)
+++ trunk/navit/navit/osd.c	2014-10-16 18:09:34 UTC (rev 5910)
@@ -169,7 +169,7 @@
  * @param h Available screen height in pixels (the height that corresponds to
  * 100%)
  */
-static void
+void
 osd_std_calculate_sizes(struct osd_item *item, int w, int h)
 {
  	if (item->rel_w) {
@@ -208,9 +208,11 @@
 	osd_std_calculate_sizes(item, w, h);
 
 	osd_std_resize(item);
+	item->do_draw=1;
 	if (item->meth.draw) {
 		if (navit_get_attr(item->navit, attr_vehicle, &vehicle_attr, NULL)) {
 			item->meth.draw(priv, item->navit, vehicle_attr.u.vehicle);
+			item->do_draw=0;
 		}
 	}
 }

Modified: trunk/navit/navit/osd.h
===================================================================
--- trunk/navit/navit/osd.h	2014-10-11 23:13:33 UTC (rev 5909)
+++ trunk/navit/navit/osd.h	2014-10-16 18:09:34 UTC (rev 5910)
@@ -55,6 +55,7 @@
 	char *command;
 	struct command_saved *enable_cs;
 	char *accesskey;
+	int do_draw; /**< Whether the item needs to be redrawn. */
 };
 
 /* prototypes */
@@ -71,6 +72,7 @@
 void osd_set_std_config(struct navit *nav, struct osd_item *item);
 void osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *priv);
 void osd_std_resize(struct osd_item *item);
+void osd_std_calculate_sizes(struct osd_item *item, int w, int h);
 void osd_std_draw(struct osd_item *item);
 int osd_set_attr(struct osd *osd, struct attr* attr);
 int osd_get_attr(struct osd *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5909] trunk/navit/navit/navit_shipped.xml

[<sl...@us...>]

Revision: 5909
          http://sourceforge.net/p/navit/code/5909
Author:   sleske
Date:     2014-10-11 23:13:33 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
Fix:xml:Better docs for center= attribute, use standard coordinate format.|Should address #1248.

Modified Paths:
--------------
    trunk/navit/navit/navit_shipped.xml

Modified: trunk/navit/navit/navit_shipped.xml
===================================================================
--- trunk/navit/navit/navit_shipped.xml	2014-10-11 23:13:24 UTC (rev 5908)
+++ trunk/navit/navit/navit_shipped.xml	2014-10-11 23:13:33 UTC (rev 5909)
@@ -25,13 +25,13 @@
 	<!-- timestamps 0/1 - prefix log messages with a timestamp -->
 	<debug name="timestamps" level="0"/>
 
-	<!-- This line defines which location on the map navit will show after startup.
-		It makes sense to set it to your home coordinates.
-		Center coordinates format:
-		[D][D]DMM.ss[S][S]... N/S [D][D]DMM.ss[S][S]... E/W 
-		[-][D]D.d[d]... [-][D][D]D.d[d]... 
-		[-]0xX [-]0xX -->
-	<navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="250">
+	<!-- center= defines which map location Navit will show after first start.
+		It will only be used for the first start; subsequent starts will remember the
+		last position (in center.txt).
+		Center coordinates format: "Long Lat" in decimal degrees (WGS 84).
+		For other formats see http://wiki.navit-project.org/index.php/Coordinate_format.
+		-->
+	<navit center="11.5666 48.1333" zoom="256" tracking="1" orientation="-1" recent_dest="250">
 		<!-- Use one of gtk_drawing_area, qt_qpainter or sdl. 
 		     On windows systems, use win32 -->
 		<graphics type="gtk_drawing_area"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5908] trunk/navit/navit

[<sl...@us...>]

Revision: 5908
          http://sourceforge.net/p/navit/code/5908
Author:   sleske
Date:     2014-10-11 23:13:24 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
Refactor:core:Remove unused enum value projection_gk

Modified Paths:
--------------
    trunk/navit/navit/coord.c
    trunk/navit/navit/projection.c
    trunk/navit/navit/projection.h

Modified: trunk/navit/navit/coord.c
===================================================================
--- trunk/navit/navit/coord.c	2014-10-11 23:13:12 UTC (rev 5907)
+++ trunk/navit/navit/coord.c	2014-10-11 23:13:24 UTC (rev 5908)
@@ -239,7 +239,7 @@
 		}
 		dbg(3,"str='%s' x=%f ns=%c y=%f ew=%c c=%d\n", str, lng, ns, lat, ew, ret);
 		dbg(3,"rest='%s'\n", str+ret);
-	} else if (str_pro == projection_utm || str_pro == projection_gk) {
+	} else if (str_pro == projection_utm) {
 		double x,y;
 		args=sscanf(str, "%lf %lf%n", &x, &y, &ret);
 		if (args < 2)

Modified: trunk/navit/navit/projection.c
===================================================================
--- trunk/navit/navit/projection.c	2014-10-11 23:13:12 UTC (rev 5907)
+++ trunk/navit/navit/projection.c	2014-10-11 23:13:24 UTC (rev 5908)
@@ -34,7 +34,6 @@
 	{projection_mg, "mg"},
 	{projection_garmin, "garmin"},
 	{projection_utm, "utm"},
-	{projection_gk, "gk"},
 };
 
 static int

Modified: trunk/navit/navit/projection.h
===================================================================
--- trunk/navit/navit/projection.h	2014-10-11 23:13:12 UTC (rev 5907)
+++ trunk/navit/navit/projection.h	2014-10-11 23:13:24 UTC (rev 5908)
@@ -21,7 +21,7 @@
 #define NAVIT_PROJECTION_H
 
 enum projection {
-	projection_none, projection_mg, projection_garmin, projection_screen, projection_utm, projection_gk
+	projection_none, projection_mg, projection_garmin, projection_screen, projection_utm
 };
 
 enum map_datum {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5907] trunk/navit/navit/projection.c

[<sl...@us...>]

Revision: 5907
          http://sourceforge.net/p/navit/code/5907
Author:   sleske
Date:     2014-10-11 23:13:12 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
Refactor:core:Improve docs for projection_from_name

Modified Paths:
--------------
    trunk/navit/navit/projection.c

Modified: trunk/navit/navit/projection.c
===================================================================
--- trunk/navit/navit/projection.c	2014-10-11 23:13:02 UTC (rev 5906)
+++ trunk/navit/navit/projection.c	2014-10-11 23:13:12 UTC (rev 5907)
@@ -51,8 +51,15 @@
 	return -1;
 }
 
+/**
+ * Look up a projection by name.
+ *
+ * @param name name of projection to look up (values from projection_names, and UTM projections)
+ * @utm_offset Only for UTM projections: Used to return the offset for the UTM projection
+ * @returns projection, or projection_none if no projection could be determined
+ */
 enum projection
-projection_from_name(const char *name, struct coord *offset)
+projection_from_name(const char *name, struct coord *utm_offset)
 {
 	int i;
 	int zone,baserow;
@@ -62,10 +69,10 @@
 		if (! strcmp(projection_names[i].name, name))
 			return projection_names[i].projection;
 	}
-	if (offset) {
+	if (utm_offset) {
 		if (sscanf(name,"utm%d%c",&zone,&ns) == 2 && zone > 0 && zone <= 60 && (ns == 'n' || ns == 's')) {
-                	offset->x=zone*1000000;
-			offset->y=(ns == 's' ? -10000000:0);
+			utm_offset->x=zone*1000000;
+			utm_offset->y=(ns == 's' ? -10000000:0);
 			return projection_utm;
 		}
 		if (sscanf(name,"utmref%d%c%c%c",&zone,&zone_field,&square_x,&square_y)) {
@@ -77,16 +84,16 @@
 			i-=12;
 			dbg(1,"zone_field %d\n",i);
 			baserow=i*887.6/100;
-                	offset->x=zone*1000000;
+			utm_offset->x=zone*1000000;
 			i=utmref_letter(square_x);
-			offset->x+=((i%8)+1)*100000;
+			utm_offset->x+=((i%8)+1)*100000;
 			i=utmref_letter(square_y);
 			dbg(1,"baserow %d\n",baserow);
 			if (!(zone % 2))
 				i-=5;
 			dbg(1,"i=%d\n",i);
 			i=(i-baserow+100)%20+baserow;
-			offset->y=i*100000;
+			utm_offset->y=i*100000;
 			return projection_utm;
 		}
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.