navit-cvs-commit Mailing List for Navit (Page 21)

Status: Beta

Brought to you by: aerostitch, horwitz, jkoan, kazer_, and 2 others

navit-cvs-commit — CVS commit mailing list

You can subscribe to this list here.

2007	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (59)	Sep (43)	Oct (95)	Nov (135)	Dec (108)
2008	Jan (229)	Feb (141)	Mar (59)	Apr (70)	May (64)	Jun (87)	Jul (57)	Aug (108)	Sep (74)	Oct (203)	Nov (141)	Dec (108)
2009	Jan (114)	Feb (91)	Mar (101)	Apr (69)	May (54)	Jun (82)	Jul (49)	Aug (109)	Sep (81)	Oct (93)	Nov (100)	Dec (79)
2010	Jan (46)	Feb (36)	Mar (135)	Apr (103)	May (116)	Jun (130)	Jul (52)	Aug (31)	Sep (46)	Oct (48)	Nov (98)	Dec (110)
2011	Jan (234)	Feb (184)	Mar (150)	Apr (43)	May (53)	Jun (52)	Jul (112)	Aug (72)	Sep (79)	Oct (23)	Nov (6)	Dec (30)
2012	Jan (39)	Feb (37)	Mar (49)	Apr (60)	May (63)	Jun (38)	Jul (33)	Aug (24)	Sep (20)	Oct (14)	Nov (23)	Dec (50)
2013	Jan (30)	Feb (32)	Mar (27)	Apr (41)	May (59)	Jun (21)	Jul (10)	Aug (73)	Sep (23)	Oct (60)	Nov (14)	Dec (15)
2014	Jan (4)	Feb (8)	Mar (11)	Apr (6)	May (27)	Jun (4)	Jul (29)	Aug (62)	Sep (11)	Oct (17)	Nov (58)	Dec (9)
2015	Jan (23)	Feb (3)	Mar (26)	Apr (47)	May (8)	Jun (28)	Jul (10)	Aug (3)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 19 20 21 22 23 .. 242 > >> (Page 21 of 242)

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

From: <mar...@us...> - 2013-09-06 08:23:11

Revision: 5631
          http://sourceforge.net/p/navit/code/5631
Author:   martin-s
Date:     2013-09-06 08:23:08 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Add:Core:Allow to set turn around penalty for route in difficult routing situations

Modified Paths:
--------------
    trunk/navit/navit/attr_def.h
    trunk/navit/navit/route.c
    trunk/navit/navit/vehicleprofile.c
    trunk/navit/navit/vehicleprofile.h

Modified: trunk/navit/navit/attr_def.h
===================================================================
--- trunk/navit/navit/attr_def.h	2013-09-04 21:28:04 UTC (rev 5630)
+++ trunk/navit/navit/attr_def.h	2013-09-06 08:23:08 UTC (rev 5631)
@@ -184,6 +184,7 @@
 ATTR(battery_temperature) /* mK */
 ATTR(turn_around_count)
 ATTR(turn_around_penalty)
+ATTR(turn_around_penalty2)
 ATTR2(0x00027500,type_rel_abs_begin)
 /* These attributes are int that can either hold relative		*
  * or absolute values. A relative value is indicated by 		*

Modified: trunk/navit/navit/route.c
===================================================================
--- trunk/navit/navit/route.c	2013-09-04 21:28:04 UTC (rev 5630)
+++ trunk/navit/navit/route.c	2013-09-06 08:23:08 UTC (rev 5631)
@@ -2307,7 +2307,13 @@
 		s=p_min->start;
 		while (s) { /* Iterating all the segments leading away from our point to update the points at their ends */
 			val=route_value_seg(profile, p_min, s, -1);
-			if (val != INT_MAX && !item_is_equal(s->data.item,p_min->seg->data.item)) {
+			if (val != INT_MAX && item_is_equal(s->data.item,p_min->seg->data.item)) {
+				if (profile->turn_around_penalty2)
+					val+=profile->turn_around_penalty2;
+				else
+					val=INT_MAX;
+			}
+			if (val != INT_MAX) {
 				new=min+val;
 				if (debug_route)
 					printf("begin %d len %d vs %d (0x%x,0x%x)\n",new,val,s->end->value, s->end->c.x, s->end->c.y);
@@ -2335,7 +2341,13 @@
 		s=p_min->end;
 		while (s) { /* Doing the same as above with the segments leading towards our point */
 			val=route_value_seg(profile, p_min, s, 1);
-			if (val != INT_MAX && !item_is_equal(s->data.item,p_min->seg->data.item)) {
+			if (val != INT_MAX && item_is_equal(s->data.item,p_min->seg->data.item)) {
+				if (profile->turn_around_penalty2)
+					val+=profile->turn_around_penalty2;
+				else
+					val=INT_MAX;
+			}
+			if (val != INT_MAX) {
 				new=min+val;
 				if (debug_route)
 					printf("end %d len %d vs %d (0x%x,0x%x)\n",new,val,s->start->value,s->start->c.x, s->start->c.y);

Modified: trunk/navit/navit/vehicleprofile.c
===================================================================
--- trunk/navit/navit/vehicleprofile.c	2013-09-04 21:28:04 UTC (rev 5630)
+++ trunk/navit/navit/vehicleprofile.c	2013-09-06 08:23:08 UTC (rev 5631)
@@ -88,6 +88,9 @@
 	case attr_turn_around_penalty:
 		this_->turn_around_penalty=attr->u.num;
 		break;
+	case attr_turn_around_penalty2:
+		this_->turn_around_penalty2=attr->u.num;
+		break;
 	default:
 		break;
 	}

Modified: trunk/navit/navit/vehicleprofile.h
===================================================================
--- trunk/navit/navit/vehicleprofile.h	2013-09-04 21:28:04 UTC (rev 5630)
+++ trunk/navit/navit/vehicleprofile.h	2013-09-06 08:23:08 UTC (rev 5631)
@@ -42,6 +42,7 @@
 	GHashTable *roadprofile_hash;
 	struct attr active_callback;
 	int turn_around_penalty;		/**< Penalty when turning around */
+	int turn_around_penalty2;		/**< Penalty when turning around, for planned turn arounds */
 };
 
 struct vehicleprofile * vehicleprofile_new(struct attr *parent, struct attr **attrs);

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:[5630] trunk/navit/configure.in

From: <sl...@us...> - 2013-09-04 21:28:06

Revision: 5630
          http://sourceforge.net/p/navit/code/5630
Author:   sleske
Date:     2013-09-04 21:28:04 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Fix:core:Set default for CACHE_SIZE during autotools build, like with CMake.|See #1158.

Modified Paths:
--------------
    trunk/navit/configure.in

Modified: trunk/navit/configure.in
===================================================================
--- trunk/navit/configure.in	2013-09-02 19:22:18 UTC (rev 5629)
+++ trunk/navit/configure.in	2013-09-04 21:28:04 UTC (rev 5630)
@@ -208,7 +208,7 @@
 AC_ARG_ENABLE(variant, [  --enable-variant=something          set variant], NAVIT_VARIANT=$enableval)
 AC_SUBST(NAVIT_VARIANT)
 
-AC_ARG_ENABLE(cache-size, [  --enable-cache-size=size in bytes        set cache size], AC_DEFINE_UNQUOTED(CACHE_SIZE,[${enableval}], [Size of Cache in Bytes]))
+AC_ARG_ENABLE(cache-size, [  --enable-cache-size=size in bytes        set cache size], AC_DEFINE_UNQUOTED(CACHE_SIZE,[${enableval}], [Size of Cache in Bytes]),AC_DEFINE(CACHE_SIZE,[1048576], [Size of Cache in Bytes]))
 
 AC_ARG_ENABLE(avoid-unaligned, [  --enable-avoid-unaligned          avoid unaligned accesses], AVOID_UNALIGNED=$enableval, AVOID_UNALIGNED=no)
 test x"${AVOID_UNALIGNED}" = xyes && AC_DEFINE(AVOID_UNALIGNED,[],Define to avoid unaligned access)

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:[5629] trunk/navit/navit

From: <md...@us...> - 2013-09-02 19:22:24

Revision: 5629
          http://sourceforge.net/p/navit/code/5629
Author:   mdankov
Date:     2013-09-02 19:22:18 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Fix:android:Update country flag in Android Address search. Produce country flag icons during autotools build with the same names as in CMake builds.

Modified Paths:
--------------
    trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
    trunk/navit/navit/xpm/Makefile.am
    trunk/navit/navit/xpm/navit_svg2png

Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java	2013-09-02 18:59:48 UTC (rev 5628)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java	2013-09-02 19:22:18 UTC (rev 5629)
@@ -254,7 +254,7 @@
 				edit_settings.putString("DefaultCountry", mCountry);
 				edit_settings.commit();
 
-				mCountryButton.setImageResource(getDrawableID("country_" + mCountry + "_32_32"));
+				mCountryButton.setImageResource(getDrawableID("country_" + mCountry));
 			}
 		});
 

Modified: trunk/navit/navit/xpm/Makefile.am
===================================================================
--- trunk/navit/navit/xpm/Makefile.am	2013-09-02 18:59:48 UTC (rev 5628)
+++ trunk/navit/navit/xpm/Makefile.am	2013-09-02 19:22:18 UTC (rev 5629)
@@ -273,6 +273,13 @@
 	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@"
 endef
 
+# template to generate scaling rules for the default PNG size
+define scaling_rule_template_def
+%.png: $(srcdir)/%.$(2)
+	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@" "$(1)" "$(1)"
+endef
+
+
 # png images of the user interface and other, sizes e.g. "8,16,32,48,96"
 if USE_SVG2PNG_SCALES
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
@@ -282,9 +289,12 @@
 
 # png state flags
 if USE_SVG2PNG_SCALES_FLAG
-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
-# create rules from template
-$(foreach extension,svg svgz, $(foreach size, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@),$(eval $(call scaling_rule_template,$(size),$(extension)))))
+svg2png_scales_flag = $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@)
+pngs += $(addsuffix .png,$(basename $(flag_svgs)))
+pngs += $(foreach scale, $(wordlist 2,100,$(svg2png_scales_flag)), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
+# create rules from templates
+$(foreach extension,svg svgz, $(foreach size, $(wordlist 2,100,$(svg2png_scales_flag)),$(eval $(call scaling_rule_template,$(size),$(extension)))))
+$(foreach extension,svg svgz, $(foreach size, $(firstword $(svg2png_scales_flag)),$(eval $(call scaling_rule_template_def,$(size),$(extension)))))
 endif
 
 # png symbols for navigation

Modified: trunk/navit/navit/xpm/navit_svg2png
===================================================================
--- trunk/navit/navit/xpm/navit_svg2png	2013-09-02 18:59:48 UTC (rev 5628)
+++ trunk/navit/navit/xpm/navit_svg2png	2013-09-02 19:22:18 UTC (rev 5629)
@@ -24,6 +24,8 @@
 
 svgtopng=$1
 png=$2
+w=$3
+h=$4
 case "$png" in
 	*_[1-9]*_[1-9]*.png)
 		svg=${png%_*_*.png};

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:[5628] trunk/navit/navit/android/src/org/navitproject/ navit/Navit.java

From: <md...@us...> - 2013-09-02 18:59:54

Revision: 5628
          http://sourceforge.net/p/navit/code/5628
Author:   mdankov
Date:     2013-09-02 18:59:48 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Add:port_android:Let notification area messages be translated.

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

Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java	2013-09-01 18:55:42 UTC (rev 5627)
+++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java	2013-09-02 18:59:48 UTC (rev 5628)
@@ -259,9 +259,9 @@
 		// Setup the status bar notification		
 		// This notification is removed in the exit() function
 		NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);	// Grab a handle to the NotificationManager
-		Notification NavitNotification = new Notification(R.drawable.icon,"Navit started",System.currentTimeMillis());	// Create a new notification, with the text string to show when the notification first appears
+		Notification NavitNotification = new Notification(R.drawable.icon, getString(R.string.notification_ticker), System.currentTimeMillis());	// Create a new notification, with the text string to show when the notification first appears
 		PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);
-		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", "Navit running", appIntent);	// Set the text in the notification
+		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent);	// Set the text in the notification
 		NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT;	// Ensure that the notification appears in Ongoing
 		nm.notify(R.string.app_name, NavitNotification);	// Set the notification
 		

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:[5627] trunk/navit/navit/navit.c

From: <mar...@us...> - 2013-09-01 18:55:45

Revision: 5627
          http://sourceforge.net/p/navit/code/5627
Author:   martin-s
Date:     2013-09-01 18:55:42 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Add:Core:Optionally avoid redraw on clear/set destination

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

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2013-08-31 12:52:37 UTC (rev 5626)
+++ trunk/navit/navit/navit.c	2013-09-01 18:55:42 UTC (rev 5627)
@@ -1570,7 +1570,7 @@
 			g_free(destination_file);
 		}
 
-		if (this_->ready == 3)
+		if (this_->ready == 3 && !(this_->flags & 4))
 			navit_draw(this_);
 	}
 }

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:[5626] trunk/navit/po/cs.po.in

From: <md...@us...> - 2013-08-31 12:52:42

Revision: 5626
          http://sourceforge.net/p/navit/code/5626
Author:   mdankov
Date:     2013-08-31 12:52:37 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Add:core:Update translations for Czech language. Fixes #1163|Thank you bugzilla lenochod

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

Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in	2013-08-31 12:26:08 UTC (rev 5625)
+++ trunk/navit/po/cs.po.in	2013-08-31 12:52:37 UTC (rev 5626)
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-06-18 19:02+0000\n"
-"Last-Translator: Vladimír Burian <vla...@em...>\n"
+"POT-Creation-Date: 2013-08-29 00:13+0400\n"
+"PO-Revision-Date: 2013-08-30 08:53+0100\n"
+"Last-Translator: lenochod <len...@ti...>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Generator: Poedit 1.5.7\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -80,11 +79,11 @@
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d stop"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "za %d stop"
 
 #, c-format
 msgid "%d meters"
@@ -96,11 +95,11 @@
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d mílí"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "za %d.%d mílí"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -113,16 +112,16 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d míle"
+msgstr[1] "%d míle"
+msgstr[2] "%d mílí"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "za %d míli"
+msgstr[1] "za %d míle"
+msgstr[2] "za %d mílí"
 
 #, c-format
 msgid "one kilometer"
@@ -202,7 +201,7 @@
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Najeďte na kruhový objezd %s"
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -285,10 +284,10 @@
 
 #, c-format
 msgid "Waypoint %d"
-msgstr ""
+msgstr "Bod trasy %d"
 
 msgid "Visit before..."
-msgstr ""
+msgstr "Navštívit nejdříve..."
 
 msgid "Set as position"
 msgstr "Použít jako pozici"
@@ -429,7 +428,7 @@
 
 #. 535
 msgid "Bonaire, Sint Eustatius and Saba"
-msgstr ""
+msgstr "Bonaire, Svatý Eustach a Saba"
 
 #. 076
 msgid "Brazil"
@@ -521,7 +520,7 @@
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "Curacao"
 
 #. 162
 msgid "Christmas Island"
@@ -852,8 +851,8 @@
 msgstr "Lotyšsko"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libyjská arabská džamáhíríje"
+msgid "Libya"
+msgstr "Libye"
 
 #. 504
 msgid "Morocco"
@@ -1141,7 +1140,7 @@
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Jižní Súdán"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1153,7 +1152,7 @@
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Svatý Martin (nizozemská část)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1319,32 +1318,41 @@
 "\t-h: print this usage info and exit.\n"
 "\t-v: Print the version and exit.\n"
 msgstr ""
+"Použití navit:\n"
+"navit [volby] [konfigurační soubor]\n"
+"\t-c <soubor>: Použijte <soubor> jako konfigurační soubor\n"
+"\t-d <n>: Nastavení souhrnné výstupní ladící úrovně v <n> (0-3). Přepíše "
+"nastavení z konfiguračního souboru.\n"
+"\t-h: Zobrazí tuto nápovědu a skončí.\n"
+"\t-v: Zobrazí verzy a skončí.\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 "Nenalezen konfigurační soubor navit.xml a navit.xml.local\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
-msgstr ""
+msgstr "Chyba při zpracování konfiguračního souboru '%s': %s\n"
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "Používáte konfigurační soubor '% s'\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
 msgstr ""
+"Interní selhání inicializace, končím. Zkontrolujte předchozí chybové "
+"zprávy.\n"
 
 msgid "unknown street"
-msgstr ""
+msgstr "neznámá ulice"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Nepojmenované vozidlo"
 
 msgid "Failed to write bookmarks file"
-msgstr ""
+msgstr "Nepodařilo se zapsat do souboru s záložkama"
 
 #. Strings from navit_shipped.xml
 msgid "Map Point"
@@ -1427,28 +1435,28 @@
 msgstr "Zmenšit"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Zmenší zvětšení"
 
 msgid "Zoom_In"
 msgstr "Zvětšit"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Zvýší zvětšení"
 
 msgid "_Recalculate"
 msgstr "Přepočítat"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Překreslí mapu"
 
 msgid "_Info"
 msgstr "Informace"
 
 msgid "Set _destination"
-msgstr ""
+msgstr "Nastavit _cíl"
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Otevře vyhledávání adres"
 
 msgid "_Stop Navigation"
 msgstr "Přestat navigovat"
@@ -1460,31 +1468,31 @@
 msgstr "_Konec"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Zavře aplikaci"
 
 msgid "Show position _cursor"
-msgstr ""
+msgstr "Zobrazit pozici _kurzoru"
 
 msgid "_Lock on Road"
 msgstr "Jet jen po silnici"
 
 msgid "_Keep orientation to the North"
-msgstr ""
+msgstr "_Orientovat na sever"
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Přepíná orientaci mapy podle směru vozidla nebo severu"
 
 msgid "_Roadbook"
 msgstr "Itinerář"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Zobrazí/skryje popis cesty"
 
 msgid "_Autozoom"
 msgstr "Autozoom"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Povolí/zakáže automatické změny úrovně zoomu"
 
 msgid "_Fullscreen"
 msgstr "Celá obrazovka"
@@ -1541,16 +1549,16 @@
 
 #, c-format
 msgid "Waypoint %s"
-msgstr ""
+msgstr "Bod trasy %s"
 
 msgid "Select waypoint to insert the new one before"
-msgstr ""
+msgstr "Vyberte bod  trasy pro vložení nového před něho"
 
 msgid "View in Browser"
 msgstr "Zobrazit v prohlížeči"
 
 msgid "Item type"
-msgstr ""
+msgstr "Typ položky"
 
 #. Android resource: @strings/address_search_streets
 msgid "Streets"
@@ -1563,7 +1571,7 @@
 msgstr "Zobrazit atributy"
 
 msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Nastavit jako polohu (a deaktivovat vozidlo)"
 
 msgid "POIs"
 msgstr "Body zájmu"
@@ -1575,7 +1583,7 @@
 msgstr ""
 
 msgid "Show results on the map"
-msgstr ""
+msgstr "Zobrazit výsledky na mapě"
 
 msgid "Cut Bookmark"
 msgstr "Vyjmout záložku"
@@ -1593,16 +1601,16 @@
 msgstr "Smazat záložku"
 
 msgid "Delete waypoint"
-msgstr ""
+msgstr "Smazat bod trasy "
 
 msgid "Bookmarks"
 msgstr "Záložky"
 
 msgid "Bookmarks as waypoints"
-msgstr ""
+msgstr "Záložky jako body trasy"
 
 msgid "Save waypoints"
-msgstr ""
+msgstr "Uložit body trasy"
 
 msgid "Replace with waypoints"
 msgstr ""
@@ -1627,7 +1635,7 @@
 msgstr ""
 
 msgid "Map Download"
-msgstr ""
+msgstr "Mapa ke stažení"
 
 msgid "Active"
 msgstr ""
@@ -1636,7 +1644,7 @@
 msgstr ""
 
 msgid "Download completely"
-msgstr ""
+msgstr "Stáhnuto kompletní"
 
 msgid "Show Satellite Status"
 msgstr "Ukázat stav satelitu"
@@ -1697,10 +1705,10 @@
 msgstr "členové a přispívající"
 
 msgid "Waypoints"
-msgstr ""
+msgstr "Body trasy"
 
 msgid "Enter Coordinates"
-msgstr ""
+msgstr "Zadejte souřadnice"
 
 #.
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1709,10 +1717,10 @@
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
-msgstr ""
+msgstr "Zeměpisná délka Zeměpisná šířka"
 
 msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Zadejte souřadnice, například:"
 
 msgid "Vehicle"
 msgstr "Vozidlo"
@@ -1730,7 +1738,7 @@
 msgstr "Mapa sleduje vozidlo"
 
 msgid "Plan with Waypoints"
-msgstr ""
+msgstr "Plán s bodama trasy"
 
 msgid "Maps"
 msgstr "Mapy"
@@ -1751,7 +1759,7 @@
 msgstr "Minulé cíle"
 
 msgid "- No former destinations available -"
-msgstr ""
+msgstr "- Minulé cíle nejsou dostupné -"
 
 msgid "Message"
 msgstr "Zpráva"
@@ -1769,436 +1777,433 @@
 msgstr "Číslo domu"
 
 msgid "Next"
-msgstr ""
+msgstr "Další"
 
 msgid "Prev"
-msgstr ""
+msgstr "Předchozí"
 
 msgid "Return to route!"
-msgstr ""
+msgstr "Vraťte se zpět!"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr ""
+msgstr "Podívejte se! Kamera!"
 
 #. warning told
 msgid "Please decrease your speed"
-msgstr ""
+msgstr "Prosím snižte rychlost"
 
 msgid "partial match"
-msgstr ""
+msgstr "Částečná shoda"
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Vyhledat"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
-msgstr ""
+msgstr "Města"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
-msgstr ""
+msgstr "Cestovat sem"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgstr "Mapová data (c) přispěvatelé OpenStreetMap, ODBL"
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "Stažené mapy"
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Celá planeta"
 
 msgid "Africa"
-msgstr ""
+msgstr "Afrika"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Kanárské ostrovy"
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
-msgstr ""
+msgstr "Asie"
 
 msgid "Korea"
-msgstr ""
+msgstr "Korea"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "Spojené arabské emiráty+ostatní"
 
 msgid "Oceania"
-msgstr ""
+msgstr "Oceánie"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Tasmánie"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Viktorie"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "Nový Jižní Wales"
 
 msgid "Europe"
-msgstr ""
+msgstr "Evropa"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Západní Evropa"
 
 msgid "Azores"
-msgstr ""
+msgstr "Azory"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "Benelux"
 
 msgid "Alsace"
-msgstr ""
+msgstr "Alsasko"
 
 msgid "Aquitaine"
-msgstr ""
+msgstr "Akvitánie"
 
 msgid "Auvergne"
-msgstr ""
+msgstr "Auvergne"
 
 msgid "Basse-Normandie"
-msgstr ""
+msgstr "Dolní Normandie"
 
 msgid "Bourgogne"
-msgstr ""
+msgstr "Burgundsko"
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Bretaň"
 
 msgid "Centre"
 msgstr ""
 
 msgid "Champagne-Ardenne"
-msgstr ""
+msgstr "Champagne-Ardennes"
 
 msgid "Corse"
-msgstr ""
+msgstr "Korsika"
 
 msgid "Franche-Comte"
-msgstr ""
+msgstr "Franche-Comté"
 
 msgid "Haute-Normandie"
-msgstr ""
+msgstr "Horní 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 "Lotrinsko"
 
 msgid "Midi-Pyrenees"
-msgstr ""
+msgstr "Jižní Pyreneje"
 
 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 "Pikardie"
 
 msgid "Poitou-Charentes"
-msgstr ""
+msgstr "Poitou-Charentes"
 
 msgid "Provence-Alpes-Cote-d-Azur"
-msgstr ""
+msgstr "Provensálsko-Alpy-Azurové pobřeží"
 
 msgid "Rhone-Alpes"
-msgstr ""
+msgstr "Rhone-Alpy"
 
 msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Württembersko"
 
 msgid "Bayern"
-msgstr ""
+msgstr "Bavorsko"
 
 msgid "Mittelfranken"
-msgstr ""
+msgstr "Střední Franky"
 
 msgid "Niederbayern"
-msgstr ""
+msgstr "Dolní Bavorsko"
 
 msgid "Oberbayern"
-msgstr ""
+msgstr "Horní Bavorsko"
 
 msgid "Oberfranken"
-msgstr ""
+msgstr "Horní Franky"
 
 msgid "Oberpfalz"
-msgstr ""
+msgstr "Horní Falcko"
 
 msgid "Schwaben"
-msgstr ""
+msgstr "Švábsko"
 
 msgid "Unterfranken"
-msgstr ""
+msgstr "Dolní Franky"
 
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Braniborsko"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Brémy"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 msgid "Hessen"
-msgstr ""
+msgstr "Hessensko"
 
 msgid "Mecklenburg-Vorpommern"
-msgstr ""
+msgstr "Meklenbursko-Pomořansko"
 
 msgid "Niedersachsen"
-msgstr ""
+msgstr "Dolní Sasko"
 
 msgid "Nordrhein-westfalen"
-msgstr ""
+msgstr "Severní Porýní-Vestfálsko"
 
 msgid "Rheinland-Pfalz"
-msgstr ""
+msgstr "Porýnsko-Falcko"
 
 msgid "Saarland"
-msgstr ""
+msgstr "Sársko"
 
 msgid "Sachsen-Anhalt"
-msgstr ""
+msgstr "Sasko-Anhaltsko"
 
 msgid "Sachsen"
-msgstr ""
+msgstr "Sasko"
 
 msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Šlesvicko-Holštýnsko"
 
 msgid "Thueringen"
-msgstr ""
+msgstr "Thueringen"
 
 msgid "Mallorca"
-msgstr ""
+msgstr "Mallorca"
 
 msgid "Galicia"
-msgstr ""
+msgstr "Galície"
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "Skandinávie"
 
 msgid "England"
-msgstr ""
+msgstr "Anglie"
 
 msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
 
 msgid "Cambridgeshire"
-msgstr ""
+msgstr "Cambridgeshire"
 
 msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
 
 msgid "East yorkshire with hull"
 msgstr ""
 
 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 "Jižní Yorkshire"
 
 msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
 
 msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
 
 msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
 
 msgid "Scotland"
-msgstr ""
+msgstr "Skotsko"
 
 msgid "Wales"
-msgstr ""
+msgstr "Wales"
 
 msgid "Crete"
-msgstr ""
+msgstr "Kréta"
 
 msgid "North America"
-msgstr ""
+msgstr "Severní Amerika"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Aljaška"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Havaj"
 
 msgid "USA"
-msgstr ""
+msgstr "USA"
 
 msgid " (except Alaska and Hawaii)"
-msgstr ""
+msgstr "(mimo Aljašky a Havaje)"
 
 msgid "Midwest"
 msgstr ""
 
 msgid "Michigan"
-msgstr ""
+msgstr "Michigan"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Ohio"
 
 msgid "Northeast"
 msgstr ""
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Massachusetts"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Vermont"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Tichý oceán"
 
 msgid "South"
 msgstr ""
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Arkansas"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "Washington D.C."
 
 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 "Virginie"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "Západní Virginie"
 
 msgid "West"
 msgstr ""
 
 msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
 
 msgid "California"
-msgstr ""
+msgstr "Kalifornie"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Colorado"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Idaho"
 
 msgid "Montana"
-msgstr ""
+msgstr "Montana"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "Nové Mexico"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Oregon"
 
 msgid "Utah"
-msgstr ""
+msgstr "Utah"
 
 msgid "Washington State"
-msgstr ""
+msgstr "Stát Washington "
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "Jižní+Střední Amerika"
 
 msgid "Guyane Francaise"
-msgstr ""
+msgstr "Francouzská Guyana"
 
 msgid "downloading"
-msgstr ""
+msgstr "stahuji"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
-msgstr ""
+msgstr "mapa připravena"
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Chyba při stahování mapy!"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
-msgstr ""
+msgstr "Není dostatek volného místa"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Chyba při zápisu mapy!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Stahování mapy přerušeno!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr ""
+msgstr "Zbývající čas"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr ""
+msgstr "Mapa ke stažení"
 
 msgid "Vehicle Position"
 msgstr "Poloha vozidla"
@@ -2206,19 +2211,19 @@
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Ano"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
-msgstr ""
+msgstr "Startuje Navit"
 
 #. Android resource: @strings/notification_event_default
 msgid "Navit running"
-msgstr ""
+msgstr "Navit běží"
 
 #. Android resource: @strings/initial_info_box_title
 msgid "Welcome to Navit"
-msgstr ""
+msgstr "Vítejte v Navit"
 
 #. Android resource: @strings/initial_info_box_message
 msgid ""
@@ -2231,10 +2236,19 @@
 "\n"
 "Enjoy Navit!"
 msgstr ""
+"Děkujeme za instalaci Navit!\n"
+"\n"
+"Pro začátek, vyberte \"Stáhnout mapy\" z menu pro stažení map. Poznámka: "
+"Velikost souboru map mohou být velké (>50MB) - wifi připojení je "
+"doporučeno.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap a přispěvovatelé\n"
+"\n"
+"Užijte si Navit!"
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
@@ -2242,15 +2256,15 @@
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Přiblížit"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Oddálit"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
-msgstr ""
+msgstr "Stáhnout mapy"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
@@ -2258,137 +2272,139 @@
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
-msgstr ""
+msgstr "Ukončit Navit"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
-msgstr ""
+msgstr "Zálohovat / Obnovit"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr ""
+msgstr "Smazat tuto mapu?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr ""
+msgstr "Stahuji:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
-msgstr ""
+msgstr "Chyba při stahování map."
 
 #. Android resource: @strings/map_download_download_aborted
 msgid "Map download aborted"
-msgstr ""
+msgstr "Stahování map přerušeno"
 
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
-msgstr ""
+msgstr "Žádné umístění. Zkuste znovu po opravě umístění."
 
 #. Android resource: @strings/maps_for_current_location
 msgid "Maps containing current location"
-msgstr ""
+msgstr "Mapy obsahující nynější umístění"
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr ""
+msgstr "Hledat dle adresy"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
-msgstr ""
+msgstr "Zadejte cíl"
 
 #. Android resource: @strings/address_partial_match
 msgid "Match partial address"
-msgstr ""
+msgstr "Shoda částí adresy"
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Vyhledávám..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
-msgstr ""
+msgstr "Adresa nebyla nalezena"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
-msgstr ""
+msgstr "Výsledky hledání"
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr ""
+msgstr "Načítání výsledku vyhledávání"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "Výsledky nenalezeny."
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr ""
+msgstr "Text nebyl zadán"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
-msgstr ""
+msgstr "Nastavení cíle v:"
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Vyberte akci"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr ""
+msgstr "Prosím vložte SD kartu"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Zálohuji..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Obnovuji..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
-msgstr ""
+msgstr "Nezdařilo se vytvořit adresář pro zálohu"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr ""
+msgstr "Záloha se nezdařila"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr ""
+msgstr "Záloha nenalezena"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
-msgstr ""
+msgstr "Obnova se nezdařila"
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr ""
+msgstr "Záloha byla úspěšná"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
 "Restore Successful\n"
 "Please restart Navit"
 msgstr ""
+"Obnova byla úspěšná.\n"
+"Restartujte prosím Navit."
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr ""
+msgstr "Záloha nenalezena"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
-msgstr ""
+msgstr "Obnova selhala"
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr ""
+msgstr "Vyberte zálohu"
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr ""
+msgstr "Zálohování"
 
 #. Android resource: @strings/restore
 msgid "Restore"
-msgstr ""
+msgstr "Obnova"
 
 msgid "Main menu"
 msgstr "Hlavní menu"
@@ -2419,6 +2435,8 @@
 "Former\n"
 "Destinations"
 msgstr ""
+"Minulé\n"
+"cíle"
 
 msgid "Quit"
 msgstr "Konec"
@@ -2446,26 +2464,30 @@
 "Drop last \n"
 "Waypoint"
 msgstr ""
+"Zrušit minulý \n"
+"bod trasy"
 
 msgid ""
 "Drop next \n"
 "Waypoint"
 msgstr ""
+"Zrušit příští \n"
+" bod trasy"
 
 msgid "Satellite Status"
-msgstr ""
+msgstr "Stav satelitu"
 
 msgid "NMEA Data"
-msgstr ""
+msgstr "NMEA Data"
 
 msgid "car_shortest"
-msgstr ""
+msgstr "auto nejkratší"
 
 msgid "car_avoid_tolls"
-msgstr ""
+msgstr "auto bez mýtného"
 
 msgid "car_pedantic"
-msgstr ""
+msgstr "auto puntičkářské"
 
 msgid "horse"
 msgstr "kůň"
@@ -2493,8 +2515,11 @@
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
 #.
 msgid "Truck"
-msgstr ""
+msgstr "kamión"
 
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Libyjská arabská džamáhíríje"
+
 #~ msgid "In %s, enter the roundabout"
 #~ msgstr "Za %s, najeďte na kruhový objezd"
 

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:[5625] trunk/navit/CMakeLists.txt

From: <md...@us...> - 2013-08-31 12:26:13

Revision: 5625
          http://sourceforge.net/p/navit/code/5625
Author:   mdankov
Date:     2013-08-31 12:26:08 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Fix:core:Prefer saxonb-xslt transformer when other variants present too. It's proven to work well for android builds requiring xsl 2.0.

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

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-08-30 19:44:40 UTC (rev 5624)
+++ trunk/navit/CMakeLists.txt	2013-08-31 12:26:08 UTC (rev 5625)
@@ -417,7 +417,7 @@
 add_feature(BUILD_MAPTOOL "default" TRUE)
 add_feature(XSL_PROCESSING "default" TRUE)
 
-set(SUPPORTED_XSLT_PROCESSORS "saxon;saxon8;saxon-xslt;saxonb-xslt;xsltproc;transform.exe")
+set(SUPPORTED_XSLT_PROCESSORS "saxonb-xslt;saxon;saxon8;saxon-xslt;xsltproc;transform.exe")
 find_program(XSLT_PROCESSOR NAMES ${SUPPORTED_XSLT_PROCESSORS})
 if(XSLT_PROCESSOR)
    message(STATUS "Found XSLT processor: ${XSLT_PROCESSOR}")

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:[5624] trunk/navit/navit/maptool/boundaries.c

From: <md...@us...> - 2013-08-30 19:44:43

Revision: 5624
          http://sourceforge.net/p/navit/code/5624
Author:   mdankov
Date:     2013-08-30 19:44:40 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Fix:maptool:Don't use g_strcmp0() to make it compileable for windows.

Modified Paths:
--------------
    trunk/navit/navit/maptool/boundaries.c

Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c	2013-08-29 19:51:40 UTC (rev 5623)
+++ trunk/navit/navit/maptool/boundaries.c	2013-08-30 19:44:40 UTC (rev 5624)
@@ -87,8 +87,10 @@
 			iso=osm_tag_value(ib, "iso3166-1:alpha2");
 		
 		if (admin_level && !strcmp(admin_level, "2")) {
-			if(!iso && !g_strcmp0(osm_tag_value(ib,"int_name"),"France")) {
-				iso="FR";
+			if(!iso) {
+				char *int_name=osm_tag_value(ib,"int_name");
+				if(int_name && !strcmp(int_name,"France"))
+					iso="FR";
 			}
 			if (iso) {
 				struct country_table *country=country_from_iso2(iso);	

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:[5623] trunk/navit/CMakeLists.txt

From: <sl...@us...> - 2013-08-29 19:51:45

Revision: 5623
          http://sourceforge.net/p/navit/code/5623
Author:   sleske
Date:     2013-08-29 19:51:40 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Fix:core:Only use -Wno-missing-field-initializers if compiler supports it.

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

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-08-29 19:20:12 UTC (rev 5622)
+++ trunk/navit/CMakeLists.txt	2013-08-29 19:51:40 UTC (rev 5623)
@@ -657,10 +657,13 @@
 #                        functions implementing the interface of a plugin.
 # -Wno-sign-compare: We currently just use int almost everywhere.
 #                    Unclear if it's really worth correcting.
+include(CheckCCompilerFlag)
 if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare ")
-    if(NOT GCC_IS_OLD)
+    # -Wno-missing-field-initializers does not work with old gcc
+    check_c_compiler_flag(-Wno-missing-field-initializers HAS_NO_MISSING_FIELD_INI)
+    if (HAS_NO_MISSING_FIELD_INI)
         set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-missing-field-initializers ")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers ")
     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:[5622] trunk/navit/navit

From: <sl...@us...> - 2013-08-29 19:20:15

Revision: 5622
          http://sourceforge.net/p/navit/code/5622
Author:   sleske
Date:     2013-08-29 19:20:12 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Fix:core:Use LONGLONG_(HEX_)FMT instead of %Ld/%lld/%Lx.

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal_gesture.c
    trunk/navit/navit/map/binfile/binfile.c
    trunk/navit/navit/maptool/osm.c
    trunk/navit/navit/types.h

Modified: trunk/navit/navit/gui/internal/gui_internal_gesture.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_gesture.c	2013-08-29 16:32:29 UTC (rev 5621)
+++ trunk/navit/navit/gui/internal/gui_internal_gesture.c	2013-08-29 19:20:12 UTC (rev 5622)
@@ -14,6 +14,7 @@
 #include "graphics.h"
 #include "debug.h"
 #include "navit.h"
+#include "types.h"
 #include "navit_nls.h"
 #include "event.h"
 #include "search.h"
@@ -60,7 +61,7 @@
    	}
 	this->gesture_ring[this->gesture_ring_last].p=*p;
 	this->gesture_ring[this->gesture_ring_last].msec=msec;
-	dbg(2,"msec=%Ld x=%d y=%d\n",msec,p->x,p->y);
+	dbg(2,"msec="LONGLONG_FMT" x=%d y=%d\n",msec,p->x,p->y);
 };
 
 int
@@ -88,7 +89,7 @@
 		*p0=g->p;
 	}
 	msec=g->msec;
-	dbg(2,"%Ld %d %d\n",g->msec, g->p.x, g->p.y);
+	dbg(2,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y);
 	for(i=1;(g=gui_internal_gesture_ring_get(this,i))!=NULL;i++) {
 		if( msec-g->msec > 1000 )
 			break;
@@ -98,7 +99,7 @@
 		if(p0) {
 			*p0=g->p;
 		}
-		dbg(2,"%Ld %d %d\n",g->msec, g->p.x, g->p.y);
+		dbg(2,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y);
 	}
 	return dt;
 }

Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c	2013-08-29 16:32:29 UTC (rev 5621)
+++ trunk/navit/navit/map/binfile/binfile.c	2013-08-29 19:20:12 UTC (rev 5622)
@@ -270,7 +270,7 @@
 			dbg(1,"eoc wrong\n");
 			eoc=NULL;
 		}
-		dbg(1,"eoc64 ok 0x%Lx 0x%Lx\n",eoc->zip64eofst,eoc->zip64ecsz);
+		dbg(1,"eoc64 ok 0x"LONGLONG_HEX_FMT " 0x"LONGLONG_HEX_FMT "\n",eoc->zip64eofst,eoc->zip64ecsz);
 	}
 	file_data_free(fi,(unsigned char *)eocl);
 	return eoc;
@@ -922,7 +922,7 @@
 	char *zipfn;
 	struct file *fi;
 	dbg(1,"enter %p %p %p\n", m, cd, t);
-	dbg(1,"cd->zipofst=0x%Lx\n", binfile_cd_offset(cd));
+	dbg(1,"cd->zipofst=0x"LONGLONG_HEX_FMT "\n", binfile_cd_offset(cd));
 	t->start=NULL;
 	t->mode=1;
 	if (m->fis)

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-08-29 16:32:29 UTC (rev 5621)
+++ trunk/navit/navit/maptool/osm.c	2013-08-29 19:20:12 UTC (rev 5622)
@@ -32,6 +32,7 @@
 #include "country.h"
 #include "file.h"
 #include "profile.h"
+#include "types.h"
 
 #ifndef M_PI
 #define M_PI       3.14159265358979323846
@@ -2290,22 +2291,22 @@
 		while(search_relation_member(ib, "street",&relm,&min_count)) {
 			if(relm.type==2)
 				relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
-			dbg(0,"street type=%d(should be 2) id=%lld\n",relm.type,relm.id);
+			dbg(0,"street type=%d(should be 2) id="LONGLONG_FMT "\n",relm.type,relm.id);
 
 		}
 		min_count=0;
 		while(search_relation_member(ib, "house",&relm,&min_count)) {
-			dbg(0,"house type=%d id=%lld\n",relm.type,relm.id);
+			dbg(0,"house type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "addr:houselink",&relm,&min_count)) {
-			dbg(0,"houselink type=%d id=%lld\n",relm.type,relm.id);
+			dbg(0,"houselink type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "address",&relm,&min_count)) {
-			dbg(0,"address type=%d id=%lld\n",relm.type,relm.id);
+			dbg(0,"address type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 	}

Modified: trunk/navit/navit/types.h
===================================================================
--- trunk/navit/navit/types.h	2013-08-29 16:32:29 UTC (rev 5621)
+++ trunk/navit/navit/types.h	2013-08-29 19:20:12 UTC (rev 5622)
@@ -30,8 +30,10 @@
 
 #ifdef HAVE_API_WIN32_BASE
 #define LONGLONG_FMT "%I64d"
+#define LONGLONG_HEX_FMT "%I64x"
 #else
 #define LONGLONG_FMT "%lld"
+#define LONGLONG_HEX_FMT "%llx"
 #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:[5621] trunk/navit/navit/maptool/boundaries.c

From: <md...@us...> - 2013-08-29 16:32:32

Revision: 5621
          http://sourceforge.net/p/navit/code/5621
Author:   mdankov
Date:     2013-08-29 16:32:29 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Fix:maptool:Fix NULL pointer dereference introduced last night.

Modified Paths:
--------------
    trunk/navit/navit/maptool/boundaries.c

Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c	2013-08-28 20:39:36 UTC (rev 5620)
+++ trunk/navit/navit/maptool/boundaries.c	2013-08-29 16:32:29 UTC (rev 5621)
@@ -87,7 +87,7 @@
 			iso=osm_tag_value(ib, "iso3166-1:alpha2");
 		
 		if (admin_level && !strcmp(admin_level, "2")) {
-			if(!iso && !strcmp(osm_tag_value(ib,"int_name"),"France")) {
+			if(!iso && !g_strcmp0(osm_tag_value(ib,"int_name"),"France")) {
 				iso="FR";
 			}
 			if (iso) {
@@ -142,7 +142,7 @@
 		if(boundary->iso2 && has_subrelations)
 			osm_warning("relation",item_bin_get_relationid(ib),0,"Country boundary '%s' has %d relations as boundary segments. These are not supported yet.\n", boundary->iso2, has_subrelations);
 		if(boundary->iso2 && !has_outer_ways) {
-			osm_warning("relation",item_bin_get_relationid(ib),0,"Skipping country boundary for '%s' because it has no outer ways.\n", boundary->iso2, has_subrelations);
+			osm_warning("relation",item_bin_get_relationid(ib),0,"Skipping country boundary for '%s' because it has no outer ways.\n", boundary->iso2);
 			g_free(boundary->iso2);
 			boundary->iso2=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:[5620] trunk/navit/navit/maptool/boundaries.c

From: <md...@us...> - 2013-08-28 20:39:41

Revision: 5620
          http://sourceforge.net/p/navit/code/5620
Author:   mdankov
Date:     2013-08-28 20:39:36 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
Add:maptool:Workaround to process France boundary not having ISO tag. Related to #1097.

Modified Paths:
--------------
    trunk/navit/navit/maptool/boundaries.c

Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c	2013-08-28 20:32:40 UTC (rev 5619)
+++ trunk/navit/navit/maptool/boundaries.c	2013-08-28 20:39:36 UTC (rev 5620)
@@ -87,6 +87,9 @@
 			iso=osm_tag_value(ib, "iso3166-1:alpha2");
 		
 		if (admin_level && !strcmp(admin_level, "2")) {
+			if(!iso && !strcmp(osm_tag_value(ib,"int_name"),"France")) {
+				iso="FR";
+			}
 			if (iso) {
 				struct country_table *country=country_from_iso2(iso);	
 				if (!country) 

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:[5619] trunk/navit/navit/maptool/boundaries.c

From: <md...@us...> - 2013-08-28 20:32:46

Revision: 5619
          http://sourceforge.net/p/navit/code/5619
Author:   mdankov
Date:     2013-08-28 20:32:40 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
Add:maptool:Skip country boundaries which have no outer members. Report unsupported cascaded country boundary relations.

Modified Paths:
--------------
    trunk/navit/navit/maptool/boundaries.c

Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c	2013-08-28 19:00:51 UTC (rev 5618)
+++ trunk/navit/navit/maptool/boundaries.c	2013-08-28 20:32:40 UTC (rev 5619)
@@ -80,6 +80,8 @@
 		struct boundary *boundary=g_new0(struct boundary, 1);
 		char *admin_level=osm_tag_value(ib, "admin_level");
 		char *iso=osm_tag_value(ib, "ISO3166-1");
+		int has_subrelations=0;
+		int has_outer_ways=0;
 		
 		if(!iso)
 			iso=osm_tag_value(ib, "iso3166-1:alpha2");
@@ -114,8 +116,10 @@
 			}
 			if(member_type==2) {
 				enum geom_poly_segment_type role;
-				if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave"))
+				if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave")) {
+					has_outer_ways=1;
 					role=geom_poly_segment_type_way_outer;
+				}
 				else if (!strcmp(rolestr,"inner") || !strcmp(rolestr,"enclave"))
 					role=geom_poly_segment_type_way_inner;
 				else if (!strcmp(rolestr,""))
@@ -127,7 +131,19 @@
 				}
 				relations_add_func(relations, relations_func, boundary, (gpointer)role, 2, osm_id);
 			}
+			if(member_type==3) {
+				if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave") || !strcmp(rolestr,"inner") || !strcmp(rolestr,"enclave"))
+					has_subrelations++;
+			}
 		}
+		if(boundary->iso2 && has_subrelations)
+			osm_warning("relation",item_bin_get_relationid(ib),0,"Country boundary '%s' has %d relations as boundary segments. These are not supported yet.\n", boundary->iso2, has_subrelations);
+		if(boundary->iso2 && !has_outer_ways) {
+			osm_warning("relation",item_bin_get_relationid(ib),0,"Skipping country boundary for '%s' because it has no outer ways.\n", boundary->iso2, has_subrelations);
+			g_free(boundary->iso2);
+			boundary->iso2=NULL;
+		}
+
 		boundary->ib=item_bin_dup(ib);
 		boundaries_list=g_list_append(boundaries_list, boundary);
 	}

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:[5618] trunk/navit/po/Makefile.am

From: <md...@us...> - 2013-08-28 19:00:58

Revision: 5618
          http://sourceforge.net/p/navit/code/5618
Author:   mdankov
Date:     2013-08-28 19:00:51 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
Fix:core:Avoid unnecessary usage of absoulute source path references in po Makefile.

Modified Paths:
--------------
    trunk/navit/po/Makefile.am

Modified: trunk/navit/po/Makefile.am
===================================================================
--- trunk/navit/po/Makefile.am	2013-08-27 20:12:39 UTC (rev 5617)
+++ trunk/navit/po/Makefile.am	2013-08-28 19:00:51 UTC (rev 5618)
@@ -66,8 +66,8 @@
 
 # Trick gettext to get translateable strings out of android/strings.xml
 
-$(top_builddir)/navit/strings.c: $(abs_top_srcdir)/navit/android/res/values/strings.xml
-	sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(abs_top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
+$(top_builddir)/navit/strings.c: $(top_srcdir)/navit/android/res/values/strings.xml
+	sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
 
 @POFILES@: navit.pot
 	sed 's/^"Project-Id-Version:.*/"Project-Id-Version: $(PACKAGE_STRING)\\n"/' < $(top_srcdir)/po/$@.in | $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ - navit.pot

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:[5617] trunk/navit/CMakeLists.txt

From: <mar...@us...> - 2013-08-27 20:12:45

Revision: 5617
          http://sourceforge.net/p/navit/code/5617
Author:   martin-s
Date:     2013-08-27 20:12:39 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Fix:Build:Compatibility for older gccs

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

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-08-27 19:57:25 UTC (rev 5616)
+++ trunk/navit/CMakeLists.txt	2013-08-27 20:12:39 UTC (rev 5617)
@@ -658,8 +658,12 @@
 # -Wno-sign-compare: We currently just use int almost everywhere.
 #                    Unclear if it's really worth correcting.
 if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare ")
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare ")
+    if(NOT GCC_IS_OLD)
+        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-missing-field-initializers ")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers ")
+    endif()
 endif()
 
 if (EXTRA_DEFINES)

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:[5616] trunk/navit/navit/navigation.c

From: <mar...@us...> - 2013-08-27 19:57:28

Revision: 5616
          http://sourceforge.net/p/navit/code/5616
Author:   martin-s
Date:     2013-08-27 19:57:25 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Fix:Core:Better instructions in cases where a junction is in a curve

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

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2013-08-27 19:32:15 UTC (rev 5615)
+++ trunk/navit/navit/navigation.c	2013-08-27 19:57:25 UTC (rev 5616)
@@ -1172,6 +1172,7 @@
 	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;
 
 	dbg(1,"enter %p %p %p\n",old, new, delta);
 	d=angle_delta(old->angle_end, new->way.angle2);
@@ -1199,6 +1200,7 @@
 	cat=maneuver_category(old->way.item.type);
 	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;
@@ -1208,9 +1210,13 @@
 			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 but isn't a highway (a highway might split up temporarily), then
@@ -1240,6 +1246,12 @@
 			dlim=abs(d)*128/256;
 		if (left < -dlim && right > dlim) 
 			is_unambigous=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;
+		}
 		if (!is_same_street && is_unambigous < 1) {
 			ret=1;
 			r="yes: not same street or ambigous";

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:[5615] trunk/navit/po/Makefile.am

From: <md...@us...> - 2013-08-27 19:32:19

Revision: 5615
          http://sourceforge.net/p/navit/code/5615
Author:   mdankov
Date:     2013-08-27 19:32:15 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Fix:core:Put Android source files, needed to build gettext database, into distribution.

Modified Paths:
--------------
    trunk/navit/po/Makefile.am

Modified: trunk/navit/po/Makefile.am
===================================================================
--- trunk/navit/po/Makefile.am	2013-08-27 18:28:20 UTC (rev 5614)
+++ trunk/navit/po/Makefile.am	2013-08-27 19:32:15 UTC (rev 5615)
@@ -3,7 +3,15 @@
 CLEANFILES = $(CATALOGS) navit.pot
 
 # keep this sorted
-EXTRA_DIST = @POIFILES@
+EXTRA_DIST = @POIFILES@ \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/Navit.java \
+	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitMapDownloader.java \
+	$(top_srcdir)/navit/android/res/values/strings.xml
 
 POTFILES  = \
 	$(top_srcdir)/navit/main.c \

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:[5614] trunk/navit/po/ru.po.in

From: <md...@us...> - 2013-08-27 18:28:24

Revision: 5614
          http://sourceforge.net/p/navit/code/5614
Author:   mdankov
Date:     2013-08-27 18:28:20 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Add:core:Update Russian translations.

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

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2013-08-27 17:24:28 UTC (rev 5613)
+++ trunk/navit/po/ru.po.in	2013-08-27 18:28:20 UTC (rev 5614)
@@ -1788,7 +1788,7 @@
 msgstr "Снизьте скорость, пожалуйста"
 
 msgid "partial match"
-msgstr ""
+msgstr "нестрогое соответствие"
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
@@ -1806,37 +1806,37 @@
 msgstr ""
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "Загруженные карты"
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Вся планета"
 
 msgid "Africa"
-msgstr ""
+msgstr "Африка"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Канарские острова"
 
 msgid "Libya"
-msgstr ""
+msgstr "Ливия"
 
 msgid "Asia"
-msgstr ""
+msgstr "Азия"
 
 msgid "Korea"
-msgstr ""
+msgstr "Корея"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Тайвань"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "ОАЭ и прилегающие"
 
 msgid "Oceania"
-msgstr ""
+msgstr "Океания"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Тасмания"
 
 msgid "Victoria"
 msgstr ""
@@ -1845,16 +1845,16 @@
 msgstr ""
 
 msgid "Europe"
-msgstr ""
+msgstr "Европа"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Западная Европа"
 
 msgid "Azores"
-msgstr ""
+msgstr "Азорские о-ва"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "Страны Бенелюкса"
 
 msgid "Alsace"
 msgstr ""
@@ -1950,16 +1950,16 @@
 msgstr ""
 
 msgid "Berlin"
-msgstr ""
+msgstr "Берлин"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Бранденбург"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Бремен"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Гамбург"
 
 msgid "Hessen"
 msgstr ""
@@ -2001,7 +2001,7 @@
 msgstr ""
 
 msgid "England"
-msgstr ""
+msgstr "Англия"
 
 msgid "Buckinghamshire"
 msgstr ""
@@ -2022,7 +2022,7 @@
 msgstr ""
 
 msgid "Kent"
-msgstr ""
+msgstr "Кент"
 
 msgid "Lancashire"
 msgstr ""
@@ -2031,7 +2031,7 @@
 msgstr ""
 
 msgid "Norfolk"
-msgstr ""
+msgstr "Норфолк"
 
 msgid "Nottinghamshire"
 msgstr ""
@@ -2061,138 +2061,138 @@
 msgstr ""
 
 msgid "Wales"
-msgstr ""
+msgstr "Уэльс"
 
 msgid "Crete"
-msgstr ""
+msgstr "Крит"
 
 msgid "North America"
-msgstr ""
+msgstr "Северная Америка"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Аляска"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Гавайи"
 
 msgid "USA"
-msgstr ""
+msgstr "США"
 
 msgid " (except Alaska and Hawaii)"
-msgstr ""
+msgstr " (кроме Аляски и Гавайских о-вов)"
 
 msgid "Midwest"
 msgstr ""
 
 msgid "Michigan"
-msgstr ""
+msgstr "Мичиган"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Охайо"
 
 msgid "Northeast"
-msgstr ""
+msgstr "Северо-восток"
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Массачусетс"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Вермонт"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Тихоокеанское побережье"
 
 msgid "South"
-msgstr ""
+msgstr "Юг"
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Арканзас"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "Округ Колумбия"
 
 msgid "Florida"
-msgstr ""
+msgstr "Флорида"
 
 msgid "Louisiana"
-msgstr ""
+msgstr "Луизиана"
 
 msgid "Maryland"
-msgstr ""
+msgstr "Мэриленд"
 
 msgid "Mississippi"
-msgstr ""
+msgstr "Миссисипи"
 
 msgid "Oklahoma"
-msgstr ""
+msgstr "Оклахома"
 
 msgid "Texas"
-msgstr ""
+msgstr "Техас"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Вирджиния"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "Западная Вирджиния"
 
 msgid "West"
-msgstr ""
+msgstr "Запад"
 
 msgid "Arizona"
-msgstr ""
+msgstr "Аризона"
 
 msgid "California"
-msgstr ""
+msgstr "Калифорния"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Колорадо"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Айдахо"
 
 msgid "Montana"
-msgstr ""
+msgstr "Монтана"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "Нью-Мексико"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Невада"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Орегон"
 
 msgid "Utah"
-msgstr ""
+msgstr "Юта"
 
 msgid "Washington State"
-msgstr ""
+msgstr "штат Вашингтон"
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "Южная и центральная Америка"
 
 msgid "Guyane Francaise"
-msgstr ""
+msgstr "Французская Гвиана"
 
 msgid "downloading"
-msgstr ""
+msgstr "загружаем"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
 msgstr "готово"
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Ошибка загрузки карты!"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
 msgstr "Не достаточно места"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Ошибка записи карты!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Загрузка карты отменена!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
@@ -2474,13 +2474,13 @@
 msgstr ""
 
 msgid "car_shortest"
-msgstr ""
+msgstr "машина (кратчайший путь)"
 
 msgid "car_avoid_tolls"
-msgstr ""
+msgstr "машина (избегать платных дорог)"
 
 msgid "car_pedantic"
-msgstr ""
+msgstr "машина (педантичный)"
 
 msgid "horse"
 msgstr "лошадь"
@@ -2508,7 +2508,7 @@
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
 #.
 msgid "Truck"
-msgstr ""
+msgstr "Грузовик"
 
 #~ msgid "Enter the roundabout soon and leave it at the %s"
 #~ msgstr "Скоро круговое движение, ожидайте съезд на %s"

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:[5613] trunk/navit/navit

From: <mar...@us...> - 2013-08-27 17:24:34

Revision: 5613
          http://sourceforge.net/p/navit/code/5613
Author:   martin-s
Date:     2013-08-27 17:24:28 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Add:Core:Add configurable penalty to turn around

Modified Paths:
--------------
    trunk/navit/navit/attr_def.h
    trunk/navit/navit/route.c
    trunk/navit/navit/vehicleprofile.c
    trunk/navit/navit/vehicleprofile.h

Modified: trunk/navit/navit/attr_def.h
===================================================================
--- trunk/navit/navit/attr_def.h	2013-08-27 07:37:56 UTC (rev 5612)
+++ trunk/navit/navit/attr_def.h	2013-08-27 17:24:28 UTC (rev 5613)
@@ -183,6 +183,7 @@
 ATTR(battery_resistance) /* mOhm */
 ATTR(battery_temperature) /* mK */
 ATTR(turn_around_count)
+ATTR(turn_around_penalty)
 ATTR2(0x00027500,type_rel_abs_begin)
 /* These attributes are int that can either hold relative		*
  * or absolute values. A relative value is indicated by 		*

Modified: trunk/navit/navit/route.c
===================================================================
--- trunk/navit/navit/route.c	2013-08-27 07:37:56 UTC (rev 5612)
+++ trunk/navit/navit/route.c	2013-08-27 17:24:28 UTC (rev 5613)
@@ -268,6 +268,7 @@
 	struct callback *done_cb;			/**< Callback when graph is done */
 	struct event_idle *idle_ev;			/**< The pointer to the idle event */
    	struct route_graph_segment *route_segments; /**< Pointer to the first route_graph_segment in the linked list of all segments */
+	struct route_graph_segment *avoid_seg;
 #define HASH_SIZE 8192
 	struct route_graph_point *hash[HASH_SIZE];	/**< A hashtable containing all route_graph_points in this graph */
 };
@@ -1987,7 +1988,7 @@
 	if (from && from->seg == over)
 		return INT_MAX;
 	if ((over->start->flags & RP_TRAFFIC_DISTORTION) && (over->end->flags & RP_TRAFFIC_DISTORTION) && 
-		route_get_traffic_distortion(over, &dist)) {
+		route_get_traffic_distortion(over, &dist) && dir != 2 && dir != -2) {
 			distp=&dist;
 	}
 	ret=route_time_seg(profile, &over->data, distp);
@@ -1998,6 +1999,45 @@
 	return ret;
 }
 
+static int
+route_graph_segment_match(struct route_graph_segment *s1, struct route_graph_segment *s2)
+{
+	if (!s1 || !s2)
+		return 0;
+	return (s1->start->c.x == s2->start->c.x && s1->start->c.y == s2->start->c.y && 
+		s1->end->c.x == s2->end->c.x && s1->end->c.y == s2->end->c.y);
+}
+
+static void
+route_graph_set_traffic_distortion(struct route_graph *this, struct route_graph_segment *seg, int delay)
+{
+	struct route_graph_point *start=NULL;
+	struct route_graph_segment *s;
+
+	while ((start=route_graph_get_point_next(this, &seg->start->c, start))) {
+		s=start->start;
+		while (s) {
+			if (route_graph_segment_match(s, seg)) {
+				if (s->data.item.type != type_none && s->data.item.type != type_traffic_distortion && delay) {
+					struct route_graph_segment_data data;
+					struct item item;
+					memset(&data, 0, sizeof(data));
+					memset(&item, 0, sizeof(item));
+					item.type=type_traffic_distortion;
+					data.item=&item;
+					data.len=delay;
+					s->start->flags |= RP_TRAFFIC_DISTORTION;
+					s->end->flags |= RP_TRAFFIC_DISTORTION;
+					route_graph_add_segment(this, s->start, s->end, &data);
+				} else if (s->data.item.type == type_traffic_distortion && !delay) {
+					s->data.item.type = type_none;
+				}
+			}
+			s=s->start_next;
+		}
+	}
+}
+
 /**
  * @brief Adds a route distortion item to the route graph
  *
@@ -2428,7 +2468,7 @@
 	struct route_graph_segment *s=NULL,*s1=NULL,*s2=NULL;
 	struct route_graph_point *start;
 	struct route_info *posinfo, *dstinfo;
-	int segs=0;
+	int segs=0,dir;
 	int val1=INT_MAX,val2=INT_MAX;
 	int val,val1_new,val2_new;
 	struct route_path *ret;
@@ -2441,19 +2481,29 @@
 	if (profile->mode == 2 || (profile->mode == 0 && pos->lenextra + dst->lenextra > transform_distance(map_projection(pos->street->item.map), &pos->c, &dst->c)))
 		return route_path_new_offroad(this, pos, dst);
 	while ((s=route_graph_get_segment(this, pos->street, s))) {
-		val=route_value_seg(profile, NULL, s, 1);
+		val=route_value_seg(profile, NULL, s, 2);
 		if (val != INT_MAX && s->end->value != INT_MAX) {
 			val=val*(100-pos->percent)/100;
+			dbg(1,"val1 %d\n",val);
+			if (route_graph_segment_match(s,this->avoid_seg) && pos->street_direction < 0)
+				val+=profile->turn_around_penalty;
+			dbg(1,"val1 %d\n",val);
 			val1_new=s->end->value+val;
+			dbg(1,"val1 +%d=%d\n",s->end->value,val1_new);
 			if (val1_new < val1) {
 				val1=val1_new;
 				s1=s;
 			}
 		}
-		val=route_value_seg(profile, NULL, s, -1);
+		val=route_value_seg(profile, NULL, s, -2);
 		if (val != INT_MAX && s->start->value != INT_MAX) {
 			val=val*pos->percent/100;
+			dbg(1,"val2 %d\n",val);
+			if (route_graph_segment_match(s,this->avoid_seg) && pos->street_direction > 0)
+				val+=profile->turn_around_penalty;
+			dbg(1,"val2 %d\n",val);
 			val2_new=s->start->value+val;
+			dbg(1,"val2 +%d=%d\n",s->start->value,val2_new);
 			if (val2_new < val2) {
 				val2=val2_new;
 				s2=s;
@@ -2471,10 +2521,24 @@
 	if (val1 < val2) {
 		start=s1->start;
 		s=s1;
+		dir=1;
 	} else {
 		start=s2->end;
 		s=s2;
+		dir=-1;
 	}
+	if (pos->street_direction && dir != pos->street_direction && profile->turn_around_penalty) {
+		if (!route_graph_segment_match(this->avoid_seg,s)) {
+			dbg(0,"avoid current segment\n");
+			if (this->avoid_seg)
+				route_graph_set_traffic_distortion(this, this->avoid_seg, 0);
+			this->avoid_seg=s;
+			route_graph_set_traffic_distortion(this, this->avoid_seg, profile->turn_around_penalty);
+			route_graph_reset(this);
+			route_graph_flood(this, dst, profile, NULL);
+			return route_path_new(this, oldpath, pos, dst, profile);
+		}
+	}
 	ret=g_new0(struct route_path, 1);
 	ret->in_use=1;
 	ret->updated=1;

Modified: trunk/navit/navit/vehicleprofile.c
===================================================================
--- trunk/navit/navit/vehicleprofile.c	2013-08-27 07:37:56 UTC (rev 5612)
+++ trunk/navit/navit/vehicleprofile.c	2013-08-27 17:24:28 UTC (rev 5613)
@@ -85,6 +85,9 @@
 	case attr_through_traffic_penalty:
 		this_->through_traffic_penalty=attr->u.num;
 		break;
+	case attr_turn_around_penalty:
+		this_->turn_around_penalty=attr->u.num;
+		break;
 	default:
 		break;
 	}

Modified: trunk/navit/navit/vehicleprofile.h
===================================================================
--- trunk/navit/navit/vehicleprofile.h	2013-08-27 07:37:56 UTC (rev 5612)
+++ trunk/navit/navit/vehicleprofile.h	2013-08-27 17:24:28 UTC (rev 5613)
@@ -41,6 +41,7 @@
 	int through_traffic_penalty;		/**< Penalty when driving on a through traffic limited road */
 	GHashTable *roadprofile_hash;
 	struct attr active_callback;
+	int turn_around_penalty;		/**< Penalty when turning around */
 };
 
 struct vehicleprofile * vehicleprofile_new(struct attr *parent, struct attr **attrs);

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:[5612] trunk/navit

From: <mar...@us...> - 2013-08-27 07:37:59

Revision: 5612
          http://sourceforge.net/p/navit/code/5612
Author:   martin-s
Date:     2013-08-27 07:37:56 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Add:Build:Enable binding_python for cmake builds

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

Added Paths:
-----------
    trunk/navit/navit/binding/python/CMakeLists.txt

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-08-27 06:25:00 UTC (rev 5611)
+++ trunk/navit/CMakeLists.txt	2013-08-27 07:37:56 UTC (rev 5612)
@@ -89,6 +89,7 @@
 add_module(vehicle/maemo "Default" FALSE)
 add_module(binding/win32 "Default" FALSE)
 add_module(binding/dbus "dbus-glib-1 not found" FALSE)
+add_module(binding/python "python libraries not found" FALSE)
 add_module(speech/dbus "dbus-glib-1 not found" FALSE)
 add_module(speech/cmdline "neither system() nor CreateProcess() found" FALSE)
 add_module(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE)
@@ -115,6 +116,7 @@
 find_package(XGettextGlade)
 find_package(PNG)
 find_package(DBusGLib)
+find_package(PythonLibs)
 find_package(OpenSSL)
 find_package(Threads)
 libfind_pkg_check_modules(FONTCONFIG fontconfig)
@@ -334,6 +336,10 @@
    set_with_reason(vehicle/gpsd_dbus "dbus-glib-1 found" TRUE ${DBusGLib_LIBRARIES})
 endif()
 
+if(PYTHONLIBS_FOUND)
+   set_with_reason(binding/python "python libraries [${PYTHONLIBS_VERSION_STRING}] found" TRUE ${PYTHON_LIBRARIES})
+endif()
+
 if (HAVE_LIBSPEECHD)
    set_with_reason(speech/speech_dispatcher "speech_dispatcher lib found" TRUE speechd)
 endif(HAVE_LIBSPEECHD)

Added: trunk/navit/navit/binding/python/CMakeLists.txt
===================================================================
--- trunk/navit/navit/binding/python/CMakeLists.txt	                        (rev 0)
+++ trunk/navit/navit/binding/python/CMakeLists.txt	2013-08-27 07:37:56 UTC (rev 5612)
@@ -0,0 +1,2 @@
+include_directories(${PYTHON_INCLUDE_DIRS})
+module_add_library(binding_python attr.c binding_python.c config.c navigation.c navit.c pcoord.c route.c)

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:[5611] trunk/navit/navit/search.c

From: <mar...@us...> - 2013-08-27 06:25:02

Revision: 5611
          http://sourceforge.net/p/navit/code/5611
Author:   martin-s
Date:     2013-08-27 06:25:00 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Fix:Core:Result items are not unique in interpolated search

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

Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c	2013-08-27 06:22:14 UTC (rev 5610)
+++ trunk/navit/navit/search.c	2013-08-27 06:25:00 UTC (rev 5611)
@@ -813,6 +813,7 @@
 	if (item_attr_get(item, attr_house_number, &attr))
 		ret->house_number=map_convert_string(item->map, attr.u.str);
 	else {
+		memset(&ret->common.unique, 0, sizeof(ret->common.unique));
 		//if (item_attr_get(item, attr_street_name, &attr))
 		//	dbg(0,"xx2 %s\n",attr.u.str);
 		for (;;) {
@@ -999,9 +1000,16 @@
 {
 	struct search_list_common *slo;
 	char *merged;
-	slo=g_hash_table_lookup(le->hash, &slc->unique);
+	int unique=0;
+	if (slc->unique.type || slc->unique.id_hi || slc->unique.id_lo)
+		unique=1;
+	if (unique)
+		slo=g_hash_table_lookup(le->hash, &slc->unique);
+	else
+		slo=NULL;
 	if (!slo) {
-		g_hash_table_insert(le->hash, &slc->unique, slc);
+		if (unique)
+			g_hash_table_insert(le->hash, &slc->unique, slc);
 		if (slc->postal && !slc->postal_mask) {
 			slc->postal_mask=g_strdup(slc->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:[5610] trunk/navit/navit/map/binfile/binfile.c

From: <mar...@us...> - 2013-08-27 06:22:22

Revision: 5610
          http://sourceforge.net/p/navit/code/5610
Author:   martin-s
Date:     2013-08-27 06:22:14 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Fix:map_binfile:Correctly handle streets with house number interpolation

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

Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c	2013-08-26 20:34:35 UTC (rev 5609)
+++ trunk/navit/navit/map/binfile/binfile.c	2013-08-27 06:22:14 UTC (rev 5610)
@@ -2021,6 +2021,7 @@
 	struct map_rect_priv *map_rec;
 	struct map_search_priv *msp=g_new0(struct map_search_priv, 1);
 	struct item *town;
+	int idx;
 	
 	msp->search = *search;
 	msp->partial = partial;
@@ -2084,7 +2085,8 @@
 			msp->map=map;
 			msp->mr_item = map_rect_new_binfile(map, NULL);
 			msp->item = map_rect_get_item_byid_binfile(msp->mr_item, item->id_hi, item->id_lo);
-			if (binmap_search_by_index(map, msp->item, &msp->mr))
+			idx=binmap_search_by_index(map, msp->item, &msp->mr);
+			if (idx)
 				msp->mode = 1;
 			else {
 				struct coord c;
@@ -2099,8 +2101,10 @@
 					dbg(0,"pn=%s\n",msp->parent_name);
 				}
 			}
-			map_rect_destroy_binfile(msp->mr_item);
-			msp->mr_item=NULL;
+			if (idx != 3) {
+				map_rect_destroy_binfile(msp->mr_item);
+				msp->mr_item=NULL;
+			}
 			if (!msp->mr)
 			{
 				break;
@@ -2315,7 +2319,7 @@
 				if (has_house_number || it->type == type_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 == 0 && item_is_street(*it))
+					|| (map_search->mode == 1 && item_is_street(*it))
 				   	)
 				{
 					if (has_house_number)

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:[5609] trunk/navit/navit/maptool/maptool.h

From: <sl...@us...> - 2013-08-26 20:34:39

Revision: 5609
          http://sourceforge.net/p/navit/code/5609
Author:   sleske
Date:     2013-08-26 20:34:35 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Fix:maptool:Use types.h in maptool.

Modified Paths:
--------------
    trunk/navit/navit/maptool/maptool.h

Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h	2013-08-26 20:34:24 UTC (rev 5608)
+++ trunk/navit/navit/maptool/maptool.h	2013-08-26 20:34:35 UTC (rev 5609)
@@ -22,17 +22,11 @@
 #include "item.h"
 #include "attr.h"
 #include "geom.h"
+#include "types.h"
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/md5.h>
 #endif
 
-
-#ifdef HAVE_API_WIN32_BASE
-#define LONGLONG_FMT "%I64d"
-#else
-#define LONGLONG_FMT "%lld"
-#endif
-
 #define sq(x) ((double)(x)*(x))
 
 #define BUFFER_SIZE 1280

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:[5608] trunk/navit/navit/search.c

From: <sl...@us...> - 2013-08-26 20:34:27

Revision: 5608
          http://sourceforge.net/p/navit/code/5608
Author:   sleske
Date:     2013-08-26 20:34:24 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Refactor:core:Add comment about possible memleak in search.

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

Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c	2013-08-26 20:34:11 UTC (rev 5607)
+++ trunk/navit/navit/search.c	2013-08-26 20:34:24 UTC (rev 5608)
@@ -322,6 +322,8 @@
 		tmp=g_list_next(tmp);
 	}	
 	g_list_free(phrases);
+	// TODO: Looks like we should g_free(str) here. But this is
+	// currently dead code, so no way to test it.
 }
 
 static void

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:[5607] trunk/navit/navit/navit_shipped.xml

From: <sl...@us...> - 2013-08-26 20:34:15

Revision: 5607
          http://sourceforge.net/p/navit/code/5607
Author:   sleske
Date:     2013-08-26 20:34:11 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Add:core:Use layer reference (<layer ref="..."/>) in navit.xml.

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

Modified: trunk/navit/navit/navit_shipped.xml
===================================================================
--- trunk/navit/navit/navit_shipped.xml	2013-08-26 19:34:36 UTC (rev 5606)
+++ trunk/navit/navit/navit_shipped.xml	2013-08-26 20:34:11 UTC (rev 5607)
@@ -747,6 +747,12 @@
 			<map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
 		</mapset>
 
+		<layer name="Found items" order="0-">
+			<itemgra item_types="found_item">
+				<circle color="#008080" radius="24" width="2" text_size="12"/>
+			</itemgra>
+		</layer>
+
 		<layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans">
 
 			<cursor w="26" h="26">
@@ -2467,11 +2473,7 @@
 					<circle color="#606060" radius="0" width="0" text_size="10"/>
 				</itemgra>
 			</layer>
-			<layer name="Found items" order="0-">
-				<itemgra item_types="found_item">
-					<circle color="#008080" radius="24" width="2" text_size="12"/>
-				</itemgra>
-			</layer>
+			<layer name="Found items" ref="Found items"/>
 		</layout>
 
 		<layout name="Car-dark" daylayout="Car" color="#011001">
@@ -3909,11 +3911,7 @@
 					<circle color="#606060" background_color="#000000" radius="0" width="0" text_size="10"/>
 				</itemgra>
 			</layer>
-			<layer name="Found items" order="0-">
-				<itemgra item_types="found_item">
-					<circle color="#008080" background_color="#000000" radius="24" width="2" text_size="12"/>
-				</itemgra>
-			</layer>
+			<layer name="Found items" ref="Found items"/>
 		</layout>
 
     <layout name="Car-Android" color="#fef9ee" font="Liberation Sans">
@@ -5295,11 +5293,7 @@
           text_size="10" />
         </itemgra>
       </layer>
-	<layer name="Found items" order="0-">
-		<itemgra item_types="found_item">
-			<circle color="#008080" radius="24" width="2" text_size="12"/>
-		</itemgra>
-	</layer>
+      <layer name="Found items" ref="Found items"/>
     </layout>
 
 		<layout name="Car-simple" color="#839ea9">
@@ -5428,11 +5422,7 @@
 					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
 				</itemgra>
 			</layer>
-			<layer name="Found items" order="0-">
-				<itemgra item_types="found_item">
-					<circle color="#008080" radius="24" width="2" text_size="12"/>
-				</itemgra>
-			</layer>
+			<layer name="Found items" ref="Found items"/>
 		</layout>
 
 		<layout name="Bike" color="#ffefb7" font="Liberation Sans">
@@ -6459,11 +6449,7 @@
 					<circle color="#606060" radius="0" width="0" text_size="10"/>
 				</itemgra>
 			</layer>					
-			<layer name="Found items" order="0-">
-				<itemgra item_types="found_item">
-					<circle color="#008080" radius="24" width="2" text_size="12"/>
-				</itemgra>
-			</layer>
+			<layer name="Found items" ref="Found items"/>
 		</layout>
 
 		<layout name="T@H" font="Liberation Sans">
@@ -7011,11 +6997,7 @@
 					<circle color="#000000" radius="3" text_size="7"/>
 				</itemgra>
 			</layer>
-			<layer name="Found items" order="0-">
-				<itemgra item_types="found_item">
-					<circle color="#008080" radius="24" width="2" text_size="12"/>
-				</itemgra>
-			</layer>
+			<layer name="Found items" ref="Found items"/>
 		</layout>
 		<layout name="Route">
 			<layer name="streets">

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

13 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 19 20 21 22 23 .. 242 > >> (Page 21 of 242)