Menu
▾
▴
navit-cvs-commit
|
From: <md...@us...> - 2014-11-08 12:22:06
|
Revision: 5928
http://sourceforge.net/p/navit/code/5928
Author: mdankov
Date: 2014-11-08 12:21:56 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Add:core:Set CPACK parameters to produce ready to use packages with default settings.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/maps/CMakeLists.txt
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2014-11-06 18:54:16 UTC (rev 5927)
+++ trunk/navit/CMakeLists.txt 2014-11-08 12:21:56 UTC (rev 5928)
@@ -13,8 +13,11 @@
cmake_minimum_required(VERSION 2.6)
cmake_policy(VERSION 2.6)
+set(NAVIT_VERSION_MAJOR "0")
+set(NAVIT_VERSION_MINOR "5")
+set(NAVIT_VERSION_PATCH "0")
+set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_VERSION_PATCH}")
-set(PACKAGE_VERSION "0.5.0")
set(PACKAGE_NAME "navit-svn")
set(PACKAGE "navit")
set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}")
@@ -99,8 +102,34 @@
add_module(autoload/osso "Default" FALSE)
add_module(map/garmin "Garmin library not found" FALSE)
add_feature(USE_NATIVE_LANGUAGE_SUPPORT "Gettext not found and not on Windows" FALSE)
+set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cpack.cmake")
+set(CPACK_PACKAGE_VENDOR "Navit team")
+set(CPACK_PACKAGE_VERSION_MAJOR ${NAVIT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${NAVIT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH "${NAVIT_VERSION_PATCH}")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/GPL-2")
+set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}")
+set(CPACK_PACKAGE_FILE_NAME ${PACKAGE})
+set(CPACK_PACKAGE_EXECUTABLES "navit;Navit")
+set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+set(CPACK_NSIS_HELP_LINK "http://www.navit-project.org/?page=contact")
+set(CPACK_NSIS_URL_INFO_ABOUT "http://www.navit-project.org")
+if(WIN32)
+ add_feature(USE_NSIS "makensis not found" FALSE)
+ FIND_PROGRAM(NSIS_EXECUTABLE NAMES makensis makensis.exe)
+ if(NSIS_EXECUTABLE)
+ set(USE_NSIS TRUE)
+ endif(NSIS_EXECUTABLE)
+ set(CPACK_GENERATOR ZIP)
+ if(USE_NSIS)
+ list(APPEND CPACK_GENERATOR NSIS)
+ endif(USE_NSIS)
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY Navit)
+endif(WIN32)
INCLUDE (CPack)
+
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckLibraryExists)
INCLUDE (CheckFunctionExists)
@@ -520,7 +549,6 @@
if (WIN32 AND NOT WINCE)
set(HAVE_API_WIN32 1)
set(HAVE_STDINT_H 1)
- set(SAMPLE_MAP FALSE)
list(APPEND NAVIT_LIBS winmm)
endif()
if(WINCE)
Modified: trunk/navit/navit/maps/CMakeLists.txt
===================================================================
--- trunk/navit/navit/maps/CMakeLists.txt 2014-11-06 18:54:16 UTC (rev 5927)
+++ trunk/navit/navit/maps/CMakeLists.txt 2014-11-08 12:21:56 UTC (rev 5928)
@@ -38,4 +38,7 @@
VERBATIM
)
endif()
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
+ DESTINATION ${SHARE_DIR}/maps
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endif()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2014-11-09 20:13:15
|
Revision: 5936
http://sourceforge.net/p/navit/code/5936
Author: mdankov
Date: 2014-11-09 20:13:03 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Set CPACK_INCLUDE_TOPLEVEL_DIRECTORY only for zip cpack generator, otherwise it breaks NSIS package generation when strict settings are active.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
Added Paths:
-----------
trunk/navit/cpack.cmake
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2014-11-09 19:58:17 UTC (rev 5935)
+++ trunk/navit/CMakeLists.txt 2014-11-09 20:13:03 UTC (rev 5936)
@@ -112,7 +112,6 @@
set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}")
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE})
set(CPACK_PACKAGE_EXECUTABLES "navit;Navit")
-set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
set(CPACK_NSIS_HELP_LINK "http://www.navit-project.org/?page=contact")
set(CPACK_NSIS_URL_INFO_ABOUT "http://www.navit-project.org")
if(WIN32)
Added: trunk/navit/cpack.cmake
===================================================================
--- trunk/navit/cpack.cmake (rev 0)
+++ trunk/navit/cpack.cmake 2014-11-09 20:13:03 UTC (rev 5936)
@@ -0,0 +1,4 @@
+if(CPACK_GENERATOR=="ZIP")
+ set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+endif(CPACK_GENERATOR=="ZIP")
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2014-12-15 15:13:02
|
Revision: 5976
http://sourceforge.net/p/navit/code/5976
Author: kazer_
Date: 2014-12-15 15:12:59 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------
Add:Plugin:Added the j1850 plugin, allows Navit to read CAN-BUS datas in some cars using this protocol
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
Added Paths:
-----------
trunk/navit/navit/plugin/j1850/
trunk/navit/navit/plugin/j1850/CMakeLists.txt
trunk/navit/navit/plugin/j1850/j1850.c
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2014-11-26 12:49:37 UTC (rev 5975)
+++ trunk/navit/CMakeLists.txt 2014-12-15 15:12:59 UTC (rev 5976)
@@ -423,6 +423,7 @@
#Modules without test yet
add_module(plugin/pedestrian "Default" FALSE)
+add_module(plugin/j1850 "Default" FALSE)
add_module(speech/android "Default" FALSE)
add_module(speech/espeak "Default" FALSE)
add_module(speech/iphone "Default" FALSE)
Added: trunk/navit/navit/plugin/j1850/CMakeLists.txt
===================================================================
--- trunk/navit/navit/plugin/j1850/CMakeLists.txt (rev 0)
+++ trunk/navit/navit/plugin/j1850/CMakeLists.txt 2014-12-15 15:12:59 UTC (rev 5976)
@@ -0,0 +1 @@
+module_add_library(plugin_j1850 j1850.c)
Added: trunk/navit/navit/plugin/j1850/j1850.c
===================================================================
--- trunk/navit/navit/plugin/j1850/j1850.c (rev 0)
+++ trunk/navit/navit/plugin/j1850/j1850.c 2014-12-15 15:12:59 UTC (rev 5976)
@@ -0,0 +1,499 @@
+/* vim: set tabstop=4 expandtab: */
+/**
+ * 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.
+ */
+
+/*
+ This plugin implements a small subset of the SAE j1850 protocal used in some cars.
+ So far the code assumes that it is run on Linux. It allows Navit to read the steering
+ wheel inputs and some metrics like RPM or the fuel tank level
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <glib.h>
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include "config.h"
+#include <navit/item.h>
+#include <navit/xmlconfig.h>
+#include <navit/main.h>
+#include <navit/debug.h>
+#include <navit/map.h>
+#include <navit/navit.h>
+#include <navit/callback.h>
+#include <navit/file.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
+#include <navit/command.h>
+#include <navit/config_.h>
+#include "graphics.h"
+#include "color.h"
+#include "osd.h"
+
+const char *init_string[] = {
+ "ATZ\r\n",
+ "ATI\r\n",
+ "ATL1\r\n",
+ "ATH1\r\n",
+ "ATS1\r\n",
+ "ATAL\r\n",
+ "ATMA\r\n",
+ NULL
+};
+
+struct j1850 {
+ struct navit *nav;
+ int status;
+ int device;
+ int index;
+ char message[255];
+ char * filename;
+ struct event_idle *idle;
+ struct callback *callback;
+ struct osd_item osd_item;
+ int width;
+ struct graphics_gc *orange,*white;
+ struct callback *click_cb;
+ int init_string_index;
+
+ int rpm;
+ int tank_level;
+ int odo;
+};
+
+/**
+ * @brief Generates a fake sentence. Used for debugging
+ * @param[in] dest - the char * to which we will write the sentence
+ * lenght - the length of the sentence to generate
+ *
+ * @return nothing
+ *
+ * Generates a fake string to simulate data from the serial port
+ *
+ */
+void rand_str(char *dest, size_t length) {
+ char charset[] = "0123456789"
+ "ABCDEF";
+
+ while (length-- > 0) {
+ size_t index = (double) rand() / RAND_MAX * (sizeof charset - 1);
+ *dest++ = charset[index];
+ }
+ *dest = '\0';
+}
+
+/**
+ * @brief Writes 'cmd' to the serial port'
+ * @param[in] cmd - the char * that we will write to the serial port
+ * device - the serial port device
+ *
+ * @return nothing
+ *
+ * Write the cmd to the serial port
+ *
+ */
+void write_to_serial_port(unsigned char *cmd, int device)
+{
+ int n_written = 0;
+ do {
+ n_written += write( device, &cmd[n_written], 1 );
+ }
+ while (cmd[n_written-1] != '\r' && n_written > 0);
+ dbg(0,"sent %s to the serial port\n",cmd);
+}
+
+/**
+ * @brief Function called when navit is idle. Does the continous reading
+ * @param[in] j1850 - the j1850 struct containing the state of the plugin
+ *
+ * @return nothing
+ *
+ * This is the main function of this plugin. It is called when navit is idle,
+ * and performs the initialization of the obd device if needed, then reads
+ * one char each time it is called, and puts this char in a buffer. When it
+ * reads an EOL character, the buffer is parsed, and the appropriate action is
+ * taken. The buffer is then cleared and we start over.
+ *
+ */
+static void
+j1850_idle(struct j1850 *j1850)
+{
+ int n; // used to keep track of the numbers of char read from the device
+ int value; // used to convert the ascii char to an int
+ char buf = '\0'; // the buffer where we store the char read from the device
+ char header[3]; // a buffer to store the j1850 header for easier matching
+ struct timeval tv; // used to timestamp the logs
+ struct attr navit;
+ // Make sure we sent all init commands before trying to read
+ if ( init_string[j1850->init_string_index])
+ {
+ dbg(0,"Sending next init command : %s\n",init_string[j1850->init_string_index]);
+ if (j1850->device > 0 ){
+ write_to_serial_port(init_string[j1850->init_string_index++],j1850->device);
+ }
+
+ // Did we reach the last init command?
+ if ( !init_string[j1850->init_string_index])
+ {
+ // if yes, switch to idle read instead of timed read
+ event_remove_timeout(j1850->idle);
+ j1850->idle=event_add_idle(125, j1850->callback);
+ }
+ return;
+ }
+ navit.type=attr_navit;
+ navit.u.navit=j1850->nav;
+
+ // If not connected, generate random messages for debugging purpose
+ if (j1850->device < 0 ){
+ rand_str(j1850->message,8);
+ return;
+ }
+
+ n = read( j1850->device, &buf, 1 );
+ if(n == -1) {
+ dbg(1,"x\n");
+ } else if (n==0) {
+ dbg(1,".\n");
+ } else {
+ if( buf == 13 ) {
+ gettimeofday(&tv, NULL);
+ unsigned long long millisecondsSinceEpoch =
+ (unsigned long long)(tv.tv_sec) * 1000 +
+ (unsigned long long)(tv.tv_usec) / 1000;
+
+ j1850->message[j1850->index]='\0';
+ FILE *fp;
+ fp = fopen(j1850->filename,"a");
+ fprintf(fp, "%llu,%s\n", millisecondsSinceEpoch, j1850->message);
+ fclose(fp);
+ strncpy(header, j1850->message, 2);
+ header[2]='\0';
+ if( strncmp(header,"10",2)==0 ) {
+ char * w1 = strndup(j1850->message+2, 4);
+ j1850->rpm = ((int)strtol(w1, NULL, 16) ) / 4 ;
+ } else if( strncmp(header,"3D",2)==0 ) {
+ if (strcmp(j1850->message, "3D110000EE") == 0) {
+ // noise
+ } else if (strcmp(j1850->message, "3D1120009B") == 0) {
+ dbg(0,"L1\n");
+ command_evaluate(&navit, "gui.spotify_volume_up()" );
+ } else if (strcmp(j1850->message, "3D110080C8") == 0) {
+ dbg(0,"L2\n");
+ command_evaluate(&navit, "gui.spotify_volume_toggle()" );
+ } else if (strcmp(j1850->message, "3D1110005A") == 0) {
+ dbg(0,"L3\n");
+ command_evaluate(&navit, "gui.spotify_volume_down()" );
+ } else if (strcmp(j1850->message, "3D110400C3") == 0) {
+ dbg(0,"R1\n");
+ command_evaluate(&navit, "gui.spotify_next_track()" );
+ } else if (strcmp(j1850->message, "3D110002D4") == 0) {
+ dbg(0,"R2\n");
+ command_evaluate(&navit, "gui.spotify_toggle()" );
+ } else if (strcmp(j1850->message, "3D11020076") == 0) {
+ dbg(0,"R3\n");
+ command_evaluate(&navit, "gui.spotify_previous_track()" );
+ } else {
+ dbg(0,"Got button from %s\n", j1850->message);
+ }
+ } else if( strncmp(header,"72",2)==0 ) {
+ char * data=strndup(j1850->message+2, 8);
+ j1850->odo=((int)strtol(data, NULL, 16) )/8000;
+ } else if( strncmp(header,"90",2)==0 ) {
+ } else if( strncmp(header,"A4",2)==0 ) {
+ char * w1 =strndup(j1850->message+2, 4);
+ j1850->tank_level = ((int)strtol(w1, NULL, 16) ) / 4 ;
+ } else {
+ // printf(" ascii: %i [%s] with header [%s]\n",buf, response, header);
+ }
+ // Message has been processed. Let's clear it
+ j1850->message[0]='\0';
+ j1850->index=0;
+ } else {
+ value=buf-48;
+ if(value==-16 || buf == 10 ){
+ //space and newline, discard
+ return;
+ } else if (value>16) {
+ // chars, need to shift down
+ value-=7;
+ j1850->message[j1850->index]=buf;
+ j1850->index++;
+ } else if (buf == '<' ) {
+ // We have a data error. Let's truncate the message
+ j1850->message[j1850->index]='\0';
+ j1850->index++;
+ } else {
+ j1850->message[j1850->index]=buf;
+ j1850->index++;
+ }
+ // printf("{%c:%i}", buf,value);
+ }
+ }
+}
+
+/**
+ * @brief Draws the j1850 OSD
+ * @param[in] j1850 - the j1850 struct containing the state of the plugin
+ * nav - the navit object
+ * v - the vehicle object
+ *
+ * @return nothing
+ *
+ * Draws the j1850 OSD. Currently it only displays the last parsed message
+ *
+ */
+static void
+osd_j1850_draw(struct j1850 *this, struct navit *nav,
+ struct vehicle *v)
+{
+ osd_std_draw(&this->osd_item);
+
+ struct point p, bbox[4];
+
+ graphics_get_text_bbox(this->osd_item.gr, this->osd_item.font, this->message, 0x10000, 0, bbox, 0);
+ p.x=(this->osd_item.w-bbox[2].x)/2;
+ p.y = this->osd_item.h-this->osd_item.h/10;
+
+ struct graphics_gc *curr_color = this->white;
+ // online? use this->bActive?this->white:this->orange;
+ graphics_draw_text(this->osd_item.gr, curr_color, NULL, this->osd_item.font, this->message, &p, 0x10000, 0);
+ graphics_draw_mode(this->osd_item.gr, draw_mode_end);
+}
+
+/**
+ * @brief Initialize the j1850 OSD
+ * @param[in] j1850 - the j1850 struct containing the state of the plugin
+ * nav - the navit object
+ *
+ * @return nothing
+ *
+ * Initialize the j1850 OSD
+ *
+ */
+static void
+osd_j1850_init(struct j1850 *this, struct navit *nav)
+{
+
+ struct color c;
+ osd_set_std_graphic(nav, &this->osd_item, (struct osd_priv *)this);
+
+ // Used when debugging or when the device is offline
+ this->orange = graphics_gc_new(this->osd_item.gr);
+ c.r = 0xFFFF;
+ c.g = 0xA5A5;
+ c.b = 0x0000;
+ c.a = 65535;
+ graphics_gc_set_foreground(this->orange, &c);
+ graphics_gc_set_linewidth(this->orange, this->width);
+
+ // Used when we are receiving real datas from the device
+ this->white = graphics_gc_new(this->osd_item.gr);
+ c.r = 65535;
+ c.g = 65535;
+ c.b = 65535;
+ c.a = 65535;
+ graphics_gc_set_foreground(this->white, &c);
+ graphics_gc_set_linewidth(this->white, this->width);
+
+
+ graphics_gc_set_linewidth(this->osd_item.graphic_fg_white, this->width);
+
+ event_add_timeout(500, 1, callback_new_1(callback_cast(osd_j1850_draw), this));
+
+ j1850_init_serial_port(this);
+
+ // navit_add_callback(nav, this->click_cb = callback_new_attr_1(callback_cast (osd_j1850_click), attr_button, this));
+
+ osd_j1850_draw(this, nav, NULL);
+}
+
+/**
+ * @brief Sends 'cmd' and reads the reply from the device
+ * @param[in] cmd - the char * that we will write to the serial port
+ * device - the serial port device
+ *
+ * @return nothing
+ *
+ * Sends 'cmd' and reads the reply from the device
+ *
+ */
+void send_and_read(unsigned char *cmd, int USB)
+{
+ int n_written = 0;
+ do {
+ n_written += write( USB, &cmd[n_written], 1 );
+ }
+ while (cmd[n_written-1] != '\r' && n_written > 0);
+
+ int n = 0;
+ char buf = '\0';
+
+ /* Whole response*/
+ char response[255];
+
+ do
+ {
+ n = read( USB, &buf, 1 );
+ if(n == -1) {
+ dbg(1,"x");
+ } else if (n==0) {
+ dbg(1,".");
+ } else {
+ dbg(1,"[%s]", &buf);
+ }
+ }
+ while( buf != '\r' && n > 0);
+
+ if (n < 0) {
+ dbg(0,"Read error\n");
+ } else if (n == 0) {
+ dbg(0,"Nothing to read?\n");
+ } else {
+ dbg(0,"Response : \n");
+ }
+}
+
+/**
+ * @brief Opens the serial port and saves state to the j1850 object
+ * @param[in] j1850 - the j1850 struct containing the state of the plugin
+ *
+ * @return nothing
+ *
+ * Opens the serial port and saves state to the j1850 object
+ *
+ */
+void
+j1850_init_serial_port(struct j1850 *j1850)
+{
+ j1850->callback=callback_new_1(callback_cast(j1850_idle), j1850);
+ // Fixme : we should read the device path from the config file
+ j1850->device = open( "/dev/ttyUSB0", O_RDWR| O_NOCTTY );
+ if ( j1850->device < 0 )
+ {
+ dbg(0,"Can't open port\n");
+ j1850->idle=event_add_timeout(100, 1, j1850->callback);
+ return;
+ }
+
+ struct termios tty;
+ struct termios tty_old;
+ memset (&tty, 0, sizeof tty);
+
+ /* Error Handling */
+ if ( tcgetattr ( j1850->device, &tty ) != 0 )
+ {
+ dbg(0,"Error\n");
+ return;
+ }
+
+ /* Save old tty parameters */
+ tty_old = tty;
+
+ /* Set Baud Rate */
+ cfsetospeed (&tty, (speed_t)B115200);
+ cfsetispeed (&tty, (speed_t)B115200);
+
+ /* Setting other Port Stuff */
+ tty.c_cflag &= ~PARENB; // Make 8n1
+ tty.c_cflag &= ~CSTOPB;
+ tty.c_cflag &= ~CSIZE;
+ tty.c_cflag |= CS8;
+
+ tty.c_cflag &= ~CRTSCTS; // no flow control
+ tty.c_cc[VMIN] = 1; // read doesn't block
+ tty.c_cc[VTIME] = 10; // 0.5 seconds read timeout
+ tty.c_cflag |= CREAD | CLOCAL; // turn on READ & ignore ctrl lines
+
+ /* Make raw */
+ cfmakeraw(&tty);
+
+ /* Flush Port, then applies attributes */
+ tcflush( j1850->device, TCIFLUSH );
+ if ( tcsetattr ( j1850->device, TCSANOW, &tty ) != 0)
+ {
+ dbg(0,"Flush error\n");
+ return;
+ }
+
+ dbg(0,"Port init ok\n");
+ // For the init part, we want to wait 1sec before each init string
+ j1850->idle=event_add_timeout(1000, 1, j1850->callback);
+}
+
+/**
+ * @brief Creates the j1850 OSD and set some default properties
+ * @param[in] nav - the navit object
+ * meth - the osd_methods
+ * attrs - pointer to the attributes
+ *
+ * @return nothing
+ *
+ * Creates the j1850 OSD and set some default properties
+ *
+ */
+static struct osd_priv *
+osd_j1850_new(struct navit *nav, struct osd_methods *meth,
+ struct attr **attrs)
+{
+ struct j1850 *this=g_new0(struct j1850, 1);
+ this->nav=nav;
+ time_t current_time = time(NULL);
+ // FIXME : make sure that the directory we log to exists!
+ this->filename=g_strdup_printf("/home/navit/.navit/obd/%i.log",current_time);
+ dbg(0,"Will log to %s\n", this->filename);
+ this->init_string_index=0;
+ struct attr *attr;
+ this->osd_item.p.x = 120;
+ this->osd_item.p.y = 20;
+ this->osd_item.w = 160;
+ this->osd_item.h = 20;
+ this->osd_item.navit = nav;
+ this->osd_item.font_size = 200;
+ this->osd_item.meth.draw = osd_draw_cast(osd_j1850_draw);
+
+ osd_set_std_attr(attrs, &this->osd_item, 2);
+ attr = attr_search(attrs, NULL, attr_width);
+ this->width=attr ? attr->u.num : 2;
+ navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_j1850_init), attr_graphics_ready, this));
+ return (struct osd_priv *) this;
+}
+
+/**
+ * @brief The plugin entry point
+ *
+ * @return nothing
+ *
+ * The plugin entry point
+ *
+ */
+void
+plugin_init(void)
+{
+ struct attr callback,navit;
+ struct attr_iter *iter;
+
+ plugin_register_osd_type("j1850", osd_j1850_new);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-03-24 20:54:24
|
Revision: 6028
http://sourceforge.net/p/navit/code/6028
Author: mdankov
Date: 2015-03-24 20:54:21 +0000 (Tue, 24 Mar 2015)
Log Message:
-----------
Fix:port_android:Ask user if they want to start voice data download dialog, if there's no voice data available.
Modified Paths:
--------------
trunk/navit/navit/android/res/values/strings.xml
trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java
trunk/navit/po/ru.po.in
Modified: trunk/navit/navit/android/res/values/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values/strings.xml 2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/navit/android/res/values/strings.xml 2015-03-24 20:54:21 UTC (rev 6028)
@@ -71,5 +71,9 @@
<string name="select_backup">Select backup</string>
<string name="backup">Backup</string>
<string name="restore">Restore</string>
+
+ <!-- TTS -->
+ <string name="TTS_title_data_missing">System text to speech engine data is missing</string>
+ <string name="TTS_qery_install_data">Navit can use any text to speech engine installed on your device. The currently selected engine reports it is unable to speak in your language. Should we ask the system to show voice download dialog?</string>
</resources>
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java 2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java 2015-03-24 20:54:21 UTC (rev 6028)
@@ -20,7 +20,10 @@
package org.navitproject.navit;
import android.content.Intent;
+import android.content.Context;
+import android.content.DialogInterface;
import android.content.pm.PackageManager;
+import android.app.AlertDialog;
import android.speech.tts.TextToSpeech;
import android.util.Log;
@@ -44,10 +47,20 @@
// success, create the TTS instance
mTts = new TextToSpeech(navit, this);
} else {
- // missing data, install it
- Intent installIntent = new Intent();
- installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
- navit.startActivity(installIntent);
+ // missing data, ask to install it
+ AlertDialog.Builder builder = new AlertDialog.Builder(navit);
+ builder
+ .setTitle(R.string.TTS_title_data_missing)
+ .setMessage(R.string.TTS_qery_install_data)
+ .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ Intent installIntent = new Intent();
+ installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+ navit.startActivity(installIntent);
+ }
+ })
+ .setNegativeButton(R.string.no, null)
+ .show();
}
}
}
Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in 2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/po/ru.po.in 2015-03-24 20:54:21 UTC (rev 6028)
@@ -2629,3 +2629,20 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr "Восстановление из копии"
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr "Отсутствуют данные системного приложения преобразования текста в речь"
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
+"Navit может использовать любое приложение преобразования текста в "
+"речь, установленное на Вашем устройстве. Активное сейчас приложение "
+"сообщило о невозможности говорить на Вашем языке. Попросим систему "
+"показать диалог загрузки голосовых данных?"
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-02 17:09:03
|
Revision: 6041
http://sourceforge.net/p/navit/code/6041
Author: kazer_
Date: 2015-04-02 17:08:56 +0000 (Thu, 02 Apr 2015)
Log Message:
-----------
Refactor:core:Removed quesoglc deps
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/configure.in
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2015-03-31 21:04:13 UTC (rev 6040)
+++ trunk/navit/CMakeLists.txt 2015-04-02 17:08:56 UTC (rev 6041)
@@ -160,7 +160,6 @@
#pkg-config based detection
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(QUESOGLC quesoglc)
pkg_check_modules(LIBLOCATION liblocation)
pkg_check_modules(LIBOSSO libosso)
# Accept even old versions of libgps, because N810 uses an old version (see #1179).
Modified: trunk/navit/configure.in
===================================================================
--- trunk/navit/configure.in 2015-03-31 21:04:13 UTC (rev 6040)
+++ trunk/navit/configure.in 2015-04-02 17:08:56 UTC (rev 6041)
@@ -1223,10 +1223,6 @@
then
sdl_failures=$sdl_failures"glut "
fi
-if test x"$glc" != xyes
- then
- sdl_failures=$sdl_failures"quesoglc "
-fi
if test -z "$sdl_failures"
then
echo "OpenGL gui : ENABLED, with $CEGUI_LIBS"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 20:11:53
|
Revision: 6047
http://sourceforge.net/p/navit/code/6047
Author: kazer_
Date: 2015-04-06 20:11:50 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:Translations:Added Korean, 74th translation
Modified Paths:
--------------
trunk/navit/README
Added Paths:
-----------
trunk/navit/po/ko.po.in
Modified: trunk/navit/README
===================================================================
--- trunk/navit/README 2015-04-06 20:01:30 UTC (rev 6046)
+++ trunk/navit/README 2015-04-06 20:11:50 UTC (rev 6047)
@@ -17,34 +17,7 @@
The routing engine not only calculates an optimal route to your
destination, but also generates directions and even speaks to you.
-Navit currently speaks 27 languages :
-- Brazilian Portuguese
-- Bulgarian
-- Chinese (Hong Kong)
-- Czech
-- Danish
-- Dutch
-- English
-- Estonian
-- Finnish
-- French
-- German
-- Hebrew
-- Hungarian
-- Italian
-- Japanese
-- Norwegian Bokmal
-- Polish
-- Portuguese
-- Romanian
-- Russian
-- Slovak
-- Slovenian
-- Spanish
-- Swedish
-- Telugu
-- Thai
-- Turkish
+Navit currently speaks over 70 languages!
You can help translating via our web based translation page :
http://translations.launchpad.net/navit/trunk/+pots/navit
Added: trunk/navit/po/ko.po.in
===================================================================
--- trunk/navit/po/ko.po.in (rev 0)
+++ trunk/navit/po/ko.po.in 2015-04-06 20:11:50 UTC (rev 6047)
@@ -0,0 +1,2635 @@
+# Korean 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:
+# Seungjun, Lee https://launchpad.net/~cybercorean
+
+msgid ""
+msgstr ""
+"Project-Id-Version: navit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-04-03 14:35+0000\n"
+"Last-Translator: Seungjun, Lee <cyb...@gm...>\n"
+"Language-Team: Korean <ko...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Running from source directory\n"
+msgstr ""
+
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: the following counts refer to streets
+msgid "zeroth"
+msgstr ""
+
+msgid "first"
+msgstr "첫번째"
+
+msgid "second"
+msgstr "두번째"
+
+msgid "third"
+msgstr "세번째"
+
+msgid "fourth"
+msgstr "네번째"
+
+msgid "fifth"
+msgstr "다섯번째"
+
+msgid "sixth"
+msgstr "여섯번재"
+
+#. TRANSLATORS: the following counts refer to roundabout exits
+msgid "zeroth exit"
+msgstr ""
+
+msgid "first exit"
+msgstr "첫번째 출구"
+
+msgid "second exit"
+msgstr "두번째 출구"
+
+msgid "third exit"
+msgstr "세번째 출구"
+
+msgid "fourth exit"
+msgstr "네번째 출구"
+
+msgid "fifth exit"
+msgstr "다섯번째 출구"
+
+msgid "sixth exit"
+msgstr "여섯번째 출구"
+
+#, c-format
+msgid "%d m"
+msgstr "%d 미터"
+
+#, c-format
+msgid "in %d m"
+msgstr "%d 미터 후에"
+
+#, c-format
+msgid "%d feet"
+msgstr "%d 피트"
+
+#, c-format
+msgid "in %d feet"
+msgstr "%d 피트 후에"
+
+#, c-format
+msgid "%d meters"
+msgstr "%d 미터"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d 미터 후에"
+
+#, c-format
+msgid "%d.%d miles"
+msgstr "%d.%d 마일"
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr "%d.%d 마일 후에"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d 킬로미터"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d 킬로미터 후에"
+
+#, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] "%d 마일"
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] "%d 마일 후에"
+
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "%d 킬로미터"
+
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "%d 킬로미터 후에"
+
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
+
+msgid "into the ramp"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|male form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|female form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|neutral form"
+msgstr ""
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
+msgid "When possible, please turn around"
+msgstr ""
+
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
+
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
+
+msgid "soon"
+msgstr ""
+
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+msgid "right"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+#, c-format
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr ""
+
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
+#. Android resource: @strings/position_popup_title
+msgid "Position"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Length"
+msgstr ""
+
+msgid "km"
+msgstr ""
+
+msgid "m"
+msgstr ""
+
+msgid "Time"
+msgstr ""
+
+msgid "Destination Length"
+msgstr ""
+
+msgid "Destination Time"
+msgstr ""
+
+msgid "Roadbook"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %d"
+msgstr ""
+
+msgid "Visit before..."
+msgstr ""
+
+msgid "Set as position"
+msgstr ""
+
+msgid "Set as destination"
+msgstr ""
+
+msgid "Add as bookmark"
+msgstr ""
+
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
+#. 020
+msgid "Andorra"
+msgstr ""
+
+#. 784
+msgid "United Arab Emirates"
+msgstr ""
+
+#. 004
+msgid "Afghanistan"
+msgstr ""
+
+#. 028
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. 660
+msgid "Anguilla"
+msgstr ""
+
+#. 008
+msgid "Albania"
+msgstr ""
+
+#. 051
+msgid "Armenia"
+msgstr ""
+
+#. 530
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. 024
+msgid "Angola"
+msgstr ""
+
+#. 010
+msgid "Antarctica"
+msgstr ""
+
+#. 032
+msgid "Argentina"
+msgstr ""
+
+#. 016
+msgid "American Samoa"
+msgstr ""
+
+#. 040
+msgid "Austria"
+msgstr ""
+
+#. 036
+msgid "Australia"
+msgstr ""
+
+#. 533
+msgid "Aruba"
+msgstr ""
+
+#. 248
+msgid "Aland Islands"
+msgstr ""
+
+#. 031
+msgid "Azerbaijan"
+msgstr ""
+
+#. 070
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#. 052
+msgid "Barbados"
+msgstr ""
+
+#. 050
+msgid "Bangladesh"
+msgstr ""
+
+#. 056
+msgid "Belgium"
+msgstr ""
+
+#. 854
+msgid "Burkina Faso"
+msgstr ""
+
+#. 100
+msgid "Bulgaria"
+msgstr ""
+
+#. 048
+msgid "Bahrain"
+msgstr ""
+
+#. 108
+msgid "Burundi"
+msgstr ""
+
+#. 204
+msgid "Benin"
+msgstr ""
+
+#. 652
+msgid "Saint Barthelemy"
+msgstr ""
+
+#. 060
+msgid "Bermuda"
+msgstr ""
+
+#. 096
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. 068
+msgid "Bolivia"
+msgstr ""
+
+#. 535
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. 076
+msgid "Brazil"
+msgstr ""
+
+#. 044
+msgid "Bahamas"
+msgstr ""
+
+#. 064
+msgid "Bhutan"
+msgstr ""
+
+#. 074
+msgid "Bouvet Island"
+msgstr ""
+
+#. 072
+msgid "Botswana"
+msgstr ""
+
+#. 112
+msgid "Belarus"
+msgstr ""
+
+#. 084
+msgid "Belize"
+msgstr ""
+
+#. 124
+msgid "Canada"
+msgstr ""
+
+#. 166
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. 180
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. 140
+msgid "Central African Republic"
+msgstr ""
+
+#. 178
+msgid "Congo"
+msgstr ""
+
+#. 756
+msgid "Switzerland"
+msgstr ""
+
+#. 384
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#. 184
+msgid "Cook Islands"
+msgstr ""
+
+#. 152
+msgid "Chile"
+msgstr ""
+
+#. 120
+msgid "Cameroon"
+msgstr ""
+
+#. 156
+msgid "China"
+msgstr ""
+
+#. 170
+msgid "Colombia"
+msgstr ""
+
+#. 188
+msgid "Costa Rica"
+msgstr ""
+
+#. 192
+msgid "Cuba"
+msgstr ""
+
+#. 132
+msgid "Cape Verde"
+msgstr ""
+
+#. 531
+msgid "Curacao"
+msgstr ""
+
+#. 162
+msgid "Christmas Island"
+msgstr ""
+
+#. 196
+msgid "Cyprus"
+msgstr ""
+
+#. 203
+msgid "Czech Republic"
+msgstr ""
+
+#. 276
+msgid "Germany"
+msgstr ""
+
+#. 262
+msgid "Djibouti"
+msgstr ""
+
+#. 208
+msgid "Denmark"
+msgstr ""
+
+#. 212
+msgid "Dominica"
+msgstr ""
+
+#. 214
+msgid "Dominican Republic"
+msgstr ""
+
+#. 012
+msgid "Algeria"
+msgstr ""
+
+#. 218
+msgid "Ecuador"
+msgstr ""
+
+#. 233
+msgid "Estonia"
+msgstr ""
+
+#. 818
+msgid "Egypt"
+msgstr ""
+
+#. 732
+msgid "Western Sahara"
+msgstr ""
+
+#. 232
+msgid "Eritrea"
+msgstr ""
+
+#. 724
+msgid "Spain"
+msgstr ""
+
+#. 231
+msgid "Ethiopia"
+msgstr ""
+
+#. 246
+msgid "Finland"
+msgstr ""
+
+#. 242
+msgid "Fiji"
+msgstr ""
+
+#. 238
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#. 583
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#. 234
+msgid "Faroe Islands"
+msgstr ""
+
+#. 250
+msgid "France"
+msgstr ""
+
+#. 266
+msgid "Gabon"
+msgstr ""
+
+#. 826
+msgid "United Kingdom"
+msgstr ""
+
+#. 308
+msgid "Grenada"
+msgstr ""
+
+#. 268
+msgid "Georgia"
+msgstr ""
+
+#. 254
+msgid "French Guiana"
+msgstr ""
+
+#. 831
+msgid "Guernsey"
+msgstr ""
+
+#. 288
+msgid "Ghana"
+msgstr ""
+
+#. 292
+msgid "Gibraltar"
+msgstr ""
+
+#. 304
+msgid "Greenland"
+msgstr ""
+
+#. 270
+msgid "Gambia"
+msgstr ""
+
+#. 324
+msgid "Guinea"
+msgstr ""
+
+#. 312
+msgid "Guadeloupe"
+msgstr ""
+
+#. 226
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. 300
+msgid "Greece"
+msgstr ""
+
+#. 239
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. 320
+msgid "Guatemala"
+msgstr ""
+
+#. 316
+msgid "Guam"
+msgstr ""
+
+#. 624
+msgid "Guinea-Bissau"
+msgstr ""
+
+#. 328
+msgid "Guyana"
+msgstr ""
+
+#. 344
+msgid "Hong Kong"
+msgstr ""
+
+#. 334
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#. 340
+msgid "Honduras"
+msgstr ""
+
+#. 191
+msgid "Croatia"
+msgstr ""
+
+#. 332
+msgid "Haiti"
+msgstr ""
+
+#. 348
+msgid "Hungary"
+msgstr ""
+
+#. 360
+msgid "Indonesia"
+msgstr ""
+
+#. 372
+msgid "Ireland"
+msgstr ""
+
+#. 376
+msgid "Israel"
+msgstr ""
+
+#. 833
+msgid "Isle of Man"
+msgstr ""
+
+#. 356
+msgid "India"
+msgstr ""
+
+#. 086
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. 368
+msgid "Iraq"
+msgstr ""
+
+#. 364
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#. 352
+msgid "Iceland"
+msgstr ""
+
+#. 380
+msgid "Italy"
+msgstr ""
+
+#. 832
+msgid "Jersey"
+msgstr ""
+
+#. 388
+msgid "Jamaica"
+msgstr ""
+
+#. 400
+msgid "Jordan"
+msgstr ""
+
+#. 392
+msgid "Japan"
+msgstr ""
+
+#. 404
+msgid "Kenya"
+msgstr ""
+
+#. 417
+msgid "Kyrgyzstan"
+msgstr ""
+
+#. 116
+msgid "Cambodia"
+msgstr ""
+
+#. 296
+msgid "Kiribati"
+msgstr ""
+
+#. 174
+msgid "Comoros"
+msgstr ""
+
+#. 659
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#. 408
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#. 410
+msgid "Korea, Republic of"
+msgstr ""
+
+#. 414
+msgid "Kuwait"
+msgstr ""
+
+#. 136
+msgid "Cayman Islands"
+msgstr ""
+
+#. 398
+msgid "Kazakhstan"
+msgstr ""
+
+#. 418
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#. 422
+msgid "Lebanon"
+msgstr ""
+
+#. 662
+msgid "Saint Lucia"
+msgstr ""
+
+#. 438
+msgid "Liechtenstein"
+msgstr ""
+
+#. 144
+msgid "Sri Lanka"
+msgstr ""
+
+#. 430
+msgid "Liberia"
+msgstr ""
+
+#. 426
+msgid "Lesotho"
+msgstr ""
+
+#. 440
+msgid "Lithuania"
+msgstr ""
+
+#. 442
+msgid "Luxembourg"
+msgstr ""
+
+#. 428
+msgid "Latvia"
+msgstr ""
+
+#. 434
+msgid "Libya"
+msgstr ""
+
+#. 504
+msgid "Morocco"
+msgstr ""
+
+#. 492
+msgid "Monaco"
+msgstr ""
+
+#. 498
+msgid "Moldova, Republic of"
+msgstr ""
+
+#. 499
+msgid "Montenegro"
+msgstr ""
+
+#. 663
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. 450
+msgid "Madagascar"
+msgstr ""
+
+#. 584
+msgid "Marshall Islands"
+msgstr ""
+
+#. 807
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. 466
+msgid "Mali"
+msgstr ""
+
+#. 104
+msgid "Myanmar"
+msgstr ""
+
+#. 496
+msgid "Mongolia"
+msgstr ""
+
+#. 446
+msgid "Macao"
+msgstr ""
+
+#. 580
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. 474
+msgid "Martinique"
+msgstr ""
+
+#. 478
+msgid "Mauritania"
+msgstr ""
+
+#. 500
+msgid "Montserrat"
+msgstr ""
+
+#. 470
+msgid "Malta"
+msgstr ""
+
+#. 480
+msgid "Mauritius"
+msgstr ""
+
+#. 462
+msgid "Maldives"
+msgstr ""
+
+#. 454
+msgid "Malawi"
+msgstr ""
+
+#. 484
+msgid "Mexico"
+msgstr ""
+
+#. 458
+msgid "Malaysia"
+msgstr ""
+
+#. 508
+msgid "Mozambique"
+msgstr ""
+
+#. 516
+msgid "Namibia"
+msgstr ""
+
+#. 540
+msgid "New Caledonia"
+msgstr ""
+
+#. 562
+msgid "Niger"
+msgstr ""
+
+#. 574
+msgid "Norfolk Island"
+msgstr ""
+
+#. 566
+msgid "Nigeria"
+msgstr ""
+
+#. 558
+msgid "Nicaragua"
+msgstr ""
+
+#. 528
+msgid "Netherlands"
+msgstr ""
+
+#. 578
+msgid "Norway"
+msgstr ""
+
+#. 524
+msgid "Nepal"
+msgstr ""
+
+#. 520
+msgid "Nauru"
+msgstr ""
+
+#. 570
+msgid "Niue"
+msgstr ""
+
+#. 554
+msgid "New Zealand"
+msgstr ""
+
+#. 512
+msgid "Oman"
+msgstr ""
+
+#. 591
+msgid "Panama"
+msgstr ""
+
+#. 604
+msgid "Peru"
+msgstr ""
+
+#. 258
+msgid "French Polynesia"
+msgstr ""
+
+#. 598
+msgid "Papua New Guinea"
+msgstr ""
+
+#. 608
+msgid "Philippines"
+msgstr ""
+
+#. 586
+msgid "Pakistan"
+msgstr ""
+
+#. 616
+msgid "Poland"
+msgstr ""
+
+#. 666
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+msgid "Pitcairn"
+msgstr ""
+
+#. 630
+msgid "Puerto Rico"
+msgstr ""
+
+#. 275
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. 620
+msgid "Portugal"
+msgstr ""
+
+#. 585
+msgid "Palau"
+msgstr ""
+
+#. 600
+msgid "Paraguay"
+msgstr ""
+
+#. 634
+msgid "Qatar"
+msgstr ""
+
+#. 638
+msgid "Reunion"
+msgstr ""
+
+#. 642
+msgid "Romania"
+msgstr ""
+
+#. 688
+msgid "Serbia"
+msgstr ""
+
+#. 643
+msgid "Russian Federation"
+msgstr ""
+
+#. 646
+msgid "Rwanda"
+msgstr ""
+
+#. 682
+msgid "Saudi Arabia"
+msgstr ""
+
+#. 090
+msgid "Solomon Islands"
+msgstr ""
+
+#. 690
+msgid "Seychelles"
+msgstr ""
+
+#. 736
+msgid "Sudan"
+msgstr ""
+
+#. 752
+msgid "Sweden"
+msgstr ""
+
+#. 702
+msgid "Singapore"
+msgstr ""
+
+#. 654
+msgid "Saint Helena"
+msgstr ""
+
+#. 705
+msgid "Slovenia"
+msgstr ""
+
+#. 744
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
+#. 703
+msgid "Slovakia"
+msgstr ""
+
+#. 694
+msgid "Sierra Leone"
+msgstr ""
+
+#. 674
+msgid "San Marino"
+msgstr ""
+
+#. 686
+msgid "Senegal"
+msgstr ""
+
+#. 706
+msgid "Somalia"
+msgstr ""
+
+#. 740
+msgid "Suriname"
+msgstr ""
+
+#. 728
+msgid "South Sudan"
+msgstr ""
+
+#. 678
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#. 222
+msgid "El Salvador"
+msgstr ""
+
+#. 534
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. 760
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#. 748
+msgid "Swaziland"
+msgstr ""
+
+#. 796
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. 148
+msgid "Chad"
+msgstr ""
+
+#. 260
+msgid "French Southern Territories"
+msgstr ""
+
+#. 768
+msgid "Togo"
+msgstr ""
+
+#. 764
+msgid "Thailand"
+msgstr ""
+
+#. 762
+msgid "Tajikistan"
+msgstr ""
+
+#. 772
+msgid "Tokelau"
+msgstr ""
+
+#. 626
+msgid "Timor-Leste"
+msgstr ""
+
+#. 795
+msgid "Turkmenistan"
+msgstr ""
+
+#. 788
+msgid "Tunisia"
+msgstr ""
+
+#. 776
+msgid "Tonga"
+msgstr ""
+
+#. 792
+msgid "Turkey"
+msgstr ""
+
+#. 780
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. 798
+msgid "Tuvalu"
+msgstr ""
+
+#. 158
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#. 834
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#. 804
+msgid "Ukraine"
+msgstr ""
+
+#. 800
+msgid "Uganda"
+msgstr ""
+
+#. 581
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#. 840
+msgid "United States"
+msgstr ""
+
+#. 858
+msgid "Uruguay"
+msgstr ""
+
+#. 860
+msgid "Uzbekistan"
+msgstr ""
+
+#. 336
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. 670
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
+#. 862
+msgid "Venezuela"
+msgstr ""
+
+#. 092
+msgid "Virgin Islands, British"
+msgstr ""
+
+#. 850
+msgid "Virgin Islands, U.S."
+msgstr ""
+
+#. 704
+msgid "Viet Nam"
+msgstr ""
+
+#. 548
+msgid "Vanuatu"
+msgstr ""
+
+#. 876
+msgid "Wallis and Futuna"
+msgstr ""
+
+#. 882
+msgid "Samoa"
+msgstr ""
+
+#. 887
+msgid "Yemen"
+msgstr ""
+
+#. 175
+msgid "Mayotte"
+msgstr ""
+
+#. 710
+msgid "South Africa"
+msgstr ""
+
+#. 894
+msgid "Zambia"
+msgstr ""
+
+#. 716
+msgid "Zimbabwe"
+msgstr ""
+
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+msgid ""
+"navit usage:\n"
+"navit [options] [configfile]\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
+"\t-h: print this usage info and exit.\n"
+"\t-v: print the version and exit.\n"
+msgstr ""
+
+#. We have not found an existing config file from all possibilities
+msgid "No config file navit.xml, navit.xml.local found\n"
+msgstr ""
+
+#, c-format
+msgid "Error parsing config file '%s': %s\n"
+msgstr ""
+
+#, c-format
+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 ""
+
+msgid "unknown street"
+msgstr ""
+
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
+msgid "Unnamed vehicle"
+msgstr ""
+
+msgid "Failed to write bookmarks file"
+msgstr ""
+
+#. Strings from navit_shipped.xml
+msgid "Map Point"
+msgstr ""
+
+msgid "Car"
+msgstr ""
+
+msgid "Iso2"
+msgstr ""
+
+msgid "Iso3"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Postal"
+msgstr ""
+
+msgid "Town"
+msgstr ""
+
+msgid "District"
+msgstr ""
+
+msgid "Street"
+msgstr ""
+
+msgid "Number"
+msgstr ""
+
+msgid "Enter Destination"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "District/Township"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Bookmark"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired).
+msgid "_Display"
+msgstr ""
+
+msgid "_Route"
+msgstr ""
+
+msgid "_Former Destinations"
+msgstr ""
+
+msgid "_Bookmarks"
+msgstr ""
+
+msgid "_Map"
+msgstr ""
+
+msgid "_Layout"
+msgstr ""
+
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
+msgstr ""
+
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
+msgstr ""
+
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
+msgstr ""
+
+msgid "Test"
+msgstr ""
+
+msgid "_Quit"
+msgstr ""
+
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
+
+msgid "_Lock on Road"
+msgstr ""
+
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
+msgid "N"
+msgstr ""
+
+msgid "NE"
+msgstr ""
+
+msgid "E"
+msgstr ""
+
+msgid "SE"
+msgstr ""
+
+msgid "S"
+msgstr ""
+
+msgid "SW"
+msgstr ""
+
+msgid "W"
+msgstr ""
+
+msgid "NW"
+msgstr ""
+
+#. Android resource: @strings/no
+msgid "No"
+msgstr ""
+
+msgid "2D"
+msgstr ""
+
+msgid "3D"
+msgstr ""
+
+msgid "OT"
+msgstr ""
+
+#, c-format
+msgid "Route %4.0fkm %02d:%02d ETA"
+msgstr ""
+
+msgid "Route 0000km 0+00:00 ETA"
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %s"
+msgstr ""
+
+msgid "Select waypoint to insert the new one before"
+msgstr ""
+
+msgid "View in Browser"
+msgstr ""
+
+msgid "Item type"
+msgstr ""
+
+#. Android resource: @strings/address_search_streets
+msgid "Streets"
+msgstr ""
+
+msgid "House numbers"
+msgstr ""
+
+msgid "View Attributes"
+msgstr ""
+
+msgid "Set as position (and deactivate vehicle)"
+msgstr ""
+
+msgid "POIs"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Remove search results from the map"
+msgstr ""
+
+msgid "Show results on the map"
+msgstr ""
+
+msgid "Foursquare"
+msgstr ""
+
+msgid "Cut Bookmark"
+msgstr ""
+
+msgid "Copy Bookmark"
+msgstr ""
+
+msgid "Rename Bookmark"
+msgstr ""
+
+msgid "Paste Bookmark"
+msgstr ""
+
+msgid "Delete Bookmark"
+msgstr ""
+
+msgid "Delete waypoint"
+msgstr ""
+
+msgid "Bookmarks"
+msgstr ""
+
+msgid "Bookmarks as waypoints"
+msgstr ""
+
+msgid "Save waypoints"
+msgstr ""
+
+msgid "Replace with waypoints"
+msgstr ""
+
+msgid "Delete Folder"
+msgstr ""
+
+#. Adds the Bookmark folders
+msgid "Add Bookmark folder"
+msgstr ""
+
+#. Pastes the Bookmark
+msgid "Paste bookmark"
+msgstr ""
+
+#, c-format
+msgid "Bookmark %s"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
+msgid "Show Satellite Status"
+msgstr ""
+
+msgid " Elevation "
+msgstr ""
+
+msgid " Azimuth "
+msgstr ""
+
+msgid "Show NMEA Data"
+msgstr ""
+
+msgid "car"
+msgstr ""
+
+msgid "bike"
+msgstr ""
+
+msgid "pedestrian"
+msgstr ""
+
+#, c-format
+msgid "Current profile: %s"
+msgstr ""
+
+#, c-format
+msgid "Change profile to: %s"
+msgstr ""
+
+msgid "Set as active"
+msgstr ""
+
+msgid "Show Satellite status"
+msgstr ""
+
+msgid "Show NMEA data"
+msgstr ""
+
+msgid "Add Bookmark"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "About Navit"
+msgstr ""
+
+#. Authors
+msgid "By"
+msgstr ""
+
+#. Contributors
+msgid "And all the Navit Team"
+msgstr ""
+
+msgid "members and contributors."
+msgstr ""
+
+msgid "Waypoints"
+msgstr ""
+
+msgid "Enter Coordinates"
+msgstr ""
+
+#.
+#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
+#. gui_internal_widget_append(wb, w)
+#.
+#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
+#. gui_internal_widget_append(w, we)
+msgid "Latitude Longitude"
+msgstr ""
+
+msgid "Enter coordinates, for example:"
+msgstr ""
+
+msgid "Vehicle"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Lock on road"
+msgstr ""
+
+msgid "Northing"
+msgstr ""
+
+msgid "Map follows Vehicle"
+msgstr ""
+
+msgid "Plan with Waypoints"
+msgstr ""
+
+msgid "Maps"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "Height Profile"
+msgstr ""
+
+msgid "Route Description"
+msgstr ""
+
+msgid "Show Locale"
+msgstr ""
+
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
+msgid "Message"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to map"
+msgstr ""
+
+msgid "Main Menu"
+msgstr ""
+
+msgid "House number"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+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"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:15:51
|
Revision: 6048
http://sourceforge.net/p/navit/code/6048
Author: kazer_
Date: 2015-04-06 21:15:49 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:Core:Added a basic circleci config
Added Paths:
-----------
trunk/navit/ci/
trunk/navit/ci/build.sh
trunk/navit/circle.yml
Added: trunk/navit/ci/build.sh
===================================================================
--- trunk/navit/ci/build.sh (rev 0)
+++ trunk/navit/ci/build.sh 2015-04-06 21:15:49 UTC (rev 6048)
@@ -0,0 +1,14 @@
+tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
+export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
+
+mkdir bin && cd bin
+cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
+cov-build --dir cov-int make || exit -1
+tar czvf navit.tgz cov-int
+
+curl --form token=$COVERITY_TOKEN \
+ --form email=$COVERITY_EMAIL \
+ --form file=@navit.tgz \
+ --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
+ --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
+ https://scan.coverity.com/builds?project=$COVERITY_PROJECT
Added: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml (rev 0)
+++ trunk/navit/circle.yml 2015-04-06 21:15:49 UTC (rev 6048)
@@ -0,0 +1,30 @@
+dependencies:
+ pre:
+ - "[ -d ~/assets ] || mkdir ~/assets"
+ - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
+ - sudo apt-get install cmake
+ - sudo apt-get install libpng12-dev
+ - sudo apt-get install libgtk2.0-dev
+ - sudo apt-get install librsvg2-bin
+ - sudo apt-get install libfreetype6-dev
+ - sudo apt-get install libdbus-glib-1-dev
+ - sudo apt-get install g++
+ - bash ci/build.sh
+ cache_directories:
+ - "~/assets/"
+test:
+ post:
+ - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@name="Demo" profilename="car" enabled="no" active="yes"@name="Demo" profilename="car" enabled="yes" active="yes" follow="1" refresh="1"@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml:
+ pwd: bin/navit/
+ - ./navit:
+ pwd: bin/navit/
+ background: true
+ - sleep 5
+ - import -window root $CIRCLE_ARTIFACTS/default.png
+ - dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:52:02
|
Revision: 6051
http://sourceforge.net/p/navit/code/6051
Author: kazer_
Date: 2015-04-06 21:52:00 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:CI:Added automatic android build
Modified Paths:
--------------
trunk/navit/circle.yml
Added Paths:
-----------
trunk/navit/ci/build_android.sh
Added: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh (rev 0)
+++ trunk/navit/ci/build_android.sh 2015-04-06 21:52:00 UTC (rev 6051)
@@ -0,0 +1,142 @@
+#!/bin/bash
+red='\e[0;31m'
+grn='\e[0;32m'
+yel='\e[1;33m'
+off='\e[0m'
+
+# setup var's to perform environment setup and cmake
+export START_PATH=~/
+export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/navit/"
+export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
+
+export NDK_SUFFIX="r10d"
+export ANDROID_NDK=$ANDROID_HOME"/android-ndk-"$NDK_SUFFIX
+export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
+
+export ANDROID_SDK=$ANDROID_HOME"/android-sdk-linux"
+export ANDROID_SDK_TOOLS=$ANDROID_SDK"/tools"
+export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
+
+export ANDROID_TOOLS_CHECK=$ANDROID_SDK"/tools"
+
+export ANDROID_PLATFORM_TOOLS_CHECK=$ANDROID_SDK"/platform-tools"
+
+export ANDROID_BUILD_TOOLS="21.1.2"
+export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
+
+export ANDROID_PLATFORM_LATEST="android-21"
+export ANDROID_PLATFORM_MIN="android-7"
+export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
+export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
+
+export BUILD_PATH=$START_PATH"/android-build"
+export ANDROID_ENV=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS
+
+export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
+
+export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support"
+
+mkdir $ANDROID_HOME
+
+# If path already has our environment no need to set it
+if echo "$ANDROID_ENV" | grep -q "$PATH"; then
+ echo -e "${grn}" " Android PATH configuration... ALREADY SET" "${off}"
+ echo
+else
+ echo -e "${grn}" " Android PATH configuration... EXPORTED" "${off}"
+ export PATH=$ANDROID_ENV:$PATH
+ echo
+fi
+
+mkdir -p $BUILD_PATH
+
+function extractSDK {
+ echo -e -n "${yel}" " Unpacking Android SDK... "
+
+ cd $ANDROID_HOME
+
+ $(tar -xf $ANDROID_SDK_FILE -C $ANDROID_HOME)
+
+ if [ $? -eq 0 ]; then {
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+ }
+ else
+ {
+ echo -e "${red}" "FAILED" "${off}"
+ exit 1
+ }
+ fi
+}
+
+function extractNDK {
+ echo -e -n "${yel}" " Unpacking Android NDK... "
+
+ cd $ANDROID_HOME
+ chmod +x ./android-ndk-r10d-linux-x86_64.bin
+ ./android-ndk-r10d-linux-x86_64.bin
+
+ if [ $? -eq 0 ]; then {
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+ }
+ else
+ {
+ echo -e "${red}" "FAILED" "${off}"
+ exit 1
+ }
+ fi
+}
+
+
+if [ ! -d $ANDROID_SDK ]; then {
+ echo -e -n "${yel}" " Android SDK downloading... "
+ extractSDK
+}
+else {
+ echo -e "${grn}" " Android SDK Found " "${off}"
+}
+fi
+
+if [ ! -d $ANDROID_NDK_BIN ]; then {
+ echo -e -n "${yel}" " Android NDK downloading... "
+ extractNDK
+}
+else {
+ echo -e "${grn}" " Android NDK Found " "${off}"
+}
+fi
+
+function addSDK {
+ export ADD_SDK="echo y|android update sdk --no-ui --all --filter $SDK_ADD_FILTER"
+ $ADD_SDK
+}
+
+function updateSDK {
+ export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+echo $UPD_SDK
+ $UPD_SDK
+}
+
+if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
+ echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
+ echo y|android update sdk --no-ui --all --filter platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21
+
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+}
+else {
+ echo -e -n "${grn}" " Android SDK Platform ..." "${off}"
+ updateSDK
+ echo -e "${grn}" "VERIFIED" "${off}"
+}
+fi
+
+mkdir -p $BUILD_PATH
+cd $BUILD_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=9 $SOURCE_PATH
+make && make apkg || exit 1
+mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
+mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
+make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+
+echo
+echo "Build leftovers :"
+ls navit/android/bin/
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-06 21:32:57 UTC (rev 6050)
+++ trunk/navit/circle.yml 2015-04-06 21:52:00 UTC (rev 6051)
@@ -1,4 +1,17 @@
+machine:
+ environment:
+ ANDROID_HOME: /home/ubuntu/android
+ ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ ANDROID_SDK_CDN: https://dl.google.com/android
+ ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
+ cache_directories:
+ - ~/.android
+ - ~/android
+ - "~/assets/"
pre:
- "[ -d ~/assets ] || mkdir ~/assets"
- wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
@@ -10,8 +23,24 @@
- sudo apt-get install libdbus-glib-1-dev
- sudo apt-get install g++
- bash ci/build.sh
- cache_directories:
- - "~/assets/"
+# Android build
+ - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ - sudo apt-get install gpsd
+ - sudo apt-get install gpsd-clients
+ - sudo apt-get install libgps-dev
+ - sudo apt-get install freeglut3-dev
+ - sudo apt-get install libxft-dev
+ - sudo apt-get install libglib2.0-dev
+ - sudo apt-get install libfreeimage-dev
+ - sudo apt-get install gettext
+ - sudo apt-get install openjdk-7-jdk
+ - sudo apt-get install ant
+ - sudo apt-get install libsaxonb-java
+# for aapt
+ - sudo apt-get install lib32stdc++6
+ - sudo apt-get install lib32z1
+ - bash ci/build_apk.sh
test:
post:
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 19:07:21
|
Revision: 6067
http://sourceforge.net/p/navit/code/6067
Author: kazer_
Date: 2015-04-08 19:07:19 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Importing Jan's settings for android build
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
trunk/navit/circle.yml
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-08 04:37:40 UTC (rev 6066)
+++ trunk/navit/ci/build_android.sh 2015-04-08 19:07:19 UTC (rev 6067)
@@ -23,16 +23,16 @@
export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
export ANDROID_PLATFORM_LATEST="android-21"
-export ANDROID_PLATFORM_MIN="android-10"
+export ANDROID_PLATFORM_MIN="android-7"
export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
export BUILD_PATH=$START_PATH"/android-build"
export ANDROID_ENV=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS
-export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
+export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
-export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support"
+export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support"
mkdir $ANDROID_HOME
@@ -106,11 +106,11 @@
# $ADD_SDK
#}
#
-#function updateSDK {
-# export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
-#echo $UPD_SDK
-# $UPD_SDK
-#}
+function updateSDK {
+ export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+echo $UPD_SDK
+ $UPD_SDK
+}
#
#if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
# echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
@@ -125,16 +125,19 @@
#}
#fi
+updateSDK
mkdir -p $BUILD_PATH
cd $BUILD_PATH
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
android list targets
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=10 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH
make && make apkg || exit 1
mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
-mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
-make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+#mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
+#make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+echo $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
+
echo
echo "Build leftovers :"
ls navit/android/bin/
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 04:37:40 UTC (rev 6066)
+++ trunk/navit/circle.yml 2015-04-08 19:07:19 UTC (rev 6067)
@@ -1,11 +1,11 @@
machine:
environment:
- #ANDROID_HOME: /home/ubuntu/android
- #ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
- #ANDROID_SDK_CDN: https://dl.google.com/android
- #ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
- #ANDROID_NDK_CDN: http://dl.google.com/android/ndk
- #ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ ANDROID_HOME: /home/ubuntu/android
+ ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ ANDROID_SDK_CDN: https://dl.google.com/android
+ ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
cache_directories:
@@ -28,8 +28,8 @@
- cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
- "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
# Android build
- # - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
- # - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
- sudo apt-get install gpsd
- sudo apt-get install gpsd-clients
- sudo apt-get install libgps-dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-14 17:58:44
|
Revision: 6078
http://sourceforge.net/p/navit/code/6078
Author: kazer_
Date: 2015-04-14 17:58:42 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Add:CI:Added a basic dbus test with JUnit report using python
Modified Paths:
--------------
trunk/navit/circle.yml
Added Paths:
-----------
trunk/navit/ci/dbus_tests.py
Added: trunk/navit/ci/dbus_tests.py
===================================================================
--- trunk/navit/ci/dbus_tests.py (rev 0)
+++ trunk/navit/ci/dbus_tests.py 2015-04-14 17:58:42 UTC (rev 6078)
@@ -0,0 +1,52 @@
+import glob
+import dbus
+from dbus import glib
+import gobject
+import sys
+import os
+import time
+from subprocess import call
+from junit_xml import TestSuite, TestCase
+
+
+gobject.threads_init()
+
+glib.init_threads()
+
+bus = dbus.SessionBus()
+
+navit_object = bus.get_object("org.navit_project.navit", # Connection name
+ "/org/navit_project/navit/default_navit" ) # Object's path
+
+iface = dbus.Interface(navit_object, dbus_interface="org.navit_project.navit.navit")
+junit_directory=sys.argv[1]
+if not os.path.exists(junit_directory):
+ os.makedirs(junit_directory)
+
+tests=[]
+start_time = time.time()
+test_cases = TestCase("zoom (factor) expected 512", '', time.time() - start_time, '', '')
+iface.zoom(-2)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=512 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 512')
+tests.append(test_cases)
+
+test_cases = TestCase("zoom (factor) expected 1024", '', time.time() - start_time, '', '')
+iface.zoom(-2)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=1024 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 1024')
+tests.append(test_cases)
+
+test_cases = TestCase("zoom via set_attr expected 512", '', time.time() - start_time, '', '')
+iface.set_attr("zoom", 512)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=512 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 512')
+tests.append(test_cases)
+
+ts = [TestSuite("Navit dbus tests", tests)]
+
+with open(junit_directory+'dbus.xml', 'w+') as f:
+ TestSuite.to_file(f, ts, prettyprint=False)
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-13 20:10:14 UTC (rev 6077)
+++ trunk/navit/circle.yml 2015-04-14 17:58:42 UTC (rev 6078)
@@ -62,4 +62,5 @@
background: true
- sleep 5
- import -window root $CIRCLE_ARTIFACTS/default.png
+ - python ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
- dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mvg...@us...> - 2015-05-15 20:25:44
|
Revision: 6090
http://sourceforge.net/p/navit/code/6090
Author: mvglasow
Date: 2015-05-15 20:25:40 +0000 (Fri, 15 May 2015)
Log Message:
-----------
Add:core:Merge project highfive|Thx jandegr and robotaxi for contributing!
Major rewrite of navigation.c:
Major improvements of maneuver announcements (what and when)
New maneuvers (U turn, keep left/right, highway merge/exit)
Announce names and numbers of highway exits and interchanges
Improve some announcement strings
Squashed commit of the following:
commit 3364214f5d7219829c3bdfa6770e970ea047421f
Merge: fd3c26b 8fa54e3
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu May 14 14:38:06 2015 +0200
Merge branch 'master' into highfive
commit fd3c26b877e8fbc18da2d606e6089b41eff308f9
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu May 14 13:28:36 2015 +0200
Add:Translations:Add English
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 0e723fa842f8a50a655499cd537f45206e9fc576
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun May 3 02:55:48 2015 +0200
Fix:Translations:Restore some lost translations
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 4bfcfd5345ee57a232b5649fa0d9ff1790e7c9a7
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun May 3 02:37:16 2015 +0200
Refactor:Translations:Update .po.in files
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f639054f896a7f00ac00cc9dba3ef2345f195923
Merge: 3e2262c 1f11d37
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun May 3 01:03:13 2015 +0200
Merge branch 'master' into highfive-r6088
Conflicts:
navit/navit/attr_def.h
navit/navit/item_def.h
navit/navit/navigation.c
navit/po/af.po.in
navit/po/ar.po.in
navit/po/ast.po.in
navit/po/be.po.in
navit/po/bg.po.in
navit/po/ca.po.in
navit/po/cs.po.in
navit/po/cy.po.in
navit/po/da.po.in
navit/po/de.po.in
navit/po/el.po.in
navit/po/en_AU.po.in
navit/po/en_CA.po.in
navit/po/en_GB.po.in
navit/po/eo.po.in
navit/po/es.po.in
navit/po/et.po.in
navit/po/eu.po.in
navit/po/fa.po.in
navit/po/fi.po.in
navit/po/fil.po.in
navit/po/fo.po.in
navit/po/fr.po.in
navit/po/fr_CH.po.in
navit/po/gl.po.in
navit/po/he.po.in
navit/po/hi.po.in
navit/po/hr.po.in
navit/po/hu.po.in
navit/po/id.po.in
navit/po/it.po.in
navit/po/jv.po.in
navit/po/ku.po.in
navit/po/lb.po.in
navit/po/lt.po.in
navit/po/lv.po.in
navit/po/mk.po.in
navit/po/ml.po.in
navit/po/mn.po.in
navit/po/nb.po.in
navit/po/nds.po.in
navit/po/nl.po.in
navit/po/nn.po.in
navit/po/pl.po.in
navit/po/pt.po.in
navit/po/pt_BR.po.in
navit/po/ro.po.in
navit/po/ru.po.in
navit/po/sc.po.in
navit/po/si.po.in
navit/po/sk.po.in
navit/po/sl.po.in
navit/po/sr.po.in
navit/po/sv.po.in
navit/po/sw.po.in
navit/po/ta.po.in
navit/po/te.po.in
navit/po/th.po.in
navit/po/tr.po.in
navit/po/uk.po.in
navit/po/ur.po.in
navit/po/vi.po.in
navit/po/zh_CN.po.in
navit/po/zh_HK.po.in
commit 3e2262ccd17ff640e663a1df68f12ce3a1454874
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri May 1 01:58:07 2015 +0200
Add:Translations:New string for motorway ramps
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f415783cfb434f5830a376581e419a260efb8c5a
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri May 1 01:24:21 2015 +0200
Refactor:core:Shorten ramp checks at interchanges
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c086e7d0a207c96653e05b2166fdd864c18f2700
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri May 1 00:26:02 2015 +0200
Fix:core:Announce motorway ramps even if they are segmented
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c559ebed907b17b65d294d7b0cbcd8a40a5fc202
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Apr 30 22:13:34 2015 +0200
Fix:core:Announce motorway ramps for all motorway-like roads
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f34116ba5026b7f023e933eac80794eff7406fb4
Author: Robotaxi <rob...@ar...>
Date: Thu Apr 30 12:30:55 2015 +0200
Announcement for entering a motorway
...if there is no additional information of the motorway name.
commit a3fa3825716f50586ad6b9d254dbb01afa1c9b48
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 23:06:58 2015 +0200
Add:core:Icons for new maneuvers
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 146eadd96f5495c09095152829a68d490e1c593b
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 22:34:14 2015 +0200
Refactor:core:clean up some comments
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit bcfe4f9f7f94c033b796baf98b7b8f7e87bf4eae
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 22:18:37 2015 +0200
Fix:core:Correctly announce interchanges and exits in attr_name
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit cf61c8f9800cd87f398d09c28c538f91bf083eee
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 18:21:27 2015 +0200
Refactor:core:some comments in navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 71280d539e49471800b182f104d14197f9ab6e5e
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 17:46:41 2015 +0200
Fix:Translations:Missing update in it.po.in
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 3a2fe4a71f4a9f4b17c206ab882bda30cc2a4851
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 26 17:17:28 2015 +0200
Add:Translations:Update translations|
Salvage existing translations where strings have changed, add missing translations (best effort)
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 5d6e3295219e16be160f5587939b81877d9875c0
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 24 17:00:48 2015 +0200
Refactor:Translations:Update .po.in files
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 60227761322d989113bf77e50628a89c796580d5
Merge: a77442d 9f67332
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 17 19:57:39 2015 +0200
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit a77442d298eed1a287d5a1e4b8be1c4a106803ed
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 17 18:47:03 2015 +0200
Fix:core:Detect complex T junctions even if name changes at the junction
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 9f67332628fd5a8d85634e1a76273fca1c4c13d1
Author: Robotaxi <rob...@ar...>
Date: Fri Apr 17 14:09:36 2015 +0200
Fine tuning for announcement
Split announcement content generally for junctions and added name_systematic info for missing cases.
commit cef33de9846eb8073949dcbe26d84e82c788e977
Author: Robotaxi <rob...@ar...>
Date: Fri Apr 17 13:15:51 2015 +0200
Corrected '==' in if statement
commit 1f4e10e9da647226805368b641a27aa74421a70f
Author: Robotaxi <rob...@ar...>
Date: Wed Apr 15 14:07:47 2015 +0200
Added missing semicolon
commit 31ed114f5402954ce1663d7cb700cf32deab8cde
Author: Robotaxi <rob...@ar...>
Date: Wed Apr 15 13:33:34 2015 +0200
Added missing semicolon
commit efb300b2df825689aec3ef07fed28a7da9c9d726
Merge: a9b3c2a 2018853
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Apr 13 23:00:35 2015 +0200
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit a9b3c2aa06ee33a4c4d7773873fba9a9a2fbd8b6
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Apr 13 22:59:57 2015 +0200
Refactor:core:updated soem comments
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 201885336ebdc8f474ceaf7d4c6e9146631f0f97
Author: Robotaxi <rob...@ar...>
Date: Mon Apr 13 14:05:25 2015 +0200
Announcement of exit ref and label only for level 2
At interchanges announcement of exit ref and label only makes sense for the first announcement, i.e. level 2. At place, i.e. some meters before turn focus shall be set on announcement of directions.
commit 52e9426bc972b2b6bf76f9a0ae76787b95f42ac6
Author: Robotaxi <rob...@ar...>
Date: Mon Apr 13 13:50:29 2015 +0200
Editorial changes
commit 2bebe31a471d18173fa3812213f527f9bf3b7402
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 12 23:00:15 2015 +0200
Fix:core:Fix bad reference in navigation_itm_new()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit d3aa0c3144b6add7898c8b0f75cd4a5f7fdb6000
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 12 22:27:01 2015 +0200
Fix:core:Don't copy exit destination onto motorway segments
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 67bedfc9d3ca1653ff022c93987a2f32222db52f
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Apr 12 19:48:34 2015 +0200
Fix:core:Avoid mis-guessing motorway interchanges as temporary splits
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 74d73465220f1a662a17ca1f529e714df1ce03fe
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Apr 11 02:12:59 2015 +0200
Fix:core:Suppress announcements where lanes split at highway toll booths
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 88525fcfbcac2b217b6ea06dca427c83b4da8a6a
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 10 21:42:20 2015 +0200
Fix:core:Don't count start of single-carriageway motorway as interchange
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8ba2bb6a8cca2a8832f117e0e832466d4ddd4961
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 10 00:42:19 2015 +0200
Fix:core:Properly identify motorway interchanges by name changes
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 7009b22a01ecad14a9486f5e50b1e144a5e016b5
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 10 00:03:54 2015 +0200
Fix:core:Ignore duplicates in navigation_itm_ways_update
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8f6da5a1fa72493efdea553d3962610ac2b91632
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 3 01:49:47 2015 +0200
Add:core:Suffixes for Lithuanian names
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8f4acd27fdb775fc81dfea100338c0c72fdf7c03
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 3 01:22:31 2015 +0200
Refactor:core:Use proper gender identifiers in navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ff999d55882dfe8d48afe71cc297ac34b3cd7d0f
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 3 01:20:45 2015 +0200
Fix:core:Suppress another compiler warning in navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8153fbf1d0770d140bc6fdfbe9dd4ce05ca99616
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Apr 3 00:34:11 2015 +0200
Fix:core:Fix road name announcement for merge maneuvers
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f2d8e84b984b2a54a50f7e876cbd2b10a6d22ed0
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Apr 2 23:51:54 2015 +0200
Fix:core:Fix some announcement bugs introduced in previous commit
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit dd95c971d694132f4aa07faeaf41a6a4d048aefa
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Apr 2 23:26:52 2015 +0200
Fix:core:Clean up announcement texts|
Proper English strings for all announcements.
Handle concatenation with "then.." properly.
Eliminate most superfluous spaces.
Roads have no sex (they don't lay eggs or give birth) but gender.
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 9f73164423b2a530fb25ea164369c56498406866
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Apr 2 21:20:07 2015 +0200
Fix:core:Clean up string creation for straight/keep left/keep right
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f09928ba8ba1b657e70c6bc019a24c903440e1e6
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Apr 2 20:30:08 2015 +0200
Fix:core:Fix compiler warnings and attr_debug in navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a3aad0f756d060dd1564f529ff63ddbc71243ff9
Author: mvglasow <michael -at- vonglasow.com>
Date: Wed Apr 1 00:24:21 2015 +0200
Add:core:Extra debug output in maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 59ad732673ee78f568931c9bb7bd8f06336315f5
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Mar 31 23:21:58 2015 +0200
Refactor:core:TODO comment in maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 1f7ff3b68eed26d95baad70507b8a7b5d44f2ae9
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Mar 30 00:14:45 2015 +0200
Fix:core:Improve some new announcements
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c73ccca846fcc00044869f50ef78923fbe54c9fb
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 29 22:55:04 2015 +0200
Refactor:core:De-duplicate code for turn announcements
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit bd1bf6b30594b8f34730a57633afd1f27164a54d
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 29 21:08:38 2015 +0200
Fix:core:Move all merge_or_exit-related code into maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit b1d18380b215edbb0f4a445fd49daa9eda726362
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 29 00:41:15 2015 +0100
Refactor:core:Remove misleading comment
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 3f1e171ea7ea4aeb21f932e7ed497def1c3cfeab
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 29 00:35:40 2015 +0100
Refactor:core:Document arguments for show_next_maneuvers()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f9097e9bbe1499015291fe0a2d1f87cba65a5277
Merge: dc6a294 40f5206
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 28 23:53:27 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit dc6a29468d8884ddc146fe348e4b7e72b57123eb
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 28 23:52:50 2015 +0100
Refactor:core:correct some comments in maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a9947f1851f873eeb0280a734014cfe024c3f17c
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 28 21:58:45 2015 +0100
Fix:core:Set mex_interchange for ramp-to-ramp changes between two motorways
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 40f5206f75691c73bcfff9a6932baed70c773903
Author: Robotaxi <rob...@ar...>
Date: Fri Mar 27 12:37:41 2015 +0100
Removed generic string from internationalization
commit 65ba5d659813d514c96bde6115b25aba90f1905d
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Mar 24 23:03:49 2015 +0100
Fix:core:Do not announce motorway interchanges as exits
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 298f65f1d865714f3993851b40f236bc8eb8266f
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 22 23:26:32 2015 +0100
Fix:core:Improve formatting of speech command for exit maneuvers
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 4da3f123258ffe7c0721852714850dc76c50a06d
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 22 17:15:27 2015 +0100
Refactor:core:Document show_maneuver()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 30d3e5ec1aaa19612f2e1fe35e0ed6df52c8c146
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 22 15:41:25 2015 +0100
Fix:core:Correct speech announcement for exit maneuvers
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 438dc177a6a4a97ac24f38e94b7d1baebd18dc55
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 22 14:14:34 2015 +0100
Refactor:core:Clean up dbg() calls
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 510fc90baa5e10ab541e8025ac01aad6bd6917c4
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 21 21:43:28 2015 +0100
Fix:core:Fix missing maneuver when turning into a way of a higher category|
Thanks robotaxi for reporting!
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 4e0680b6e4528fc130ec298273ebfdc8fbce2dee
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 21 00:14:50 2015 +0100
Fix:core:Fix missing announcements at multi-carriageway T junctions|
Thanks robotaxi for reporting
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ff0d34a30fbe7966c50c396636691a9d4e393cb8
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 15 20:21:56 2015 +0100
Refactor:core:Clean up docs, comments and formatting in navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 5c7ed7974b4052510af40921c06ba77d771aaae3
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 15 18:33:35 2015 +0100
Refactor:core:remove obsolete angle_straight
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f1c9c476d36187cd521c592b9c8f4b7e381e429e
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Mar 15 18:12:44 2015 +0100
Refactor:core:Use only delta3 for roundabout analysis, remove dead code
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 0ef17818d076a2108a0cb7f793e7bccd966b6a9b
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Mar 14 01:19:45 2015 +0100
Fix:core:Fix more errors in roundabout delta3 calculation
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 1431446956c5c7d13cfcf0d27878ae24e6bea93c
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Mar 13 23:14:46 2015 +0100
Fix:core:Use only delta3 for roundabout (experimental)
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 5539c37b9b0bec9bfbbb0a4c8baf2f5d08475e15
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Mar 13 22:33:24 2015 +0100
Fix:core:Improve maneuver identification in roundabout analysis
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit fceeaa4fe847012b22d9e99fe6dcbe60c68854e0
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Mar 13 17:39:18 2015 +0100
Add:core:Option to ignore oneway restrictions in is_way_allowed()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 15070b43bf9dfafa50505127ed74224448763a90
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Mar 13 17:11:29 2015 +0100
Refactor:core:Prepare for more thorough roundabout delta analysis
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit de29f9e08e2d70a6368263e598c6bc6d2ee1de4b
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Mar 5 23:44:12 2015 +0100
Fix:core:Re-add some local variables dropped in last merge
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit d4ffaf588f9d6a67951e1ec1e722087b30133211
Merge: cfd4baa c4312dc
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Mar 5 23:32:18 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
Conflicts:
navit/navit/navigation.c
commit c4312dc79795a9d7a3339642d21c144aa1d5785e
Author: Robotaxi <rob...@ar...>
Date: Thu Mar 5 13:53:13 2015 +0100
Patch for #1095
Corrects the criterion, when strengthening of the announcement comes to action, and specifies the strengthening of the announcement more specific for the possible numbers of ways to turn into. Code is similar to "simple turn rule pattern" in #1095.
commit a1f49929263a1d8e56016725a0cf7ffa760ec8dd
Author: jandegr <ja...@us...>
Date: Sat Feb 28 14:35:09 2015 +0100
(try to) fix CID 25307 (thx kazer & Coverity)
commit d83e1b0fe3b3a8896aaa61ff6c3c7c609c8e140c
Author: jandegr <ja...@us...>
Date: Sat Feb 28 14:22:09 2015 +0100
(try to) fix CID 25287 (thx kazer & Coverity)
commit 4e5123eccfccd51dfa26c175eb5895afe6d80ffa
Author: jandegr <ja...@us...>
Date: Sat Feb 28 10:58:43 2015 +0100
improve exit left/right command handling
commit 6b768b9ce62998ef159c8a1b74e1f5517e192881
Author: jandegr <ja...@us...>
Date: Sat Feb 28 08:28:26 2015 +0100
(try to) fix CID 34808 -out of bounds writre- (thx kazer & Coverity)
commit 7ffd28be0406f9f77ceb7bebbe5e02a4536c899b
Author: jandegr <ja...@us...>
Date: Fri Feb 27 20:40:12 2015 +0100
(try to) fix CID 34807 (thx kazer & Coverity)
commit 2d350f80cb30bb2aeaeaf28e52eb16a976323a84
Author: jandegr <ja...@us...>
Date: Fri Feb 27 20:35:12 2015 +0100
(try to) fix CID 34806 (thx kazer & Coverity)
commit efa4fd9e5cdef5631ec75410e5d6f7bdd64c1685
Author: jandegr <ja...@us...>
Date: Fri Feb 27 20:15:59 2015 +0100
fix uninitialized pointer (thx kazer & Coverity - CID 34810)
commit 296dd61dafec14c3861dec2554d659f2db64a893
Author: jandegr <ja...@us...>
Date: Fri Feb 27 19:23:00 2015 +0100
fix unchecked return value (thx kazer & Coverity)
commit cfd4baa5813dfe6bf7bbd40c2c728751807d5da6
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 20 20:54:33 2015 +0100
Fix:core:Use all three estimates for roundabout delta calculation
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit fd4e493304a1d0557c8cbeab40108655ec076772
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 10 22:59:57 2015 +0100
Fix:core:Don't use experimental delta3 for roundabout calculations
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 99ce7ccc4be95da0af27aaf7df01f99b37c80e1a
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 10 22:30:08 2015 +0100
Fix:core:Fix multiple errors in roundabout delta calculation
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit d1d9109e4048ada47a74649c294ca21d5ee33916
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 21:45:20 2015 +0100
Add:core:Use delta3 to determine roundabout angle (experimental)
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit fce24cb19c80aeef1ed68e501fe6cf15e2bbe24b
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 21:27:57 2015 +0100
Fix:core:Adjust direction for (still unused) roundabout delta estimate
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 49e56e473b9c791c9b9834abb6c014bd109937bc
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 21:03:03 2015 +0100
Refactoring:core:Move roundabout analysis into separate function
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 983115c829026910adb8931123298b59cf630b78
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 19:11:30 2015 +0100
Fix:core:Tweak error estimates for roundabout delta
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c64437c559ee33372f2451dc5222e333ea7f6978
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 17:40:55 2015 +0100
Add:core:adjust_delta as separate function, modified logic
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a66fe6b59cd39d9d67859fa37a9a9e9b4b0c1f3d
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 16:35:38 2015 +0100
Fix:core:Further roundabout delta improvements
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 84f82a19f368a948034c9b9b6e842d7ec4acd02b
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 15:48:22 2015 +0100
Fix:core:Fix bug in roundabout delta calculation
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 801d2a39038e5e961841201f26ade0b83b069b03
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Feb 6 01:36:04 2015 +0100
Add:core:Add third algorithm for roundabout delta (not used yet)
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit eabce5c87640321edb6e35cd461363b78f86613f
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Feb 5 23:55:01 2015 +0100
Fix:core:Fix bug in roundabout angle calculation
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 86e37b3b3e59a87132d1098ceb2a5e1acd51b1a6
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Feb 5 21:40:57 2015 +0100
Fix:core:Add missing space in certain turn instructions
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c59a23cbee2e876f02a51e73c270195cf5222c89
Author: jandegr <ja...@us...>
Date: Wed Feb 4 19:27:11 2015 +0100
revert zoombutton state
commit db111c78f09f3d8daabd360d23fc96c96c41fdbb
Author: jandegr <ja...@us...>
Date: Wed Feb 4 10:12:41 2015 +0100
add rank to struct street_destination
commit 6957607d4eaa1906e2cd0692c4fa8d8ed11d91df
Author: jandegr <ja...@us...>
Date: Wed Feb 4 10:06:22 2015 +0100
small speech for roundabout addition
commit 732d6db21c1690d8bbc9910b71696aab531136d6
Author: jandegr <ja...@us...>
Date: Wed Feb 4 10:00:35 2015 +0100
improce consistency of announced destinations
commit a35fdcedae6d7c50922e3d9b8a4393214e57eeb3
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 3 23:31:42 2015 +0100
Fix:core:When examining roundabout approaches, stop at intersections
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 6aaf27dee1b9261ed8d1ef26b0f10f4fef2d8f2a
Merge: 3b6df47 f5ad1ac
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 3 23:25:04 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 3b6df47247a21f1692232e3b9501a63f302ef215
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 3 23:11:06 2015 +0100
Fix:core:Handle zero errors for roundabout delta estimates correctly
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 86c5dac994e2ae1610eb53a4a88a1a33b0b7e819
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Feb 3 22:25:43 2015 +0100
Fix:core:Fix some special cases in navigation_way_get_max_delta|
Also introduces a local variable for delta of approach segments
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 9ed40079d41eb7cf5e5368ffd440c2ae448813f7
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Feb 2 22:04:10 2015 +0100
Fix:core:Make navigation_way_get_max_delta work for reversed ways|
Also adds functionality to preserve sign of delta
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit eab4d5330faeb8c4270b888ab07aef1852b84d2f
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Jan 29 21:24:42 2015 +0100
Fix:core:improve error estinates when calculating roundabout delta
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f5ad1ac1bff68901577c7e3acb788f0591b22237
Author: jandegr <ja...@us...>
Date: Tue Jan 27 14:48:59 2015 +0100
cleanup and exit announcement mod.
commit 52a596605f02654a7395e94ede4cdca884d52a13
Author: jandegr <ja...@us...>
Date: Fri Jan 23 17:51:28 2015 +0100
speech rearrangement
commit 45751536fad4aa5eb80b1457775c551485312ce2
Author: jandegr <ja...@us...>
Date: Fri Jan 23 17:44:31 2015 +0100
temporary fix in command_new
commit 20f2118dffe02f6caa7db599ac245826b5e77fb9
Author: jandegr <ja...@us...>
Date: Mon Jan 19 15:35:15 2015 +0100
speech mod for 'at ....'
commit 4636a04b2b6033e6a2b9fe15a2ad02efa13c8972
Author: jandegr <ja...@us...>
Date: Mon Jan 19 15:06:35 2015 +0100
turnaround left/right icons
commit bc7abfc4bac217f53b367c8db23af455a5b6410f
Author: jandegr <ja...@us...>
Date: Mon Jan 19 14:08:48 2015 +0100
improve translatability
commit 4d0a33b3259a472f9a37f080cdc0833953420e3e
Author: jandegr <ja...@us...>
Date: Mon Jan 19 13:44:03 2015 +0100
new nav icons and some cleanup
commit 10d07462ccdd7ca8ad24116f5aee924c13bbe765
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 18 22:44:02 2015 +0100
Fix:core:Partial revert of 608a95 (HEAD~3)|
Restore previous error formula for roundabout delta detection based on bearings before and after
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 463d812f28d38c13d152247f47cc76a985e6e4b6
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Jan 17 01:36:42 2015 +0100
Fix:core:Examine at least one segment before and after roundabout
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 17f27eba7f72df6a88018f78c7b249e30b616b41
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Jan 16 23:26:21 2015 +0100
Fix:core:Stop examining roundabout approaches at intersections or ramp end
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 608a95abf2b6d94363528c257c3ec21db87689ae
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Jan 16 22:57:55 2015 +0100
Fix:core:Tweak formula for roundabout angle detection
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 37ac64079bb142f90f6cee9db821d097542a753a
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Jan 16 00:35:11 2015 +0100
Fix:core:Fix some bugs in roundabout angle detection
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c353cecbce52a93410778925a65bc1b37f7c9b2d
Merge: ee360ec 8b0a1e3
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Jan 15 00:22:39 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit ee360ec8a18648adf4de5c34f994f81efe6b1bb7
Author: mvglasow <michael -at- vonglasow.com>
Date: Wed Jan 14 22:50:59 2015 +0100
Fix:core:Refine criteria for announcing road splits|
Don't announce road splits if the alternative is just a ramp or service road, unless the road also continues on one of these types
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8b0a1e37540085e8be4947150c9245574e8f0e0f
Author: jandegr <ja...@us...>
Date: Wed Jan 14 19:00:29 2015 +0100
small fix for attr_name
commit a76240dbd30333265034d7115a4fbeec8e31c7cf
Author: jandegr <ja...@us...>
Date: Wed Jan 14 11:34:12 2015 +0100
add attr's for destination forward and backward
commit b42ed3c7991b0a191a4c3d11a7d6d278d6fefe3a
Author: jandegr <ja...@us...>
Date: Wed Jan 14 11:31:37 2015 +0100
add destination forwad and backward
commit eb358043b5dfb79b92ed3c67a7693df6789b6c4c
Author: jandegr <ja...@us...>
Date: Wed Jan 14 11:29:19 2015 +0100
small addition of prev. commit
commit 80adbd48f3e81c26af870354cb23daae914f560b
Author: jandegr <ja...@us...>
Date: Wed Jan 14 11:13:25 2015 +0100
new attr (navigation.item[..].name) for OSD usage
navigation.item[..].name :
attr_name returns exit_ref and exit_label if available
preceeded by the word 'exit'
if exit_label alone is available, it returns the word
'interchange' followed by exit_label
otherwise returns street name and name_systematic if available
FIXME should a new attr. be defined for this and if yes, which ?
commit 0c9c7f24e2aab0450d847bdee7c062acb6239b1a
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Jan 13 23:52:04 2015 +0100
Refactoring:core:Remove redundant condition in maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 9246a7eb44d54ae7d6bbbd3cdd054cdadf1e75bb
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Jan 13 23:23:37 2015 +0100
Fix:core:Fix some missing announcements at road splits
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f0cb0e05f42b7d6a7c6252b55fc5cadff6770689
Author: jandegr <ja...@us...>
Date: Mon Jan 12 20:10:45 2015 +0100
first draft of translators comments
commit 6ed55e565abecb023503c0bead987609761dac1b
Author: jandegr <ja...@us...>
Date: Mon Jan 12 18:06:24 2015 +0100
fix an issue with exit_to
first step in fixing an issue with exit_to in case there can be more than one ramp targetted by exit_to
commit 864b520753a2d4367c81180fe504789b36b94f9f
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 11 17:35:02 2015 +0100
Fix:core:Handle duplicate ways on the route more gracefully
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 7169ccb6f00f96265e3f5e879309a41b00996a15
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 11 15:49:40 2015 +0100
Fix:core:change handling of certain broken roundabouts
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit b3c14561b2f4f76883e2e259e5ccbaeb28fd8695
Merge: 68dd137 2eb7848
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 11 15:46:57 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 68dd13715bbc6456c7ff1889b0e19e93cfabe008
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 11 14:45:43 2015 +0100
Fix:core:Use weighted average for angle calculation of roundabouts
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 7e69d7c7394297bfc79110bc9e15651f8e1d5cfc
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 11 14:22:43 2015 +0100
Refactoring:core:Document transform_get_angle_delta
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 4d2c98e0e533a420b0ae87c4b34780415cd8902e
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Jan 9 22:16:13 2015 +0100
Fix:core:Improve angle calculation of roundabouts|
Uses a hybrid of pre-r2017 and r2017, so far without considering confidence
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 2eb7848c1e92f3a92cdd0a73ea1afbba9130765a
Author: Robotaxi <rob...@ar...>
Date: Fri Jan 9 17:06:49 2015 +0100
suffix addition for german
commit 6518f33e1bc25f3d5fe554a40d5ee04d3309be39
Author: jandegr <ja...@us...>
Date: Fri Jan 9 15:27:12 2015 +0100
speech rework
add destination to roundabout exits
start to fix indents
some small fixes
commit 521b0448dcbd4b8a8500d18f18230920311a625f
Author: jandegr <ja...@us...>
Date: Thu Jan 8 14:35:36 2015 +0100
speech : addition for interchange
commit 46c1105fbadb5e84283e70673c3653a4ee58af70
Author: jandegr <ja...@us...>
Date: Thu Jan 8 14:32:45 2015 +0100
document known issues
commit d6db9d048956b29c7fb016f0a1f61e34372f54dc
Author: jandegr <ja...@us...>
Date: Wed Jan 7 14:20:10 2015 +0100
small fix for type_nav_right_1 in speech
commit f109a8f21ace066f9f5a0eb0963899d70cdc629f
Author: jandegr <ja...@us...>
Date: Wed Jan 7 12:40:19 2015 +0100
speech rework
commit 99443cdcf054633464ed9d140f98dcaacd9c8e0f
Author: jandegr <ja...@us...>
Date: Wed Jan 7 08:23:49 2015 +0100
remove french suffixes
commit a49b0057a31d6c0634342ee748e47c35c1660e5a
Author: jandegr <ja...@us...>
Date: Wed Jan 7 08:21:04 2015 +0100
comment for is_way_allowed()
commit 6155beb5ecaf9e5937a06f8ebdbd147d665a9687
Merge: b9cde98 37bd0df
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 4 00:51:04 2015 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit b9cde983547fd22ce3859be06ede5bff9863c1be
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Jan 4 00:50:57 2015 +0100
Fix:core:Fix some incorrect announcements at roundabouts
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 37bd0dff08b73f41aa76af462476b704b0366c3e
Author: Robotaxi <rob...@ar...>
Date: Fri Jan 2 14:24:23 2015 +0100
added destination references of motorway links
commit bdae78bd2421ab1aca48087034bad28b042d3b86
Author: Robotaxi <rob...@ar...>
Date: Fri Jan 2 13:03:03 2015 +0100
Fixed announcement of 'street name systematic'
Especially for destinations on motorway links. Contains getting the right attributes.
commit 7765799e07ebbe49d55b1b5ab08a92cfe5036c43
Author: mvglasow <michael -at- vonglasow.com>
Date: Thu Jan 1 20:00:04 2015 +0100
Fix:core:Tweak criteria for keep right/keep left maneuvers
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 6866f6166c751cda788ec754a9a31a98decb2913
Author: mvglasow <michael -at- vonglasow.com>
Date: Tue Dec 30 15:04:26 2014 +0100
Fix:core:Suppress exit maneuver at end of motorway
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a3c54f16f9ce7c99bcaf334ceb4740a6174dd568
Author: Robotaxi <rob...@ar...>
Date: Mon Dec 29 15:24:54 2014 +0100
Added translations of new phrases.
First version to be in sync with navigation.c
commit c852db721e5238da25b080f100aad2412aecaf81
Author: Robotaxi <rob...@ar...>
Date: Mon Dec 29 15:03:47 2014 +0100
Took up new phrases into translation files
commit 54ae3113a54ee41fd7173f57c94512687259c554
Author: Robotaxi <rob...@ar...>
Date: Tue Dec 23 08:32:11 2014 +0100
Rename nav_exit_right_wh .svg to nav_exit_right_wh.svg
commit e6524ff3538d3737a7a0d88c7bfbb6ac46b896db
Author: Robotaxi <rob...@ar...>
Date: Tue Dec 23 08:31:07 2014 +0100
Rename nav_exit_left_wh .svg to nav_exit_left_wh.svg
commit 377e99858a6fe0e6be7167aba28f154721d015ea
Author: jandegr <ja...@us...>
Date: Sat Dec 20 15:09:54 2014 +0100
note on a bug in navigation_itm_new (exit_to info)
commit f437b6fabfa5900cd4da7094643ded397b2eb53c
Author: jandegr <ja...@us...>
Date: Thu Dec 18 20:51:02 2014 +0100
comments
commit 2318b4816f86c99a130fdb6384da0e07c155ad97
Author: jandegr <ja...@us...>
Date: Wed Dec 17 17:30:02 2014 +0100
follow-up on#1250 and some small fixes
commit 227b92a6a84c8ec2dc6b2777aef40be43fe45231
Author: jandegr <ja...@us...>
Date: Wed Dec 17 13:31:23 2014 +0100
a few small fixes
commit 43f361b60bc8abf8ec3262182a33d1a52028cd53
Author: jandegr <ja...@us...>
Date: Wed Dec 17 13:12:00 2014 +0100
navigation_tim_new cleanup
commit 7064cc5da5306a2da77fda1283aa0a9ee9e289d1
Author: jandegr <ja...@us...>
Date: Sun Dec 14 17:36:48 2014 +0100
convert exit info
convert exit_ref and exit_label into separate properties of way.
They are not(yet) available as attr's for the OSD
commit dc8513011e83a03c0ad283eb6cf848948d9433b0
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 22:01:50 2014 +0100
Refactoring:core:remove no longer needed debug levels from mavigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 1612d2ffbfc8911d5b584fb217404810c5bdb895
Merge: 99ea106 24ecb57
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 21:54:56 2014 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 99ea106461927c990cf169fdd2ee3cf9e51b25de
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 21:53:06 2014 +0100
Fix:core:Don't crash on broken roundabouts
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 24ecb572b2482e290b15e5f003bfc178e617abee
Author: jandegr <ja...@us...>
Date: Sat Dec 13 19:37:58 2014 +0100
speech improvement for exit and interchange
commit 10e0c783c85662cf92411496507c106929297518
Author: jandegr <ja...@us...>
Date: Sat Dec 13 19:34:54 2014 +0100
speech improvement
commit a19a7f3c1c571758fa32a474fa907ee118d2135b
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 19:33:04 2014 +0100
Fix:core:Prevent misinterpreting roundabouts as regular turns
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a4d259ed9714f2b1c5d71acf81b6189ac8192c0b
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 18:25:09 2014 +0100
Refactoring:core:Set maneuver type in command_new(), constants for turns
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 374da752483bde530d04ff9d6c5d866567997361
Merge: 58c7435 3f78e6d
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 15:20:42 2014 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 58c74358664f7573c216bfc1e56f2c5c6d8c08af
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 13 15:00:37 2014 +0100
Fix:core:Use oneway flags to detect complex T junctions|
Removes workaround for a now-fixed bug regarding way flags
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 3f78e6d0d7391b6d6b93d0f9bd683a93a1925058
Author: jandegr <ja...@us...>
Date: Sat Dec 13 13:44:56 2014 +0100
speech improvement for 'continue straight'
Merge a variation of Kazer's 'Continue straight' patch, more cases left to solve later
commit e5521ca2bbf0ce66ae8ea542d35d1b61aabd15d6
Author: jandegr <ja...@us...>
Date: Sat Dec 13 12:17:54 2014 +0100
comment on 'ref' update
commit 19aff3ab93b298381c00618b5e08ea9281fcb11f
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 12 23:42:51 2014 +0100
Refactoring:core:Move delta into navigation_maneuver
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f3134c0f78267645d4bd4e8cd01022d6a8c11485
Merge: 1b8bad7 57ec97f
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 12 22:22:33 2014 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 1b8bad7e444a71d34ad686dc2d626084606c39c4
Merge: 1e803e7 8eb4cd5
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 12 22:22:22 2014 +0100
Merge branch 'master' into highfive
Conflicts:
navit/navit/attr_def.h
navit/navit/binding/dbus/binding_dbus.c
navit/navit/navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 57ec97fea9b4f5477cd80d03099bce1402119abc
Author: jandegr <ja...@us...>
Date: Fri Dec 12 15:13:09 2014 +0100
one more speech test (keep left/right, ..interchange)
commit 5cebd8d838a2cfa867ab32cd097a424a113da705
Author: jandegr <ja...@us...>
Date: Fri Dec 12 09:07:53 2014 +0100
fix for exit speech
commit 1e803e7a69023ca5f7bc34f6d9848973b7c4758a
Author: jandegr <ja...@us...>
Date: Thu Dec 11 20:59:46 2014 +0100
remove commented-out string
commit 78b0f9102c49b953615777adfb7321387820243f
Author: jandegr <ja...@us...>
Date: Thu Dec 11 20:29:59 2014 +0100
small change for speech of turn.... destination
commit 07865edd4366d2fa1bb0029f50dadb0cd8df62af
Author: jandegr <ja...@us...>
Date: Thu Dec 11 18:49:32 2014 +0100
some speech for announcing an exit
commit 1f4c3396c0a7dc83c1e8ebb0f8d30eb552da463f
Author: jandegr <ja...@us...>
Date: Wed Dec 10 17:21:15 2014 +0100
comments cleanup
commit 6d5bf3163335371a342359352661dcf8f40f1445
Author: jandegr <ja...@us...>
Date: Wed Dec 10 17:03:53 2014 +0100
small change for speech of 'merge'
commit 41f24735657f8f3e3dd591cc0dbe37c950353576
Author: jandegr <ja...@us...>
Date: Wed Dec 10 16:54:22 2014 +0100
first rudimentary speech of destination
commit 18164b1829d2933dcf9c7d92b09c52aedf3b04d7
Author: jandegr <ja...@us...>
Date: Tue Dec 9 21:09:29 2014 +0100
comment for speech direction
commit 35fcd83a87a9459fd25fe5af4b88b1df55d57e92
Author: jandegr <ja...@us...>
Date: Tue Dec 9 20:10:57 2014 +0100
some comment on strength_needed
commit 50b5b400ad934b16953a526192af7939935e4836
Author: jandegr <ja...@us...>
Date: Mon Dec 8 08:36:53 2014 +0100
missing pieces for destination
commit c9db9f9fd17bc070a2897d10edbfc0ec29bf9db9
Merge: 34a1467 fc4fead
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 22:56:20 2014 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 34a146732dd0cb71e88b2cec1700baa0f242efdb
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 22:42:52 2014 +0100
Refactoring:core:drop unused check_roundabout
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit b3dfe35a5260eaab3d55a8bc7a247f0653cf9cae
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 22:29:54 2014 +0100
Refactoring:core:set flags directly in navigation_item_new()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 284a826f7c8ef7c875cd83b86310ebbcec949e0f
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 21:33:22 2014 +0100
Refactoring:core:navigation_way_init
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit fc4fead0fc32bb3e5b29e578e26bc407e262a85f
Author: jandegr <ja...@us...>
Date: Sun Dec 7 20:51:10 2014 +0100
transform exit_to info into destination info
commit e0e864b411c757f415983c65884922803103ecf6
Author: jandegr <ja...@us...>
Date: Sun Dec 7 20:43:21 2014 +0100
upd. navigation_itm_new for destination
commit 086142f97839096bf7f73374213fcb8b6a6d2445
Author: jandegr <ja...@us...>
Date: Sun Dec 7 20:37:14 2014 +0100
map_item_attr_get mod. for destination
commit 4208d9adb44cbc4702e03413db5bb016c3fb0c88
Author: jandegr <ja...@us...>
Date: Sun Dec 7 20:32:40 2014 +0100
merge select_announced_destinations from #1082
merge select_announced_destinations from #1082 by Robotaxi, with slight
renaming of variables
commit 6ab6c4044532cdf692e1ace5706bfe398704ba5d
Author: jandegr <ja...@us...>
Date: Sun Dec 7 20:28:45 2014 +0100
merge free_list and split_string_to_list for destination
commit b9fea0019c36e1750d8387e55607aa67e7285f41
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 17:52:28 2014 +0100
Fix:core:set flags for ways on the route
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 84867cfbaf2ccfcd19bfeb0cad6c9b3727929adb
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 16:06:34 2014 +0100
Add:core:Don't count service roads towards num_other_ways
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit db80f784a618ffc9b4dae37f41b8ce4270207a3a
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 15:56:46 2014 +0100
Fix:core:fix typo in is_motorway_like()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit d1aaaa56f23d156fe1041d2a4c00e3028d3481c7
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 15:45:02 2014 +0100
Fix:core:count motorway direction change maneuvers as exit
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit f3117db8e3dbdab58eebf97ca7dcf3043357d5e1
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 14:59:10 2014 +0100
Add:core:Update definition of motorway-like|
Parameter to decide how to treat ramps
Service roads are equivalent to ramps
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 8153d8599be01d85dcc85fd3acdb1cc0eaec0f66
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Dec 7 00:30:38 2014 +0100
Refactoring:core:Pass navigation_maneuver for destination
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 3b7d57df62ff8f453d8d361e2a9355fa404697f5
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 6 22:08:38 2014 +0100
Add:core:Add support for keep right/left and new maneuver type logic
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ead8e44142124695666ef9183c59c6cf2f5bc6e0
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 6 16:22:10 2014 +0100
Add:core:change semantic meaning of left and right in navigation_maneuver|
Now refers to left and right neighbors of the route, not "straightest" ways
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 9c39d8d5a2968eaf619555fe8c98bfb1b986bebe
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Dec 6 15:52:44 2014 +0100
Add:core:Add maneuvers for keep left, keep right
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ed241767849e0bd6338ed821fd4e32cb50421ade
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 5 20:58:53 2014 +0100
Add:core:Complete handling of merge_or_exit
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ccac6572556caf5e447d695daa14482f9568252b
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 5 18:37:06 2014 +0100
Refactoring:core:make sense of local variables in maneuver_required2()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a1a9ca7e130ada55207882aa820d57e7a4828b15
Author: mvglasow <michael -at- vonglasow.com>
Date: Fri Dec 5 18:17:35 2014 +0100
Add:core:Detect motorway interchanges
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 30341edc13269cc8e8a1f256a6a3b942178cebaf
Author: jandegr <ja...@us...>
Date: Wed Dec 3 15:11:49 2014 +0100
more cleanup of navigation_itm_new()
commit 908e97af08f7733475d28e2ce4b7925ee21f4e8f
Author: jandegr <ja...@us...>
Date: Tue Dec 2 17:03:57 2014 +0100
remove outdated comments
commit 5bb31c8974abc4c57c671f0fff8b7a9b504eb32b
Author: jandegr <ja...@us...>
Date: Tue Dec 2 16:47:36 2014 +0100
improve the collection of coordinates in navigation_itm_new
commit 6a6ee3908495e13e37fa532018383e31abb21cae
Author: jandegr <ja...@us...>
Date: Mon Dec 1 10:03:27 2014 +0100
reduce noise and use the new log levels
commit 5a5c6f4c3d59df21539b053780c71835b8d53553
Author: jandegr <ja...@us...>
Date: Mon Dec 1 09:55:02 2014 +0100
Comments : update and cleanup
commit b9d6106183579c6a0d183121be204dd9bb9379d8
Author: jandegr <ja...@us...>
Date: Mon Dec 1 09:44:33 2014 +0100
remove leftovers from string-type lanes,
even if lanes comes back some day it will never be as a string again,
so removal of those remains is appropriate.
commit 8f9973b48351e2ea2432ba076fe429eeec576ce2
Author: jandegr <ja...@us...>
Date: Mon Dec 1 08:09:20 2014 +0100
navigation.c remove noisy dbg line
commit 6e605ccb4b814e5a326f91a4fc0fd0c69c848cb7
Author: jandegr <ja...@us...>
Date: Mon Dec 1 08:00:06 2014 +0100
navigation.c remove noisy dbg line and free way.destination
commit 3c0ccd8910be5fe0a99548db52606b3b82d13ffa
Author: jandegr <ja...@us...>
Date: Mon Dec 1 07:57:07 2014 +0100
remove some outdated comments in navigation.c
commit d2d2d8922ee9e996d5efd1724a20fec113ca6ac9
Author: jandegr <ja...@us...>
Date: Mon Dec 1 07:53:02 2014 +0100
fix one occurence of attr_destination
it is attr_street_destination, but in one place early on an attr_destination was left behind in a piece of code.
commit 25da044ecb7dbd332d0db1ab53e7b4074f82b68e
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 22:41:20 2014 +0100
Fix:core:Eliminate some compiler warnings
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit aec0cd15587abc1493bf86b472f02a241cdf0948
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 22:25:41 2014 +0100
Refactoring:core:Remove unused navigation_way.lanes
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 960dc90f2839f5249c58b5638353135c363b6cec
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 22:19:01 2014 +0100
Fix:core:Ensure proper freeing of navigation_way.destination
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 70d9c7f1366a32fcab2aa71ed2c7c65bd112f799
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 22:15:03 2014 +0100
Fix:core:Free name_systematic member of navigation_way properly
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit d6b0a643c54a0984efbcca0db06fec2a466fefcb
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 21:50:43 2014 +0100
Fix:core:Fix typo in calculate_entry_angle()
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 16b13853ab3f4c2416ccc1e2ca3e663523e0ac28
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 21:49:41 2014 +0100
Fix:core:Free navigation_maneuver along with its navigation_cmd
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit a48d84498d3a9af558bf74ff0839be3d159b0ebe
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 18:20:22 2014 +0100
Add:core:introduce mex_interchange and use is_motorway_like() consistently
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 525b4785006bcc90296cd45dd75566f4bb854cc8
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 16:21:34 2014 +0100
Refactoring:core:Update documentation for navigation_maneuver
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 661d50743e0190abfa87cd55cbcbb2082c18ed3a
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 16:18:58 2014 +0100
Fix:core:Improve detection of motorway interchanges
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5935 ffa7fe5e-494d-0410-b361-a75ebd5db220
Conflicts:
navit/navit/navigation.c
commit 50f19c27d465d3adf9fc0b3704ec60bebfeba1a9
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 16:14:38 2014 +0100
Fix:core:Eliminate more superfluous maneuvers at ramps|Should fix #660
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5934 ffa7fe5e-494d-0410-b361-a75ebd5db220
Conflicts:
navit/navit/navigation.c
commit 1741aa54b6eaab09b2eef1d188a2d1b9bba63c17
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 16:07:46 2014 +0100
Fix:core:Announce turns when going straight is not allowed | One step closer to fixing #660, thanks jandegr and tryagain
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5933 ffa7fe5e-494d-0410-b361-a75ebd5db220
Conflicts:
navit/navit/navigation.c
commit 2636d0f37d12d8bea5652c1bd55dc0f79618a732
Author: mvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sun Nov 9 01:38:42 2014 +0000
Fix:core:use curve_limit throughout maneuver_required2
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5932 ffa7fe5e-494d-0410-b361-a75ebd5db220
commit bda0e51ddf76c06f7161de387dd7fa0a0072b6a5
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 15:54:20 2014 +0100
Fix:core:Refine criteria for announcing maneuvers|Partial fix for #660
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5929 ffa7fe5e-494d-0410-b361-a75ebd5db220
Conflicts:
navit/navit/navigation.c
commit d94cf5a39504372ed63d53aa4a624993cc528f55
Author: mvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sun Nov 9 21:28:51 2014 +0000
Add:dbus:Include maneuver type in GPS export
Signed-off-by: mvglasow <michael -at- vonglasow.com>
git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5938 ffa7fe5e-494d-0410-b361-a75ebd5db220
commit 98b9703e5c539b7664ed323ce09a3b4e0ae3ceaa
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 02:16:33 2014 +0100
Fix:core:Comment out references to removed attr_street_lanes
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 542d581200077b9b01fac115cc67a10282b6f093
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 02:16:20 2014 +0100
Fix:maptool:Comment out references to removed attr_street_lanes
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 6e6bc2d31973c32918f0dfdd8cd74b17eeb3a5c9
Merge: 2a31691 c19dbff
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 01:52:16 2014 +0100
Merge branch 'highfive' of github.com:mvglasow/navit into highfive
commit 2a316914d25ab8f41791738723e1e104acb4feba
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 29 00:31:29 2014 +0100
Add:core:Struct to store results of maneuver_required2
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit c19dbff1e79eb4c08ef6f0a0967520d3c81497a4
Author: jandegr <ja...@us...>
Date: Fri Nov 28 21:28:58 2014 +0100
Update osm.c
remove attr_string_street_lanes
commit 0d722010beedf40b78379d0768b9384ebd9ab182
Author: jandegr <ja...@us...>
Date: Fri Nov 28 21:24:14 2014 +0100
Update osm.c
reduce lanes to an empty holder as in Navit SF trunk
commit 00307d9c885d98b49221cf7318adb5282e91feac
Author: jandegr <ja...@us...>
Date: Fri Nov 28 20:39:29 2014 +0100
Update osm.c
add street_name_systematic_int
commit f8912c108967ccd0452405ade892ba5ce3180e63
Author: jandegr <ja...@us...>
Date: Fri Nov 28 20:10:31 2014 +0100
Update item_def.h
remove ITEM(nav_exit) since it leads to the same icon as the one for ITEM(nav_exit_right)
commit 0075af0130bc97f66a33c70082758eedf7a67449
Author: jandegr <ja...@us...>
Date: Fri Nov 28 19:34:05 2014 +0100
Update navigation.c
remove lanes
commit 7af1f951a3de371885f592cb5c3e4eb993c9b3ac
Author: jandegr <ja...@us...>
Date: Fri Nov 28 19:30:06 2014 +0100
Update attr_def.h
remove lanes attr.
commit a7cad98e87ea92f3000cfb35a740ea07d343a99a
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Nov 24 22:03:10 2014 +0100
Add:core:Add preliminary icons for new maneuver types|By jandegr
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit b80da97e6c0cdca177f9cf2059fbb2b982b568d2
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Nov 24 22:02:43 2014 +0100
Add:core:Add items for new maneuver types|By jandegr
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit ba9817221a5d4694e2a3d97caadb58f084384fa6
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Nov 24 22:02:19 2014 +0100
Add:tools:Add support for new street attributes in maptool|By jandegr
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 0e58c92ac6485a7c43716fc0570dd45d932783ca
Author: mvglasow <michael -at- vonglasow.com>
Date: Mon Nov 24 22:00:59 2014 +0100
Add:core:Add extra attributes for ways|By jandegr
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 34b9168622f350e529c657afa7bd108ade67750a
Author: mvglasow <michael -at- vonglasow.com>
Date: Sun Nov 23 21:44:45 2014 +0100
Refactoring:core:allow navigation.c to use new (r5960+) logging syntax
Signed-off-by: mvglasow <michael -at- vonglasow.com>
commit 70bccee933a18b70e449224fb3ff5cf498d46b38
Author: mvglasow <michael -at- vonglasow.com>
Date: Sat Nov 22 20:26:53 2014 +0100
Add:core:Commit jandegr's updated navigation.c
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Revision Links:
--------------
http://sourceforge.net/p/navit/code/6088
http://sourceforge.net/p/navit/code/2017
http://sourceforge.net/p/navit/code/2017
http://sourceforge.net/p/navit/code/5960
Modified Paths:
--------------
trunk/navit/navit/attr_def.h
trunk/navit/navit/item.h
trunk/navit/navit/item_def.h
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/navigation.c
trunk/navit/navit/navit_shipped.xml
trunk/navit/navit/transform.c
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/be.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/bs.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/ckb.po.in
trunk/navit...
[truncated message content] |
|
From: <ka...@us...> - 2015-08-04 20:47:32
|
Revision: 6135
http://sourceforge.net/p/navit/code/6135
Author: kazer_
Date: 2015-08-04 20:47:30 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
Fix:Android:Default to 0 if we can't find the svn rev of the last commit
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
trunk/navit/po/de.po.in
trunk/navit/po/pt_BR.po.in
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-08-04 18:15:11 UTC (rev 6134)
+++ trunk/navit/ci/build_android.sh 2015-08-04 20:47:30 UTC (rev 6135)
@@ -131,6 +131,7 @@
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
android list targets
svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68`
+if [[ "$svn_rev" == "" ]]; then svn_rev="0"; fi
sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt
cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2015-08-04 18:15:11 UTC (rev 6134)
+++ trunk/navit/po/de.po.in 2015-08-04 20:47:30 UTC (rev 6135)
@@ -40,8 +40,8 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-20 21:54+0000\n"
-"Last-Translator: Mathias Klein <ma_...@gm...>\n"
+"PO-Revision-Date: 2015-07-23 12:34+0000\n"
+"Last-Translator: Robotaxi <rob...@ar...>\n"
"Language-Team: Martin Schaller <mar...@so...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -393,7 +393,7 @@
#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
-msgstr "Sie haben Ihr Ziel %s erreicht"
+msgstr "%s haben Sie Ihr Ziel erreicht"
#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
msgid "Interchange"
@@ -2808,9 +2808,3 @@
"Navit kann jede text-to-speech engine nutzen, die installiert ist. Die\r\n"
"derzeit angewählte engine kann Ihre Sprache nicht wiedergeben.\r\n"
"Soll das System den Voice-Download Dialog öffnen?"
-
-#~ msgid "%d m"
-#~ msgstr "%d m"
-
-#~ msgid "in %d m"
-#~ msgstr "in %d m"
Modified: trunk/navit/po/pt_BR.po.in
===================================================================
--- trunk/navit/po/pt_BR.po.in 2015-08-04 18:15:11 UTC (rev 6134)
+++ trunk/navit/po/pt_BR.po.in 2015-08-04 20:47:30 UTC (rev 6135)
@@ -86,14 +86,6 @@
msgstr "sexta saída"
#, c-format
-msgid "%d m"
-msgstr ""
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
msgid "%d feet"
msgstr "%d pés"
@@ -102,14 +94,6 @@
msgstr "em %d pés"
#, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "em %d metros"
-
-#, c-format
msgid "%d.%d miles"
msgstr "%d.%d milhas"
@@ -118,14 +102,6 @@
msgstr "em %d.%d milhas"
#, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d quilômetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "em %d.%d quilômetros"
-
-#, c-format
msgid "one mile"
msgid_plural "%d miles"
msgstr[0] "uma milha"
@@ -138,6 +114,22 @@
msgstr[1] "em %d milhas"
#, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "em %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d quilômetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "em %d.%d quilômetros"
+
+#, c-format
msgid "one kilometer"
msgid_plural "%d kilometers"
msgstr[0] "um quilômetro"
@@ -218,10 +210,10 @@
msgid "Enter the roundabout soon"
msgstr "Entre na rotatória em seguida"
-#. TRANSLATORS: first arg. is the distance to the roundabout, second arg. is the manieth exit
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "Enter the roundabout %1$s and leave at the %2$s"
-msgstr ""
+msgid "Enter the roundabout %s"
+msgstr "Entre na rotatória %s"
#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
@@ -242,25 +234,25 @@
msgid "then"
msgstr "em seguida"
-#. TRANSLATORS: the arg. is the phrase 'onto ...'.
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then right merge%1$s"
+msgid "then merge%1$s|right"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'.
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Merge right %1$s%2$s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
-#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then left merge%1$s"
-msgstr ""
+msgid "then merge%1$s|left"
+msgstr "em seguida vire a %1$s|esquerda"
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Merge left %1$s%2$s"
-msgstr ""
+msgid "Merge %1$s%2$s|left"
+msgstr "Vire a %1$s%2$s|esquerda"
msgid "on your left"
msgstr "à sua esquerda"
@@ -345,23 +337,23 @@
msgid "Turn %1$s%2$s %3$s%4$s"
msgstr "Vire a %1$s%2$s %3$s%4$s"
-#. TRANSLATORS: Left U-turn
-msgid "then make a left U-turn"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "então faça o retorno"
-#. TRANSLATORS: the arg. is distance. Left U-turn
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Make a left U-turn %1$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Faça o retorno a esquerda %1$s"
-#. TRANSLATORS: Right U-turn, the stuff after
-msgid "then make a right U-turn"
-msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "então faça o retorno a direita"
-#. TRANSLATORS: the arg. is distance. Right U-turn
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Make a right U-turn %1$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Faça o retorno a direita %1$s"
#. An empty placeholder that we can use in the future for
#. * some motorway commands that are now suppressed but we
@@ -2786,29 +2778,3 @@
"currently selected engine reports it is unable to speak in your language. "
"Should we ask the system to show voice download dialog?"
msgstr ""
-
-#, c-format
-#~ msgid "Enter the roundabout %s"
-#~ msgstr "Entre na rotatória %s"
-
-#, c-format
-#~ msgid "then merge%1$s|left"
-#~ msgstr "em seguida vire a %1$s|esquerda"
-
-#, c-format
-#~ msgid "Merge %1$s%2$s|left"
-#~ msgstr "Vire a %1$s%2$s|esquerda"
-
-#~ msgid "then make a U-turn|left"
-#~ msgstr "então faça o retorno"
-
-#, c-format
-#~ msgid "Make a U-turn %1$s|left"
-#~ msgstr "Faça o retorno a esquerda %1$s"
-
-#~ msgid "then make a U-turn|right"
-#~ msgstr "então faça o retorno a direita"
-
-#, c-format
-#~ msgid "Make a U-turn %1$s|right"
-#~ msgstr "Faça o retorno a direita %1$s"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X