Menu
▾
▴
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
|
|
From: <ka...@us...> - 2014-08-08 19:41:50
|
Revision: 5831
http://sourceforge.net/p/navit/code/5831
Author: kazer_
Date: 2014-08-08 19:41:37 +0000 (Fri, 08 Aug 2014)
Log Message:
-----------
Update:Core:Massive translation update from launchpad
Modified Paths:
--------------
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/cs.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_GB.po.in
trunk/navit/po/eo.po.in
trunk/navit/po/es.po.in
trunk/navit/po/et.po.in
trunk/navit/po/eu.po.in
trunk/navit/po/fi.po.in
trunk/navit/po/fo.po.in
trunk/navit/po/fr.po.in
trunk/navit/po/fr_CH.po.in
trunk/navit/po/gl.po.in
trunk/navit/po/he.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/lt.po.in
trunk/navit/po/mk.po.in
trunk/navit/po/nb.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/pt.po.in
trunk/navit/po/pt_BR.po.in
trunk/navit/po/ro.po.in
trunk/navit/po/sl.po.in
trunk/navit/po/sr.po.in
trunk/navit/po/sv.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-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/af.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,7 +1,7 @@
-# Afrikaans (af) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Afrikaans translation 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:
# Andre Hugo https://launchpad.net/~cortexhugo
# KaZeR https://launchpad.net/~kazer
# Kobus https://launchpad.net/~kobuswolf
@@ -9,11 +9,12 @@
# Wimpie Hall https://launchpad.net/~gotek
# mdhull https://launchpad.net/~mark-emsafrica
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Afrikaans <af...@li...>\n"
@@ -21,8 +22,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1334,6 +1335,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1710,7 +1715,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1808,6 +1813,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2202,6 +2210,92 @@
msgid "Vehicle Position"
msgstr "Voertuig posisie"
+msgid "Main menu"
+msgstr "Hoofkieslys"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Wys\n"
+"Kaart"
+
+msgid "Settings"
+msgstr "Instellings"
+
+msgid "Tools"
+msgstr "Gereedskap"
+
+msgid "Route"
+msgstr "Roete"
+
+msgid "About"
+msgstr "Rakende"
+
+msgid "Quit"
+msgstr "Verlaat"
+
+msgid "Actions"
+msgstr "Aksies"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Stop\n"
+"Navigasie"
+
+msgid "Display"
+msgstr "Skerm"
+
+msgid "Fullscreen"
+msgstr "Volskerm"
+
+msgid "Window Mode"
+msgstr "Venster Modus"
+
+msgid "Description"
+msgstr "Beskrywing"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "perd"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2388,111 +2482,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Hoofkieslys"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Wys\n"
-"Kaart"
-
-msgid "Settings"
-msgstr "Instellings"
-
-msgid "Tools"
-msgstr "Gereedskap"
-
-msgid "Route"
-msgstr "Roete"
-
-msgid "About"
-msgstr "Rakende"
-
-msgid "Quit"
-msgstr "Verlaat"
-
-msgid "Actions"
-msgstr "Aksies"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Stop\n"
-"Navigasie"
-
-msgid "Display"
-msgstr "Skerm"
-
-msgid "Fullscreen"
-msgstr "Volskerm"
-
-msgid "Window Mode"
-msgstr "Venster Modus"
-
-msgid "Description"
-msgstr "Beskrywing"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "perd"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/ar.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,17 +1,18 @@
-# Arabic (ar) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Arabic translation 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
# Magd Addin M. Almuntaser https://launchpad.net/~ttmtt-team
# drsaudi https://launchpad.net/~mon7b6
# metehyi https://launchpad.net/~metehyi
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-06 20:48+0100\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-11-10 01:24+0000\n"
"Last-Translator: metehyi <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -20,8 +21,8 @@
"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: 2013-11-10 02:26+0000\n"
-"X-Generator: Launchpad (build 16820)\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"
@@ -1349,6 +1350,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1725,8 +1730,8 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
-msgstr "خط الطول خط العرض"
+msgid "Latitude Longitude"
+msgstr ""
msgid "Enter coordinates, for example:"
msgstr "أدخل الإحداثيات، مثلا:"
@@ -2220,6 +2225,92 @@
msgid "Vehicle Position"
msgstr "موقع وسيلة التنقل"
+msgid "Main menu"
+msgstr "اللائحة الرئيسية"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"أعرض\n"
+"الخريطة"
+
+msgid "Settings"
+msgstr "الإعدادات"
+
+msgid "Tools"
+msgstr "العدة"
+
+msgid "Route"
+msgstr "الطريق"
+
+msgid "About"
+msgstr "حوْل"
+
+msgid "Quit"
+msgstr "أخرج"
+
+msgid "Actions"
+msgstr "أفعال"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"الأهداف\n"
+"السابقة"
+
+msgid "Coordinates"
+msgstr "الإحداثيات"
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr "قفّ"
+
+msgid "Display"
+msgstr "المظهار"
+
+msgid "Fullscreen"
+msgstr "ملء الشاشة"
+
+msgid "Window Mode"
+msgstr "نمط النافذة"
+
+msgid "Description"
+msgstr "الوصف"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr "حالة القمر الأصطناعي"
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "خيل/فرس"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2406,111 +2497,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr "استعادة"
-
-msgid "Main menu"
-msgstr "اللائحة الرئيسية"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"أعرض\n"
-"الخريطة"
-
-msgid "Settings"
-msgstr "الإعدادات"
-
-msgid "Tools"
-msgstr "العدة"
-
-msgid "Route"
-msgstr "الطريق"
-
-msgid "About"
-msgstr "حوْل"
-
-msgid "Quit"
-msgstr "أخرج"
-
-msgid "Actions"
-msgstr "أفعال"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"الأهداف\n"
-"السابقة"
-
-msgid "Coordinates"
-msgstr "الإحداثيات"
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr "قفّ"
-
-msgid "Display"
-msgstr "المظهار"
-
-msgid "Fullscreen"
-msgstr "ملء الشاشة"
-
-msgid "Window Mode"
-msgstr "نمط النافذة"
-
-msgid "Description"
-msgstr "الوصف"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr "حالة القمر الأصطناعي"
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "خيل/فرس"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/ast.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,14 +1,15 @@
-# Asturian (ast) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Asturian translation 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"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: Xuacu Saturio <xua...@gm...>\n"
"Language-Team: Asturian <as...@li...>\n"
@@ -16,8 +17,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1329,6 +1330,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1705,7 +1710,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1803,6 +1808,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2197,6 +2205,92 @@
msgid "Vehicle Position"
msgstr "Posición del vehículu"
+msgid "Main menu"
+msgstr "Menú principal"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Ver\n"
+"Mapa"
+
+msgid "Settings"
+msgstr "Axustes"
+
+msgid "Tools"
+msgstr "Ferramientes"
+
+msgid "Route"
+msgstr "Ruta"
+
+msgid "About"
+msgstr "Tocante a"
+
+msgid "Quit"
+msgstr "Colar"
+
+msgid "Actions"
+msgstr "Aiciones"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Parar\n"
+"Navegación"
+
+msgid "Display"
+msgstr "Amosar"
+
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
+msgid "Window Mode"
+msgstr "Mou ventana"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "caballu"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2383,111 +2477,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Menú principal"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Ver\n"
-"Mapa"
-
-msgid "Settings"
-msgstr "Axustes"
-
-msgid "Tools"
-msgstr "Ferramientes"
-
-msgid "Route"
-msgstr "Ruta"
-
-msgid "About"
-msgstr "Tocante a"
-
-msgid "Quit"
-msgstr "Colar"
-
-msgid "Actions"
-msgstr "Aiciones"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Parar\n"
-"Navegación"
-
-msgid "Display"
-msgstr "Amosar"
-
-msgid "Fullscreen"
-msgstr "Pantalla completa"
-
-msgid "Window Mode"
-msgstr "Mou ventana"
-
-msgid "Description"
-msgstr "Descripción"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "caballu"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/bg.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,18 +1,19 @@
-# Bulgarian (bg) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Bulgarian translation 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:
# Alex Stanev https://launchpad.net/~realender
# Alexander Atanasov https://launchpad.net/~aatanasov
# Anton Todorov https://launchpad.net/~antod
# Lyudmil Bonev https://launchpad.net/~bonev-j
# MalamiR https://launchpad.net/~mamut-killer
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: Alex Stanev <al...@st...>\n"
"Language-Team: Bulgarian <bg...@li...>\n"
@@ -20,8 +21,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1334,6 +1335,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1710,7 +1715,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1808,6 +1813,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2202,6 +2210,92 @@
msgid "Vehicle Position"
msgstr "Позиция на автомобил"
+msgid "Main menu"
+msgstr "Главно меню"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Покажи\n"
+"Картата"
+
+msgid "Settings"
+msgstr "Настройки"
+
+msgid "Tools"
+msgstr "Инструменти"
+
+msgid "Route"
+msgstr "Маршрут"
+
+msgid "About"
+msgstr "Относно"
+
+msgid "Quit"
+msgstr "Излез"
+
+msgid "Actions"
+msgstr "Действия"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Спри\n"
+"Навигацията"
+
+msgid "Display"
+msgstr "Показване"
+
+msgid "Fullscreen"
+msgstr "Цял екран"
+
+msgid "Window Mode"
+msgstr "Режим Прозорец"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "кон"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2388,111 +2482,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Главно меню"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Покажи\n"
-"Картата"
-
-msgid "Settings"
-msgstr "Настройки"
-
-msgid "Tools"
-msgstr "Инструменти"
-
-msgid "Route"
-msgstr "Маршрут"
-
-msgid "About"
-msgstr "Относно"
-
-msgid "Quit"
-msgstr "Излез"
-
-msgid "Actions"
-msgstr "Действия"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Спри\n"
-"Навигацията"
-
-msgid "Display"
-msgstr "Показване"
-
-msgid "Fullscreen"
-msgstr "Цял екран"
-
-msgid "Window Mode"
-msgstr "Режим Прозорец"
-
-msgid "Description"
-msgstr "Описание"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "кон"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/ca.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,11 +1,12 @@
-# Catalan (ca) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Catalan translation 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:
# Ferran Roig https://launchpad.net/~ferro9
# Frans https://launchpad.net/~francesc-galbany
# KaZeR https://launchpad.net/~kazer
# Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo
+# Sergi Gomis https://launchpad.net/~paloky3
# Xevib https://launchpad.net/~xbarnada
# beamspot https://launchpad.net/~benrouravkg
# jmontane https://launchpad.net/~jmontane
@@ -13,20 +14,21 @@
# kualsevol https://launchpad.net/~ojuanv
# per...@gm... https://launchpad.net/~peremayol
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-28 11:16+0100\n"
-"PO-Revision-Date: 2014-01-07 12:07+0000\n"
-"Last-Translator: Ferran Roig <Unknown>\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"PO-Revision-Date: 2014-07-09 18:11+0000\n"
+"Last-Translator: Sergi Gomis <pa...@gm...>\n"
"Language-Team: Catalan <ca...@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-01-07 17:41+0000\n"
-"X-Generator: Launchpad (build 16877)\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"
@@ -294,7 +296,7 @@
msgstr ""
msgid "Visit before..."
-msgstr ""
+msgstr "Visitar abans..."
msgid "Set as position"
msgstr "Estableix com a posició"
@@ -1328,7 +1330,7 @@
#. 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 s'ha trobat l'arxiu de configuració navit.xml, navit.xml.local\n"
#, c-format
msgid "Error parsing config file '%s': %s\n"
@@ -1336,6 +1338,10 @@
#, c-format
msgid "Using config file '%s'\n"
+msgstr "Usant l'arxiu de configuració '%s'\n"
+
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
msgstr ""
msgid ""
@@ -1714,7 +1720,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -2209,6 +2215,92 @@
msgid "Vehicle Position"
msgstr "Posició del vehicle"
+msgid "Main menu"
+msgstr "Menú principal"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Mostra\n"
+"Mapa"
+
+msgid "Settings"
+msgstr "Configuració"
+
+msgid "Tools"
+msgstr "Eines"
+
+msgid "Route"
+msgstr "Ruta"
+
+msgid "About"
+msgstr "Quant a..."
+
+msgid "Quit"
+msgstr "Surt"
+
+msgid "Actions"
+msgstr "Accions"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Atura la\n"
+"Navegació"
+
+msgid "Display"
+msgstr "Pantalla"
+
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
+msgid "Window Mode"
+msgstr "Mode de la finestra"
+
+msgid "Description"
+msgstr "Descripció"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "cavall"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2395,111 +2487,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Menú principal"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Mostra\n"
-"Mapa"
-
-msgid "Settings"
-msgstr "Configuració"
-
-msgid "Tools"
-msgstr "Eines"
-
-msgid "Route"
-msgstr "Ruta"
-
-msgid "About"
-msgstr "Quant a..."
-
-msgid "Quit"
-msgstr "Surt"
-
-msgid "Actions"
-msgstr "Accions"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Atura la\n"
-"Navegació"
-
-msgid "Display"
-msgstr "Pantalla"
-
-msgid "Fullscreen"
-msgstr "Pantalla completa"
-
-msgid "Window Mode"
-msgstr "Mode de la finestra"
-
-msgid "Description"
-msgstr "Descripció"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "cavall"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/cs.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,7 +1,7 @@
-# Czech (cs) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# translation of navit_cs.po to Čeština
+# 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:
# 72ka https://launchpad.net/~2hp
# Aleš Janda https://launchpad.net/~kyblicek
# Ivan Kološ https://launchpad.net/~ivan-kolos
@@ -12,15 +12,15 @@
# Vaclav Cerny https://launchpad.net/~vatoz
# Vladimír Burian https://launchpad.net/~vburian
# Vojtěch Látal https://launchpad.net/~vojtik
-# lenochod https://launchpad.net/~lenochod
# stritek https://launchpad.net/~stritek
# talmik https://launchpad.net/~mikatom
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-10 01:22+0000\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-12-09 13:46+0000\n"
"Last-Translator: MMlosh <Unknown>\n"
"Language-Team: Čeština\n"
@@ -28,8 +28,8 @@
"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: 2013-12-10 01:41+0000\n"
-"X-Generator: Launchpad (build 16869)\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"
@@ -1353,6 +1353,10 @@
msgid "Using config file '%s'\n"
msgstr "Používáte konfigurační soubor '% s'\n"
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1731,8 +1735,8 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
-msgstr "Zeměpisná délka Zeměpisná šířka"
+msgid "Latitude Longitude"
+msgstr ""
msgid "Enter coordinates, for example:"
msgstr "Zadejte souřadnice, například:"
@@ -2226,6 +2230,98 @@
msgid "Vehicle Position"
msgstr "Poloha vozidla"
+msgid "Main menu"
+msgstr "Hlavní menu"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Ukázat\n"
+"mapu"
+
+msgid "Settings"
+msgstr "Nastavení"
+
+msgid "Tools"
+msgstr "Nástroje"
+
+msgid "Route"
+msgstr "Trasa"
+
+msgid "About"
+msgstr "O programu"
+
+msgid "Quit"
+msgstr "Konec"
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Minulé\n"
+"cíle"
+
+msgid "Coordinates"
+msgstr "Souřadnice"
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Ukonči\n"
+"Navigaci"
+
+msgid "Display"
+msgstr "Zobrazit"
+
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
+msgid "Window Mode"
+msgstr "V okně"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid ""
+"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 "Stav satelitu"
+
+msgid "NMEA Data"
+msgstr "NMEA Data"
+
+msgid "car_shortest"
+msgstr "auto nejkratší"
+
+msgid "car_avoid_tolls"
+msgstr "auto bez mýtného"
+
+msgid "car_pedantic"
+msgstr "auto puntičkářské"
+
+msgid "horse"
+msgstr "kůň"
+
+msgid "Truck"
+msgstr "kamión"
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2423,117 +2519,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr "Obnova"
-
-msgid "Main menu"
-msgstr "Hlavní menu"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Ukázat\n"
-"mapu"
-
-msgid "Settings"
-msgstr "Nastavení"
-
-msgid "Tools"
-msgstr "Nástroje"
-
-msgid "Route"
-msgstr "Trasa"
-
-msgid "About"
-msgstr "O programu"
-
-msgid "Quit"
-msgstr "Konec"
-
-msgid "Actions"
-msgstr "Akce"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Minulé\n"
-"cíle"
-
-msgid "Coordinates"
-msgstr "Souřadnice"
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Ukonči\n"
-"Navigaci"
-
-msgid "Display"
-msgstr "Zobrazit"
-
-msgid "Fullscreen"
-msgstr "Celá obrazovka"
-
-msgid "Window Mode"
-msgstr "V okně"
-
-msgid "Description"
-msgstr "Popis"
-
-msgid ""
-"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 "Stav satelitu"
-
-msgid "NMEA Data"
-msgstr "NMEA Data"
-
-msgid "car_shortest"
-msgstr "auto nejkratší"
-
-msgid "car_avoid_tolls"
-msgstr "auto bez mýtného"
-
-msgid "car_pedantic"
-msgstr "auto puntičkářské"
-
-msgid "horse"
-msgstr "kůň"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr "kamión"
Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/da.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,10 +1,9 @@
-# Danish (da) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Danish translation 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:
# Fennek https://launchpad.net/~ng-fennek
# Glenn https://launchpad.net/~glenn-mh-dk
-# Glenn Sommer https://launchpad.net/~glemsom
# Jørgen Elgaard Larsen https://launchpad.net/~jel-elgaard
# Kennet https://launchpad.net/~kharpsoe
# Lasse Luttermann https://launchpad.net/~lasse-luttermann
@@ -13,11 +12,12 @@
# Tomas Groth https://launchpad.net/~tomasgroth
# Uffe Kjems https://launchpad.net/~uffekjems
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:40+0000\n"
"Last-Translator: Lasse Luttermann <lut...@si...>\n"
"Language-Team: Glenn Sommer <gl...@gm...>\n"
@@ -25,8 +25,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1338,6 +1338,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1714,7 +1718,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1812,6 +1816,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2206,6 +2213,92 @@
msgid "Vehicle Position"
msgstr "Køretøjsposition"
+msgid "Main menu"
+msgstr "Hovedmenu"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Vis\n"
+"Kort"
+
+msgid "Settings"
+msgstr "Indstillinger"
+
+msgid "Tools"
+msgstr "Værktøj"
+
+msgid "Route"
+msgstr "Rute"
+
+msgid "About"
+msgstr "Om"
+
+msgid "Quit"
+msgstr "Luk"
+
+msgid "Actions"
+msgstr "Funktioner"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Stop\n"
+"Navigation"
+
+msgid "Display"
+msgstr "Vis"
+
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+msgid "Window Mode"
+msgstr "Vinduestilstand"
+
+msgid "Description"
+msgstr "Beskrivelse"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "hest"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2392,111 +2485,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Hovedmenu"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Vis\n"
-"Kort"
-
-msgid "Settings"
-msgstr "Indstillinger"
-
-msgid "Tools"
-msgstr "Værktøj"
-
-msgid "Route"
-msgstr "Rute"
-
-msgid "About"
-msgstr "Om"
-
-msgid "Quit"
-msgstr "Luk"
-
-msgid "Actions"
-msgstr "Funktioner"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Stop\n"
-"Navigation"
-
-msgid "Display"
-msgstr "Vis"
-
-msgid "Fullscreen"
-msgstr "Fuldskærm"
-
-msgid "Window Mode"
-msgstr "Vinduestilstand"
-
-msgid "Description"
-msgstr "Beskrivelse"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "hest"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/de.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,7 +1,7 @@
-# German (de) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# German 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:
# Achim Behrens https://launchpad.net/~k1l
# Bernhard Reiter https://launchpad.net/~ockham-razor
# Christian Moll https://launchpad.net/~christian-chrmoll
@@ -17,7 +17,6 @@
# Lars Hennig https://launchpad.net/~elhennig
# Lukas Bögelein https://launchpad.net/~lukas-boegelein
# MUrks https://launchpad.net/~tabstop
-# Martin Schaller https://launchpad.net/~martin-s-sourceforge
# Roadrunner IN https://launchpad.net/~online
# Roschkor https://launchpad.net/~bound-one2000
# S.E. https://launchpad.net/~stephan-evert
@@ -33,11 +32,12 @@
# 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: 2013-12-11 23:50+0100\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"
"Language-Team: Martin Schaller <mar...@so...>\n"
@@ -45,8 +45,8 @@
"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: 2013-12-24 22:21+0000\n"
-"X-Generator: Launchpad (build 16877)\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"
@@ -1369,6 +1369,10 @@
msgid "Using config file '%s'\n"
msgstr "Benutze Konfigurations-Datei '%s'\n"
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1749,8 +1753,8 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
-msgstr "Längengrad Breitengrad"
+msgid "Latitude Longitude"
+msgstr ""
msgid "Enter coordinates, for example:"
msgstr "Koordinaten eingeben, z.B.:"
@@ -2244,6 +2248,98 @@
msgid "Vehicle Position"
msgstr "Fahrzeugposition"
+msgid "Main menu"
+msgstr "Hauptmenü"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Karte\n"
+"anzeigen"
+
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgid "Tools"
+msgstr "Werkzeuge"
+
+msgid "Route"
+msgstr "Route"
+
+msgid "About"
+msgstr "Über"
+
+msgid "Quit"
+msgstr "Beenden"
+
+msgid "Actions"
+msgstr "Aktionen"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Vorherige\n"
+"Ziele"
+
+msgid "Coordinates"
+msgstr "Koordinaten"
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Navigation\n"
+"beenden"
+
+msgid "Display"
+msgstr "Darstellung"
+
+msgid "Fullscreen"
+msgstr "Vollbildmodus"
+
+msgid "Window Mode"
+msgstr "Fenstermodus"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+"Letzten Wegpunkt\n"
+"entfernen"
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+"Nächsten Wegpunkt\n"
+"entfernen"
+
+msgid "Satellite Status"
+msgstr "Satellitenstatus"
+
+msgid "NMEA Data"
+msgstr "NMEA Daten"
+
+msgid "car_shortest"
+msgstr "Auto kürzeste"
+
+msgid "car_avoid_tolls"
+msgstr "Auto ohne Maut"
+
+msgid "car_pedantic"
+msgstr "Auto genau"
+
+msgid "horse"
+msgstr "Pferd"
+
+msgid "Truck"
+msgstr "LKW"
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2441,117 +2537,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr "Wiederherstellen"
-
-msgid "Main menu"
-msgstr "Hauptmenü"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Karte\n"
-"anzeigen"
-
-msgid "Settings"
-msgstr "Einstellungen"
-
-msgid "Tools"
-msgstr "Werkzeuge"
-
-msgid "Route"
-msgstr "Route"
-
-msgid "About"
-msgstr "Über"
-
-msgid "Quit"
-msgstr "Beenden"
-
-msgid "Actions"
-msgstr "Aktionen"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Vorherige\n"
-"Ziele"
-
-msgid "Coordinates"
-msgstr "Koordinaten"
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Navigation\n"
-"beenden"
-
-msgid "Display"
-msgstr "Darstellung"
-
-msgid "Fullscreen"
-msgstr "Vollbildmodus"
-
-msgid "Window Mode"
-msgstr "Fenstermodus"
-
-msgid "Description"
-msgstr "Beschreibung"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-"Letzten Wegpunkt\n"
-"entfernen"
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-"Nächsten Wegpunkt\n"
-"entfernen"
-
-msgid "Satellite Status"
-msgstr "Satellitenstatus"
-
-msgid "NMEA Data"
-msgstr "NMEA Daten"
-
-msgid "car_shortest"
-msgstr "Auto kürzeste"
-
-msgid "car_avoid_tolls"
-msgstr "Auto ohne Maut"
-
-msgid "car_pedantic"
-msgstr "Auto genau"
-
-msgid "horse"
-msgstr "Pferd"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr "LKW"
Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/de_CH.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,13 +1,14 @@
-# German (Switzerland) (de_CH) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# German (Switzerland) translation 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"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2010-05-18 08:49+0000\n"
"Last-Translator: \n"
"Language-Team: German (Switzerland) <de...@li...>\n"
@@ -15,8 +16,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1329,6 +1330,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1705,7 +1710,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1803,6 +1808,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2197,6 +2205,88 @@
msgid "Vehicle Position"
msgstr ""
+msgid "Main menu"
+msgstr ""
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+msgid "Route"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+msgid "Quit"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
+msgid "Window Mode"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr ""
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2383,107 +2473,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr ""
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-
-msgid "Settings"
-msgstr ""
-
-msgid "Tools"
-msgstr ""
-
-msgid "Route"
-msgstr ""
-
-msgid "About"
-msgstr ""
-
-msgid "Quit"
-msgstr ""
-
-msgid "Actions"
-msgstr ""
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-
-msgid "Display"
-msgstr ""
-
-msgid "Fullscreen"
-msgstr ""
-
-msgid "Window Mode"
-msgstr ""
-
-msgid "Description"
-msgstr ""
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr ""
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/el.po.in
===================================================================
--- trunk/navit/po/el.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/el.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,7 +1,7 @@
-# Greek (el) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# Greek translation 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
# Roadrunner IN https://launchpad.net/~online
# aitolos https://launchpad.net/~yang-hellug
@@ -9,11 +9,12 @@
# okiroi https://launchpad.net/~g-theodoroy
# vassilis https://launchpad.net/~kagemarou
+
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:41+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Greek <el...@li...>\n"
@@ -21,8 +22,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1334,6 +1335,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1710,7 +1715,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1808,6 +1813,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2202,6 +2210,90 @@
msgid "Vehicle Position"
msgstr "Θέση Οχήματος"
+msgid "Main menu"
+msgstr "Κύριο Μενού"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Εμφάνιση\n"
+"Χάρτη"
+
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+msgid "Tools"
+msgstr "Εργαλεία"
+
+msgid "Route"
+msgstr "Διαδρομή"
+
+msgid "About"
+msgstr "Περί"
+
+msgid "Quit"
+msgstr "Έξοδος"
+
+msgid "Actions"
+msgstr "Ενέργειες"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr "Διακοπή"
+
+msgid "Display"
+msgstr "Προβολή"
+
+msgid "Fullscreen"
+msgstr "Πλήρης Οθόνη"
+
+msgid "Window Mode"
+msgstr "Λειτουργία παραθύρων"
+
+msgid "Description"
+msgstr "Περιγραφή"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "άλογο"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2388,109 +2480,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Κύριο Μενού"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Εμφάνιση\n"
-"Χάρτη"
-
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-msgid "Tools"
-msgstr "Εργαλεία"
-
-msgid "Route"
-msgstr "Διαδρομή"
-
-msgid "About"
-msgstr "Περί"
-
-msgid "Quit"
-msgstr "Έξοδος"
-
-msgid "Actions"
-msgstr "Ενέργειες"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr "Διακοπή"
-
-msgid "Display"
-msgstr "Προβολή"
-
-msgid "Fullscreen"
-msgstr "Πλήρης Οθόνη"
-
-msgid "Window Mode"
-msgstr "Λειτουργία παραθύρων"
-
-msgid "Description"
-msgstr "Περιγραφή"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "άλογο"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3048 m)
-#. (data has to be in [cm] and [kg] according to 'atkaction.h')
-#. vehicle_width= 9 feet, 274 cm
-#. vehicle_height= 13.5 feet, 411 cm
-#. vehicle_length= 70 feet, 2134 cm
-#. vehicle_weight= 80000 lbs, 36287 kg
-#. vehicle_axle_weight= 34000 lbs, 15422 kg
-#.
-msgid "Truck"
-msgstr ""
Modified: trunk/navit/po/en_AU.po.in
===================================================================
--- trunk/navit/po/en_AU.po.in 2014-08-05 21:31:51 UTC (rev 5830)
+++ trunk/navit/po/en_AU.po.in 2014-08-08 19:41:37 UTC (rev 5831)
@@ -1,15 +1,16 @@
-# English (Australia) (en_AU) translations for navit
-# Copyright (C) 2006-2013 The Navit Team
+# English (Australia) translation 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"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 21:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:04-0700\n"
"PO-Revision-Date: 2013-09-28 01:41+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: English (Australia) <en...@li...>\n"
@@ -17,8 +18,8 @@
"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: 2013-10-26 21:48+0000\n"
-"X-Generator: Launchpad (build 16810)\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"
@@ -1330,6 +1331,10 @@
msgid "Using config file '%s'\n"
msgstr ""
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
msgstr ""
@@ -1706,7 +1711,7 @@
#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
-msgid "Longitude Latitude"
+msgid "Latitude Longitude"
msgstr ""
msgid "Enter coordinates, for example:"
@@ -1804,6 +1809,9 @@
msgid "Downloaded maps"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2198,6 +2206,92 @@
msgid "Vehicle Position"
msgstr "Vehicle Position"
+msgid "Main menu"
+msgstr "Main menu"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Show\n"
+"Map"
+
+msgid "Settings"
+msgstr "Settings"
+
+msgid "Tools"
+msgstr "Tools"
+
+msgid "Route"
+msgstr "Route"
+
+msgid "About"
+msgstr "About"
+
+msgid "Quit"
+msgstr "Quit"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Stop\n"
+"Navigation"
+
+msgid "Display"
+msgstr "Display"
+
+msgid "Fullscreen"
+msgstr "FullScreen"
+
+msgid "Window Mode"
+msgstr "Window Mode"
+
+msgid "Description"
+msgstr "Description"
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr "horse"
+
+msgid "Truck"
+msgstr ""
+
#. Strings from android/res/values/strings.xml
#. Android resource: @strings/yes
msgid "Yes"
@@ -2384,111 +2478,3 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
-
-msgid "Main menu"
-msgstr "Main menu"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Show\n"
-"Map"
-
-msgid "Settings"
-msgstr "Settings"
-
-msgid "Tools"
-msgstr "Tools"
-
-msgid "Route"
-msgstr "Route"
-
-msgid "About"
-msgstr "About"
-
-msgid "Quit"
-msgstr "Quit"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-
-msgid "Coordinates"
-msgstr ""
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Stop\n"
-"Navigation"
-
-msgid "Display"
-msgstr "Display"
-
-msgid "Fullscreen"
-msgstr "FullScreen"
-
-msgid "Window Mode"
-msgstr "Window Mode"
-
-msgid "Description"
-msgstr "Description"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-
-msgid "Satellite Status"
-msgstr ""
-
-msgid "NMEA Data"
-msgstr ""
-
-msgid "car_shortest"
-msgstr ""
-
-msgid "car_avoid_tolls"
-msgstr ""
-
-msgid "car_pedantic"
-msgstr ""
-
-msgid "horse"
-msgstr "horse"
-
-#. chr:
-#. flags used for a truck: (first flag number is 0)
-#. 8: SIZE_OR_WEIGHT_LIMIT
-#. 21: TRANSPORT_TRUCK
-#. speed setup:
-#. 'speed' data of the atkaction for a car is
-#. reduced about 10 km/h. When the speed was at
-#. 10 km/h, I reduced it to 5 km/h.
-#. 'route_weight' data has been treated in the same way.
-#. If you want to discourage the use of small roads,
-#. just reduce this value.
-#. size and weight setup:
-#. This is an example, you have to use the data of your truck.
-#. bobshaffer's standard truck:
-#. (1 lb = 453.59237 g, 1 foot = .3...
[truncated message content] |
|
From: <ka...@us...> - 2014-08-05 21:31:59
|
Revision: 5830
http://sourceforge.net/p/navit/code/5830
Author: kazer_
Date: 2014-08-05 21:31:51 +0000 (Tue, 05 Aug 2014)
Log Message:
-----------
Add:maptool:Added 11 new poi types (religion related)
Modified Paths:
--------------
trunk/navit/navit/item_def.h
Modified: trunk/navit/navit/item_def.h
===================================================================
--- trunk/navit/navit/item_def.h 2014-08-02 20:42:11 UTC (rev 5829)
+++ trunk/navit/navit/item_def.h 2014-08-05 21:31:51 UTC (rev 5830)
@@ -338,6 +338,17 @@
ITEM(bookmark_folder)
ITEM(poi_pub)
ITEM(poi_atm)
+ITEM(poi_taoist)
+ITEM(poi_sikh)
+ITEM(poi_shinto)
+ITEM(poi_pastafarian)
+ITEM(poi_pagan)
+ITEM(poi_jewish)
+ITEM(poi_jain)
+ITEM(poi_islamic)
+ITEM(poi_hindu)
+ITEM(poi_buddhist)
+ITEM(poi_bahai)
ITEM(found_item)
ITEM2(0x7ffffff0,poi_custom0)
ITEM(poi_custom1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2014-08-02 20:42:21
|
Revision: 5829
http://sourceforge.net/p/navit/code/5829
Author: mdankov
Date: 2014-08-02 20:42:11 +0000 (Sat, 02 Aug 2014)
Log Message:
-----------
Fix:gui/internal:Properly handle backspace button on multibyte input, were leading to crashes on some android devices.
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal.c
Modified: trunk/navit/navit/gui/internal/gui_internal.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal.c 2014-08-02 09:11:57 UTC (rev 5828)
+++ trunk/navit/navit/gui/internal/gui_internal.c 2014-08-02 20:42:11 UTC (rev 5829)
@@ -1624,8 +1624,8 @@
dbg(1,"backspace\n");
if (wi->text && wi->text[0]) {
len=g_utf8_prev_char(wi->text+strlen(wi->text))-wi->text;
- wi->text[len]=' ';
- text=g_strdup_printf("%s ", wi->text);
+ wi->text[len]='\0';
+ text=g_strdup(wi->text);
}
} else {
if (wi->state & STATE_CLEAR) {
@@ -1639,10 +1639,6 @@
}
g_free(wi->text);
wi->text=text;
- if (*key == NAVIT_KEY_BACKSPACE && wi->text) {
- gui_internal_widget_render(this, wi);
- wi->text[len]='\0';
- }
if (wi->func) {
wi->reason=gui_internal_reason_keypress;
wi->func(this, wi, wi->data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2014-08-02 09:12:07
|
Revision: 5828
http://sourceforge.net/p/navit/code/5828
Author: mdankov
Date: 2014-08-02 09:11:57 +0000 (Sat, 02 Aug 2014)
Log Message:
-----------
Fix:port_win32:Do not duplicate first character of xi:include'd filename if there are no path characters in href.
Modified Paths:
--------------
trunk/navit/navit/support/wordexp/glob.c
Modified: trunk/navit/navit/support/wordexp/glob.c
===================================================================
--- trunk/navit/navit/support/wordexp/glob.c 2014-07-25 07:10:51 UTC (rev 5827)
+++ trunk/navit/navit/support/wordexp/glob.c 2014-08-02 09:11:57 UTC (rev 5828)
@@ -62,9 +62,8 @@
return 1;
}
/* store the path information */
- if (NULL == (pathend = max (strrchr (pattern, '\\'), strrchr (pattern, '/'))))
- pathend = (char *) pattern;
- pathlen = pathend - pattern + 1;
+ pathend = max (strrchr (pattern, '\\'), strrchr (pattern, '/'));
+ pathlen = pathend ? (pathend - pattern + 1) : 0;
/* glob */
pglob->gl_pathc = 0; /* number of founded files */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-25 07:10:54
|
Revision: 5827
http://sourceforge.net/p/navit/code/5827
Author: sleske
Date: 2014-07-25 07:10:51 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Fix:build:No --output for ksvgtopng cmd line.|Fixes #1221, thanks tobe deprez.
Modified Paths:
--------------
trunk/navit/navit/xpm/CMakeLists.txt
Modified: trunk/navit/navit/xpm/CMakeLists.txt
===================================================================
--- trunk/navit/navit/xpm/CMakeLists.txt 2014-07-25 07:10:27 UTC (rev 5826)
+++ trunk/navit/navit/xpm/CMakeLists.txt 2014-07-25 07:10:51 UTC (rev 5827)
@@ -22,7 +22,7 @@
file(STRINGS ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"")
string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
endif()
- set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} --output ${IMAGE_OUTPUT})
+ set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAGE_OUTPUT})
elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape")
if (${SCALE} GREATER 0)
set(SCALE_ARGS --export-width=${SCALE} --export-height=${SCALE})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-25 07:10:39
|
Revision: 5826
http://sourceforge.net/p/navit/code/5826
Author: sleske
Date: 2014-07-25 07:10:27 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Refactor:maptool:Remove unused code.
Modified Paths:
--------------
trunk/navit/navit/maptool/itembin.c
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/itembin.c
===================================================================
--- trunk/navit/navit/maptool/itembin.c 2014-07-25 07:10:09 UTC (rev 5825)
+++ trunk/navit/navit/maptool/itembin.c 2014-07-25 07:10:27 UTC (rev 5826)
@@ -283,18 +283,6 @@
}
void
-item_bin_write_range(struct item_bin *ib, FILE *out, int min, int max)
-{
- struct range r;
-
- r.min=min;
- r.max=max;
- fwrite(&r, sizeof(r), 1, out);
- item_bin_write(ib, out);
-}
-
-
-void
item_bin_write_clipped(struct item_bin *ib, struct tile_parameter *param, struct item_bin_sink *out)
{
struct tile_data tile_data;
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-25 07:10:09 UTC (rev 5825)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-25 07:10:27 UTC (rev 5826)
@@ -220,7 +220,6 @@
void item_bin_remove_attr(struct item_bin *ib, void *ptr);
void item_bin_write(struct item_bin *ib, FILE *out);
struct item_bin *item_bin_dup(struct item_bin *ib);
-void item_bin_write_range(struct item_bin *ib, FILE *out, int min, int max);
void item_bin_write_clipped(struct item_bin *ib, struct tile_parameter *param, struct item_bin_sink *out);
void item_bin_dump(struct item_bin *ib, FILE *out);
void dump_itembin(struct item_bin *ib);
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-25 07:10:09 UTC (rev 5825)
+++ trunk/navit/navit/maptool/osm.c 2014-07-25 07:10:27 UTC (rev 5826)
@@ -1537,7 +1537,6 @@
char relation_type[BUFFER_SIZE];
char iso_code[BUFFER_SIZE];
-int admin_level;
int boundary;
void
@@ -1548,7 +1547,6 @@
debug_attr_buffer[0]='\0';
relation_type[0]='\0';
iso_code[0]='\0';
- admin_level=-1;
boundary=0;
item_bin_init(tmp_item_bin, type_none);
item_bin_add_attr_longlong(tmp_item_bin, attr_osm_relationid, osmid_attr_value);
@@ -1605,16 +1603,6 @@
type=type_none;
if ((!strcmp(relation_type, "multipolygon") || !strcmp(relation_type, "boundary")) && (boundary || type!=type_none)) {
-#if 0
- if (admin_level == 2) {
- FILE *f;
- fprintf(stderr,"Multipolygon for %s\n", iso_code);
- char *name=g_strdup_printf("country_%s.tmp",iso_code);
- f=fopen(name,"w");
- item_bin_write(tmp_item_bin, f);
- fclose(f);
- }
-#endif
item_bin_write(tmp_item_bin, osm->boundaries);
}
@@ -1661,8 +1649,6 @@
tmp_item_bin->type=type_none;
osm_warning("relation", osmid_attr_value, 0, "Unknown restriction %s\n",v);
}
- } else if (!strcmp(k,"admin_level")) {
- admin_level=atoi(v);
} else if (!strcmp(k,"boundary")) {
if (!strcmp(v,"administrative") || !strcmp(v,"postal_code")) {
boundary=1;
@@ -1950,11 +1936,11 @@
l=matches;
while (l) {
struct boundary *b=l->data;
- char *admin_level=osm_tag_value(b->ib, "admin_level");
+ char *boundary_admin_level_string=osm_tag_value(b->ib, "admin_level");
char *postal=osm_tag_value(b->ib, "postal_code");
- if (admin_level) {
+ if (boundary_admin_level_string) {
char *name;
- a=atoi(admin_level);
+ a=atoi(boundary_admin_level_string);
if (a > 2 && a < end) {
enum attr_type attr_type=attr_none;
switch(match->country->admin_levels[a-3]) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-25 07:10:15
|
Revision: 5825
http://sourceforge.net/p/navit/code/5825
Author: sleske
Date: 2014-07-25 07:10:09 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Refactor:maptool:Remove unused password function (from r4410).
Revision Links:
--------------
http://sourceforge.net/p/navit/code/4410
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/zip.c
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-25 07:09:49 UTC (rev 5824)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-25 07:10:09 UTC (rev 5825)
@@ -416,7 +416,6 @@
int zip_get_maxnamelen(struct zip_info *info);
int zip_add_member(struct zip_info *info);
int zip_set_timestamp(struct zip_info *info, char *timestamp);
-int zip_set_password(struct zip_info *info, char *password);
void zip_open(struct zip_info *info, char *out, char *dir, char *index);
FILE *zip_get_index(struct zip_info *info);
int zip_get_zipnum(struct zip_info *info);
Modified: trunk/navit/navit/maptool/zip.c
===================================================================
--- trunk/navit/navit/maptool/zip.c 2014-07-25 07:09:49 UTC (rev 5824)
+++ trunk/navit/navit/maptool/zip.c 2014-07-25 07:10:09 UTC (rev 5825)
@@ -428,14 +428,6 @@
return 0;
}
-int
-zip_set_password(struct zip_info *info, char *passwd)
-{
- info->passwd=passwd;
- return 1;
-}
-
-
void
zip_open(struct zip_info *info, char *out, char *dir, char *index)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-25 07:09:56
|
Revision: 5824
http://sourceforge.net/p/navit/code/5824
Author: sleske
Date: 2014-07-25 07:09:49 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Fix:core:Do not crash if config file contains no Navit config.
Modified Paths:
--------------
trunk/navit/navit/start_real.c
Modified: trunk/navit/navit/start_real.c
===================================================================
--- trunk/navit/navit/start_real.c 2014-07-25 07:09:28 UTC (rev 5823)
+++ trunk/navit/navit/start_real.c 2014-07-25 07:09:49 UTC (rev 5824)
@@ -203,12 +203,15 @@
} else {
dbg(0, _("Using config file '%s'\n"), config_file);
}
+ if (! config) {
+ dbg(0, _("Error: No configuration found in config file '%s'\n"), config_file);
+ }
while (li) {
g_free(li->data);
li = g_list_next(li);
}
g_list_free(list);
- if (! config_get_attr(config, attr_navit, &navit, NULL) && !config_empty_ok) {
+ if (! (config && config_get_attr(config, attr_navit, &navit, NULL))) {
dbg(0, "%s", _("Internal initialization failed, exiting. Check previous error messages.\n"));
exit(5);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-25 07:09:38
|
Revision: 5823
http://sourceforge.net/p/navit/code/5823
Author: sleske
Date: 2014-07-25 07:09:28 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Refactor:maptool:Doxygen comments.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.h
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-20 11:53:08 UTC (rev 5822)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-25 07:09:28 UTC (rev 5823)
@@ -91,8 +91,17 @@
int clen;
};
+/**
+ * An attribute for an item_bin as it is stored in a Navit binfile.
+ * Note that this struct only has fields for the header of the attribute.
+ * The attribute value is stored in memory after this struct. The type of the value
+ * (string, number, ...) depends on the attribute type.
+ * @see struct item_bin
+ */
struct attr_bin {
+ /** Length of this attribute (not including this length field) in 32-bit ints. */
int len;
+ /** Attribute type. */
enum attr_type type;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-20 11:53:11
|
Revision: 5822
http://sourceforge.net/p/navit/code/5822
Author: sleske
Date: 2014-07-20 11:53:08 +0000 (Sun, 20 Jul 2014)
Log Message:
-----------
Refactor:core:Mark unused attribute types.
Modified Paths:
--------------
trunk/navit/navit/attr.c
trunk/navit/navit/attr.h
trunk/navit/navit/attr_def.h
Modified: trunk/navit/navit/attr.c
===================================================================
--- trunk/navit/navit/attr.c 2014-07-18 06:11:27 UTC (rev 5821)
+++ trunk/navit/navit/attr.c 2014-07-20 11:53:08 UTC (rev 5822)
@@ -40,10 +40,17 @@
};
+/** List of attr_types with their names as strings. */
static struct attr_name attr_names[]={
#define ATTR2(x,y) ATTR(y)
#define ATTR(x) { attr_##x, #x },
+
+#define ATTR_UNUSED /* Unused attr_types not needed here.*/
+
#include "attr_def.h"
+
+#undef ATTR_UNUSED
+
#undef ATTR2
#undef ATTR
};
Modified: trunk/navit/navit/attr.h
===================================================================
--- trunk/navit/navit/attr.h 2014-07-18 06:11:27 UTC (rev 5821)
+++ trunk/navit/navit/attr.h 2014-07-20 11:53:08 UTC (rev 5822)
@@ -28,10 +28,25 @@
enum item_type;
+/**
+ * Attribute type values, created using macro magic.
+ */
enum attr_type {
#define ATTR2(x,y) attr_##y=x,
#define ATTR(x) attr_##x,
+
+/* Special macro for unused attribute types. Creates a placeholder entry
+ * in the enum so the following values do not change. */
+#define ATTR_UNUSED ATTR_UNUSED_L(__LINE__)
+#define ATTR_UNUSED_L(x) ATTR_UNUSED_WITH_LINE_NUMBER(x)
+#define ATTR_UNUSED_WITH_LINE_NUMBER(x) ATTR_UNUSED_##x,
+
#include "attr_def.h"
+
+#undef ATTR_UNUSED_WITH_LINE_NUMBER
+#undef ATTR_UNUSED_L
+#undef ATTR_UNUSED
+
#undef ATTR2
#undef ATTR
};
Modified: trunk/navit/navit/attr_def.h
===================================================================
--- trunk/navit/navit/attr_def.h 2014-07-18 06:11:27 UTC (rev 5821)
+++ trunk/navit/navit/attr_def.h 2014-07-20 11:53:08 UTC (rev 5822)
@@ -26,21 +26,21 @@
ATTR2(0x00010000,type_item_begin)
ATTR(town_streets_item)
-ATTR(street_name_item)
-ATTR(street_name_numbers_item)
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(street_item)
-ATTR(street_number_item)
+ATTR_UNUSED
ATTR(position_sat_item)
ATTR(current_item)
ATTR2(0x0001ffff,type_item_end)
ATTR2(0x00020000,type_int_begin)
-ATTR(h_remove)
+ATTR_UNUSED
ATTR(id)
ATTR(flags)
-ATTR(w_remove)
-ATTR(x_remove)
-ATTR(y_remove)
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(flush_size)
ATTR(flush_time)
ATTR(zipfile_ref)
@@ -63,11 +63,11 @@
ATTR(vocabulary_name)
ATTR(vocabulary_name_systematic)
ATTR(vocabulary_distances)
-ATTR(announce_name_systematic_first)
+ATTR_UNUSED
ATTR(antialias)
ATTR(order_delta)
ATTR(baudrate)
-ATTR(font_size_remove)
+ATTR_UNUSED
ATTR(icon_xs)
ATTR(icon_l)
ATTR(icon_s)
@@ -92,7 +92,7 @@
ATTR(keyboard)
ATTR(position_sats_signal)
ATTR(cps)
-ATTR(fast)
+ATTR_UNUSED
ATTR(osd_configuration)
ATTR(columns)
ATTR(align)
@@ -108,18 +108,16 @@
ATTR(message_maxage)
ATTR(message_maxnum)
ATTR(pitch)
-ATTR(roll)
-ATTR(yaw)
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(route_status)
ATTR(route_weight)
-ATTR(distance_metric)
+ATTR_UNUSED
ATTR(route_mode)
ATTR(maxspeed_handling)
ATTR(flags_forward_mask)
ATTR(flags_reverse_mask)
-ATTR(house_number_interpolation)
-ATTR(house_number_left_interpolation)
-ATTR(house_number_right_interpolation)
+ATTR_UNUSED
ATTR(delay)
ATTR(lag)
ATTR(bpp)
@@ -137,9 +135,9 @@
ATTR(brightness)
ATTR(contrast)
ATTR(height)
-ATTR(minspeed)
-ATTR(recspeed)
-ATTR(speed_cond)
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(shmkey)
ATTR(vehicle_width)
ATTR(vehicle_length)
@@ -149,7 +147,7 @@
ATTR(vehicle_dangerous_goods)
ATTR(shmsize)
ATTR(shmoffset)
-ATTR(speed_category)
+ATTR_UNUSED
ATTR(static_speed)
ATTR(static_distance)
ATTR(through_traffic_penalty)
@@ -175,13 +173,13 @@
ATTR(min_dist)
ATTR(max_dist)
ATTR(cache_size)
-ATTR(battery_voltage) /* mV */
-ATTR(battery_current) /* mA */
-ATTR(battery_capacity) /* Wh */
-ATTR(battery_capacity_rel) /* ppm */
-ATTR(battery_charge) /* mAh */
-ATTR(battery_resistance) /* mOhm */
-ATTR(battery_temperature) /* mK */
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(turn_around_count)
ATTR(turn_around_penalty)
ATTR(turn_around_penalty2)
@@ -205,7 +203,7 @@
ATTR(overwrite)
ATTR(active)
ATTR(follow_cursor)
-ATTR(orientation_removeme)
+ATTR_UNUSED
ATTR(tracking)
ATTR(menubar)
ATTR(statusbar)
@@ -219,17 +217,17 @@
ATTR(ondemand)
ATTR(menu_on_map_click)
ATTR(direction)
-ATTR(route_follow_straight_REMOVE) // This is to be removed with the next version
+ATTR_UNUSED
ATTR(gui_speech)
ATTR(town_id) /* fixme? */
ATTR(street_id) /* fixme? */
ATTR(district_id) /* fixme? */
ATTR(drag_bitmap)
ATTR(use_mousewheel)
-ATTR(fullscreen_old)
+ATTR_UNUSED
ATTR(position_magnetic_direction)
ATTR(use_overlay)
-ATTR(night_mode)
+ATTR_UNUSED
ATTR(autozoom_active)
ATTR(position_valid)
ATTR(frame)
@@ -265,21 +263,21 @@
ATTR(district_name)
ATTR(street_name)
ATTR(street_name_systematic)
-ATTR(street_number)
+ATTR_UNUSED
ATTR(debug)
ATTR(address)
ATTR(phone)
ATTR(entry_fee)
ATTR(open_hours)
ATTR(skin)
-ATTR(fullscreen_removeme)
-ATTR(view_mode)
-ATTR(tilt)
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(window_title)
-ATTR(media_cmd)
-ATTR(image_codec)
+ATTR_UNUSED
+ATTR_UNUSED
/* poi */
-ATTR(icono)
+ATTR_UNUSED
ATTR(info_html)
ATTR(price_html)
/* navigation */
@@ -292,7 +290,7 @@
ATTR(source)
ATTR(description)
ATTR(gc_type)
-ATTR(layout_removeme)
+ATTR_UNUSED
ATTR(position_nmea)
ATTR(gpsd_query)
ATTR(on_eof)
@@ -301,9 +299,9 @@
ATTR(path)
ATTR(font)
ATTR(url_local)
-ATTR(gc_size)
-ATTR(gc_difficulty)
-ATTR(gc_terrain)
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(icon_src)
ATTR(position_time_iso8601)
ATTR(house_number)
@@ -313,7 +311,7 @@
ATTR(county_name)
ATTR(state_name)
ATTR(message)
-ATTR(callbacks)
+ATTR_UNUSED
ATTR(enable_expression)
ATTR(fax)
ATTR(email)
@@ -323,12 +321,12 @@
ATTR(town_or_district_name)
ATTR(postal)
ATTR(postal_mask)
-ATTR(house_number_first)
-ATTR(house_number_last)
-ATTR(house_number_left_first)
-ATTR(house_number_left_last)
-ATTR(house_number_right_first)
-ATTR(house_number_right_last)
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(town_name_match)
ATTR(district_name_match)
ATTR(street_name_match)
@@ -339,12 +337,12 @@
ATTR(nightlayout)
ATTR(xml_text)
ATTR(layout_name)
-ATTR(user_name)
-ATTR(user_pass)
+ATTR_UNUSED
+ATTR_UNUSED
ATTR(status_text)
ATTR(log_gpx_desc)
ATTR(map_pass)
-ATTR(validity_period)
+ATTR_UNUSED
ATTR(socket)
/* These attributes for house number interpolation are only written by
* martin-s' (unpublished) GDF converter. */
@@ -414,7 +412,7 @@
ATTR2(0x0006ffff,type_coord_geo_end)
ATTR2(0x00070000,type_color_begin)
ATTR(color)
-ATTR(color2)
+ATTR_UNUSED
ATTR(background_color)
ATTR(text_color)
ATTR(idle_color)
@@ -490,8 +488,6 @@
ATTR(osm_nodeid_last_node)
ATTR2(0x000cffff,type_int64_end)
ATTR2(0x000d0000,type_group_begin)
-ATTR(speed_dep)
ATTR2(0x000dffff,type_group_end)
ATTR2(0x000e0000,type_item_type_begin)
-ATTR(alt_item_type)
ATTR2(0x000effff,type_item_type_end)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2014-07-18 06:11:36
|
Revision: 5821
http://sourceforge.net/p/navit/code/5821
Author: martin-s
Date: 2014-07-18 06:11:27 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Fix:gui_internal:Made back_to_map work from dbus
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal_command.c
Modified: trunk/navit/navit/gui/internal/gui_internal_command.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_command.c 2014-07-17 20:22:10 UTC (rev 5820)
+++ trunk/navit/navit/gui/internal/gui_internal_command.c 2014-07-18 06:11:27 UTC (rev 5821)
@@ -799,6 +799,7 @@
gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
{
gui_internal_prune_menu(this, NULL);
+ gui_internal_check_exit(this);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:22:17
|
Revision: 5820
http://sourceforge.net/p/navit/code/5820
Author: sleske
Date: 2014-07-17 20:22:10 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Some comments about relation processing.
Modified Paths:
--------------
trunk/navit/navit/maptool/osm_relations.c
Modified: trunk/navit/navit/maptool/osm_relations.c
===================================================================
--- trunk/navit/navit/maptool/osm_relations.c 2014-07-17 20:21:26 UTC (rev 5819)
+++ trunk/navit/navit/maptool/osm_relations.c 2014-07-17 20:22:10 UTC (rev 5820)
@@ -21,8 +21,11 @@
#include "maptool.h"
#include "attr.h"
+/** Information about all members of a relation type and how to process them. */
struct relations {
+ /** Hashes for nodes, ways and relations which are members. */
GHashTable *member_hash[3];
+ /** Default entries for processing items which are not a member of any relation. */
GList *default_members;
};
@@ -99,6 +102,7 @@
{
struct relations_member *memb=relations_member_new(func, relation_priv, member_priv, id);
GHashTable *member_hash=rel->member_hash[type-1];
+ // The real key is the OSM ID, but we recycle "memb" as key to avoid a second allocating for the key.
g_hash_table_insert(member_hash, memb, g_list_append(g_hash_table_lookup(member_hash, memb), memb));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:21:35
|
Revision: 5819
http://sourceforge.net/p/navit/code/5819
Author: sleske
Date: 2014-07-17 20:21:26 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Fix:maptool:Correctly handle missing nodes if node_hash is used.
Modified Paths:
--------------
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:21:09 UTC (rev 5818)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:21:26 UTC (rev 5819)
@@ -1419,7 +1419,12 @@
struct node_item *node_buffer_base=(struct node_item *)(node_buffer.base);
int result_index;
if (node_hash) {
- result_index=(int)(long)(g_hash_table_lookup(node_hash, (gpointer)(long)(id)));
+ // Use g_hash_table_lookup_extended instead of g_hash_table_lookup
+ // to distinguish a key with a value 0 from a missing key.
+ if (!g_hash_table_lookup_extended (node_hash, (gpointer)(long)(id), NULL,
+ (gpointer)&result_index)) {
+ result_index=-1;
+ }
} else {
result_index=node_item_find_index_in_ordered_list(id);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:21:15
|
Revision: 5818
http://sourceforge.net/p/navit/code/5818
Author: sleske
Date: 2014-07-17 20:21:09 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Extract functions for node buffer handling.
Modified Paths:
--------------
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:45 UTC (rev 5817)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:21:09 UTC (rev 5818)
@@ -1297,12 +1297,28 @@
slices++;
}
+static struct node_item*
+allocate_node_item_in_buffer(void) {
+ struct node_item* new_node;
+ if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced)
+ extend_buffer(&node_buffer);
+ if (node_buffer.size + sizeof(struct node_item) > slice_size) {
+ flush_nodes(0);
+ }
+ new_node=(struct node_item *)(node_buffer.base+node_buffer.size);
+ node_buffer.size+=sizeof(struct node_item);
+ return new_node;
+}
+
+static void
+remove_last_node_item_from_buffer(void) {
+ node_buffer.size-=sizeof(struct node_item);
+}
+
void
osm_add_node(osmid id, double lat, double lon)
{
in_node=1;
- if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced)
- extend_buffer(&node_buffer);
attr_strings_clear();
node_is_tagged=0;
nodeid=id;
@@ -1313,10 +1329,8 @@
osmid_attr.type=attr_osm_nodeid;
osmid_attr.len=3;
osmid_attr_value=id;
- if (node_buffer.size + sizeof(struct node_item) > slice_size) {
- flush_nodes(0);
- }
- current_node=(struct node_item *)(node_buffer.base+node_buffer.size);
+
+ current_node=allocate_node_item_in_buffer();
current_node->id=id;
current_node->ref_way=0;
current_node->dummy1=0;
@@ -1324,7 +1338,6 @@
current_node->dummy3=0;
current_node->c.x=lon*6371000.0*M_PI/180;
current_node->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
- node_buffer.size+=sizeof(struct node_item);
if (! node_hash) {
if (current_node->id > id_last_node) {
id_last_node=current_node->id;
@@ -1339,7 +1352,7 @@
g_hash_table_insert(node_hash, (gpointer)(long)(current_node->id),
(gpointer)(long)(current_node-(struct node_item *)node_buffer.base));
else {
- node_buffer.size-=sizeof(struct node_item);
+ remove_last_node_item_from_buffer();
nodeid=0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:20:53
|
Revision: 5817
http://sourceforge.net/p/navit/code/5817
Author: sleske
Date: 2014-07-17 20:20:45 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Remove unused function resolve_ways_file.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-17 20:20:25 UTC (rev 5816)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-17 20:20:45 UTC (rev 5817)
@@ -311,7 +311,6 @@
unsigned long long item_bin_get_nodeid(struct item_bin *ib);
unsigned long long item_bin_get_wayid(struct item_bin *ib);
unsigned long long item_bin_get_relationid(struct item_bin *ib);
-FILE *resolve_ways_file(FILE *in, char *suffix, char *filename);
void process_way2poi(FILE *in, FILE *out, int type);
int map_resolve_coords_and_split_at_intersections(FILE *in, FILE *out, FILE *out_index, FILE *out_graph, FILE *out_coastline, int final);
void write_countrydir(struct zip_info *zip_info, int max_index_size);
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:25 UTC (rev 5816)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:45 UTC (rev 5817)
@@ -2999,19 +2999,6 @@
}
}
-FILE *
-resolve_ways_file(FILE *in, char *suffix, char *filename)
-{
- char *newfilename=g_strdup_printf("%s_new",filename);
- FILE *new=tempfile(suffix,newfilename,1);
- resolve_ways(in, new);
- fclose(in);
- fclose(new);
- tempfile_rename(suffix,newfilename,filename);
- g_free(newfilename);
- return tempfile(suffix,filename,0);
-}
-
/**
* Get POI coordinates from area/line coordinates.
* @param in *in input file with area/line coordinates.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:20:33
|
Revision: 5816
http://sourceforge.net/p/navit/code/5816
Author: sleske
Date: 2014-07-17 20:20:25 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:New #define for relation member template string.
Modified Paths:
--------------
trunk/navit/navit/maptool/boundaries.c
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c 2014-07-17 20:20:05 UTC (rev 5815)
+++ trunk/navit/navit/maptool/boundaries.c 2014-07-17 20:20:25 UTC (rev 5816)
@@ -111,7 +111,7 @@
int member_type_numeric;
char *rolestr;
- if (sscanf(member,"%d:"LONGLONG_FMT":%n",&member_type_numeric,&osm_id,&read) < 2)
+ if (sscanf(member,RELATION_MEMBER_PARSE_FORMAT,&member_type_numeric,&osm_id,&read) < 2)
continue;
member_type=(enum relation_member_type)member_type_numeric;
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-17 20:20:05 UTC (rev 5815)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-17 20:20:25 UTC (rev 5816)
@@ -34,6 +34,9 @@
#define debug_tile(x) 0
#define debug_itembin(x) 0
+#define RELATION_MEMBER_PRINT_FORMAT "%d:"LONGLONG_FMT":%s"
+#define RELATION_MEMBER_PARSE_FORMAT "%d:"LONGLONG_FMT":%n"
+
struct tile_data {
char buffer[1024];
int tile_depth;
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:05 UTC (rev 5815)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:25 UTC (rev 5816)
@@ -1616,7 +1616,7 @@
char member_buffer[bufsize];
struct attr memberattr = { attr_osm_member };
- snprintf(member_buffer,bufsize,"%d:"LONGLONG_FMT":%s", (int)type, (long long) ref, role);
+ snprintf(member_buffer,bufsize, RELATION_MEMBER_PRINT_FORMAT, (int)type, (long long) ref, role);
memberattr.u.str=member_buffer;
item_bin_add_attr(tmp_item_bin, &memberattr);
}
@@ -2143,7 +2143,7 @@
{
int len;
int type_numeric;
- sscanf(relation_member_string,"%d:"LONGLONG_FMT":%n",&type_numeric,&memb->id,&len);
+ sscanf(relation_member_string,RELATION_MEMBER_PARSE_FORMAT,&type_numeric,&memb->id,&len);
memb->type=(enum relation_member_type)type_numeric;
memb->role=relation_member_string+len;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:20:13
|
Revision: 5815
http://sourceforge.net/p/navit/code/5815
Author: sleske
Date: 2014-07-17 20:20:05 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Mark unused members of struct node_item.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-17 20:19:42 UTC (rev 5814)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-17 20:20:05 UTC (rev 5815)
@@ -106,10 +106,10 @@
struct node_item {
unsigned int id;
- char ref_node;
+ char dummy1;
char ref_way;
- char ref_ref;
- char dummy;
+ char dummy2;
+ char dummy3;
struct coord c;
};
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:19:42 UTC (rev 5814)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:20:05 UTC (rev 5815)
@@ -1318,10 +1318,10 @@
}
current_node=(struct node_item *)(node_buffer.base+node_buffer.size);
current_node->id=id;
- current_node->ref_node=0;
current_node->ref_way=0;
- current_node->ref_ref=0;
- current_node->dummy=0;
+ current_node->dummy1=0;
+ current_node->dummy2=0;
+ current_node->dummy3=0;
current_node->c.x=lon*6371000.0*M_PI/180;
current_node->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
node_buffer.size+=sizeof(struct node_item);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:19:52
|
Revision: 5814
http://sourceforge.net/p/navit/code/5814
Author: sleske
Date: 2014-07-17 20:19:42 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Better function names.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.c
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c 2014-07-17 20:19:27 UTC (rev 5813)
+++ trunk/navit/navit/maptool/maptool.c 2014-07-17 20:19:42 UTC (rev 5814)
@@ -453,7 +453,7 @@
}
static void
-osm_collect_data(struct maptool_params *p, char *suffix)
+osm_read_input_data(struct maptool_params *p, char *suffix)
{
unlink("coords.tmp");
if (p->process_ways)
@@ -563,7 +563,7 @@
static void
-osm_find_intersections(struct maptool_params *p, char *suffix)
+osm_resolve_coords_and_split_at_intersections(struct maptool_params *p, char *suffix)
{
FILE *ways, *ways_split, *ways_split_index, *graph, *coastline;
int i;
@@ -577,7 +577,7 @@
coastline=tempfile(suffix,"coastline",1);
if (i)
load_buffer("coords.tmp",&node_buffer, i*slice_size, slice_size);
- map_find_intersections(ways,ways_split,ways_split_index,graph,coastline,final);
+ map_resolve_coords_and_split_at_intersections(ways,ways_split,ways_split_index,graph,coastline,final);
fclose(ways_split);
if (ways_split_index)
fclose(ways_split_index);
@@ -884,8 +884,8 @@
// input from an OSM file
if (p.input == 0) {
- if (start_phase(&p, "collecting data")) {
- osm_collect_data(&p, suffix);
+ if (start_phase(&p, "reading input data")) {
+ osm_read_input_data(&p, suffix);
p.node_table_loaded=1;
}
if (start_phase(&p, "counting references and resolving ways")) {
@@ -895,10 +895,10 @@
if (start_phase(&p,"converting ways to pois")) {
osm_process_way2poi(&p, suffix);
}
- if (start_phase(&p,"finding intersections")) {
+ if (start_phase(&p,"splitting at intersections")) {
if (p.process_ways) {
maptool_load_node_table(&p,0);
- osm_find_intersections(&p, suffix);
+ osm_resolve_coords_and_split_at_intersections(&p, suffix);
}
}
free(node_buffer.base);
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-17 20:19:27 UTC (rev 5813)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-17 20:19:42 UTC (rev 5814)
@@ -310,7 +310,7 @@
unsigned long long item_bin_get_relationid(struct item_bin *ib);
FILE *resolve_ways_file(FILE *in, char *suffix, char *filename);
void process_way2poi(FILE *in, FILE *out, int type);
-int map_find_intersections(FILE *in, FILE *out, FILE *out_index, FILE *out_graph, FILE *out_coastline, int final);
+int map_resolve_coords_and_split_at_intersections(FILE *in, FILE *out, FILE *out_index, FILE *out_graph, FILE *out_coastline, int final);
void write_countrydir(struct zip_info *zip_info, int max_index_size);
void osm_process_towns(FILE *in, FILE *boundaries, FILE *ways, char *suffix);
void load_countries(void);
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-17 20:19:27 UTC (rev 5813)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:19:42 UTC (rev 5814)
@@ -2927,7 +2927,7 @@
}
static void
-write_item_part(FILE *out, FILE *out_index, FILE *out_graph, struct item_bin *orig, int first, int last, long long *last_id)
+write_item_way_subsection(FILE *out, FILE *out_index, FILE *out_graph, struct item_bin *orig, int first, int last, long long *last_id)
{
struct item_bin new;
struct coord *c=(struct coord *)(orig+1);
@@ -3047,14 +3047,14 @@
geom_line_middle(c,count,&c1);
c[0]=c1;
}
- write_item_part(out, NULL, NULL, ib, 0, 0, NULL);
+ write_item_way_subsection(out, NULL, NULL, ib, 0, 0, NULL);
}
}
}
int
-map_find_intersections(FILE *in, FILE *out, FILE *out_index, FILE *out_graph, FILE *out_coastline, int final)
+map_resolve_coords_and_split_at_intersections(FILE *in, FILE *out, FILE *out_index, FILE *out_graph, FILE *out_coastline, int final)
{
struct coord *c;
int i,ccount,last,remaining;
@@ -3081,7 +3081,7 @@
if (ni) {
c[i]=ni->c;
if (ni->ref_way > 1 && i != 0 && i != ccount-1 && i != last && item_get_default_flags(ib->type)) {
- write_item_part(out, out_index, out_graph, ib, last, i, &last_id);
+ write_item_way_subsection(out, out_index, out_graph, ib, last, i, &last_id);
last=i;
}
} else if (final) {
@@ -3097,9 +3097,9 @@
}
}
if (ccount) {
- write_item_part(out, out_index, out_graph, ib, last, ccount-1, &last_id);
+ write_item_way_subsection(out, out_index, out_graph, ib, last, ccount-1, &last_id);
if (final && ib->type == type_water_line && out_coastline) {
- write_item_part(out_coastline, NULL, NULL, ib, last, ccount-1, NULL);
+ write_item_way_subsection(out_coastline, NULL, NULL, ib, last, ccount-1, NULL);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:19:32
|
Revision: 5813
http://sourceforge.net/p/navit/code/5813
Author: sleske
Date: 2014-07-17 20:19:27 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Fix:maptool:Improve online help and manpage for maptool.
Modified Paths:
--------------
trunk/navit/man/maptool.1
trunk/navit/navit/maptool/maptool.c
Modified: trunk/navit/man/maptool.1
===================================================================
--- trunk/navit/man/maptool.1 2014-07-17 20:19:08 UTC (rev 5812)
+++ trunk/navit/man/maptool.1 2014-07-17 20:19:27 UTC (rev 5813)
@@ -4,12 +4,13 @@
.SH SYNOPSIS
.B For OSM XML data:
.B bzcat planet.osm.bz2 | maptool mymap.bin
-[\-h] [\-2] [\-5 <file>] [\-6] [\-a <level>] [\-c] -[\-d <connect string]
+[\-h] [\-5 <file>] [\-6] [\-a <level>] [\-c] -[\-d <connect string]
[\-e <phase>] [\-i <file>] [\-k] [\-M] [\-N] [\-o] [\-r <file>] [\-s <phase>]
[\-S <size>] [\-w] [\-W] [\-U] [\-z <level>]
+
.B For OSM Protobuf/PBF data:
.B maptool \-\-protobuf \-i planet.osm.pbf planet.bin
-[\-h] [\-2] [\-5 <file>] [\-6] [\-a <level>] [\-c] [\-e <phase>]
+[\-h] [\-5 <file>] [\-6] [\-a <level>] [\-c] [\-e <phase>]
[\-i <file>] [\-k] [\-M] [\-N] [\-o] [\-P] [\-r <file>] [\-s <phase>]
[\-S <size>] [\-w] [\-W] [\-U] [\-z <level>]
.SH DESCRIPTION
@@ -19,9 +20,6 @@
\-h (\-\-help)
display a short help message
.TP
-\-2 (\-\-dowai2poi)
-convert ways and polygons to POIs when applicable
-.TP
\-4 (\-\-md5)
set file where to write md5 sum
.TP
@@ -50,8 +48,8 @@
process only nodes
.TP
\-o (\-\-coverage)
-converts every street to street_converage, resulting in a big fat black line.
-You can overlay this map with another vector map or image map, and every street
+converts every street to street_coverage, resulting in a big fat black line.
+You can overlay this map with another vector map or image map, and every street
you will still see is missing in the \-o map
.TP
\-P (\-\-protobuf)
@@ -64,7 +62,8 @@
start at specified phase
.TP
\-S (\-\-slice-size) <phrase>
-defines the amount of memory to use, in bytes. Default is 1GB
+limit memory to use for some large internal buffers, in bytes. Default is 1 GB.
+Smaller slices reduce peak memory usage, at the cost of increased processing time.
.TP
\-w (\-\-dedupe-ways)
ensure no duplicate ways or nodes. useful when using several input files
Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c 2014-07-17 20:19:08 UTC (rev 5812)
+++ trunk/navit/navit/maptool/maptool.c 2014-07-17 20:19:27 UTC (rev 5813)
@@ -195,14 +195,14 @@
fprintf(f,"-E (--experimental) : Enable experimental features (%s)\n",
experimental_feature_description ? experimental_feature_description : "-not available in this version-");
fprintf(f,"-i (--input-file) <file> : specify the input file name (OSM), overrules default stdin\n");
- fprintf(f,"-k (--keep-tmpfiles) : do not delete tmp files after processing. useful to reuse them\n\n");
+ fprintf(f,"-k (--keep-tmpfiles) : do not delete tmp files after processing. useful to reuse them\n");
fprintf(f,"-M (--o5m) : input file os o5m\n");
fprintf(f,"-N (--nodes-only) : process only nodes\n");
fprintf(f,"-o (--coverage) : map every street to item coverage\n");
fprintf(f,"-P (--protobuf) : input file is protobuf\n");
fprintf(f,"-r (--rule-file) <file> : read mapping rules from specified file\n");
fprintf(f,"-s (--start) <phase> : start at specified phase\n");
- fprintf(f,"-S (--slice-size) <size> : defines the amount of memory to use, in bytes. Default is %dGB\n", SLIZE_SIZE_DEFAULT_GB);
+ fprintf(f,"-S (--slice-size) <size> : limit memory to use for some large internal buffers, in bytes. Default is %dGB.\n", SLIZE_SIZE_DEFAULT_GB);
fprintf(f,"-t (--timestamp) y-m-dTh:m:s : Set zip timestamp\n");
fprintf(f,"-w (--dedupe-ways) : ensure no duplicate ways or nodes. useful when using several input files\n");
fprintf(f,"-W (--ways-only) : process only ways\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-17 20:19:10
|
Revision: 5812
http://sourceforge.net/p/navit/code/5812
Author: sleske
Date: 2014-07-17 20:19:08 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Refactor:maptool:Remove obsolete feature switch doway2poi.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.c
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c 2014-07-09 09:06:48 UTC (rev 5811)
+++ trunk/navit/navit/maptool/maptool.c 2014-07-17 20:19:08 UTC (rev 5812)
@@ -55,7 +55,6 @@
int phase;
int slices;
int unknown_country;
-int doway2poi=1;
char ch_suffix[] ="r"; /* Used to make compiler happy due to Bug 35903 in gcc */
/** Textual description of available experimental features, or NULL (=none available). */
char* experimental_feature_description = NULL; /* add description here */
@@ -465,10 +464,8 @@
}
if (p->process_ways && p->process_nodes) {
p->osm.turn_restrictions=tempfile(suffix,"turn_restrictions",1);
- if(doway2poi) {
- p->osm.line2poi=tempfile(suffix,"line2poi",1);
- p->osm.poly2poi=tempfile(suffix,"poly2poi",1);
- }
+ p->osm.line2poi=tempfile(suffix,"line2poi",1);
+ p->osm.poly2poi=tempfile(suffix,"poly2poi",1);
}
if (p->process_relations) {
p->osm.boundaries=tempfile(suffix,"boundaries",1);
@@ -544,23 +541,21 @@
save_buffer("coords.tmp",&node_buffer, i*slice_size);
fclose(ways);
}
- if(doway2poi) {
- FILE *poly2poi=tempfile(suffix,first?"poly2poi":"poly2poi_resolved",0);
- FILE *poly2poinew=tempfile(suffix,"poly2poi_resolved_new",1);
- FILE *line2poi=tempfile(suffix,first?"line2poi":"line2poi_resolved",0);
- FILE *line2poinew=tempfile(suffix,"line2poi_resolved_new",1);
- resolve_ways(poly2poi, poly2poinew);
- resolve_ways(line2poi, line2poinew);
- fclose(poly2poi);
- fclose(poly2poinew);
- fclose(line2poi);
- fclose(line2poinew);
- tempfile_rename(suffix,"poly2poi_resolved_new","poly2poi_resolved");
- tempfile_rename(suffix,"line2poi_resolved_new","line2poi_resolved");
- if (first && !p->keep_tmpfiles) {
- tempfile_unlink(suffix,"poly2poi");
- tempfile_unlink(suffix,"line2poi");
- }
+ FILE *poly2poi=tempfile(suffix,first?"poly2poi":"poly2poi_resolved",0);
+ FILE *poly2poinew=tempfile(suffix,"poly2poi_resolved_new",1);
+ FILE *line2poi=tempfile(suffix,first?"line2poi":"line2poi_resolved",0);
+ FILE *line2poinew=tempfile(suffix,"line2poi_resolved_new",1);
+ resolve_ways(poly2poi, poly2poinew);
+ resolve_ways(line2poi, line2poinew);
+ fclose(poly2poi);
+ fclose(poly2poinew);
+ fclose(line2poi);
+ fclose(line2poinew);
+ tempfile_rename(suffix,"poly2poi_resolved_new","poly2poi_resolved");
+ tempfile_rename(suffix,"line2poi_resolved_new","line2poi_resolved");
+ if (first && !p->keep_tmpfiles) {
+ tempfile_unlink(suffix,"poly2poi");
+ tempfile_unlink(suffix,"line2poi");
}
first=0;
}
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-09 09:06:48 UTC (rev 5811)
+++ trunk/navit/navit/maptool/osm.c 2014-07-17 20:19:08 UTC (rev 5812)
@@ -40,8 +40,6 @@
#define M_PI_4 0.785398163397448309616
#endif
-extern int doway2poi;
-
static int in_way, in_node, in_relation;
osmid nodeid,wayid;
@@ -801,7 +799,7 @@
attr_mapping_rel2poly_place[attr_mapping_rel2poly_place_count++]=attr_mapping;
}
}
- if (t[0]== '?' && doway2poi) {
+ if (t[0]== '?') {
attr_mapping_way2poi=g_realloc(attr_mapping_way2poi, sizeof(*attr_mapping_way2poi)*(attr_mapping_way2poi_count+1));
attr_mapping_way2poi[attr_mapping_way2poi_count++]=attr_mapping;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-09 09:06:51
|
Revision: 5811
http://sourceforge.net/p/navit/code/5811
Author: sleske
Date: 2014-07-09 09:06:48 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
Fix:build/autotools:Add new source file search_houseno_interpol.c/.h to autotools build.
Modified Paths:
--------------
trunk/navit/navit/Makefile.am
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2014-07-08 22:11:46 UTC (rev 5810)
+++ trunk/navit/navit/Makefile.am 2014-07-09 09:06:48 UTC (rev 5811)
@@ -51,13 +51,14 @@
lib@LIBNAVIT@_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c compass.c config_.c coord.c country.c data_window.c debug.c \
event.c event_glib.h file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c \
linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c bookmarks.h navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \
- profile.c profile_option.c projection.c roadprofile.c route.c routech.c search.c script.c speech.c start_real.c transform.c track.c \
- util.c vehicle.c vehicleprofile.c xmlconfig.c announcement.h atom.h attr.h attr_def.h cache.h callback.h color.h command.h compass.h config_.h coord.h country.h \
+ profile.c profile_option.c projection.c roadprofile.c route.c routech.c search.c search_houseno_interpol.c script.c speech.c start_real.c \
+ transform.c track.c util.c vehicle.c vehicleprofile.c xmlconfig.c \
+ announcement.h atom.h attr.h attr_def.h cache.h callback.h color.h command.h compass.h config_.h coord.h country.h \
android.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h endianess.h event.h \
file.h geom.h graphics.h gtkext.h gui.h item.h item_def.h keys.h log.h layer.h layout.h linguistics.h main.h map-share.h map.h\
map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \
- param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h speech.h start_real.h \
- transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
+ param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h search_houseno_interpol.h \
+ speech.h start_real.h transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
navit_lfs.h navit_nls.c navit_nls.h sunriset.c sunriset.h glib_slice.h
XSLTS=@XSLTS@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-08 22:11:54
|
Revision: 5810
http://sourceforge.net/p/navit/code/5810
Author: sleske
Date: 2014-07-08 22:11:46 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
Fix:build:Remove feature SHARED_LIBNAVIT. Only works on Android, so just enable it there.|Fixes #1186.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2014-07-07 14:29:18 UTC (rev 5809)
+++ trunk/navit/CMakeLists.txt 2014-07-08 22:11:46 UTC (rev 5810)
@@ -405,7 +405,6 @@
# other features
add_feature(USE_PLUGINS "default" TRUE)
-add_feature(SHARED_LIBNAVIT "default" FALSE)
add_feature(USE_ROUTING "default" TRUE)
add_feature(USE_SVG "default" TRUE)
add_feature(SVG2PNG "default" TRUE)
@@ -578,7 +577,7 @@
set_with_reason(speech/android "Android detected" TRUE)
set_with_reason(vehicle/android "Android detected" TRUE)
set_with_reason(plugin/pedestrian "Android detected" TRUE)
- cfg_feature(SHARED_LIBNAVIT "Android detected" TRUE)
+ set(SHARED_LIBNAVIT TRUE)
add_feature(XPM2PNG "Android detected" TRUE)
set(NAVIT_COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} -fPIC")
@@ -639,12 +638,6 @@
endif(USE_PLUGINS)
message(STATUS "Use plugins: ${MODULE_BUILD_TYPE}")
-if (SHARED_LIBNAVIT)
- set(NAVIT_CORE_BUILD_TYPE "STATIC")
-else(SHARED_LIBNAVIT)
- set(NAVIT_CORE_BUILD_TYPE "SHARED")
-endif(SHARED_LIBNAVIT)
-
CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-07 14:29:23
|
Revision: 5809
http://sourceforge.net/p/navit/code/5809
Author: sleske
Date: 2014-07-07 14:29:18 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Refactor:maptool:Use enum for relation member types, separate function for default entries in relations collection.
Modified Paths:
--------------
trunk/navit/navit/maptool/boundaries.c
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/maptool/osm_relations.c
trunk/navit/navit/maptool/osm_xml.c
Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c 2014-07-07 14:28:46 UTC (rev 5808)
+++ trunk/navit/navit/maptool/boundaries.c 2014-07-07 14:29:18 UTC (rev 5809)
@@ -107,19 +107,21 @@
while ((member=item_bin_get_attr(ib, attr_osm_member, member))) {
long long osm_id;
int read=0;
- int member_type;
+ enum relation_member_type member_type;
+ int member_type_numeric;
char *rolestr;
- if (sscanf(member,"%d:"LONGLONG_FMT":%n",&member_type,&osm_id,&read) < 2)
+ if (sscanf(member,"%d:"LONGLONG_FMT":%n",&member_type_numeric,&osm_id,&read) < 2)
continue;
+ member_type=(enum relation_member_type)member_type_numeric;
rolestr=member+read;
- if(member_type==1) {
+ if(member_type==rel_member_node) {
if(!strcmp(rolestr,"admin_centre") || !strcmp(rolestr,"admin_center"))
boundary->admin_centre=osm_id;
}
- if(member_type==2) {
+ if(member_type==rel_member_way) {
enum geom_poly_segment_type role;
if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave")) {
has_outer_ways=1;
@@ -134,9 +136,9 @@
osm_warning("way",osm_id,1,"\n");
role=geom_poly_segment_type_none;
}
- relations_add_relation_member_entry(relations, relations_func, boundary, (gpointer)role, 2, osm_id);
+ relations_add_relation_member_entry(relations, relations_func, boundary, (gpointer)role, rel_member_way, osm_id);
}
- if(member_type==3) {
+ if(member_type==rel_member_relation) {
if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave") || !strcmp(rolestr,"inner") || !strcmp(rolestr,"enclave"))
has_subrelations++;
}
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-07 14:28:46 UTC (rev 5808)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-07 14:29:18 UTC (rev 5809)
@@ -276,6 +276,14 @@
FILE *towns;
};
+/** Type of a relation member. */
+enum relation_member_type {
+ UNUSED,
+ rel_member_node,
+ rel_member_way,
+ rel_member_relation,
+};
+
void osm_warning(char *type, osmid id, int cont, char *fmt, ...);
void osm_info(char *type, osmid id, int cont, char *fmt, ...);
void osm_add_tag(char *k, char *v);
@@ -283,7 +291,7 @@
void osm_add_way(osmid id);
void osm_add_relation(osmid id);
void osm_end_relation(struct maptool_osm *osm);
-void osm_add_member(int type, osmid ref, char *role);
+void osm_add_member(enum relation_member_type type, osmid ref, char *role);
void osm_end_way(struct maptool_osm *osm);
void osm_end_node(struct maptool_osm *osm);
void osm_add_nd(osmid ref);
@@ -323,7 +331,8 @@
/* osm_relations.c */
struct relations * relations_new(void);
struct relations_func *relations_func_new(void (*func)(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv), void *func_priv);
-void relations_add_relation_member_entry(struct relations *rel, struct relations_func *func, void *relation_priv, void *member_priv, int type, osmid id);
+void relations_add_relation_member_entry(struct relations *rel, struct relations_func *func, void *relation_priv, void *member_priv, enum relation_member_type type, osmid id);
+void relations_add_relation_default_entry(struct relations *rel, struct relations_func *func);
void relations_process(struct relations *rel, FILE *nodes, FILE *ways);
void relations_destroy(struct relations *rel);
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-07 14:28:46 UTC (rev 5808)
+++ trunk/navit/navit/maptool/osm.c 2014-07-07 14:29:18 UTC (rev 5809)
@@ -1612,13 +1612,13 @@
}
void
-osm_add_member(int type, osmid ref, char *role)
+osm_add_member(enum relation_member_type type, osmid ref, char *role)
{
const int bufsize=BUFFER_SIZE*3+3;
char member_buffer[bufsize];
struct attr memberattr = { attr_osm_member };
- snprintf(member_buffer,bufsize,"%d:"LONGLONG_FMT":%s", type, (long long) ref, role);
+ snprintf(member_buffer,bufsize,"%d:"LONGLONG_FMT":%s", (int)type, (long long) ref, role);
memberattr.u.str=member_buffer;
item_bin_add_attr(tmp_item_bin, &memberattr);
}
@@ -2135,7 +2135,7 @@
}
struct relation_member {
- int type;
+ enum relation_member_type type;
long long id;
char *role;
};
@@ -2144,7 +2144,9 @@
parse_relation_member_string(char *relation_member_string, struct relation_member *memb)
{
int len;
- sscanf(relation_member_string,"%d:"LONGLONG_FMT":%n",&memb->type,&memb->id,&len);
+ int type_numeric;
+ sscanf(relation_member_string,"%d:"LONGLONG_FMT":%n",&type_numeric,&memb->id,&len);
+ memb->type=(enum relation_member_type)type_numeric;
memb->role=relation_member_string+len;
}
@@ -2406,7 +2408,7 @@
}
min_count=0;
while(search_relation_member(ib, "street",&relm,&min_count)) {
- if(relm.type==2)
+ if(relm.type==rel_member_way)
relations_add_relation_member_entry(relations, relations_func, rel, NULL, relm.type, relm.id);
}
min_count=0;
@@ -2423,7 +2425,7 @@
}
}
relations_func=relations_func_new(relation_func_writethrough, &fp->out);
- relations_add_relation_member_entry(relations, relations_func, NULL, NULL, -1, 0);
+ relations_add_relation_default_entry(relations, relations_func);
}
void
@@ -2472,11 +2474,11 @@
hn_interpol->nodeid_first_node=item_bin_get_nodeid_from_attr(ib, attr_osm_nodeid_first_node);
hn_interpol->nodeid_last_node=item_bin_get_nodeid_from_attr(ib, attr_osm_nodeid_last_node);
dbg_assert(hn_interpol->wayid && hn_interpol->nodeid_first_node && hn_interpol->nodeid_last_node);
- relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_first_node);
- relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_last_node);
- relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 2, hn_interpol->wayid);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, rel_member_node, hn_interpol->nodeid_first_node);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, rel_member_node, hn_interpol->nodeid_last_node);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, rel_member_way, hn_interpol->wayid);
}
- relations_add_relation_member_entry(relations, relations_func_new(relation_func_writethrough, &fp->out), NULL, NULL, -1, 0);
+ relations_add_relation_default_entry(relations, relations_func_new(relation_func_writethrough, &fp->out));
}
void
@@ -2687,17 +2689,17 @@
osm_warning("relation",relid,0,"turn restriction: multiple via member\n");
continue;
}
- if (fromm.type != 2) {
+ if (fromm.type != rel_member_way) {
osm_warning("relation",relid,0,"turn restriction: wrong type for from member ");
osm_warning(osm_types[fromm.type],fromm.id,1,"\n");
continue;
}
- if (tom.type != 2) {
+ if (tom.type != rel_member_way) {
osm_warning("relation",relid,0,"turn restriction: wrong type for to member ");
osm_warning(osm_types[tom.type],tom.id,1,"\n");
continue;
}
- if (viam.type != 1 && viam.type != 2) {
+ if (viam.type != rel_member_node && viam.type != rel_member_way) {
osm_warning("relation",relid,0,"turn restriction: wrong type for via member ");
osm_warning(osm_types[viam.type],viam.id,1,"\n");
continue;
Modified: trunk/navit/navit/maptool/osm_relations.c
===================================================================
--- trunk/navit/navit/maptool/osm_relations.c 2014-07-07 14:28:46 UTC (rev 5808)
+++ trunk/navit/navit/maptool/osm_relations.c 2014-07-07 14:29:18 UTC (rev 5809)
@@ -72,6 +72,16 @@
return relations_func;
}
+static struct relations_member *
+relations_member_new(struct relations_func *func, void *relation_priv, void *member_priv, osmid id)
+{
+ struct relations_member *memb=g_new(struct relations_member, 1);
+ memb->memberid=id;
+ memb->relation_priv=relation_priv;
+ memb->member_priv=member_priv;
+ memb->func=func;
+ return memb;
+}
/*
* @brief Add an entry for a relation member to the relations collection.
* This function fills the relations collection, which is then passed to relations_process for
@@ -80,28 +90,34 @@
* @param in func structure defining function to call when this member is read
* @param in relation_priv parameter describing relation, or NULL. Will be passed to func function.
* @param in member_priv parameter describing relation member, or NULL. Will be passed to func function.
- * @param in type This member type: 1 - node, 2 - way, 3 - relation.
- * Set to -1 to add a default member entry which matches any map item of any type which
- * is not a member of any relation.
+ * @param in type Type of this member (node, way etc.).
* @param in id OSM ID of relation member.
*/
void
relations_add_relation_member_entry(struct relations *rel, struct relations_func *func, void
- *relation_priv, void *member_priv, int type, osmid id)
+ *relation_priv, void *member_priv, enum relation_member_type type, osmid id)
{
- struct relations_member *memb=g_new(struct relations_member, 1);
+ struct relations_member *memb=relations_member_new(func, relation_priv, member_priv, id);
+ GHashTable *member_hash=rel->member_hash[type-1];
+ g_hash_table_insert(member_hash, memb, g_list_append(g_hash_table_lookup(member_hash, memb), memb));
+}
- memb->memberid=id;
- memb->relation_priv=relation_priv;
- memb->member_priv=member_priv;
- memb->func=func;
- if(type>0) {
- GHashTable *member_hash=rel->member_hash[type-1];
- g_hash_table_insert(member_hash, memb, g_list_append(g_hash_table_lookup(member_hash, memb), memb));
- } else
- rel->default_members=g_list_append(rel->default_members, memb);
+/*
+ * @brief Add a default entry to the relations collection.
+ * Put a default entry into the relations collection, which is then passed to
+ * relations_process for processing. The default entry is used for map items which are not a
+ * member of any relation.
+ * @param in rel relations collection to add the new member to
+ * @param in func structure defining function to call when this member is read
+ */
+void
+relations_add_relation_default_entry(struct relations *rel, struct relations_func *func)
+{
+ struct relations_member *memb=relations_member_new(func, NULL, NULL, 0);
+ rel->default_members=g_list_append(rel->default_members, memb);
}
+
/*
* @brief The actual relations processing: Loop through raw data and process any relations members.
* This function reads through all nodes and ways passed in, and looks up each item in the
Modified: trunk/navit/navit/maptool/osm_xml.c
===================================================================
--- trunk/navit/navit/maptool/osm_xml.c 2014-07-07 14:28:46 UTC (rev 5808)
+++ trunk/navit/navit/maptool/osm_xml.c 2014-07-07 14:29:18 UTC (rev 5809)
@@ -148,7 +148,7 @@
char type_buffer[BUFFER_SIZE];
char ref_buffer[BUFFER_SIZE];
char role_buffer[BUFFER_SIZE];
- int type;
+ enum relation_member_type type;
if (!osm_xml_get_attribute(p, "type", type_buffer, BUFFER_SIZE))
return 0;
if (!osm_xml_get_attribute(p, "ref", ref_buffer, BUFFER_SIZE))
@@ -156,14 +156,14 @@
if (!osm_xml_get_attribute(p, "role", role_buffer, BUFFER_SIZE))
return 0;
if (!strcmp(type_buffer,"node"))
- type=1;
+ type=rel_member_node;
else if (!strcmp(type_buffer,"way"))
- type=2;
+ type=rel_member_way;
else if (!strcmp(type_buffer,"relation"))
- type=3;
+ type=rel_member_relation;
else {
- fprintf(stderr,"Unknown type %s\n",type_buffer);
- type=0;
+ fprintf(stderr,"Unknown type '%s'\n",type_buffer);
+ return 0;
}
osm_add_member(type, atoll(ref_buffer), role_buffer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-07 14:28:54
|
Revision: 5808
http://sourceforge.net/p/navit/code/5808
Author: sleske
Date: 2014-07-07 14:28:46 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Refactor:maptool:Rename methods, add Doxygen commments.
Modified Paths:
--------------
trunk/navit/navit/maptool/boundaries.c
trunk/navit/navit/maptool/maptool.c
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/maptool/osm_relations.c
Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c 2014-07-07 14:28:25 UTC (rev 5807)
+++ trunk/navit/navit/maptool/boundaries.c 2014-07-07 14:28:46 UTC (rev 5808)
@@ -134,7 +134,7 @@
osm_warning("way",osm_id,1,"\n");
role=geom_poly_segment_type_none;
}
- relations_add_func(relations, relations_func, boundary, (gpointer)role, 2, osm_id);
+ relations_add_relation_member_entry(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"))
Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c 2014-07-07 14:28:25 UTC (rev 5807)
+++ trunk/navit/navit/maptool/maptool.c 2014-07-07 14:28:46 UTC (rev 5808)
@@ -959,6 +959,7 @@
}
}
if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing house number interpolations")) {
+ // OSM house number interpolations are handled like a relation.
struct files_relation_processing *files_relproc = files_relation_processing_new(p.osm.line2poi, suffix);
p.osm.house_number_interpolations=tempfile(suffix,"house_number_interpolations",0);
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2014-07-07 14:28:25 UTC (rev 5807)
+++ trunk/navit/navit/maptool/maptool.h 2014-07-07 14:28:46 UTC (rev 5808)
@@ -323,7 +323,7 @@
/* osm_relations.c */
struct relations * relations_new(void);
struct relations_func *relations_func_new(void (*func)(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv), void *func_priv);
-void relations_add_func(struct relations *rel, struct relations_func *func, void *relation_priv, void *member_priv, int type, osmid id);
+void relations_add_relation_member_entry(struct relations *rel, struct relations_func *func, void *relation_priv, void *member_priv, int type, osmid id);
void relations_process(struct relations *rel, FILE *nodes, FILE *ways);
void relations_destroy(struct relations *rel);
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2014-07-07 14:28:25 UTC (rev 5807)
+++ trunk/navit/navit/maptool/osm.c 2014-07-07 14:28:46 UTC (rev 5808)
@@ -2289,7 +2289,7 @@
};
static void
-process_associated_street_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv)
+process_associated_street_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv_unused)
{
struct process_relation_member_func_priv *fp=func_priv;
struct associated_street *rel=relation_priv;
@@ -2324,7 +2324,7 @@
};
static void
-process_house_number_interpolation_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv)
+process_house_number_interpolation_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv_unused)
{
struct process_relation_member_func_priv *fp=func_priv;
struct house_number_interpolation *rel=relation_priv;
@@ -2375,7 +2375,7 @@
}
static void
-relation_func_writethrough(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv)
+relation_func_writethrough(void *func_priv, void *relation_priv_unused, struct item_bin *member, void *member_priv_unused)
{
FILE *out=*(FILE **)func_priv;
if(out)
@@ -2407,23 +2407,23 @@
min_count=0;
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);
+ relations_add_relation_member_entry(relations, relations_func, rel, NULL, relm.type, relm.id);
}
min_count=0;
while(search_relation_member(ib, "house",&relm,&min_count)) {
- relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
+ relations_add_relation_member_entry(relations, relations_func, rel, NULL, relm.type, relm.id);
}
min_count=0;
while(search_relation_member(ib, "addr:houselink",&relm,&min_count)) {
- relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
+ relations_add_relation_member_entry(relations, relations_func, rel, NULL, relm.type, relm.id);
}
min_count=0;
while(search_relation_member(ib, "address",&relm,&min_count)) {
- relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
+ relations_add_relation_member_entry(relations, relations_func, rel, NULL, relm.type, relm.id);
}
}
relations_func=relations_func_new(relation_func_writethrough, &fp->out);
- relations_add_func(relations, relations_func, NULL, NULL, -1, 0);
+ relations_add_relation_member_entry(relations, relations_func, NULL, NULL, -1, 0);
}
void
@@ -2472,11 +2472,11 @@
hn_interpol->nodeid_first_node=item_bin_get_nodeid_from_attr(ib, attr_osm_nodeid_first_node);
hn_interpol->nodeid_last_node=item_bin_get_nodeid_from_attr(ib, attr_osm_nodeid_last_node);
dbg_assert(hn_interpol->wayid && hn_interpol->nodeid_first_node && hn_interpol->nodeid_last_node);
- relations_add_func(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_first_node);
- relations_add_func(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_last_node);
- relations_add_func(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 2, hn_interpol->wayid);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_first_node);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 1, hn_interpol->nodeid_last_node);
+ relations_add_relation_member_entry(relations, relations_func_process_hn_interpol, hn_interpol, NULL, 2, hn_interpol->wayid);
}
- relations_add_func(relations, relations_func_new(relation_func_writethrough, &fp->out), NULL, NULL, -1, 0);
+ relations_add_relation_member_entry(relations, relations_func_new(relation_func_writethrough, &fp->out), NULL, NULL, -1, 0);
}
void
@@ -2707,9 +2707,9 @@
turn_restriction->type=ib->type;
turn_restriction->r.l.x=1<<30;
turn_restriction->order=255;
- relations_add_func(relations, relations_func, turn_restriction, (gpointer) 0, fromm.type, fromm.id);
- relations_add_func(relations, relations_func, turn_restriction, (gpointer) 1, viam.type, viam.id);
- relations_add_func(relations, relations_func, turn_restriction, (gpointer) 2, tom.type, tom.id);
+ relations_add_relation_member_entry(relations, relations_func, turn_restriction, (gpointer) 0, fromm.type, fromm.id);
+ relations_add_relation_member_entry(relations, relations_func, turn_restriction, (gpointer) 1, viam.type, viam.id);
+ relations_add_relation_member_entry(relations, relations_func, turn_restriction, (gpointer) 2, tom.type, tom.id);
turn_restrictions=g_list_append(turn_restrictions, turn_restriction);
}
return turn_restrictions;
Modified: trunk/navit/navit/maptool/osm_relations.c
===================================================================
--- trunk/navit/navit/maptool/osm_relations.c 2014-07-07 14:28:25 UTC (rev 5807)
+++ trunk/navit/navit/maptool/osm_relations.c 2014-07-07 14:28:46 UTC (rev 5808)
@@ -73,18 +73,21 @@
}
/*
- * @brief Add a relation member to relations collection.
- * @param in rel relations collection to add the new member to.
- * @param in funct structure defining function to call when this member is read
- * @param in relation_priv parameter describing relation. Will be passed to funct function
- * @param in member_priv parameter describing member function. Will be passed to funct function
- * @param in type This member type: 1 - node, 2 - way, 3 - relation.
- * Set to -1 to add a default member action which matches any item of any type which is not a member of any relation.
- * @param in osmid This member id
- * @param unused relations
+ * @brief Add an entry for a relation member to the relations collection.
+ * This function fills the relations collection, which is then passed to relations_process for
+ * processing.
+ * @param in rel relations collection to add the new member to
+ * @param in func structure defining function to call when this member is read
+ * @param in relation_priv parameter describing relation, or NULL. Will be passed to func function.
+ * @param in member_priv parameter describing relation member, or NULL. Will be passed to func function.
+ * @param in type This member type: 1 - node, 2 - way, 3 - relation.
+ * Set to -1 to add a default member entry which matches any map item of any type which
+ * is not a member of any relation.
+ * @param in id OSM ID of relation member.
*/
void
-relations_add_func(struct relations *rel, struct relations_func *func, void *relation_priv, void *member_priv, int type, osmid id)
+relations_add_relation_member_entry(struct relations *rel, struct relations_func *func, void
+ *relation_priv, void *member_priv, int type, osmid id)
{
struct relations_member *memb=g_new(struct relations_member, 1);
@@ -100,8 +103,10 @@
}
/*
- * @brief Process relations members from the file.
- * @param in rel struct relations storing pre-processed relations info
+ * @brief The actual relations processing: Loop through raw data and process any relations members.
+ * This function reads through all nodes and ways passed in, and looks up each item in the
+ * relations collection. For each relation member found, its processing function is called.
+ * @param in rel relations collection storing pre-processed relations. Built using relations_add_relation_member_entry.
* @param in nodes file containing nodes in "coords.tmp" format
* @param in ways file containing items in item_bin format. This file may contain both nodes, ways, and relations in that format.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2014-07-07 14:28:33
|
Revision: 5807
http://sourceforge.net/p/navit/code/5807
Author: sleske
Date: 2014-07-07 14:28:25 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Refactor:core:Extract house number interpolation to search_houseno_interpol.c
Modified Paths:
--------------
trunk/navit/navit/CMakeLists.txt
trunk/navit/navit/search.c
Added Paths:
-----------
trunk/navit/navit/search_houseno_interpol.c
trunk/navit/navit/search_houseno_interpol.h
Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt 2014-07-07 14:28:09 UTC (rev 5806)
+++ trunk/navit/navit/CMakeLists.txt 2014-07-07 14:28:25 UTC (rev 5807)
@@ -9,7 +9,7 @@
event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c
linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navit_nls.c navigation.c osd.c param.c phrase.c plugin.c popup.c
profile.c profile_option.c projection.c roadprofile.c route.c routech.c script.c search.c speech.c start_real.c sunriset.c transform.c track.c
- util.c vehicle.c vehicleprofile.c xmlconfig.c )
+ search_houseno_interpol.c util.c vehicle.c vehicleprofile.c xmlconfig.c )
if(NOT USE_PLUGINS)
list(APPEND NAVIT_SRC ${CMAKE_CURRENT_BINARY_DIR}/builtin.c)
Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c 2014-07-07 14:28:09 UTC (rev 5806)
+++ trunk/navit/navit/search.c 2014-07-07 14:28:25 UTC (rev 5807)
@@ -34,6 +34,7 @@
#include "linguistics.h"
#include "geom.h"
#include "util.h"
+#include "search_houseno_interpol.h"
#ifdef HAVE_API_ANDROID
#include "android.h"
@@ -57,52 +58,6 @@
GList *list,*curr,*last;
};
-enum include_end_nodes {
- end_nodes_yes,
- end_nodes_no,
-};
-
-struct hn_interpol_attr {
- enum attr_type house_number_interpol_attr;
- int interpol_increment;
- enum include_end_nodes include_end_nodes;
-};
-
-#define house_number_interpol_attr_END -1
-/**
- * Attributes that indicate a house number interpolation,
- * along with interpolation information.
- */
-struct hn_interpol_attr house_number_interpol_attrs[] = {
- { attr_house_number_left, 1, end_nodes_yes },
- { attr_house_number_left_odd, 2, end_nodes_yes },
- { attr_house_number_left_even, 2, end_nodes_yes },
- { attr_house_number_right, 1, end_nodes_yes },
- { attr_house_number_right_odd, 2, end_nodes_yes },
- { attr_house_number_right_even, 2, end_nodes_yes },
- { attr_house_number_interpolation_no_ends_incrmt_1, 1, end_nodes_no },
- { attr_house_number_interpolation_no_ends_incrmt_2, 2, end_nodes_no },
- { house_number_interpol_attr_END, -1, -1 },
-};
-
-/** Data for a house number interpolation. */
-struct house_number_interpolation {
- /** Index of interpolation attribute currently used. */
- int curr_interpol_attr_idx;
- /** Interpolation increment */
- int increment;
- /** Reverse interpolation? (0/1) */
- int rev;
- /** First number. */
- char *first;
- /** Last number. */
- char *last;
- /** Include first and last node in interpolation results? */
- enum include_end_nodes include_end_nodes;
- /** Current number in running interpolation. */
- char *curr;
-};
-
struct search_list {
struct mapset *ms;
struct item *item;
@@ -188,23 +143,6 @@
}
}
-static void
-house_number_interpolation_clear_current(struct house_number_interpolation *inter)
-{
- g_free(inter->first);
- g_free(inter->last);
- g_free(inter->curr);
- inter->first=inter->last=inter->curr=NULL;
- inter->increment=inter->include_end_nodes=-1;
-}
-
-static void
-house_number_interpolation_clear_all(struct house_number_interpolation *inter)
-{
- inter->curr_interpol_attr_idx=0;
- house_number_interpolation_clear_current(inter);
-}
-
static char *
search_fix_spaces(char *str)
{
@@ -701,179 +639,6 @@
g_free(this_);
}
-static char *
-search_next_house_number_curr_interpol_with_ends(struct house_number_interpolation *inter)
-{
- dbg(1,"interpolate %s-%s %s\n",inter->first,inter->last,inter->curr);
- if (!inter->first || !inter->last)
- return NULL;
- if (!inter->curr)
- inter->curr=g_strdup(inter->first);
- else {
- if (strcmp(inter->curr, inter->last)) {
- int next=atoi(inter->curr)+(inter->increment);
- g_free(inter->curr);
- if (next == atoi(inter->last))
- inter->curr=g_strdup(inter->last);
- else
- inter->curr=g_strdup_printf("%d",next);
- } else {
- g_free(inter->curr);
- inter->curr=NULL;
- }
- }
- dbg(1,"interpolate result %s\n",inter->curr);
- return inter->curr;
-}
-
-static int
-house_number_is_end_number(char* house_number, struct house_number_interpolation *inter) {
- return ( (!strcmp(house_number, inter->first))
- || (!strcmp(house_number, inter->last)) );
-}
-
-static char *
-search_next_house_number_curr_interpol(struct house_number_interpolation *inter)
-{
- char* hn=NULL;
- switch (inter->include_end_nodes) {
- case end_nodes_yes:
- hn=search_next_house_number_curr_interpol_with_ends(inter);
- break;
- case end_nodes_no:
- do {
- hn=search_next_house_number_curr_interpol_with_ends(inter);
- } while (hn!=NULL && house_number_is_end_number(hn, inter));
- break;
- }
- return hn;
-}
-
-static void
-search_house_number_interpolation_split(char *str, struct house_number_interpolation *inter)
-{
- char *pos=strchr(str,'-');
- char *first,*last;
- int len;
- if (!pos) {
- inter->first=g_strdup(str);
- inter->last=g_strdup(str);
- inter->rev=0;
- return;
- }
- len=pos-str;
- first=g_malloc(len+1);
- strncpy(first, str, len);
- first[len]='\0';
- last=g_strdup(pos+1);
- dbg(1,"%s = %s - %s\n",str, first, last);
- if (atoi(first) > atoi(last)) {
- inter->first=last;
- inter->last=first;
- inter->rev=1;
- } else {
- inter->first=first;
- inter->last=last;
- inter->rev=0;
- }
-}
-
-static int
-search_match(char *str, char *search, int partial)
-{
- if (!partial)
- return (!g_ascii_strcasecmp(str, search));
- else
- return (!g_ascii_strncasecmp(str, search, strlen(search)));
-}
-
-static struct pcoord *
-search_house_number_coordinate(struct item *item, struct house_number_interpolation *inter)
-{
- struct pcoord *ret=g_new(struct pcoord, 1);
- ret->pro = map_projection(item->map);
- dbg(1,"%s\n",item_to_name(item->type));
- if (!inter) {
- struct coord c;
- if (item_coord_get(item, &c, 1)) {
- ret->x=c.x;
- ret->y=c.y;
- } else {
- g_free(ret);
- ret=NULL;
- }
- } else {
- int count,max=1024;
- int hn_pos,hn_length;
- int inter_increment=inter->increment;
- struct coord *c=g_alloca(sizeof(struct coord)*max);
- item_coord_rewind(item);
- count=item_coord_get(item, c, max);
- hn_length=atoi(inter->last)-atoi(inter->first);
- if (inter->rev)
- hn_pos=atoi(inter->last)-atoi(inter->curr);
- else
- hn_pos=atoi(inter->curr)-atoi(inter->first);
- if (count) {
- int i,distance_sum=0,hn_distance;
- int *distances=g_alloca(sizeof(int)*(count-1));
- dbg(1,"count=%d hn_length=%d hn_pos=%d (%s of %s-%s)\n",count,hn_length,hn_pos,inter->curr,inter->first,inter->last);
- if (!hn_length) {
- hn_length=2;
- hn_pos=1;
- }
- if (count == max)
- dbg(0,"coordinate overflow\n");
- for (i = 0 ; i < count-1 ; i++) {
- distances[i]=navit_sqrt(transform_distance_sq(&c[i],&c[i+1]));
- distance_sum+=distances[i];
- dbg(1,"distance[%d]=%d\n",i,distances[i]);
- }
- dbg(1,"sum=%d\n",distance_sum);
-#if 0
- hn_distance=distance_sum*hn_pos/hn_length;
-#else
- hn_distance=(distance_sum*hn_pos+distance_sum*inter_increment/2)/(hn_length+inter_increment);
-#endif
- dbg(1,"hn_distance=%d\n",hn_distance);
- i=0;
- while (i < count-1 && hn_distance > distances[i])
- hn_distance-=distances[i++];
- dbg(1,"remaining distance=%d from %d\n",hn_distance,distances[i]);
- ret->x=(c[i+1].x-c[i].x)*hn_distance/distances[i]+c[i].x;
- ret->y=(c[i+1].y-c[i].y)*hn_distance/distances[i]+c[i].y;
- }
- }
- return ret;
-}
-
-static char *
-search_next_interpolated_house_number(struct item *item, struct house_number_interpolation *inter, char *inter_match, int inter_partial)
-{
- while (1) {
- char *hn;
- struct attr attr;
- struct hn_interpol_attr curr_interpol_attr;
- while((hn=search_next_house_number_curr_interpol(inter))){
- if (search_match(hn, inter_match, inter_partial)) {
- return map_convert_string(item->map, hn);
- }
- }
-
- house_number_interpolation_clear_current(inter);
- curr_interpol_attr=house_number_interpol_attrs[inter->curr_interpol_attr_idx];
- if (curr_interpol_attr.house_number_interpol_attr==house_number_interpol_attr_END) {
- return NULL;
- }
- if (item_attr_get(item, curr_interpol_attr.house_number_interpol_attr, &attr)) {
- search_house_number_interpolation_split(attr.u.str, inter);
- inter->increment=curr_interpol_attr.interpol_increment;
- inter->include_end_nodes=curr_interpol_attr.include_end_nodes;
- }
- inter->curr_interpol_attr_idx++;
- }
-}
-
static struct search_list_house_number *
search_list_house_number_new(struct item *item, struct house_number_interpolation *inter, char *inter_match, int inter_partial)
{
Added: trunk/navit/navit/search_houseno_interpol.c
===================================================================
--- trunk/navit/navit/search_houseno_interpol.c (rev 0)
+++ trunk/navit/navit/search_houseno_interpol.c 2014-07-07 14:28:25 UTC (rev 5807)
@@ -0,0 +1,251 @@
+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+#include <string.h>
+#include <math.h>
+#include "debug.h"
+#include "projection.h"
+#include "item.h"
+#include "xmlconfig.h"
+#include "map.h"
+#include "mapset.h"
+#include "coord.h"
+#include "transform.h"
+#include "search.h"
+#include "country.h"
+#include "linguistics.h"
+#include "geom.h"
+#include "util.h"
+#include "search_houseno_interpol.h"
+
+struct hn_interpol_attr {
+ enum attr_type house_number_interpol_attr;
+ int interpol_increment;
+ enum include_end_nodes include_end_nodes;
+};
+
+#define house_number_interpol_attr_END -1
+/**
+ * Attributes that indicate a house number interpolation,
+ * along with interpolation information.
+ */
+struct hn_interpol_attr house_number_interpol_attrs[] = {
+ { attr_house_number_left, 1, end_nodes_yes },
+ { attr_house_number_left_odd, 2, end_nodes_yes },
+ { attr_house_number_left_even, 2, end_nodes_yes },
+ { attr_house_number_right, 1, end_nodes_yes },
+ { attr_house_number_right_odd, 2, end_nodes_yes },
+ { attr_house_number_right_even, 2, end_nodes_yes },
+ { attr_house_number_interpolation_no_ends_incrmt_1, 1, end_nodes_no },
+ { attr_house_number_interpolation_no_ends_incrmt_2, 2, end_nodes_no },
+ { house_number_interpol_attr_END, -1, -1 },
+};
+
+void
+house_number_interpolation_clear_current(struct house_number_interpolation *inter)
+{
+ g_free(inter->first);
+ g_free(inter->last);
+ g_free(inter->curr);
+ inter->first=inter->last=inter->curr=NULL;
+ inter->increment=inter->include_end_nodes=-1;
+}
+
+void
+house_number_interpolation_clear_all(struct house_number_interpolation *inter)
+{
+ inter->curr_interpol_attr_idx=0;
+ house_number_interpolation_clear_current(inter);
+}
+
+static char *
+search_next_house_number_curr_interpol_with_ends(struct house_number_interpolation *inter)
+{
+ dbg(1,"interpolate %s-%s %s\n",inter->first,inter->last,inter->curr);
+ if (!inter->first || !inter->last)
+ return NULL;
+ if (!inter->curr)
+ inter->curr=g_strdup(inter->first);
+ else {
+ if (strcmp(inter->curr, inter->last)) {
+ int next=atoi(inter->curr)+(inter->increment);
+ g_free(inter->curr);
+ if (next == atoi(inter->last))
+ inter->curr=g_strdup(inter->last);
+ else
+ inter->curr=g_strdup_printf("%d",next);
+ } else {
+ g_free(inter->curr);
+ inter->curr=NULL;
+ }
+ }
+ dbg(1,"interpolate result %s\n",inter->curr);
+ return inter->curr;
+}
+
+static int
+house_number_is_end_number(char* house_number, struct house_number_interpolation *inter) {
+ return ( (!strcmp(house_number, inter->first))
+ || (!strcmp(house_number, inter->last)) );
+}
+
+static char *
+search_next_house_number_curr_interpol(struct house_number_interpolation *inter)
+{
+ char* hn=NULL;
+ switch (inter->include_end_nodes) {
+ case end_nodes_yes:
+ hn=search_next_house_number_curr_interpol_with_ends(inter);
+ break;
+ case end_nodes_no:
+ do {
+ hn=search_next_house_number_curr_interpol_with_ends(inter);
+ } while (hn!=NULL && house_number_is_end_number(hn, inter));
+ break;
+ }
+ return hn;
+}
+
+static void
+search_house_number_interpolation_split(char *str, struct house_number_interpolation *inter)
+{
+ char *pos=strchr(str,'-');
+ char *first,*last;
+ int len;
+ if (!pos) {
+ inter->first=g_strdup(str);
+ inter->last=g_strdup(str);
+ inter->rev=0;
+ return;
+ }
+ len=pos-str;
+ first=g_malloc(len+1);
+ strncpy(first, str, len);
+ first[len]='\0';
+ last=g_strdup(pos+1);
+ dbg(1,"%s = %s - %s\n",str, first, last);
+ if (atoi(first) > atoi(last)) {
+ inter->first=last;
+ inter->last=first;
+ inter->rev=1;
+ } else {
+ inter->first=first;
+ inter->last=last;
+ inter->rev=0;
+ }
+}
+
+struct pcoord *
+search_house_number_coordinate(struct item *item, struct house_number_interpolation *inter)
+{
+ struct pcoord *ret=g_new(struct pcoord, 1);
+ ret->pro = map_projection(item->map);
+ dbg(1,"%s\n",item_to_name(item->type));
+ if (!inter) {
+ struct coord c;
+ if (item_coord_get(item, &c, 1)) {
+ ret->x=c.x;
+ ret->y=c.y;
+ } else {
+ g_free(ret);
+ ret=NULL;
+ }
+ } else {
+ int count,max=1024;
+ int hn_pos,hn_length;
+ int inter_increment=inter->increment;
+ struct coord *c=g_alloca(sizeof(struct coord)*max);
+ item_coord_rewind(item);
+ count=item_coord_get(item, c, max);
+ hn_length=atoi(inter->last)-atoi(inter->first);
+ if (inter->rev)
+ hn_pos=atoi(inter->last)-atoi(inter->curr);
+ else
+ hn_pos=atoi(inter->curr)-atoi(inter->first);
+ if (count) {
+ int i,distance_sum=0,hn_distance;
+ int *distances=g_alloca(sizeof(int)*(count-1));
+ dbg(1,"count=%d hn_length=%d hn_pos=%d (%s of %s-%s)\n",count,hn_length,hn_pos,inter->curr,inter->first,inter->last);
+ if (!hn_length) {
+ hn_length=2;
+ hn_pos=1;
+ }
+ if (count == max)
+ dbg(0,"coordinate overflow\n");
+ for (i = 0 ; i < count-1 ; i++) {
+ distances[i]=navit_sqrt(transform_distance_sq(&c[i],&c[i+1]));
+ distance_sum+=distances[i];
+ dbg(1,"distance[%d]=%d\n",i,distances[i]);
+ }
+ dbg(1,"sum=%d\n",distance_sum);
+#if 0
+ hn_distance=distance_sum*hn_pos/hn_length;
+#else
+ hn_distance=(distance_sum*hn_pos+distance_sum*inter_increment/2)/(hn_length+inter_increment);
+#endif
+ dbg(1,"hn_distance=%d\n",hn_distance);
+ i=0;
+ while (i < count-1 && hn_distance > distances[i])
+ hn_distance-=distances[i++];
+ dbg(1,"remaining distance=%d from %d\n",hn_distance,distances[i]);
+ ret->x=(c[i+1].x-c[i].x)*hn_distance/distances[i]+c[i].x;
+ ret->y=(c[i+1].y-c[i].y)*hn_distance/distances[i]+c[i].y;
+ }
+ }
+ return ret;
+}
+
+static int
+search_match(char *str, char *search, int partial)
+{
+ if (!partial)
+ return (!g_ascii_strcasecmp(str, search));
+ else
+ return (!g_ascii_strncasecmp(str, search, strlen(search)));
+}
+
+char *
+search_next_interpolated_house_number(struct item *item, struct house_number_interpolation *inter, char *inter_match, int inter_partial)
+{
+ while (1) {
+ char *hn;
+ struct attr attr;
+ struct hn_interpol_attr curr_interpol_attr;
+ while((hn=search_next_house_number_curr_interpol(inter))){
+ if (search_match(hn, inter_match, inter_partial)) {
+ return map_convert_string(item->map, hn);
+ }
+ }
+
+ house_number_interpolation_clear_current(inter);
+ curr_interpol_attr=house_number_interpol_attrs[inter->curr_interpol_attr_idx];
+ if (curr_interpol_attr.house_number_interpol_attr==house_number_interpol_attr_END) {
+ return NULL;
+ }
+ if (item_attr_get(item, curr_interpol_attr.house_number_interpol_attr, &attr)) {
+ search_house_number_interpolation_split(attr.u.str, inter);
+ inter->increment=curr_interpol_attr.interpol_increment;
+ inter->include_end_nodes=curr_interpol_attr.include_end_nodes;
+ }
+ inter->curr_interpol_attr_idx++;
+ }
+}
+
Added: trunk/navit/navit/search_houseno_interpol.h
===================================================================
--- trunk/navit/navit/search_houseno_interpol.h (rev 0)
+++ trunk/navit/navit/search_houseno_interpol.h 2014-07-07 14:28:25 UTC (rev 5807)
@@ -0,0 +1,54 @@
+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *
+ * Boston, MA 02110-1301, USA.
+ */
+
+enum include_end_nodes {
+ end_nodes_yes,
+ end_nodes_no,
+};
+
+/** Data for a house number interpolation. */
+struct house_number_interpolation {
+ /** Index of interpolation attribute currently used. */
+ int curr_interpol_attr_idx;
+ /** Interpolation increment */
+ int increment;
+ /** Reverse interpolation? (0/1) */
+ int rev;
+ /** First number. */
+ char *first;
+ /** Last number. */
+ char *last;
+ /** Include first and last node in interpolation results? */
+ enum include_end_nodes include_end_nodes;
+ /** Current number in running interpolation. */
+ char *curr;
+};
+
+void
+house_number_interpolation_clear_current(struct house_number_interpolation *inter);
+
+void
+house_number_interpolation_clear_all(struct house_number_interpolation *inter);
+
+char *
+search_next_interpolated_house_number(struct item *item, struct house_number_interpolation
+ *inter, char *inter_match, int inter_partial);
+
+struct pcoord *
+search_house_number_coordinate(struct item *item, struct house_number_interpolation *inter);
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.
