diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2018-05-25 22:07:07 -0700 |
|---|---|---|
| committer | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-05-25 22:17:50 -0700 |
| commit | 41a1264cdd43a11695de85eab0bd3c941abf2b70 (patch) | |
| tree | 3da1ef3bebc674807258ae824ff9156a64adf370 | |
| parent | 8a76acb966f7059caf9d72c853175bd923b1e9d7 (diff) | |
| download | navit-41a1264cdd43a11695de85eab0bd3c941abf2b70.tar.gz | |
cleanup:cmake:remove trailing spaces
244 files changed, 1049 insertions, 1049 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index af7aadabd..65d5633d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,7 +60,7 @@ jobs: name: Process icons command: | cd navit/icons - make + make mkdir ../android/res/drawable-nodpi rename 'y/A-Z/a-z/' * cp *.png ../android/res/drawable-nodpi @@ -68,7 +68,7 @@ jobs: - run: name: Process translations command: | - cd po + cd po make mkdir ../navit/android/res/raw rename 'y/A-Z/a-z/' * @@ -122,7 +122,7 @@ jobs: - store_artifacts: name: Store Javadoc path: navit/android/build/outputs/docs/javadoc - destination: doc + destination: doc - store_artifacts: name: Store Lint reports path: navit/android/build/reports diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e3168fb2..db4e234b6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,7 +187,7 @@ if (NOT DISABLE_QT) # and actually requires all components to be installed. Maybe this can # be fixed later... find_package(Qt4 4.7 COMPONENTS QtCore OPTIONAL_COMPONENTS QtGui QtXml QtDeclarative QtSvg) - endif (Qt5Widgets_FOUND OR Qt5Quick_FOUND OR Qt5Sensors_FOUND) + endif (Qt5Widgets_FOUND OR Qt5Quick_FOUND OR Qt5Sensors_FOUND) endif (NOT DISABLE_QT) #pkg-config based detection @@ -364,7 +364,7 @@ endif () if (Qt5Positioning_FOUND) set_with_reason(vehicle/qt5 "Qt5 Positioning found" TRUE ${Qt5Positioning_LIBRARIES} - ${Qt5Sensors_LIBRARIES}) + ${Qt5Sensors_LIBRARIES}) endif () if(GTK2_FOUND) # Include gtk.h with "SYSTEM" to avoid GCC compiler warning for gtkitemfactory.h. @@ -685,7 +685,7 @@ if(ANDROID) message(STATUS "Using generator "${CMAKE_GENERATOR}) if (NOT ${CMAKE_GENERATOR} STREQUAL Ninja) find_program(ANDROID_LOCATION NAMES android android.bat) - find_program(ANT_LOCATION NAMES ant) + find_program(ANT_LOCATION NAMES ant) if (NOT ANT_LOCATION) message_error("Could not find ant. Please install ant and add it to the search path.") else() @@ -51,7 +51,7 @@ library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations. - + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect @@ -98,7 +98,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -145,7 +145,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -203,7 +203,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -254,7 +254,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -308,7 +308,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -349,7 +349,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -401,7 +401,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -435,7 +435,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest @@ -42,7 +42,7 @@ You can help translating via our web based translation page: For help or more information, please refer to the wiki: http://wiki.navit-project.org -If you don't know where to start, we recommend you to read the +If you don't know where to start, we recommend you to read the Interactive Help : http://wiki.navit-project.org/index.php/Interactive_help diff --git a/cmake/FindDBusGLib.cmake b/cmake/FindDBusGLib.cmake index e4e870075..57bbd022a 100644 --- a/cmake/FindDBusGLib.cmake +++ b/cmake/FindDBusGLib.cmake @@ -12,7 +12,7 @@ FIND_PATH(DBusGLib_INCLUDE_DIR dbus/dbus-glib.h ) FIND_LIBRARY(DBusGLib_LIBRARY - NAMES + NAMES dbus-glib-1 PATHS ${DBUS_GLIB_PKGCONFIG_LIBRARY_DIRS} diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index eb1f3fc7c..88f2dc3cf 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -53,18 +53,18 @@ macro(add_module_plugin PLUGIN_PATH REASON ENABLE) endmacro() macro(module_add_library MODULE_NAME ) - LINK_DIRECTORIES(${${MODULE_NAME}_LIBRARY_DIRS}) + LINK_DIRECTORIES(${${MODULE_NAME}_LIBRARY_DIRS}) add_library(${MODULE_NAME} ${MODULE_BUILD_TYPE} ${ARGN}) SET_TARGET_PROPERTIES(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}") TARGET_LINK_LIBRARIES(${MODULE_NAME} ${${MODULE_NAME}_LIBS}) SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} ${${MODULE_NAME}_FLAGS}") - INCLUDE_DIRECTORIES(${${MODULE_NAME}_INCLUDES}) + INCLUDE_DIRECTORIES(${${MODULE_NAME}_INCLUDES}) if (USE_PLUGINS) if (ANDROID) TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME}) endif() if (APPLE) - set_target_properties( ${MODULE_NAME} PROPERTIES LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + set_target_properties( ${MODULE_NAME} PROPERTIES LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") endif() # workaround to be compatible with old paths set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs") diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index eedd2016e..30a0aee5a 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -75,7 +75,7 @@ mkdir navit-build %build %define debug_package %{nil} %{__rm} -rf %{buildroot} -#cmake git files directly +#cmake git files directly cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DPACKAGE:STRING=harbour-navit \ -DNAVIT_BINARY:STRING=harbour-navit \ @@ -99,7 +99,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ %{navit_real_source} %{__make} -# -DMAN_DIR:PATH=share/harbour-navit/man1 +# -DMAN_DIR:PATH=share/harbour-navit/man1 %install %make_install @@ -144,7 +144,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ *Mon Apr 10 2017 metalstrolch 0.5.1-1 - Almost harbour valid -*Mon Dec 14 2015 metalstrolch 0.5.1-0 +*Mon Dec 14 2015 metalstrolch 0.5.1-0 - Initial sailfish release - Initial package. diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 886dc1227..096b529f9 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -1,5 +1,5 @@ INSTALL(FILES maptool.1 DESTINATION ${MAN_DIR}) if(NOT DEFINED NAVIT_BINARY) set(NAVIT_BINARY navit) -endif() +endif() INSTALL(FILES navit.1 DESTINATION ${MAN_DIR} RENAME ${NAVIT_BINARY}.1) diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 2c1006b94..a924b3396 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -30,7 +30,7 @@ endif() foreach ( PLUGIN_PATH ${ALL_PLUGINS}) if (${PLUGIN_PATH}) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_PATH}") - + string(REPLACE "/" "_" MODULE_INC ${PLUGIN_PATH}) list(APPEND NAVIT_SUPPORT_LIBS ${MODULE_INC}) endif() @@ -39,11 +39,11 @@ endforeach() foreach ( MODULE_PATH ${ALL_MODULES}) if ( ${MODULE_PATH} ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_PATH}") - + string(REPLACE "/" "_" MODULE_INC ${MODULE_PATH}) list(APPEND MODULES_PROTOTYPE "\nvoid\tmodule_${MODULE_INC}_init(void)") list(APPEND MODULES_FUNC "\nmodule_${MODULE_INC}_init()") - + if (NOT USE_PLUGINS) list(APPEND MODULES_NAME ${MODULE_INC}) else() @@ -103,7 +103,7 @@ endif(SHARED_LIBNAVIT) if(NOT MSVC) SET(NAVIT_LIBS ${NAVIT_LIBS} m) endif(NOT MSVC) -target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) +target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=navit;LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\";PREFIX=\"${CMAKE_INSTALL_PREFIX}\"") if (DEFINED NAVIT_COMPILE_FLAGS) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") @@ -191,7 +191,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/navit.xml get_directory_property(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES) WRITE_FILE("cmake_plugin_settings.txt" - "set(APPLE ${APPLE} CACHE BOOL init)\n" + "set(APPLE ${APPLE} CACHE BOOL init)\n" "set(ANDROID ${ANDROID} CACHE BOOL init)\n" "set(USE_PLUGINS ${USE_PLUGINS} CACHE BOOL init)\n" "set(MODULE_BUILD_TYPE \"${MODULE_BUILD_TYPE}\" CACHE STRING init)\n" diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake index b5bd757cb..811a895d2 100644 --- a/navit/android/AndroidManifest.xml.cmake +++ b/navit/android/AndroidManifest.xml.cmake @@ -28,9 +28,9 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:scheme="google.navigation" /> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="google.navigation" /> </intent-filter> </activity> <activity android:name=".NavitAddressSearchActivity"></activity> @@ -38,4 +38,4 @@ <activity android:name=".NavitAddressResultListActivity"></activity> <activity android:name=".FileBrowserActivity"></activity> </application> -</manifest> +</manifest> diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt index e91c94d7b..6720f4e6d 100644 --- a/navit/android/CMakeLists.txt +++ b/navit/android/CMakeLists.txt @@ -51,7 +51,7 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja) COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/ COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml" + -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml" -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake COMMAND ${CMAKE_COMMAND} @@ -59,28 +59,28 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja) -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi -D LOWER=1 -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - COMMAND ${CMAKE_COMMAND} + COMMAND ${CMAKE_COMMAND} -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so" -D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo" + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo" -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw -D LOWER=1 -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake ) - + add_dependencies (android_resources images locales ${NAVIT_LIBNAME}) - + add_custom_target ( apkg COMMAND ant debug ) - + add_custom_target ( apkg-release COMMAND ant release ) add_dependencies(apkg android_resources) add_dependencies(apkg-release android_resources) - + endif(ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja) diff --git a/navit/android/po2xml.xslt b/navit/android/po2xml.xslt index 1a92d2db4..17ea440f9 100644 --- a/navit/android/po2xml.xslt +++ b/navit/android/po2xml.xslt @@ -1,6 +1,6 @@ <?xml version="1.0"?> <xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:po2xml="http://example.com/namespace" exclude-result-prefixes="po2xml"> -<xsl:param name="po_file"/> +<xsl:param name="po_file"/> <xsl:output method="xml" indent="yes" encoding="utf-8"/> <xsl:function name="po2xml:escape"> diff --git a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml index d45485f49..6495317e8 100644 --- a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml +++ b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml @@ -14,7 +14,7 @@ android:layout_gravity="top" android:background = "#f00" android:background = "#0f0" - + --> <LinearLayout diff --git a/navit/android/res/values-v21/styles.xml b/navit/android/res/values-v21/styles.xml index a1d66bb3d..3edbb901a 100644 --- a/navit/android/res/values-v21/styles.xml +++ b/navit/android/res/values-v21/styles.xml @@ -24,22 +24,22 @@ <style name="NavitTheme" parent="NavitBaseTheme"> <!-- API 21 theme customizations can go here. --> - + <!-- Don't use translucent system bars on API 21 as they are drawn with a semitransparent black background which can't be changed. --> <item name="android:windowTranslucentNavigation">false</item> <item name="android:windowTranslucentStatus">false</item> - - <!-- + + <!-- We could set any semi-transparent color here (or change it in code), but this would not be available on API 19/20. Simply specifying full transparency allows us to implement a - separate mechanism that will work on all versions. + separate mechanism that will work on all versions. --> <item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item> - + <item name="android:windowDrawsSystemBarBackgrounds">true</item> </style> diff --git a/navit/android/res/values/strings-dont-translate.xml b/navit/android/res/values/strings-dont-translate.xml index b2a5496bc..f3892ef33 100644 --- a/navit/android/res/values/strings-dont-translate.xml +++ b/navit/android/res/values/strings-dont-translate.xml @@ -13,7 +13,7 @@ <!-- OPTIONS MENU --> <string name="optionsmenu_address_search">@string/address_search_title</string> - + <!-- Backup Restore --> <string-array name="dialog_backup_restore_items"> <item >@string/backup</item> diff --git a/navit/android/res/values/strings.xml b/navit/android/res/values/strings.xml index 87acfec6b..ae80265e3 100644 --- a/navit/android/res/values/strings.xml +++ b/navit/android/res/values/strings.xml @@ -25,7 +25,7 @@ <string name="optionsmenu_exit_navit">Exit Navit</string> <string name="optionsmenu_backup_restore">Backup / Restore</string> <string name="optionsmenu_set_map_location">Set map location</string> - + <!-- POSITION POP-UP --> <string name="position_popup_title">Position</string> <string name="position_popup_drive_here">Route to here</string> @@ -65,7 +65,7 @@ <string name="address_search_set_destination">Setting destination to:</string> <string name="address_search_towns">Towns</string> <string name="address_search_streets">Streets</string> - + <!-- Backup Restore --> <string name="choose_an_action">Choose an action</string> <string name="please_insert_an_sd_card">Please insert an SD Card</string> @@ -82,11 +82,11 @@ <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> - + <!-- Permissions dialog--> <string name="permissions_not_granted">Navit needs permission to access GPS and read the map.\nIf you change your mind please restart Navit and grant the permissions</string> <string name="permissions_info_box_title">One or more ungranted permissions</string> diff --git a/navit/attr.h b/navit/attr.h index 4884ea95b..c9e1ca30f 100644 --- a/navit/attr.h +++ b/navit/attr.h @@ -79,14 +79,14 @@ enum attr_format { #define AF_TRANSPORT_TRUCK (1<<21) #define AF_DELIVERY_TRUCK (1<<22) #define AF_PUBLIC_BUS (1<<23) -#define AF_TAXI (1<<24) -#define AF_HIGH_OCCUPANCY_CAR (1<<25) -#define AF_CAR (1<<26) -#define AF_MOTORCYCLE (1<<27) -#define AF_MOPED (1<<28) -#define AF_HORSE (1<<29) -#define AF_BIKE (1<<30) -#define AF_PEDESTRIAN (1<<31) +#define AF_TAXI (1<<24) +#define AF_HIGH_OCCUPANCY_CAR (1<<25) +#define AF_CAR (1<<26) +#define AF_MOTORCYCLE (1<<27) +#define AF_MOPED (1<<28) +#define AF_HORSE (1<<29) +#define AF_BIKE (1<<30) +#define AF_PEDESTRIAN (1<<31) #define AF_PBH (AF_PEDESTRIAN|AF_BIKE|AF_HORSE) #define AF_MOTORIZED_FAST (AF_MOTORCYCLE|AF_CAR|AF_HIGH_OCCUPANCY_CAR|AF_TAXI|AF_PUBLIC_BUS|AF_DELIVERY_TRUCK|AF_TRANSPORT_TRUCK|AF_EMERGENCY_VEHICLES) diff --git a/navit/attr_def.h b/navit/attr_def.h index e2e3aeab1..1a0c92ee4 100644 --- a/navit/attr_def.h +++ b/navit/attr_def.h @@ -19,7 +19,7 @@ /** @file attr_def.h * @brief Attribute definitions. - * + * * Any attribute used by a Navit object must be defined in this file. * * @author Navit Team diff --git a/navit/autoload/osso/CMakeLists.txt b/navit/autoload/osso/CMakeLists.txt index 905afb01b..2a6f9b631 100644 --- a/navit/autoload/osso/CMakeLists.txt +++ b/navit/autoload/osso/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(autoload_osso osso.c) +module_add_library(autoload_osso osso.c) diff --git a/navit/binding/dbus/CMakeLists.txt b/navit/binding/dbus/CMakeLists.txt index 6f081ab09..ad6858346 100644 --- a/navit/binding/dbus/CMakeLists.txt +++ b/navit/binding/dbus/CMakeLists.txt @@ -1,4 +1,4 @@ -module_add_library(binding_dbus binding_dbus.c) +module_add_library(binding_dbus binding_dbus.c) set(bindir ${CMAKE_INSTALL_PREFIX}/${BIN_DIR}) configure_file ( diff --git a/navit/binding/dbus/navit.introspect b/navit/binding/dbus/navit.introspect index 9366c0cb3..9530a7b27 100644 --- a/navit/binding/dbus/navit.introspect +++ b/navit/binding/dbus/navit.introspect @@ -6,7 +6,7 @@ <arg direction="out" type="s" /> </method> </interface> - + <interface name="org.navit_project.navit"> <method name="get_navit"> <arg name="iter" type="o" direction="in"/> @@ -19,7 +19,7 @@ <arg name="iter" type="o" direction="in"/> </method> </interface> - + <interface name="org.navit_project.navit.navit"> <method name="zoom"> <arg type="i" direction="in" /> diff --git a/navit/binding/win32/CMakeLists.txt b/navit/binding/win32/CMakeLists.txt index 792a8ff43..710a4dcf6 100644 --- a/navit/binding/win32/CMakeLists.txt +++ b/navit/binding/win32/CMakeLists.txt @@ -2,8 +2,8 @@ if (USE_LIBGNUINTL AND NOT HAVE_GLIB) ADD_DEPENDENCIES(support_glib intl_cmake) endif() -module_add_library(binding_win32 binding_win32.c) +module_add_library(binding_win32 binding_win32.c) add_executable(tell_navit tell_navit.c) -target_link_libraries(tell_navit ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) +target_link_libraries(tell_navit ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) install(TARGETS tell_navit DESTINATION ${BIN_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/navit/builtin.c.in b/navit/builtin.c.in index d340d174b..464845929 100644 --- a/navit/builtin.c.in +++ b/navit/builtin.c.in @@ -1,5 +1,5 @@ ${MODULES_PROTOTYPE}; -extern void builtin_init(void); -void builtin_init(void) { +extern void builtin_init(void); +void builtin_init(void) { ${MODULES_FUNC}; } diff --git a/navit/coord.h b/navit/coord.h index 8d08c0353..cff549e95 100644 --- a/navit/coord.h +++ b/navit/coord.h @@ -87,7 +87,7 @@ struct coord_geo { navit_float lat; /*!< Latitude */ }; -//! A cartesian coordinate +//! A cartesian coordinate struct coord_geo_cart { navit_float x; /*!< X-Value */ navit_float y; /*!< Y-Value */ @@ -98,7 +98,7 @@ struct coord_geo_cart { * An enumeration of formats for printing geographic coordinates in. * */ -enum coord_format +enum coord_format { /** * Degrees with decimal places. @@ -115,7 +115,7 @@ enum coord_format * Degrees, minutes and seconds. * ie 20 30 30.00 N 110 30 30 E */ - DEGREES_MINUTES_SECONDS + DEGREES_MINUTES_SECONDS }; enum projection; diff --git a/navit/data.h b/navit/data.h index 19928a391..c060739b0 100644 --- a/navit/data.h +++ b/navit/data.h @@ -100,7 +100,7 @@ get_string(unsigned char **p) while (**p) (*p)++; (*p)++; return ret; -} +} #define L(x) ({ unsigned char *t=(unsigned char *)&(x); t[0] | (t[1] << 8) | (t[2] << 16) | (t[3] << 24); }) diff --git a/navit/data_window_int.h b/navit/data_window_int.h index 6d3ead94e..a9b712759 100644 --- a/navit/data_window_int.h +++ b/navit/data_window_int.h @@ -22,7 +22,7 @@ struct data_window { GtkWidget *window; - GtkWidget *scrolled_window; + GtkWidget *scrolled_window; GtkWidget *treeview; void(*callback)(struct data_window *, char **cols); }; diff --git a/navit/debug.h b/navit/debug.h index 49f19566f..4d12ec169 100644 --- a/navit/debug.h +++ b/navit/debug.h @@ -30,7 +30,7 @@ extern "C" { #ifdef _MSC_VER #define __PRETTY_FUNCTION__ __FUNCTION__ -/* Uncomment the following define to enable MSVC's memory debugging support */ +/* Uncomment the following define to enable MSVC's memory debugging support */ /*#define _CRTDBG_MAP_ALLOC*/ #ifdef _CRTDBG_MAP_ALLOC #include <stdlib.h> diff --git a/navit/endianess.h b/navit/endianess.h index 2b4047093..9e00dfb85 100644 --- a/navit/endianess.h +++ b/navit/endianess.h @@ -18,9 +18,9 @@ */ #ifndef __ENDIANESS_HANDLER__ - /* The following is based on xorg/xserver/GL/glx/glxbyteorder.h + /* The following is based on xorg/xserver/GL/glx/glxbyteorder.h * which is (c) IBM Corp. 2006,2007 and originally licensed under the following - * BSD-license. All modifications in navit are licensed under the GNU GPL as + * BSD-license. All modifications in navit are licensed under the GNU GPL as * described in file "COPYRIGHT". * * Portions also from GNU C Library include/bits/byteswap.h Also licsend @@ -33,11 +33,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL @@ -92,14 +92,14 @@ #endif -#if __BYTE_ORDER == __BIG_ENDIAN +#if __BYTE_ORDER == __BIG_ENDIAN #define le16_to_cpu(x) __bswap_16 (x) #define le32_to_cpu(x) __bswap_32 (x) #define le64_to_cpu(x) __bswap_64 (x) #define cpu_to_le16(x) __bswap_16 (x) #define cpu_to_le32(x) __bswap_32 (x) #define cpu_to_le64(x) __bswap_64 (x) -#elif __BYTE_ORDER == __LITTLE_ENDIAN +#elif __BYTE_ORDER == __LITTLE_ENDIAN #define le16_to_cpu(x) (x) #define le32_to_cpu(x) (x) #define cpu_to_le16(x) (x) diff --git a/navit/file.h b/navit/file.h index 46dbc4c99..e44ca96ad 100644 --- a/navit/file.h +++ b/navit/file.h @@ -44,7 +44,7 @@ struct file { #ifndef __CEGCC__ time_t mtime; time_t ctime; - int version; + int version; #endif #if defined(_WIN32) || defined(__CEGCC__) long map_handle; diff --git a/navit/fonts/CMakeLists.txt b/navit/fonts/CMakeLists.txt index 2c2f22531..28dedecd1 100644 --- a/navit/fonts/CMakeLists.txt +++ b/navit/fonts/CMakeLists.txt @@ -1,6 +1,6 @@ add_custom_target( fonts ALL DEPENDS ${NAVIT_FONTS} COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${CMAKE_CURRENT_SOURCE_DIR}/*.ttf" #${NAVIT_FONTS}" + -D GLOB_EXP="${CMAKE_CURRENT_SOURCE_DIR}/*.ttf" #${NAVIT_FONTS}" -D DST=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake ) diff --git a/navit/fonts/License.txt b/navit/fonts/License.txt index f1787287c..b0e1f3edc 100644 --- a/navit/fonts/License.txt +++ b/navit/fonts/License.txt @@ -3,17 +3,17 @@ LIBERATION FONT SOFTWARE This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement. - 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: + 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. - 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. + 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. - 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. + 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. - 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. + 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. diff --git a/navit/fonts/README b/navit/fonts/README index 51a5329cd..e57b91222 100644 --- a/navit/fonts/README +++ b/navit/fonts/README @@ -24,7 +24,7 @@ Courier New. 3.2 Build from the source - Change into directory liberation-fonts-[VERSION]/ and build from sources by + Change into directory liberation-fonts-[VERSION]/ and build from sources by following commands: $ cd liberation-fonts-[VERSION] @@ -42,7 +42,7 @@ Courier New. 4. Usage ======== -The fonts should be installed and detected by the system after installation. +The fonts should be installed and detected by the system after installation. 5. License diff --git a/navit/graphics/cocoa/graphics_cocoa.m b/navit/graphics/cocoa/graphics_cocoa.m index 8612469ac..6f5bcedc5 100644 --- a/navit/graphics/cocoa/graphics_cocoa.m +++ b/navit/graphics/cocoa/graphics_cocoa.m @@ -175,7 +175,7 @@ struct graphics_font_priv { struct point p; p.x=theEvent.locationInWindow.x; p.y=graphics->h-theEvent.locationInWindow.y; - + dbg(1,"Enter %d %d",p.x,p.y); callback_list_call_attr_3(graphics->cbl, attr_button, GINT_TO_POINTER(1), GINT_TO_POINTER(1), (void *)&p); } @@ -185,7 +185,7 @@ struct graphics_font_priv { struct point p; p.x=theEvent.locationInWindow.x; p.y=graphics->h-theEvent.locationInWindow.y; - + dbg(1,"Enter %d %d",p.x,p.y); callback_list_call_attr_3(graphics->cbl, attr_button, GINT_TO_POINTER(0), GINT_TO_POINTER(1), (void *)&p); } @@ -195,7 +195,7 @@ struct graphics_font_priv { struct point p; p.x=theEvent.locationInWindow.x; p.y=graphics->h-theEvent.locationInWindow.y; - + dbg(1,"Enter %d %d",p.x,p.y); callback_list_call_attr_1(graphics->cbl, attr_motion, (void *)&p); } @@ -233,7 +233,7 @@ struct graphics_font_priv { return [self init]; } -static +static void free_graphics(struct graphics_priv *gr) { if (gr->layer) { @@ -355,7 +355,7 @@ applicationDidFinishLaunching:(NSNotification *)aNotification if (global_graphics_cocoa) { callback_list_call_attr_2(global_graphics_cocoa->cbl, attr_resize, (int)appFrame.size.width, (int)appFrame.size.height); - + } #if USE_UIKIT @@ -404,7 +404,7 @@ draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point * CGContextBeginPath(gr->layer_context); CGContextAddLines(gr->layer_context, points, count); CGContextStrokePath(gr->layer_context); - + } static void @@ -533,8 +533,8 @@ gc_set_background(struct graphics_gc_priv *gc, struct color *c) } static struct graphics_gc_methods gc_methods = { - gc_destroy, - gc_set_linewidth, + gc_destroy, + gc_set_linewidth, gc_set_dashes, gc_set_foreground, gc_set_background, @@ -630,14 +630,14 @@ static struct graphics_methods graphics_methods = { draw_polygon, draw_rectangle, NULL, /* draw_circle, */ - draw_text, + draw_text, draw_image, NULL, /* draw_image_warp, */ draw_drag, font_new, gc_new, background_gc, - overlay_new, + overlay_new, image_new, get_data, image_free, @@ -748,7 +748,7 @@ static void event_cocoa_remove_timeout(struct event_timeout *ev) { NavitTimer *t=(NavitTimer *)ev; - + [t->timer invalidate]; [t release]; } @@ -769,7 +769,7 @@ static void event_cocoa_remove_idle(struct event_idle *ev) { NavitTimer *t=(NavitTimer *)ev; - + [t->timer invalidate]; [t release]; } @@ -782,7 +782,7 @@ static struct event_methods event_cocoa_methods = { event_cocoa_add_timeout, event_cocoa_remove_timeout, event_cocoa_add_idle, - event_cocoa_remove_idle, + event_cocoa_remove_idle, NULL, /* event_cocoa_call_callback, */ }; diff --git a/navit/graphics/egl/CMakeLists.txt b/navit/graphics/egl/CMakeLists.txt index 1943f2bc0..a0e4e27dd 100644 --- a/navit/graphics/egl/CMakeLists.txt +++ b/navit/graphics/egl/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(graphics_egl graphics_egl.c) +module_add_library(graphics_egl graphics_egl.c) diff --git a/navit/graphics/gd/CMakeLists.txt b/navit/graphics/gd/CMakeLists.txt index 5f8f6ec7a..cf411b9ae 100644 --- a/navit/graphics/gd/CMakeLists.txt +++ b/navit/graphics/gd/CMakeLists.txt @@ -1,3 +1,3 @@ include_directories(${GD_INCLUDE_DIR}) -module_add_library(graphics_gd graphics_gd.c) +module_add_library(graphics_gd graphics_gd.c) target_link_libraries(graphics_gd ${GD_LIBS}) diff --git a/navit/graphics/gtk_drawing_area/CMakeLists.txt b/navit/graphics/gtk_drawing_area/CMakeLists.txt index 19e442616..b5b55f4f6 100644 --- a/navit/graphics/gtk_drawing_area/CMakeLists.txt +++ b/navit/graphics/gtk_drawing_area/CMakeLists.txt @@ -1,3 +1,3 @@ set(graphics_gtk_drawing_area_LIBS ${IMLIB2_LDFLAGS} ${GTK2_LIBRARIES}) -module_add_library(graphics_gtk_drawing_area graphics_gtk_drawing_area.c) +module_add_library(graphics_gtk_drawing_area graphics_gtk_drawing_area.c) diff --git a/navit/graphics/opengl/CMakeLists.txt b/navit/graphics/opengl/CMakeLists.txt index 6596344d1..1b408e023 100644 --- a/navit/graphics/opengl/CMakeLists.txt +++ b/navit/graphics/opengl/CMakeLists.txt @@ -2,5 +2,5 @@ set(graphics_opengl_SOURCES graphics_opengl.c) if (USE_OPENGLES) LIST(APPEND graphics_opengl_SOURCES graphics_opengl_x11.c graphics_opengl_egl.c) endif (USE_OPENGLES) -module_add_library(graphics_opengl ${graphics_opengl_SOURCES}) +module_add_library(graphics_opengl ${graphics_opengl_SOURCES}) diff --git a/navit/graphics/qt5/loader.qml b/navit/graphics/qt5/loader.qml index 9882cb23a..29dcb7832 100644 --- a/navit/graphics/qt5/loader.qml +++ b/navit/graphics/qt5/loader.qml @@ -4,7 +4,7 @@ import QtQuick.Window 2.0 Window { width: 200; height: 200 - + Item { id: root anchors.fill: parent diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h index 9678b0dc0..3b90689f0 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h @@ -87,8 +87,8 @@ class RenderArea; //############################################################################################################## -//# Description: -//# Comment: +//# Description: +//# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## struct graphics_gc_priv { @@ -98,8 +98,8 @@ struct graphics_gc_priv { }; //############################################################################################################## -//# Description: -//# Comment: +//# Description: +//# Comment: //# Authors: Martin Schaller (04/2008) //############################################################################################################## struct graphics_priv { diff --git a/navit/graphics/sdl/CMakeLists.txt b/navit/graphics/sdl/CMakeLists.txt index b8cad6025..c367a1762 100644 --- a/navit/graphics/sdl/CMakeLists.txt +++ b/navit/graphics/sdl/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(graphics_sdl graphics_sdl.c raster.c) +module_add_library(graphics_sdl graphics_sdl.c raster.c) diff --git a/navit/gui/internal/gui_internal_poi.h b/navit/gui/internal/gui_internal_poi.h index 665f44a70..4e6bed74b 100644 --- a/navit/gui/internal/gui_internal_poi.h +++ b/navit/gui/internal/gui_internal_poi.h @@ -13,28 +13,28 @@ struct poi_param { /** * Index to struct selector selectors[], shows what type of POIs is defined. - */ + */ unsigned char selnb; /** * Page number to display. - */ + */ unsigned char pagenb; /** * Radius (number of 10-kilometer intervals) to search for POIs. - */ + */ unsigned char dist; /** * Should filter phrase be compared to postal address of the POI. * =0 - name filter, =1 - address filter, =2 - address filter, including postal code - */ + */ unsigned char AddressFilterType; /** * Filter string, casefold()ed and divided into substrings at the spaces, which are replaced by ASCII 0*. - */ - char *filterstr; + */ + char *filterstr; /** * list of pointers to individual substrings of filterstr. - */ + */ GList *filter; /** * Number of POIs in this list diff --git a/navit/gui/internal/gui_internal_priv.h b/navit/gui/internal/gui_internal_priv.h index 37b09d62a..66b3e41fe 100644 --- a/navit/gui/internal/gui_internal_priv.h +++ b/navit/gui/internal/gui_internal_priv.h @@ -136,7 +136,7 @@ struct gui_priv { struct widget *container; } html[10]; -/* gestures */ +/* gestures */ struct gesture_elem { long long msec; diff --git a/navit/gui/qml/bookmarksProxy.h b/navit/gui/qml/bookmarksProxy.h index de48898a0..8063a2058 100644 --- a/navit/gui/qml/bookmarksProxy.h +++ b/navit/gui/qml/bookmarksProxy.h @@ -51,7 +51,7 @@ public slots: while ((item=bookmarks_get_item(mattr.u.bookmarks))) { QString label; QString path; - + if (item->type != type_bookmark && item->type != type_bookmark_folder) continue; if (!item_attr_get(item, attr_label, &attr)) continue; label=QString::fromLocal8Bit(attr.u.str); diff --git a/navit/gui/qml/guiProxy.h b/navit/gui/qml/guiProxy.h index 7648eb5b3..ca46af09e 100644 --- a/navit/gui/qml/guiProxy.h +++ b/navit/gui/qml/guiProxy.h @@ -48,7 +48,7 @@ public: //QDeclarativeExpression commandJS(this->object->guiWidget->rootContext(),QString(),qobject_cast<QObject*>(this->object->guiWidget->rootObject())); //commandJS.setSourceLocation("command.js",0); //this->function=function; - //commandJS.eval(qobject_cast<QObject*>(this->object->guiWidget->rootObject())); + //commandJS.eval(qobject_cast<QObject*>(this->object->guiWidget->rootObject())); } signals: void widthSignal(int); @@ -57,7 +57,7 @@ public slots: void pushPage(QString page) { returnPath.push_front(page); } - QString popPage() { + QString popPage() { if (!returnPath.empty()) { if (returnPath.length()>1) { returnPath.pop_front(); diff --git a/navit/gui/qml/navitProxy.h b/navit/gui/qml/navitProxy.h index 423863b0e..d3f8a0e86 100644 --- a/navit/gui/qml/navitProxy.h +++ b/navit/gui/qml/navitProxy.h @@ -51,7 +51,7 @@ public slots: while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) { QStandardItem* curItem=new QStandardItem(); - //Listed attributes are usualy have very complex structure + //Listed attributes are usualy have very complex structure if (attr.type==attr_layout) { curItem->setData(QVariant(counter),NGQStandardItemModel::ItemId); curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemName); diff --git a/navit/gui/qml/ngqpoint.h b/navit/gui/qml/ngqpoint.h index b1e6312ff..14aaddc61 100644 --- a/navit/gui/qml/ngqpoint.h +++ b/navit/gui/qml/ngqpoint.h @@ -94,7 +94,7 @@ public: this->c.x = c->x; this->c.y = c->y; this->type=type; - + this->name=name; this->coord=this->_coordString(); } @@ -116,7 +116,7 @@ public slots: this->coord=this->_coordString(); } QString pointName() { - return this->name; + return this->name; } QString coordString() { return this->coord; @@ -311,12 +311,12 @@ protected: mr=map_rect_new(m, &sel); if (! mr) continue; - while ((item=map_rect_get_item(mr))) { + while ((item=map_rect_get_item(mr))) { data=street_get_data(item); - if (transform_within_dist_item(&co, item->type, data->c, data->count, dist)) { + if (transform_within_dist_item(&co, item->type, data->c, data->count, dist)) { if (item_attr_get(item, attr_label, &attr)) { label=map_convert_string(m, attr.u.str); - this->item=*item; + this->item=*item; this->_setUrl(item); if (QString(item_to_name(item->type)).startsWith(QString("poi_"))) { ret=QString::fromLocal8Bit(item_to_name(item->type)); diff --git a/navit/gui/qml/proxy.h b/navit/gui/qml/proxy.h index 72a696f00..ebdb0667a 100644 --- a/navit/gui/qml/proxy.h +++ b/navit/gui/qml/proxy.h @@ -35,7 +35,7 @@ public slots: QString getAttr(const QString &attr_name) { QString ret; struct attr attr; - + getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL); if (ATTR_IS_INT(attr.type)) { ret.setNum(attr.u.num); @@ -81,7 +81,7 @@ public slots: return; } - + int itemId() { return _itemId; } diff --git a/navit/gui/qml/routeProxy.h b/navit/gui/qml/routeProxy.h index f4c5f9911..fb76c492c 100644 --- a/navit/gui/qml/routeProxy.h +++ b/navit/gui/qml/routeProxy.h @@ -14,13 +14,13 @@ public slots: QList<struct attr> destinations=this->_routeDestinations(); struct pcoord *coords=(struct pcoord*)malloc(sizeof(struct pcoord)*(destinations.size()+1)); //Additional destination included - for (QList<struct attr>::const_iterator iter=destinations.begin();iter!=destinations.end();iter++) { + for (QList<struct attr>::const_iterator iter=destinations.begin();iter!=destinations.end();iter++) { coords[counter]=*(iter->u.pcoord); counter++; } //Add new one - coords[counter]=*(this->object->currentPoint->pc()); + coords[counter]=*(this->object->currentPoint->pc()); //Propagate to route engine route_set_destinations(navit_get_route(this->object->nav),coords,counter+1,1); diff --git a/navit/gui/qml/searchProxy.h b/navit/gui/qml/searchProxy.h index 16f79a2a3..3d76dc0dd 100644 --- a/navit/gui/qml/searchProxy.h +++ b/navit/gui/qml/searchProxy.h @@ -52,7 +52,7 @@ public: search_list_search(this->sl, &search_attr, 0); while((res=search_list_get_result(this->sl))); } - } + } } ~NGQProxySearch() { search_list_destroy(this->sl); @@ -131,7 +131,7 @@ public slots: } if (res->town->common.district_name) { entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"), QString::fromLocal8Bit(res->town->common.district_name))); - } + } } if (this->search_context=="street") { entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter))); @@ -150,8 +150,8 @@ public slots: this->country_name=countryName; struct attr attr; struct search_list_result *res; - - //We need to update ISO2 + + //We need to update ISO2 attr.type=attr_country_name; attr.u.str=countryName.toLocal8Bit().data(); search_list_search(this->sl,&attr,0); @@ -183,7 +183,7 @@ public slots: attr.type=attr_town_or_district_name; attr.u.str=townName.toLocal8Bit().data(); search_list_search(this->sl,&attr,0); - + //...and street this->street_name=""; diff --git a/navit/gui/qml/skins/navit/ButtonIcon.qml b/navit/gui/qml/skins/navit/ButtonIcon.qml index 9b5d6ae3a..6e0f8f032 100644 --- a/navit/gui/qml/skins/navit/ButtonIcon.qml +++ b/navit/gui/qml/skins/navit/ButtonIcon.qml @@ -19,7 +19,7 @@ Rectangle { } Text { - id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; + id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } diff --git a/navit/gui/qml/skins/navit/Cellar.qml b/navit/gui/qml/skins/navit/Cellar.qml index de4d3c146..89ecfc899 100644 --- a/navit/gui/qml/skins/navit/Cellar.qml +++ b/navit/gui/qml/skins/navit/Cellar.qml @@ -3,14 +3,14 @@ import "pagenavigation.js" as Navit Rectangle { - function onStartup(currentPage) { + function onStartup(currentPage) { btnBack.opacity=0; btnQuit.opacity=0; if ( gui.lengthPage() > 1 ) { btnBack.opacity=1; } if ( gui.lengthPage() == 1 && currentPage == "PageMain.qml" ) { - btnQuit.opacity=1; + btnQuit.opacity=1; } } diff --git a/navit/gui/qml/skins/navit/ListSelector.qml b/navit/gui/qml/skins/navit/ListSelector.qml index 09c927cf1..9480275be 100644 --- a/navit/gui/qml/skins/navit/ListSelector.qml +++ b/navit/gui/qml/skins/navit/ListSelector.qml @@ -17,8 +17,8 @@ Rectangle { listScroller.opacity=0.5; } } - - Component.onCompleted: startup(); + + Component.onCompleted: startup(); Text { id: labelTxt; text: listselector.text; color: "White"; font.pointSize: 22; @@ -37,7 +37,7 @@ Rectangle { clip: true highlightFollowsCurrentItem: true keyNavigationWraps: true - + Component.onCompleted: { list.currentIndex=listselector.itemId; } } Rectangle { diff --git a/navit/gui/qml/skins/navit/PageAbout.qml b/navit/gui/qml/skins/navit/PageAbout.qml index a96baabca..b026e73be 100644 --- a/navit/gui/qml/skins/navit/PageAbout.qml +++ b/navit/gui/qml/skins/navit/PageAbout.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageBookmarks.qml b/navit/gui/qml/skins/navit/PageBookmarks.qml index 15a5982b6..46da8d865 100644 --- a/navit/gui/qml/skins/navit/PageBookmarks.qml +++ b/navit/gui/qml/skins/navit/PageBookmarks.qml @@ -11,7 +11,7 @@ Rectangle { function bookmarkReload() { listModel.xml=bookmarks.getBookmarks(); listModel.query="/bookmarks/bookmark"; - listModel.reload(); + listModel.reload(); } function bookmarkClick(itemName,itemType,itemCoord) { @@ -31,9 +31,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -41,7 +41,7 @@ Rectangle { ButtonIcon { id: folderBtn; text: "New folder"; icon: "gui_active.svg"; onClicked: folderDialog.opacity=1 anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: parent.left; anchors.leftMargin: page.width/16 } - ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); } + ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); } anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: folderBtn.right; anchors.leftMargin: page.width/16 } @@ -109,7 +109,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "" anchors.top: pasteBtn.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml index 39694d2af..c02aea7c3 100644 --- a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml +++ b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml @@ -25,9 +25,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageNavigate.qml b/navit/gui/qml/skins/navit/PageNavigate.qml index 3d4e04bc2..32e43841f 100644 --- a/navit/gui/qml/skins/navit/PageNavigate.qml +++ b/navit/gui/qml/skins/navit/PageNavigate.qml @@ -23,9 +23,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PagePoi.qml b/navit/gui/qml/skins/navit/PagePoi.qml index 4ab9f5c0f..71f21bb2f 100644 --- a/navit/gui/qml/skins/navit/PagePoi.qml +++ b/navit/gui/qml/skins/navit/PagePoi.qml @@ -64,9 +64,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -138,7 +138,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "" anchors.top: distanceSlider.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PagePointInfo.qml b/navit/gui/qml/skins/navit/PagePointInfo.qml index 1014c63df..c33027e26 100644 --- a/navit/gui/qml/skins/navit/PagePointInfo.qml +++ b/navit/gui/qml/skins/navit/PagePointInfo.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -68,7 +68,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "Attributes"; anchors.top: urlTxt.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageRoute.qml b/navit/gui/qml/skins/navit/PageRoute.qml index a340eaa1b..ea71569b3 100644 --- a/navit/gui/qml/skins/navit/PageRoute.qml +++ b/navit/gui/qml/skins/navit/PageRoute.qml @@ -20,9 +20,9 @@ Rectangle { } route.getDestinations(); } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSearch.qml b/navit/gui/qml/skins/navit/PageSearch.qml index 3d9419920..bc93dce52 100644 --- a/navit/gui/qml/skins/navit/PageSearch.qml +++ b/navit/gui/qml/skins/navit/PageSearch.qml @@ -20,9 +20,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -36,19 +36,19 @@ Rectangle { columns: 1;rows: 2; id: gridCountry; Text { - id: txtItemCountry; text: "Country"; + id: txtItemCountry; text: "Country"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { id: btnCountry; text: search.countryName; icon: "country_"+search.countryISO2+".svgz"; onClicked: { search.searchContext="country"; Navit.load("PageSearchSelector.qml"); } - } + } } Grid { columns: 1; rows: 2; id: gridCity opacity: 0; Text { - id: txtItemCity; text: "Town"; + id: txtItemCity; text: "Town"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { @@ -67,7 +67,7 @@ Rectangle { id: gridStreet opacity: 0; Text { - id: txtItemStreet; text: "Street"; + id: txtItemStreet; text: "Street"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { @@ -79,7 +79,7 @@ Rectangle { id: gridAddress; opacity: 0; Text { - id: txtItemAddress; text: "Address"; + id: txtItemAddress; text: "Address"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { diff --git a/navit/gui/qml/skins/navit/PageSearchSelector.qml b/navit/gui/qml/skins/navit/PageSearchSelector.qml index ec1ca73dd..d47fcbc71 100644 --- a/navit/gui/qml/skins/navit/PageSearchSelector.qml +++ b/navit/gui/qml/skins/navit/PageSearchSelector.qml @@ -40,15 +40,15 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } TextInput{ - id: searchTxt; + id: searchTxt; anchors.top: parent.top; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 width: page.width; font.pointSize: 14; color: "White";focus: true; readOnly: false; cursorVisible: true; } @@ -78,8 +78,8 @@ Rectangle { id: imgIcon; source: gui.iconPath+itemIcon width: 20; height: 20; } - Text { - id: txtItemName; text: itemName; color: "White"; + Text { + id: txtItemName; text: itemName; color: "White"; anchors.left: imgIcon.right;anchors.leftMargin: 5 width: list.width-imgIcon.width } @@ -98,7 +98,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: search.searchContext; onChanged: setSearchResult() anchors.top: searchTxt.bottom; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 width: page.width; height: page.height/2-cellar.height diff --git a/navit/gui/qml/skins/navit/PageSettings.qml b/navit/gui/qml/skins/navit/PageSettings.qml index f7efcacd5..2030fe56f 100644 --- a/navit/gui/qml/skins/navit/PageSettings.qml +++ b/navit/gui/qml/skins/navit/PageSettings.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml index 61db6a385..9d0002d9d 100644 --- a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml +++ b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml @@ -34,9 +34,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -60,9 +60,9 @@ Rectangle { } } - CommonHighlight { id: listHighlight} + CommonHighlight { id: listHighlight} - ListSelector { + ListSelector { id:layoutList; text: "Current layout"; itemId: navit.getAttrList("layout"); onChanged: navit.setObjectByName("layout",layoutList.value) anchors.top: parent.top; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageSettingsLocale.qml b/navit/gui/qml/skins/navit/PageSettingsLocale.qml index 441248484..ab4afa20d 100644 --- a/navit/gui/qml/skins/navit/PageSettingsLocale.qml +++ b/navit/gui/qml/skins/navit/PageSettingsLocale.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -22,7 +22,7 @@ Rectangle { Grid { columns: 1;rows: 3 anchors.horizontalCenter: parent.horizontalCenter; - anchors.verticalCenter: parent.verticalCenter; + anchors.verticalCenter: parent.verticalCenter; Text { id: lang; text: gui.localeName; color: "White";font.pointSize: gui.height/24 } Text { id: langname; text: gui.langName; color: "White";font.pointSize: gui.height/24 } diff --git a/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/gui/qml/skins/navit/PageSettingsRules.qml index 37b18c8d4..007f36c84 100644 --- a/navit/gui/qml/skins/navit/PageSettingsRules.qml +++ b/navit/gui/qml/skins/navit/PageSettingsRules.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSettingsTools.qml b/navit/gui/qml/skins/navit/PageSettingsTools.qml index a4af1222e..717bdc9fd 100644 --- a/navit/gui/qml/skins/navit/PageSettingsTools.qml +++ b/navit/gui/qml/skins/navit/PageSettingsTools.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -22,7 +22,7 @@ Rectangle { Grid { columns: 1;rows: 1 anchors.horizontalCenter: parent.horizontalCenter; - anchors.verticalCenter: parent.verticalCenter; + anchors.verticalCenter: parent.verticalCenter; ButtonIcon { id: btnDisplay; text: "Locale"; icon: "gui_actions.svg"; onClicked: Navit.load("PageSettingsLocale.qml"); } diff --git a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml index 157afcb00..189b8fd1f 100644 --- a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml +++ b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -43,9 +43,9 @@ Rectangle { } } } - CommonHighlight { id: listHighlight} + CommonHighlight { id: listHighlight} - ListSelector { + ListSelector { id:vehicleList; text: "Current vehicle profile"; itemId: navit.itemId; onChanged: {navit.setObjectByName("vehicle",vehicleList.value) } anchors.top: parent.top; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 anchors.left: parent.left; width: page.width/2;height: page.height/2 diff --git a/navit/gui/qml/skins/navit/Slider.qml b/navit/gui/qml/skins/navit/Slider.qml index e4d56e031..698a9f6e1 100644 --- a/navit/gui/qml/skins/navit/Slider.qml +++ b/navit/gui/qml/skins/navit/Slider.qml @@ -39,7 +39,7 @@ Rectangle { } MouseArea { anchors.fill: parent - onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } + onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } } radius: 8; opacity: 0.7 diff --git a/navit/gui/qml/skins/navit/ToggleButton.qml b/navit/gui/qml/skins/navit/ToggleButton.qml index 29d986601..30617644b 100644 --- a/navit/gui/qml/skins/navit/ToggleButton.qml +++ b/navit/gui/qml/skins/navit/ToggleButton.qml @@ -13,14 +13,14 @@ import Qt 4.7 function toggle() { if (togglebutton.state == "on") togglebutton.state = "off"; - else + else togglebutton.state = "on"; } function startup () { - if (togglebutton.stOn == "1" ) + if (togglebutton.stOn == "1" ) togglebutton.stOn = "true"; - else if (togglebutton.stOn == "0" ) + else if (togglebutton.stOn == "0" ) togglebutton.stOn = "false"; if (togglebutton.stOn == "true") togglebutton.state = "on"; @@ -38,7 +38,7 @@ import Qt 4.7 } Text { - id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter; + id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter; color: "White"; font.pointSize: gui.height/64; horizontalAlignment: Qt.AlignHCenter } diff --git a/navit/gui/qml/skins/navit/ToggleSwitch.qml b/navit/gui/qml/skins/navit/ToggleSwitch.qml index b1b262461..14bc7b0ba 100644 --- a/navit/gui/qml/skins/navit/ToggleSwitch.qml +++ b/navit/gui/qml/skins/navit/ToggleSwitch.qml @@ -15,9 +15,9 @@ import Qt 4.7 } function startup () { - if (toggleswitch.stOn == "1" ) + if (toggleswitch.stOn == "1" ) toggleswitch.stOn = "true"; - else if (toggleswitch.stOn == "0" ) + else if (toggleswitch.stOn == "0" ) toggleswitch.stOn = "false"; if (toggleswitch.stOn == "true") toggleswitch.state = "on"; diff --git a/navit/gui/qml/skins/navit/command.js b/navit/gui/qml/skins/navit/command.js index 071653acf..bcf0cf746 100644 --- a/navit/gui/qml/skins/navit/command.js +++ b/navit/gui/qml/skins/navit/command.js @@ -1,7 +1,7 @@ import Qt 4.7 Rectangle { - id: page + id: page function pageOpen(command) { if ( command=="menu") { @@ -11,10 +11,10 @@ Rectangle { if (command=="quit") { navit.quit(); } - + } - - Component.onCompleted: pageOpen(gui.commandFunction); - - Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 } + + Component.onCompleted: pageOpen(gui.commandFunction); + + Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 } } diff --git a/navit/gui/qml/skins/navit/main.qml b/navit/gui/qml/skins/navit/main.qml index 20b93d113..344dd182d 100644 --- a/navit/gui/qml/skins/navit/main.qml +++ b/navit/gui/qml/skins/navit/main.qml @@ -11,9 +11,9 @@ Rectangle { function pageOpen() { Navit.load("PageMain.qml"); } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -25,7 +25,7 @@ Rectangle { height: gui.height-cellar.height; anchors.horizontalCenter: parent.horizontalCenter; anchors.verticalCenter: parent.verticalCenter; - } + } Cellar {id: cellar;anchors.bottom: main.bottom; anchors.horizontalCenter: main.horizontalCenter; width: main.width } } diff --git a/navit/gui/qt5_qml/skins/menu.qml b/navit/gui/qt5_qml/skins/menu.qml index 540a16032..0cb9ce38c 100644 --- a/navit/gui/qt5_qml/skins/menu.qml +++ b/navit/gui/qt5_qml/skins/menu.qml @@ -18,7 +18,7 @@ Rectangle { anchors.leftMargin: 0 anchors.right: parent.right anchors.rightMargin: 0 - + Loader { id: menucontent width: parent.width diff --git a/navit/gui/qt5_qml/skins/modern/main.qml b/navit/gui/qt5_qml/skins/modern/main.qml index 3c35a4dd0..5ffd1de3e 100644 --- a/navit/gui/qt5_qml/skins/modern/main.qml +++ b/navit/gui/qt5_qml/skins/modern/main.qml @@ -68,7 +68,7 @@ Rectangle { NumberAnimation { properties: "x,y,opacity";duration: 200 } - onRunningChanged: { + onRunningChanged: { if ((mainMenu.opacity == 0) && (!running)){ backend.resize(navit1.width, navit1.height); console.log("transition done, hiding menu window size " + navit1.width + " x " + navit1.height) diff --git a/navit/gui/qt5_qml/skins/modern/menu.qml b/navit/gui/qt5_qml/skins/modern/menu.qml index ee51f68a2..bcca54b0b 100644 --- a/navit/gui/qt5_qml/skins/modern/menu.qml +++ b/navit/gui/qt5_qml/skins/modern/menu.qml @@ -8,7 +8,7 @@ Item { width: parent.width y: topBar.height height: parent.height - ( topBar.height + bottomBar.height ) - + Loader { id: menucontent width: parent.width diff --git a/navit/gui/qt5_qml/skins/pois.qml b/navit/gui/qt5_qml/skins/pois.qml index bc083e1ed..a78260211 100644 --- a/navit/gui/qt5_qml/skins/pois.qml +++ b/navit/gui/qt5_qml/skins/pois.qml @@ -10,14 +10,14 @@ Item { color: "#ff0000" radius: 2 border.width: 1 - + Image { id: image1 height: parent.height - 4; source : model.modelData.active ? "icons/appbar.layer.svg" : "icons/appbar.layer.delete.svg" opacity: model.modelData.active ? 1 : 0.4 } - + Text { width: 128 id: distanceText @@ -27,7 +27,7 @@ Item { anchors.left: image1.right anchors.leftMargin: 8 } - + Text { text: name color: "#ffffff" @@ -35,7 +35,7 @@ Item { anchors.left: distanceText.right anchors.leftMargin: 8 } - + MouseArea{ anchors.fill: parent hoverEnabled: true @@ -44,7 +44,7 @@ Item { } } } - + Component.onCompleted: backend.get_pois() } diff --git a/navit/gui/win32/CMakeLists.txt b/navit/gui/win32/CMakeLists.txt index 16b653c9f..2c5dd0923 100644 --- a/navit/gui/win32/CMakeLists.txt +++ b/navit/gui/win32/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(gui_win32 gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.c) +module_add_library(gui_win32 gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.c) diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt index 040f0ee5e..362d81d8d 100644 --- a/navit/icons/CMakeLists.txt +++ b/navit/icons/CMakeLists.txt @@ -55,10 +55,10 @@ macro(add_scale_targets IMAGE_SRC IMAGE_NAME) else() set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}_${CURRENT_SCALE}_${CURRENT_SCALE}.png) endif() - + if(NOT CURRENT_SCALE EQUAL -1) convert_to_png( - ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC} + ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC} ${IMAGE_DST} ${CURRENT_SCALE} ) @@ -82,7 +82,7 @@ install(FILES desktop_icons/256x256/navit.png DESTINATION share/icons/hicolor/2 if (USE_SVG OR SVG2PNG) FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg" "*.svgz") - + if(USE_SVG) list(APPEND IMAGES_TO_COPY ${SVG_FILES}) endif(USE_SVG) @@ -112,7 +112,7 @@ endif(XPM2PNG) foreach (IMAGE_SRC ${FILES_TO_PNG}) string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) - + if ( IMAGE_SRC MATCHES ".*svgz*" ) if ( DEFINED svg2png_scaling_nav AND ${IMAGE} MATCHES "^nav_") add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling_nav}) @@ -124,7 +124,7 @@ foreach (IMAGE_SRC ${FILES_TO_PNG}) else() add_scale_targets(${IMAGE_SRC} ${IMAGE} 0) endif() - + endforeach() foreach (IMAGE_FILE ${IMAGES_TO_COPY}) diff --git a/navit/iphone/downloader/Classes/DownloaderAppDelegate.h b/navit/iphone/downloader/Classes/DownloaderAppDelegate.h index 3227e6b8f..e0cc8dc10 100644 --- a/navit/iphone/downloader/Classes/DownloaderAppDelegate.h +++ b/navit/iphone/downloader/Classes/DownloaderAppDelegate.h @@ -9,7 +9,7 @@ #import <UIKit/UIKit.h> @interface DownloaderAppDelegate : NSObject <UIApplicationDelegate> { - + UIWindow *window; UINavigationController *navigationController; } diff --git a/navit/iphone/downloader/Classes/DownloaderAppDelegate.m b/navit/iphone/downloader/Classes/DownloaderAppDelegate.m index ff8a093a8..51b0d3705 100644 --- a/navit/iphone/downloader/Classes/DownloaderAppDelegate.m +++ b/navit/iphone/downloader/Classes/DownloaderAppDelegate.m @@ -19,10 +19,10 @@ #pragma mark - #pragma mark Application lifecycle -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. - + // Set the navigation controller as the window's root view controller and display. self.window.rootViewController = self.navigationController; [self.window makeKeyAndVisible]; @@ -41,7 +41,7 @@ - (void)applicationDidEnterBackground:(UIApplication *)application { /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. If your application supports background execution, called instead of applicationWillTerminate: when the user quits. */ } diff --git a/navit/iphone/downloader/Classes/DownloaderDetailViewController.m b/navit/iphone/downloader/Classes/DownloaderDetailViewController.m index 97e24b1c4..2b1633ece 100644 --- a/navit/iphone/downloader/Classes/DownloaderDetailViewController.m +++ b/navit/iphone/downloader/Classes/DownloaderDetailViewController.m @@ -28,7 +28,7 @@ // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { - + // Sets the Navigation bar to have the location name self.title = [self.locationName objectForKey:NAME_KEY]; @@ -47,7 +47,7 @@ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; - + // Release any cached data, images, etc. that aren't in use. } @@ -60,7 +60,7 @@ -(void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; } - + - (void)dealloc { [locationName_ release]; [super dealloc]; diff --git a/navit/iphone/downloader/Classes/RootViewController.h b/navit/iphone/downloader/Classes/RootViewController.h index 5cfe64cd4..2d8a6b7af 100644 --- a/navit/iphone/downloader/Classes/RootViewController.h +++ b/navit/iphone/downloader/Classes/RootViewController.h @@ -8,10 +8,10 @@ #import <UIKit/UIKit.h> -@interface RootViewController : UITableViewController +@interface RootViewController : UITableViewController { NSMutableArray* locations_; - + } @property (nonatomic, retain) NSMutableArray* locations; diff --git a/navit/iphone/downloader/Classes/RootViewController.m b/navit/iphone/downloader/Classes/RootViewController.m index d2820fe3c..9bf6c855e 100644 --- a/navit/iphone/downloader/Classes/RootViewController.m +++ b/navit/iphone/downloader/Classes/RootViewController.m @@ -20,14 +20,14 @@ - (void)viewDidLoad { [super viewDidLoad]; - + // Sets the title of the Navigation bar. self.title= @"Navit Map Downloader"; - + // Loads in the array for locations and their associated bounding boxes NSString *path = [[NSBundle mainBundle] pathForResource:@"LocationsArray" ofType:@"plist"]; - locations_ = [[NSMutableArray alloc] initWithContentsOfFile:path]; - + locations_ = [[NSMutableArray alloc] initWithContentsOfFile:path]; + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. // self.navigationItem.rightBarButtonItem = self.editButtonItem; } @@ -80,21 +80,21 @@ // Customize the appearance of table view cells. - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - + static NSString *CellIdentifier = @"Cell"; - + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) { cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - + // Configure the cell. - + // Gets the location name from LocationsArray.plist cell.textLabel.text = [[self.locations objectAtIndex:indexPath.row] objectForKey:NAME_KEY]; - + //Makes the fancy arrows to the left of the region being downloaded (e.g. "Ireland > " ) - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; return cell; } @@ -111,14 +111,14 @@ /* // Override to support editing the table view. - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - + if (editingStyle == UITableViewCellEditingStyleDelete) { // Delete the row from the data source. [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } + } else if (editingStyle == UITableViewCellEditingStyleInsert) { // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view. - } + } } */ @@ -143,18 +143,18 @@ #pragma mark Table view delegate - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - + DownloaderDetailViewController *detailViewController = [[DownloaderDetailViewController alloc] initWithNibName:@"DownloaderDetailViewController" bundle:nil]; - // Sets the "Back" button in the next ViewController (DownloaderDetailViewController). + // Sets the "Back" button in the next ViewController (DownloaderDetailViewController). // Which, be default, pulls the name from the previous ViewController // Here, we manually call it the text label "Back" self.navigationItem.backBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:nil action:nil] autorelease]; - + // Pass the selected object to the new view controller. detailViewController.locationName = [self.locations objectAtIndex:indexPath.row]; - [self.navigationController pushViewController:detailViewController animated:YES]; - + [self.navigationController pushViewController:detailViewController animated:YES]; + [DownloaderDetailViewController release]; } @@ -165,7 +165,7 @@ - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; - + // Relinquish ownership any cached data, images, etc that aren't in use. } diff --git a/navit/iphone/downloader/main.m b/navit/iphone/downloader/main.m index e18fb9c59..39d344c1f 100644 --- a/navit/iphone/downloader/main.m +++ b/navit/iphone/downloader/main.m @@ -9,7 +9,7 @@ #import <UIKit/UIKit.h> int main(int argc, char *argv[]) { - + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; int retVal = UIApplicationMain(argc, argv, nil, nil); [pool release]; diff --git a/navit/item.h b/navit/item.h index 341d4406d..bf65555fc 100644 --- a/navit/item.h +++ b/navit/item.h @@ -51,7 +51,7 @@ extern int default_flags[]; #define item_is_town(item) ((item).type >= type_town_label && (item).type <= type_district_label_1e7) #define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7) #define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) -#define item_is_point(item) ((item).type < type_line) +#define item_is_point(item) ((item).type < type_line) #define item_is_custom_poi(item) ((item).type >= type_poi_customg && (item).type < type_line) #define item_is_street(item) (((item).type >= type_street_nopass && (item).type <= type_roundabout) \ || (item).type == type_street_service \ diff --git a/navit/keys.h b/navit/keys.h index be7527ede..a47a1bcca 100644 --- a/navit/keys.h +++ b/navit/keys.h @@ -3,7 +3,7 @@ #define NAVIT_KEY_RIGHT 6 /* ^R */ #define NAVIT_KEY_BACKSPACE 8 /* ^H */ #define NAVIT_KEY_RETURN 13 /* ^M */ -#define NAVIT_KEY_DOWN 14 /* ^N */ +#define NAVIT_KEY_DOWN 14 /* ^N */ #define NAVIT_KEY_ZOOM_OUT 15 /* ^O */ #define NAVIT_KEY_UP 16 /* ^P */ #define NAVIT_KEY_ZOOM_IN 17 /* ^Q */ diff --git a/navit/layout.h b/navit/layout.h index a17d8e279..ece5d0cc8 100644 --- a/navit/layout.h +++ b/navit/layout.h @@ -68,13 +68,13 @@ struct element { }; -struct itemgra { +struct itemgra { struct range order,sequence_range,speed_range,angle_range; GList *type; GList *elements; }; -struct layer { +struct layer { NAVIT_OBJECT struct navit *navit; char *name; diff --git a/navit/map.h b/navit/map.h index 64261abc1..df8f9bf4e 100644 --- a/navit/map.h +++ b/navit/map.h @@ -18,7 +18,7 @@ */ /** @file - * + * * @brief Contains exported functions / structures for map.c * * This file contains code that works together with map.c and that is exported diff --git a/navit/map/binfile/CMakeLists.txt b/navit/map/binfile/CMakeLists.txt index 9b5a6cc96..62ef1326b 100644 --- a/navit/map/binfile/CMakeLists.txt +++ b/navit/map/binfile/CMakeLists.txt @@ -1 +1 @@ -module_add_library(map_binfile binfile.c) +module_add_library(map_binfile binfile.c) diff --git a/navit/map/csv/csv.h b/navit/map/csv/csv.h index 0ea31b18c..c32be1eff 100644 --- a/navit/map/csv/csv.h +++ b/navit/map/csv/csv.h @@ -32,13 +32,13 @@ struct map_priv { GHashTable*qitem_hash; char* filename; /*need to write map file on exit*/ - int dirty; + int dirty; int attr_cnt; enum attr_type *attr_types; int next_item_idx; enum item_type item_type; /*list of quadtree items that have no coord set yet ()*/ - GList* new_items; + GList* new_items; char *charset; }; diff --git a/navit/map/csv/quadtree.h b/navit/map/csv/quadtree.h index 389339456..ab96a97ac 100644 --- a/navit/map/csv/quadtree.h +++ b/navit/map/csv/quadtree.h @@ -45,7 +45,7 @@ struct quadtree_node { int ref_count; }; -struct quadtree_iter; +struct quadtree_iter; struct quadtree_node* quadtree_node_new(struct quadtree_node* parent, double xmin, double xmax, double ymin, double ymax ); struct quadtree_item* quadtree_find_nearest_flood(struct quadtree_node* this_, struct quadtree_item* item, double current_max, struct quadtree_node* toSkip); diff --git a/navit/map/filter/CMakeLists.txt b/navit/map/filter/CMakeLists.txt index 15da3f3c6..7ea4221a5 100644 --- a/navit/map/filter/CMakeLists.txt +++ b/navit/map/filter/CMakeLists.txt @@ -1 +1 @@ -module_add_library(map_filter filter.c) +module_add_library(map_filter filter.c) diff --git a/navit/map/garmin/gar2navit.h b/navit/map/garmin/gar2navit.h index 27c5f65e1..d6d22cc0a 100644 --- a/navit/map/garmin/gar2navit.h +++ b/navit/map/garmin/gar2navit.h @@ -12,9 +12,9 @@ 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, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - + Garmin and MapSource are registered trademarks or trademarks of Garmin Ltd. or one of its subsidiaries. diff --git a/navit/map/garmin/garmin.h b/navit/map/garmin/garmin.h index 94e893b12..c1feaacba 100644 --- a/navit/map/garmin/garmin.h +++ b/navit/map/garmin/garmin.h @@ -12,9 +12,9 @@ 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, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - + Garmin and MapSource are registered trademarks or trademarks of Garmin Ltd. or one of its subsidiaries. diff --git a/navit/map/garmin/garmintypes.txt b/navit/map/garmin/garmintypes.txt index f8a49c532..5f902f937 100644 --- a/navit/map/garmin/garmintypes.txt +++ b/navit/map/garmin/garmintypes.txt @@ -300,7 +300,7 @@ POINT 0, 0x1614 = poi_marine_type, lighted Navaid, violet 0, 0x1615 = poi_marine_type, lighted Navaid, blue 0, 0x1616 = poi_marine_type, lighted Navaid, multi colored -# RGN2-4 types +# RGN2-4 types # Marine types start 1, 0x0100 = point_unkn, Light 1, 0x0102 = point_unkn, Light with north topmark @@ -409,7 +409,7 @@ POINT 1, 0x0d07 = poi_zoo, Zoo 1, 0x0d08 = poi_stadium, Sportpark, Stadium 1, 0x0d0a = poi_bar, Wine Bar -1, 0x0d14 = poi_hospital, Hospital +1, 0x0d14 = poi_hospital, Hospital 1, 0x0e01 = poi_theater, Theater 1, 0x0e02 = poi_bar, Bar 1, 0x0e03 = poi_cinema, Cinema @@ -440,7 +440,7 @@ POINT 1, 0x100e = poi_car_wash, Car Wash 1, 0x1011 = poi_business_service, Business Service 1, 0x1012 = poi_communication, Communication -1, 0x1013 = poi_repair_service, Repair Service +1, 0x1013 = poi_repair_service, Repair Service 1, 0x1014 = poi_social_service, Social Service 1, 0x1015 = poi_public_utilities, Utility 1, 0x1101 = poi_police, Police Station @@ -633,7 +633,7 @@ POLYGONE 0, 0x51 = poly_wetland, Wetland 0, 0x52 = tundra, Tundra 0, 0x53 = poly_flats, Flats -# RGN2-4 +# RGN2-4 # Marine 1, 0x0100 = street_unkn, Land - white 1, 0x0101 = street_unkn, Land - non-urban diff --git a/navit/maptool/google/protobuf-c/protobuf-c-private.h b/navit/maptool/google/protobuf-c/protobuf-c-private.h index 01bbd35aa..53a33b51b 100644 --- a/navit/maptool/google/protobuf-c/protobuf-c-private.h +++ b/navit/maptool/google/protobuf-c/protobuf-c-private.h @@ -1,7 +1,7 @@ /* --- protobuf-c-private.h: private structures and functions --- */ /* * Copyright 2008, Dave Benson. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with * the License. You may obtain a copy of the License @@ -64,7 +64,7 @@ protobuf_c_service_generated_init (ProtobufCService *service, const ProtobufCServiceDescriptor *descriptor, ProtobufCServiceDestroy destroy); -void +void protobuf_c_service_invoke_internal(ProtobufCService *service, unsigned method_index, const ProtobufCMessage *input, diff --git a/navit/maptool/google/protobuf-c/protobuf-c.h b/navit/maptool/google/protobuf-c/protobuf-c.h index 98bd77b2a..50af74dac 100644 --- a/navit/maptool/google/protobuf-c/protobuf-c.h +++ b/navit/maptool/google/protobuf-c/protobuf-c.h @@ -2,7 +2,7 @@ /* * Copyright 2008, Dave Benson. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with * the License. You may obtain a copy of the License @@ -126,7 +126,7 @@ extern ProtobufCAllocator protobuf_c_default_allocator; /* settable */ */ extern ProtobufCAllocator protobuf_c_system_allocator; /* use malloc, free etc */ -/* This is the function that our default allocators call when they +/* This is the function that our default allocators call when they run out-of-memory. The default behavior of this function is to terminate your program. */ extern void (*protobuf_c_out_of_memory) (void); @@ -284,7 +284,7 @@ struct _ProtobufCMessageDescriptor * * ProtobufCMessage is sort-of a lightweight * base-class for all messages. - * + * * In particular, ProtobufCMessage doesn't have * any allocation policy associated with it. * That's because it is common to create ProtobufCMessage's @@ -311,7 +311,7 @@ struct _ProtobufCMessage /* To pack a message: you have two options: (1) you can compute the size of the message - using protobuf_c_message_get_packed_size() + using protobuf_c_message_get_packed_size() then pass protobuf_c_message_pack() a buffer of that length. (2) Provide a virtual buffer (a ProtobufCBuffer) to @@ -331,7 +331,7 @@ ProtobufCMessage * void protobuf_c_message_free_unpacked (ProtobufCMessage *message, ProtobufCAllocator *allocator); -/* WARNING: 'message' must be a block of memory +/* WARNING: 'message' must be a block of memory of size descriptor->sizeof_message. */ #define protobuf_c_message_init(descriptor, message) ((descriptor)->message_init((ProtobufCMessage*) (message))) @@ -378,11 +378,11 @@ void protobuf_c_service_destroy (ProtobufCService *); /* --- querying the descriptors --- */ const ProtobufCEnumValue * -protobuf_c_enum_descriptor_get_value_by_name +protobuf_c_enum_descriptor_get_value_by_name (const ProtobufCEnumDescriptor *desc, const char *name); const ProtobufCEnumValue * -protobuf_c_enum_descriptor_get_value +protobuf_c_enum_descriptor_get_value (const ProtobufCEnumDescriptor *desc, int value); const ProtobufCFieldDescriptor * @@ -390,7 +390,7 @@ protobuf_c_message_descriptor_get_field_by_name (const ProtobufCMessageDescriptor *desc, const char *name); const ProtobufCFieldDescriptor * -protobuf_c_message_descriptor_get_field +protobuf_c_message_descriptor_get_field (const ProtobufCMessageDescriptor *desc, unsigned value); const ProtobufCMethodDescriptor * diff --git a/navit/maptool/osmformat.proto b/navit/maptool/osmformat.proto index 73f6472a9..560d71deb 100644 --- a/navit/maptool/osmformat.proto +++ b/navit/maptool/osmformat.proto @@ -1,7 +1,7 @@ option java_package = "crosby.binary"; package OSMPBF; -/* OSM Binary file format +/* OSM Binary file format This is the master schema file of the OSM binary file format. This file is designed to support limited random-access and future @@ -42,7 +42,7 @@ message HeaderBlock { repeated string required_features = 4; repeated string optional_features = 5; - optional string writingprogram = 16; + optional string writingprogram = 16; optional string source = 17; // From the bbox field. } @@ -68,13 +68,13 @@ message PrimitiveBlock { repeated PrimitiveGroup primitivegroup = 2; // Granularity, units of nanodegrees, used to store coordinates in this block - optional int32 granularity = 17 [default=100]; + optional int32 granularity = 17 [default=100]; // Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees. optional int64 lat_offset = 19 [default=0]; - optional int64 lon_offset = 20 [default=0]; + optional int64 lon_offset = 20 [default=0]; // Granularity of dates, normally represented in units of milliseconds since the 1970 epoch. - optional int32 date_granularity = 18 [default=1000]; + optional int32 date_granularity = 18 [default=1000]; // Proposed extension: @@ -112,7 +112,7 @@ message Info { /** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes. */ message DenseInfo { - repeated int32 version = 1 [packed = true]; + repeated int32 version = 1 [packed = true]; repeated sint64 timestamp = 2 [packed = true]; // DELTA coded repeated sint64 changeset = 3 [packed = true]; // DELTA coded repeated sint32 uid = 4 [packed = true]; // DELTA coded @@ -124,7 +124,7 @@ message DenseInfo { // TODO: REMOVE THIS? message ChangeSet { required int64 id = 1; -// +// // // Parallel arrays. // repeated uint32 keys = 2 [packed = true]; // String IDs. // repeated uint32 vals = 3 [packed = true]; // String IDs. @@ -153,7 +153,7 @@ message Node { /* Used to densly represent a sequence of nodes that do not have any tags. We represent these nodes columnwise as five columns: ID's, lats, and -lons, all delta coded. When metadata is not omitted, +lons, all delta coded. When metadata is not omitted, We encode keys & vals for all nodes as a single array of integers containing key-stringid and val-stringid, using a stringid of 0 as a @@ -172,7 +172,7 @@ message DenseNodes { repeated sint64 lon = 9 [packed = true]; // DELTA coded // Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless. - repeated int32 keys_vals = 10 [packed = true]; + repeated int32 keys_vals = 10 [packed = true]; } @@ -192,7 +192,7 @@ message Relation { NODE = 0; WAY = 1; RELATION = 2; - } + } required int64 id = 1; // Parallel arrays. diff --git a/navit/maptype.h b/navit/maptype.h index 7ebf233b6..d2b86a51b 100644 --- a/navit/maptype.h +++ b/navit/maptype.h @@ -26,7 +26,7 @@ enum projection; struct maptype { char *name; struct map_priv *(*map_new)(struct map_methods *meth, char *data, char **charset, enum projection *pro); - struct maptype *next; + struct maptype *next; }; /* prototypes */ diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index 3a645fbc2..ae2eedd37 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -34,7 +34,7 @@ For other formats see http://wiki.navit-project.org/index.php/Coordinate_format. --> <navit center="11.5666 48.1333" zoom="256" tracking="1" orientation="-1" recent_dest="250" drag_bitmap="0"> - <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. + <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. On windows systems, use win32 --> <graphics type="gtk_drawing_area"/> <!-- The following line let you select which graphical user interface you'd like to use. @@ -99,9 +99,9 @@ Navigation</text></img> <img src='gui_actions' onclick='route_description()'><text>Description</text></img> <img src='gui_heightprofile' onclick='route_height_profile()'><text>Height Profile</text></img> <img cond='navit.waypoints_flag && (navit.route.route_status&1)' src='cursor_still' onclick='waypoints()'><text>Waypoints</text></img> - <img cond='navit.waypoints_flag && (navit.route.route_status&1)' src='gui_stop' onclick='navit.route_remove_last_waypoint()'><text>Drop last + <img cond='navit.waypoints_flag && (navit.route.route_status&1)' src='gui_stop' onclick='navit.route_remove_last_waypoint()'><text>Drop last Waypoint</text></img> - <img cond='navit.waypoints_flag && (navit.route.route_status&1)' src='gui_stop' onclick='navit.route_remove_next_waypoint()'><text>Drop next + <img cond='navit.waypoints_flag && (navit.route.route_status&1)' src='gui_stop' onclick='navit.route_remove_next_waypoint()'><text>Drop next Waypoint</text></img> </a> <a name='Map Point'><text>Map Point</text> @@ -170,7 +170,7 @@ Waypoint</text></img> You can find a list of all the available OSDs items here: http://wiki.navit-project.org/index.php/OSD --> <osd enabled="no" type="compass"/> - <osd enabled="no" type="navigation_next_turn"/> + <osd enabled="no" type="navigation_next_turn"/> <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. @@ -178,12 +178,12 @@ Waypoint</text></img> <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.png"/> <osd enabled="no" type="button" x="-96" y="0" command="gui.menu(1)" src="menu.png"/> <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.png"/> - <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.png"/> + <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.png"/> <!-- Vehicle with GPS enabled for gpsd on unix --> <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> <!-- Vehicle with GPS enabled for direct communication on windows. Remove the line above if you use this. --> - <!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" + <!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" source="serial:COM4 baudrate=4800 parity=N data=8 stop=1" > --> <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): --> @@ -285,7 +285,7 @@ Waypoint</text></img> <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7" /> <!-- Those types do not appear in maptool.c and therefore are not used ATM --> <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7" /> - <!--roundabout does not apply to OSMaps --> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="20" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> @@ -3612,7 +3612,7 @@ Waypoint</text></img> <icon src="gui_sound_32_32.png"/> <circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/> </itemgra> - + <itemgra item_types="waypoint,route_end" order="2"> <circle color="#00a0a0" radius="4" width="2" background_color="#000000" text_size="24"/> </itemgra> @@ -4951,7 +4951,7 @@ Waypoint</text></img> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_bk.png" w="32" h="32" x="4" y="30"/> </itemgra> - + <itemgra item_types="waypoint,route_end" order="2"> <circle color="#000000" radius="4" width="2" text_size="24"/> </itemgra> @@ -4991,7 +4991,7 @@ Waypoint</text></img> <itemgra item_types="waypoint,route_end" order="18"> <circle color="#000000" radius="530" width="8" text_size="48"/> </itemgra> - + <itemgra item_types="nav_none" order="0-"> <icon src="unknown.png" /> </itemgra> @@ -5619,7 +5619,7 @@ Waypoint</text></img> <itemgra item_types="street_route" > <polyline width="11" color="#516170" /> </itemgra> - + <itemgra item_types="street_1_city,street_1_land" order="12-"> <polyline width="3" color="#a4bac8" /> </itemgra> @@ -5656,7 +5656,7 @@ Waypoint</text></img> <itemgra item_types="street_route" > <polyline width="9" color="#ffffff" /> </itemgra> - + <itemgra item_types="waypoint,route_end" > <circle color="#000000" radius="8" width="2" text_size="24"/> </itemgra> @@ -6627,7 +6627,7 @@ Waypoint</text></img> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/> </itemgra> - + <itemgra item_types="waypoint,route_end" order="2"> <circle color="#000000" radius="4" width="2" text_size="24"/> </itemgra> @@ -6667,7 +6667,7 @@ Waypoint</text></img> <itemgra item_types="waypoint,route_end" order="18"> <circle color="#000000" radius="530" width="8" text_size="48"/> </itemgra> - + <itemgra item_types="nav_none" order="0-"> <icon src="unknown.svg"/> </itemgra> @@ -6675,7 +6675,7 @@ Waypoint</text></img> <icon src="gui_sound_32_32.png"/> <circle color="#FF089C" radius="10" text_size="7"/> </itemgra> - </layer> + </layer> <layer name="Street Labels"> <itemgra item_types="highway_exit_label" order="10-"> <circle color="#000000" radius="3" text_size="12"/> @@ -6703,7 +6703,7 @@ Waypoint</text></img> <!-- This entry shows all unknown linear elements as blue lines --> <!-- <itemgra item_types="street_unkn" order="0-"> - <polyline color="#8080ff" width="3"/> + <polyline color="#8080ff" width="3"/> </itemgra> --> </layer> @@ -6756,7 +6756,7 @@ Waypoint</text></img> <itemgra item_types="poi_bicycle_parking,poi_bicycle_rental" order="14-"> <circle color="#606060" radius="0" width="0" text_size="10"/> </itemgra> - </layer> + </layer> <layer name="Found items" ref="Found items"/> </layout> @@ -6788,10 +6788,10 @@ Waypoint</text></img> <itemgra item_types="poly_wood" order="0-"> <polygon color="#72bf81"/> </itemgra> - <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> - <polygon color="#a0a0a0"/> - <text text_size="5"/> - </itemgra> + <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> + <polygon color="#a0a0a0"/> + <text text_size="5"/> + </itemgra> <!-- landuse=residential --> <itemgra item_types="poly_town" order="0-"> <polygon color="#f2f2f2"/> @@ -7223,7 +7223,7 @@ Waypoint</text></img> <itemgra item_types="rg_point" order="0-"> <circle color="#FF089C" radius="10"/> </itemgra> - + <itemgra item_types="waypoint,route_end" order="2"> <circle color="#008080" radius="4" width="2" text_size="24"/> </itemgra> @@ -7263,7 +7263,7 @@ Waypoint</text></img> <itemgra item_types="waypoint,route_end" order="18"> <circle color="#008080" radius="530" width="8" text_size="48"/> </itemgra> - + <!-- !!!!...POIs...!!!! --> <!-- amenity=bank --> <itemgra item_types="poi_bank" order="14-"> diff --git a/navit/plugin.h b/navit/plugin.h index 4687a6460..03fb4ad5a 100644 --- a/navit/plugin.h +++ b/navit/plugin.h @@ -75,22 +75,22 @@ plugin_register_##name(PLUGIN_PROTO((*func),__VA_ARGS__)) \ { \ if (plugin_##name##_func) \ (*plugin_##name##_func)(__VA_ARGS__); \ -} +} #define PLUGIN_FUNC1(name,t1,p1) \ PLUGIN_PROTO((*plugin_##name##_func),t1 p1); \ void plugin_call_##name(t1 p1) PLUGIN_CALL(name,p1) \ -PLUGIN_REGISTER(name,t1 p1) +PLUGIN_REGISTER(name,t1 p1) #define PLUGIN_FUNC3(name,t1,p1,t2,p2,t3,p3) \ PLUGIN_PROTO((*plugin_##name##_func),t1 p1,t2 p2,t3 p3); \ void plugin_call_##name(t1 p1,t2 p2, t3 p3) PLUGIN_CALL(name,p1,p2,p3) \ -PLUGIN_REGISTER(name,t1 p1,t2 p2,t3 p3) +PLUGIN_REGISTER(name,t1 p1,t2 p2,t3 p3) #define PLUGIN_FUNC4(name,t1,p1,t2,p2,t3,p3,t4,p4) \ PLUGIN_PROTO((*plugin_##name##_func),t1 p1,t2 p2,t3 p3,t4 p4); \ void plugin_call_##name(t1 p1,t2 p2, t3 p3, t4 p4) PLUGIN_CALL(name,p1,p2,p3,p4) \ -PLUGIN_REGISTER(name,t1 p1,t2 p2,t3 p3,t4 p4) +PLUGIN_REGISTER(name,t1 p1,t2 p2,t3 p3,t4 p4) struct name_val { char *name; @@ -116,7 +116,7 @@ void * \ plugin_get_category_##category(const char *name) \ { \ return plugin_get_category(plugin_category_##category, #category, name); \ -} +} #else #define PLUGIN_FUNC1(name,t1,p1) \ diff --git a/navit/route.h b/navit/route.h index 5f55f804c..9a5ee35cb 100644 --- a/navit/route.h +++ b/navit/route.h @@ -18,7 +18,7 @@ */ /** @file - * + * * @brief Contains exported code for route.c * * This file contains code that works together with route.c and that is exported to diff --git a/navit/script/cabify.sh b/navit/script/cabify.sh index 4536ff330..0364e8f7f 100755 --- a/navit/script/cabify.sh +++ b/navit/script/cabify.sh @@ -27,8 +27,8 @@ else fi [ "$2" != "" ] && SRCDIR="$2" [ "$3" != "" ] && BASEDIR="$3" -if [ "$4" != "" ]; -then +if [ "$4" != "" ]; +then NAVITXML="$4" else NAVITXML="" diff --git a/navit/script/download_index.html b/navit/script/download_index.html index 7439f4b6a..ca5a7d48f 100644 --- a/navit/script/download_index.html +++ b/navit/script/download_index.html @@ -34,45 +34,45 @@ } #controls { float: left; - + } </style> <script src="http://openlayers.org/dev/lib/OpenLayers.js"></script> <script type="text/javascript"> var map, polygonControl, polygonLayer, bbox_set; - + OpenLayers.Util.onImageLoadErrorColor = "transparent"; function init(){ map = new OpenLayers.Map('map'); - - var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", - "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); - + + var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", + "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); + polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer"); - + map.addLayers([wmsLayer, polygonLayer]); map.addControl(new OpenLayers.Control.LayerSwitcher()); map.addControl(new OpenLayers.Control.MousePosition()); - + polyOptions = {sides: 4, irregular: true}; polygonControl = new OpenLayers.Control.DrawFeature(polygonLayer, OpenLayers.Handler.RegularPolygon, {handlerOptions: polyOptions}); //alert(polygonControl); - + map.addControl(polygonControl); - + polygonControl.featureAdded=featureInsert; - + map.setCenter(new OpenLayers.LonLat(0, 0), 3); - + document.getElementById('noneToggle').checked = true; //document.getElementById('irregularToggle').checked = false; - + //var polyOptions = {sides: 4, irregular: true}; //polygonControl.handler.setOptions(polyOptions); } - + function featureInsert(feature){ var old=[]; for (var i = 0; i < polygonLayer.features.length; i++) { @@ -81,9 +81,9 @@ } } polygonLayer.destroyFeatures(old); - + var bounds = feature.geometry.getBounds(); - + document.form.bounds_top.value = bounds.top; document.form.bounds_right.value = bounds.right; document.form.bounds_btm.value = bounds.bottom; diff --git a/navit/script/gensvg b/navit/script/gensvg index b7a4241c9..6225051d8 100755 --- a/navit/script/gensvg +++ b/navit/script/gensvg @@ -2,7 +2,7 @@ makearrow() { -cat <<EOT +cat <<EOT <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:svg="http://www.w3.org/2000/svg" @@ -233,14 +233,14 @@ do xl2=14 yl2=32 long1=$longa - ;; + ;; 315) xa0=23.54 ya0=23.54 xl2=19.3 yl2=19.3 long1=$longa - ;; + ;; esac long2=$((1-long1)) filename="nav_roundabout_${letter}${st}_$col.svg" @@ -249,7 +249,7 @@ do done filename="nav_straight_$col.svg" xl0=32 - xl1=32 + xl1=32 yl1=32 xcc0=32 ycc0=10 diff --git a/navit/script/geotag b/navit/script/geotag index e025cbc61..608f6c269 100755 --- a/navit/script/geotag +++ b/navit/script/geotag @@ -9,10 +9,10 @@ case $order in ;; 12|13) size=4000 - ;; + ;; 14|15) size=16000 - ;; + ;; 16|17|18|19) size=64000 ;; diff --git a/navit/script/gps_emu b/navit/script/gps_emu index f2eef3e50..73ddbc54f 100755 --- a/navit/script/gps_emu +++ b/navit/script/gps_emu @@ -1,15 +1,15 @@ #! /bin/bash function send_data { - trap send_data SIGPIPE + trap send_data SIGPIPE while read line do case $line in \$GPVTG*) echo "$line" - sleep 1 + sleep 1 ;; - *) + *) echo "$line" ;; esac diff --git a/navit/script/gps_emu2 b/navit/script/gps_emu2 index e9e79b42a..b4a66e526 100755 --- a/navit/script/gps_emu2 +++ b/navit/script/gps_emu2 @@ -21,8 +21,8 @@ while (read(FILE,$record,64)) if ($mode == 3) { - ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($timestampl); - $datestring=sprintf("%02d.%02d.%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec); + ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($timestampl); + $datestring=sprintf("%02d.%02d.%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec); $long_dir="E"; $lat_dir="N"; if ($longitude < 0) { @@ -42,5 +42,5 @@ while (read(FILE,$record,64)) printf("\$GPVTG,%s,T,,M,,N,%s,K,*6A\n",$direction,$speed*1.852); printf(STDERR "\$GPGGA,%02d%02d%02d,%s,%s,%s,%s,1,%d,%s,%s,M,,,,0000*0C\n",$hour,$min,$sec,$lat_gps,$lat_dir,$long_gps,$long_dir,$sats,$hdop,$altitude); sleep(1); - } + } } diff --git a/navit/script/mapExtract.class.php b/navit/script/mapExtract.class.php index f5c4bbbc3..8d96ec76f 100644 --- a/navit/script/mapExtract.class.php +++ b/navit/script/mapExtract.class.php @@ -1,22 +1,22 @@ <?php class mapExtract { - + var $input_fd; var $output_fd; var $fetchBbox; - + var $formats; var $worldBbox; - + function mapExtract() { $formats = array(); - + $formats['ziphpack'] = "lssssslLLSS"; $formats['zipheader'] = "l" . "ziplocsig"; # Signature (is always the same) $formats['zipheader'] .= "/s" . "zipver"; # zip version needed $formats['zipheader'] .= "/s" . "zipgenfld";# type of os that generated the file - $formats['zipheader'] .= "/s" . "zipmthd"; # + $formats['zipheader'] .= "/s" . "zipmthd"; # $formats['zipheader'] .= "/s" . "ziptime"; # time $formats['zipheader'] .= "/s" . "zipdate"; # date $formats['zipheader'] .= "/l" . "zipcrc"; # crc checksum @@ -24,7 +24,7 @@ class mapExtract { $formats['zipheader'] .= "/L" . "zipuncmp"; # uncompressed size $formats['zipheader'] .= "/S" . "zipfnln"; # length of filename $formats['zipheader'] .= "/S" . "zipxtraln";# length of extra data (always 0) - + $formats['zipcdpack'] = "iccccssssiIISSSSSII"; $formats['zipcd'] = "". "i" . "zipcensig/". @@ -46,7 +46,7 @@ class mapExtract { "S" . "zipint/". "I" . "zipext/". "I" . "zipofst"; - + $formats['zipeocpack'] = "iSSSSIIs"; $formats['zipeoc'] = "". "i" . "zipesig/". @@ -57,20 +57,20 @@ class mapExtract { "I" . "zipecsz/". "I" . "zipeofst/". "s" . "zipecoml/". - + $world_bbox = array(); $world_bbox['l']['x'] = -20000000; $world_bbox['l']['y'] = -20000000; $world_bbox['h']['x'] = 20000000; $world_bbox['h']['y'] = 20000000; - + $this->formats = $formats; $this->worldBbox = $world_bbox; } - - + + function process() { - + if (!is_array($this->fetchBbox)) { return "Fetch box not set"; } @@ -85,10 +85,10 @@ class mapExtract { $offset = 0; $zipcd_data = ''; $report = array(); - + /** * Read through zipheaders - * + * */ for(;;) { $buffer = fread($this->input_fd, 30); @@ -98,20 +98,20 @@ class mapExtract { if ($tileinfo['ziplocsig'] != 0x4034b50) break; - + if ($tileinfo['zipfnln'] <= 0) break; - + $filename = fread($this->input_fd, $tileinfo['zipfnln']); $done=false; - + $r = $this->worldBbox; - - $len=strlen($filename); + + $len=strlen($filename); for ($i=0 ; $i < $len ; $i++) { $c['x'] = floor( ($r['l']['x'] + $r['h']['x'])/2 ); $c['y'] = floor( ($r['l']['y'] + $r['h']['y'])/2 ); - + switch($filename[$i]) { case 'a': $r['l']['x'] = $c['x']; @@ -135,27 +135,27 @@ class mapExtract { if ($done) break; } - # print "zipsize=" . $tileinfo['zipsize']; + # print "zipsize=" . $tileinfo['zipsize']; $tilecontent = fread($this->input_fd, $tileinfo['zipsize']); - - # print "tile $filename"; + + # print "tile $filename"; /* Area inside box, save it! */ if ($this->contains_bbox($r)) { $report['added_areas']++; - + $zipheader = $buffer; # print " in\n"; - + /* Area outside of box, set zipcontent=0 */ } else { # print " out\n"; $report['excluded_areas']++; - + $tileinfo['zipmthd'] = $tileinfo['zipcrc'] = $tileinfo ['zipsize'] = $tileinfo['zipuncmp'] = 0; $zipheader = $tileinfo; $tilecontent = ''; - $zipheader = pack($this->formats['ziphpack'], + $zipheader = pack($this->formats['ziphpack'], $tileinfo['ziplocsig'], $tileinfo['zipver'], $tileinfo['zipgenfld'], @@ -169,9 +169,9 @@ class mapExtract { $tileinfo['zipxtraln'] ); } - + $put = $zipheader.$filename.$tilecontent; - + /* Zip directory */ $zipcd_data .= pack($this->formats['zipcdpack'], 0x02014b50, @@ -194,17 +194,17 @@ class mapExtract { 0x00, $offset ) . $filename; - + fwrite($this->output_fd, $put); $offset += strlen($put); $filecount += 1; } - + fwrite($this->output_fd, $zipcd_data); $ecsz = strlen($zipcd_data); - + /* Zip central directory */ - $zip_eoc = pack($this->formats['zipeocpack'], + $zip_eoc = pack($this->formats['zipeocpack'], 0x06054b50, #zipesig; 0, #zipedsk; 0, #zipecen; @@ -215,11 +215,11 @@ class mapExtract { 0 #zipecoml; ); fwrite($this->output_fd, $zip_eoc); - - + + return null; } - + function setBbox($sx,$sy,$ex,$ey) { if ($ex<$sx) return false; @@ -235,7 +235,7 @@ class mapExtract { function setInputFD($fd) { $this->input_fd=$fd; } - + function setOutput($file) { $this->output_fd=fopen($file,'w'); } @@ -243,8 +243,8 @@ class mapExtract { function setOutputFD($fd) { $this->output_fd=$fd; } - - + + function contains_bbox(&$r) { $c =& $this->fetchBbox; if ($c['l']['x'] > $r['h']['x']) @@ -255,14 +255,14 @@ class mapExtract { return false; elseif ($c['h']['y'] < $r['l']['y']) return false; - else + else return true; } - + function getmercator($sx,$sy,$ex,$ey) { $sx = $sx*6371000.0*M_PI/180; $sy = log(tan(M_PI_4+$sy*M_PI/360))*6371000.0; - + $ex = $ex*6371000.0*M_PI/180; $ey = log(tan(M_PI_4+$ey*M_PI/360))*6371000.0; return array( @@ -276,7 +276,7 @@ class mapExtract { ) ); } - + } diff --git a/navit/script/map_index.php b/navit/script/map_index.php index 57fd0d054..050d5fc76 100644 --- a/navit/script/map_index.php +++ b/navit/script/map_index.php @@ -4,7 +4,7 @@ $bbox=split(',',urldecode($HTTP_GET_VARS['bbox'])); if (count($bbox) == 4) { $mapextract = new mapExtract(); - $mapextract->setBbox($bbox[0], $bbox[1], $bbox[2], $bbox[3]); + $mapextract->setBbox($bbox[0], $bbox[1], $bbox[2], $bbox[3]); $fp=fopen('php://output','w'); $mapextract->setInput('../../planet.bin'); $mapextract->setOutputFD($fp); @@ -13,7 +13,7 @@ else header('Content-Type: application/octet-stream'); $name='osm_bbox_'; - $name.=round($bbox[0],1) . ',' . round($bbox[1],1) . ','; + $name.=round($bbox[0],1) . ',' . round($bbox[1],1) . ','; $name.=round($bbox[2],1) . ',' . round($bbox[3],1); $name.='.bin'; header("Content-disposition: attachment; filename=\"$name\""); @@ -37,6 +37,6 @@ $urlf=$url . "?bbox=$bbox"; echo "$area <a href='$urlf'>$urlf</a><br />\n"; } - + } ?> diff --git a/navit/script/mapextract.php b/navit/script/mapextract.php index 33441ba95..0e114c746 100644 --- a/navit/script/mapextract.php +++ b/navit/script/mapextract.php @@ -1,13 +1,13 @@ #!/usr/local/bin/php –q <?php function getmercator($sx,$sy,$ex,$ey) { - + $sx = $sx*6371000.0*M_PI/180; $sy = log(tan(M_PI_4+$sy*M_PI/360))*6371000.0; - + $ex = $ex*6371000.0*M_PI/180; $ey = log(tan(M_PI_4+$ey*M_PI/360))*6371000.0; - + return array( 'l' => array( 'x' => $sx, @@ -18,7 +18,7 @@ function getmercator($sx,$sy,$ex,$ey) { 'y' => $ey ) ); - + } function contains_bbox($c, &$r) { if ($c['l']['x'] > $r['h']['x']) @@ -29,7 +29,7 @@ function contains_bbox($c, &$r) { return false; elseif ($c['h']['y'] < $r['l']['y']) return false; - else + else return true; } @@ -44,7 +44,7 @@ $formats['ziphpack'] = "lssssslLLSS"; $formats['zipheader'] = "l" . "ziplocsig"; # Signature (is always the same) $formats['zipheader'] .= "/s" . "zipver"; # zip version needed $formats['zipheader'] .= "/s" . "zipgenfld";# type of os that generated the file -$formats['zipheader'] .= "/s" . "zipmthd"; # +$formats['zipheader'] .= "/s" . "zipmthd"; # $formats['zipheader'] .= "/s" . "ziptime"; # time $formats['zipheader'] .= "/s" . "zipdate"; # date $formats['zipheader'] .= "/l" . "zipcrc"; # crc checksum @@ -91,26 +91,26 @@ $offset = 0; /** * Read through zipheaders - * + * */ while (!feof($fp)) { - + $buffer = fread($fp, 30); $tileinfo = unpack($formats['zipheader'], $buffer); - + if ($tileinfo['zipfnln'] <= 0) break; - + $filename = fread($fp, $tileinfo['zipfnln']); $x=0; $done=false; - + $r = $world_bbox; - + while (!$done) { $c['x'] = floor( ($r['l']['x'] + $r['h']['x'])/2 ); $c['y'] = floor( ($r['l']['y'] + $r['h']['y'])/2 ); - + switch($filename[$x]) { case 'a': $r['l']['x'] = $c['x']; @@ -133,23 +133,23 @@ while (!feof($fp)) { } $x++; } - + $tilecontent = fread($fp, $tileinfo['zipsize']); - + /* Area inside box, save it! */ if (contains_bbox($fetch_bbox, $r)) { #echo "In box. "; #echo $filename . " "; $zipheader = $buffer; #echo "\n"; - + /* Area outside of box, set zipcontent=0 */ } else { $tileinfo['zipmthd'] = $tileinfo['zipcrc'] = $tileinfo['zipsize'] = $tileinfo['zipuncmp'] = 0; #echo "Out of box"; $zipheader = $tileinfo; $tilecontent = ''; - $zipheader = pack($formats['ziphpack'], + $zipheader = pack($formats['ziphpack'], $tileinfo['ziplocsig'], $tileinfo['zipver'], $tileinfo['zipgenfld'], @@ -163,11 +163,11 @@ while (!feof($fp)) { $tileinfo['zipxtraln'] ); } - + $put = $zipheader.$filename.$tilecontent; $files[$filename]['header'] = $tileinfo; $files[$filename]['size'] = strlen($put); - + $zipcd = array(); $zipcd['zipcensig'] = 0x02014b50; $zipcd['zipcver'] = $tileinfo['zipver']; @@ -210,11 +210,11 @@ while (!feof($fp)) { $zipcd['zipext'], $zipcd['zipofst'] ) . $filename; - - + + fwrite($sp, $put); $offset += strlen($put); - + } fwrite($sp, $zipcd_data); diff --git a/navit/script/osm/Geo/OSM/APIClientV4.pm b/navit/script/osm/Geo/OSM/APIClientV4.pm index 26b8ec5fc..d5a267e1c 100644 --- a/navit/script/osm/Geo/OSM/APIClientV4.pm +++ b/navit/script/osm/Geo/OSM/APIClientV4.pm @@ -22,10 +22,10 @@ use POSIX qw(sigprocmask); sub new { my( $class, %attr ) = @_; - + my $obj = bless {}, $class; - my $url = $attr{api}; + my $url = $attr{api}; if( not defined $url ) { croak "Did not specify aip url"; @@ -34,7 +34,7 @@ sub new $url =~ s,/$,,; # Strip trailing slash $obj->{url} = $url; $obj->{client} = new LWP::UserAgent(agent => 'Geo::OSM::APIClientV4', timeout => 1200); - + if( defined $attr{username} and defined $attr{password} ) { if( $obj->{url} =~ m,http://([\w.]+)/, ) @@ -44,7 +44,7 @@ sub new my $encoded = MIME::Base64::encode_base64("$attr{username}:$attr{password}",""); $obj->{client}->default_header( "Authorization", "Basic $encoded" ); } - + $obj->{reader} = init Geo::OSM::OsmReader( sub { _process($obj,@_) } ); return $obj; } @@ -62,7 +62,7 @@ sub _process if( ref $obj->{buffer} eq "CODE" ) { $obj->{buffer}->($ent); return } die "Internal error: don't know what to do with buffer $obj->{buffer}"; -} +} # Utility function to handle the temporary blocking of signals in a way that # works with exception handling. @@ -104,18 +104,18 @@ sub create $ent->set_id($oldid); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/create"; $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + # print $res->as_string; if( $res->code == 200 ) { return $res->content } - + $self->{last_error} = $res; return undef; } @@ -126,11 +126,11 @@ sub modify my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/".$ent->id(); $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -142,11 +142,11 @@ sub delete my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request DELETE => $self->{url}."/".$ent->type()."/".$ent->id(); # $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -157,9 +157,9 @@ sub get($$) my $self = shift; my $type = shift; my $id = shift; - + my $req = new HTTP::Request GET => $self->{url}."/$type/$id"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -167,7 +167,7 @@ sub get($$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); @@ -176,7 +176,7 @@ sub get($$) { die "Unexpected response for get_$type [".$res->content()."]\n"; } - + return $res[0]; } @@ -203,9 +203,9 @@ sub map($$$$) { my $self = shift; my @bbox = @_; - + my $req = new HTTP::Request GET => $self->{url}."/map?bbox=$bbox[0],$bbox[1],$bbox[2],$bbox[3]"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -213,12 +213,12 @@ sub map($$$$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); undef $self->{buffer}; - + return \@res; } diff --git a/navit/script/osm/Geo/OSM/APIClientV5.pm b/navit/script/osm/Geo/OSM/APIClientV5.pm index 5bee097de..39cc124d9 100644 --- a/navit/script/osm/Geo/OSM/APIClientV5.pm +++ b/navit/script/osm/Geo/OSM/APIClientV5.pm @@ -24,10 +24,10 @@ use Socket qw(inet_ntoa); sub new { my( $class, %attr ) = @_; - + my $obj = bless {}, $class; - my $url = $attr{api}; + my $url = $attr{api}; if( not defined $url ) { croak "Did not specify api url"; @@ -36,13 +36,13 @@ sub new $url =~ s,/$,,; # Strip trailing slash $obj->{url} = URI->new($url); $obj->{client} = new LWP::UserAgent(agent => 'Geo::OSM::APIClientV5', timeout => 1200); - + if( defined $attr{username} and defined $attr{password} ) { my $encoded = MIME::Base64::encode_base64("$attr{username}:$attr{password}",""); $obj->{client}->default_header( "Authorization", "Basic $encoded" ); } - + # We had the problem of the client doing a DNS lookup each request. To # solve this we do a gethostbyname now and store that in the URI. { @@ -57,7 +57,7 @@ sub new } # Hack to avoid protocol lookups each time @LWP::Protocol::http::EXTRA_SOCK_OPTS = ( 'Proto' => 6 ); - + $obj->{reader} = init Geo::OSM::OsmReader( sub { _process($obj,@_) } ); return $obj; } @@ -75,7 +75,7 @@ sub _process if( ref $obj->{buffer} eq "CODE" ) { $obj->{buffer}->($ent); return } die "Internal error: don't know what to do with buffer $obj->{buffer}"; -} +} # Utility function to handle the temporary blocking of signals in a way that # works with exception handling. @@ -121,18 +121,18 @@ sub create($) $ent->set_id($oldid); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/create"; $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + # print $res->as_string; if( $res->code == 200 ) { return $res->content } - + $self->{last_error} = $res; return undef; } @@ -143,11 +143,11 @@ sub modify($) my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/".$ent->id(); $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -159,11 +159,11 @@ sub delete($) my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request DELETE => $self->{url}."/".$ent->type()."/".$ent->id(); # $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -175,12 +175,12 @@ sub get($$) my $type = shift; my $id = shift; my $extra = shift; - + $extra = "/".$extra if (defined $extra); $extra = "" if not defined $extra; my $req = new HTTP::Request GET => $self->{url}."/$type/$id$extra"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -188,7 +188,7 @@ sub get($$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); @@ -215,7 +215,7 @@ sub resurrect($$) if (defined $ret || !defined $self->{last_error} || ($self->{last_error}->code != 410)) { return $ret; } - + my @ents = $self->get($type, $id, 'history'); # we want the last _visible_ one my $ent = $ents[-2]; @@ -270,9 +270,9 @@ sub get_subtype($$) my $type = shift; my $id = shift; my $subtype = shift; - + my $req = new HTTP::Request GET => $self->{url}."/$type/$id/$subtype"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -280,7 +280,7 @@ sub get_subtype($$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); @@ -289,7 +289,7 @@ sub get_subtype($$) { die "Unexpected response for get_subtype($type,$id,$subtype) [".$res->content()."]\n"; } - + return \@res; } @@ -297,7 +297,7 @@ sub get_node_ways($) { my $self = shift; my $id = shift; - + return $self->get_subtype("node",$id,"ways"); } @@ -305,9 +305,9 @@ sub map($$$$) { my $self = shift; my @bbox = @_; - + my $req = new HTTP::Request GET => $self->{url}."/map?bbox=$bbox[0],$bbox[1],$bbox[2],$bbox[3]"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -315,12 +315,12 @@ sub map($$$$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); undef $self->{buffer}; - + return \@res; } diff --git a/navit/script/osm/Geo/OSM/APIClientV6.pm b/navit/script/osm/Geo/OSM/APIClientV6.pm index d659ac14c..304564be5 100644 --- a/navit/script/osm/Geo/OSM/APIClientV6.pm +++ b/navit/script/osm/Geo/OSM/APIClientV6.pm @@ -24,10 +24,10 @@ use Socket qw(inet_ntoa); sub new { my( $class, %attr ) = @_; - + my $obj = bless {}, $class; - my $url = $attr{api}; + my $url = $attr{api}; if( not defined $url ) { croak "Did not specify api url"; @@ -36,13 +36,13 @@ sub new $url =~ s,/$,,; # Strip trailing slash $obj->{url} = URI->new($url); $obj->{client} = new LWP::UserAgent(agent => 'Geo::OSM::APIClientV6', timeout => 1200); - + if( defined $attr{username} and defined $attr{password} ) { my $encoded = MIME::Base64::encode_base64("$attr{username}:$attr{password}",""); $obj->{client}->default_header( "Authorization", "Basic $encoded" ); } - + # We had the problem of the client doing a DNS lookup each request. To # solve this we do a gethostbyname now and store that in the URI. { @@ -57,7 +57,7 @@ sub new } # Hack to avoid protocol lookups each time @LWP::Protocol::http::EXTRA_SOCK_OPTS = ( 'Proto' => 6 ); - + $obj->{reader} = init Geo::OSM::OsmReader( sub { _process($obj,@_) } ); return $obj; } @@ -75,7 +75,7 @@ sub _process if( ref $obj->{buffer} eq "CODE" ) { $obj->{buffer}->($ent); return } die "Internal error: don't know what to do with buffer $obj->{buffer}"; -} +} # Utility function to handle the temporary blocking of signals in a way that # works with exception handling. @@ -125,11 +125,11 @@ sub create_changeset $self->{changeset}=$res->content; return 1; } - + $self->{last_error} = $res; $self->{changeset}=undef; return 0; - + } sub close_changeset @@ -144,7 +144,7 @@ sub close_changeset return 1; } return 0; - + } sub create($) @@ -156,18 +156,18 @@ sub create($) $ent->set_id($oldid); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/create"; $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + # print $res->as_string; if( $res->code == 200 ) { return $res->content } - + $self->{last_error} = $res; return undef; } @@ -179,11 +179,11 @@ sub modify($) my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request PUT => $self->{url}."/".$ent->type()."/".$ent->id(); $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -196,11 +196,11 @@ sub delete($) my $content = encode("utf-8", $ent->full_xml); my $req = new HTTP::Request DELETE => $self->{url}."/".$ent->type()."/".$ent->id(); $req->content($content); - + # print $req->as_string; - + my $res = $self->_request($req); - + return $ent->id() if $res->code == 200; $self->{last_error} = $res; return undef; @@ -212,12 +212,12 @@ sub get($$) my $type = shift; my $id = shift; my $extra = shift; - + $extra = "/".$extra if (defined $extra); $extra = "" if not defined $extra; my $req = new HTTP::Request GET => $self->{url}."/$type/$id$extra"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -225,7 +225,7 @@ sub get($$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); @@ -252,7 +252,7 @@ sub resurrect($$) if (defined $ret || !defined $self->{last_error} || ($self->{last_error}->code != 410)) { return $ret; } - + my @ents = $self->get($type, $id, 'history'); # we want the last _visible_ one my $ent = $ents[-2]; @@ -307,9 +307,9 @@ sub get_subtype($$) my $type = shift; my $id = shift; my $subtype = shift; - + my $req = new HTTP::Request GET => $self->{url}."/$type/$id/$subtype"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -317,7 +317,7 @@ sub get_subtype($$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); @@ -326,7 +326,7 @@ sub get_subtype($$) { die "Unexpected response for get_subtype($type,$id,$subtype) [".$res->content()."]\n"; } - + return \@res; } @@ -334,7 +334,7 @@ sub get_node_ways($) { my $self = shift; my $id = shift; - + return $self->get_subtype("node",$id,"ways"); } @@ -342,9 +342,9 @@ sub map($$$$) { my $self = shift; my @bbox = @_; - + my $req = new HTTP::Request GET => $self->{url}."/map?bbox=$bbox[0],$bbox[1],$bbox[2],$bbox[3]"; - + my $res = $self->_request($req); if( $res->code != 200 ) @@ -352,12 +352,12 @@ sub map($$$$) $self->{last_error} = $res; return undef; } - + my @res; $self->{buffer} = \@res; $self->{reader}->parse($res->content); undef $self->{buffer}; - + return \@res; } diff --git a/navit/script/osm/Geo/OSM/EntitiesV3.pm b/navit/script/osm/Geo/OSM/EntitiesV3.pm index 2708463c7..0e0581af4 100644 --- a/navit/script/osm/Geo/OSM/EntitiesV3.pm +++ b/navit/script/osm/Geo/OSM/EntitiesV3.pm @@ -67,9 +67,9 @@ sub tag_xml { my ($self,$writer) = @_; my @a = @{$self->{tags}}; - + my $str = ""; - + while( my($k,$v) = splice @a, 0, 2 ) { $writer->emptyTag( "tag", 'k' => $k, 'v' => $v ); @@ -83,9 +83,9 @@ sub set_id my($self,$id) = @_; if( not defined $id ) - { $id = $_ID-- } + { $id = $_ID-- } $self->{id} = $id; -} +} sub id { @@ -120,14 +120,14 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags, $segs) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_segs($segs); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); - + return $obj; } @@ -168,11 +168,11 @@ sub map my $incomplete = 0; my ($new_id) = $mapper->map('way',$self->id); # Determine mapped ID # It is ok for the new_id to be incomplete; it may be a create request - + my @new_segs = map { [ $mapper->map('segment',$_) ] } @{$self->segs}; map { $incomplete |= $_->[1] } @new_segs; # incomplete tracks if any of the segs are incomplete - + my $new_ent = new Geo::OSM::Way( {id=>$new_id, timestamp=>$self->timestamp}, $self->tags, [map {$_->[0]} @new_segs] ); return($new_ent,$incomplete); } @@ -183,15 +183,15 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); $obj->{from} = $attr->{from}; $obj->{to} = $attr->{to}; - + return $obj; } @@ -242,15 +242,15 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); $obj->{lon} = $attr->{lon}; $obj->{lat} = $attr->{lat}; - + return $obj; } @@ -277,7 +277,7 @@ sub xml my $self = shift; my $str = ""; my $writer = $self->_get_writer(\$str); - + $writer->startTag( "node", id => $self->id, lat => $self->lat, lon => $self->lon, timestamp => $self->timestamp ); $self->tag_xml( $writer ); $writer->endTag( "node" ); diff --git a/navit/script/osm/Geo/OSM/EntitiesV5.pm b/navit/script/osm/Geo/OSM/EntitiesV5.pm index 625ff6b03..fa9116daa 100644 --- a/navit/script/osm/Geo/OSM/EntitiesV5.pm +++ b/navit/script/osm/Geo/OSM/EntitiesV5.pm @@ -67,9 +67,9 @@ sub tag_xml { my ($self,$writer) = @_; my @a = @{$self->{tags}}; - + my $str = ""; - + while( my($k,$v) = splice @a, 0, 2 ) { $writer->emptyTag( "tag", 'k' => $k, 'v' => $v ); @@ -83,9 +83,9 @@ sub set_id my($self,$id) = @_; if( not defined $id ) - { $id = $_ID-- } + { $id = $_ID-- } $self->{id} = $id; -} +} sub id { @@ -121,14 +121,14 @@ use Carp; sub new { my($class, $attr, $tags, $nodes) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_nodes($nodes); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); - + return $obj; } @@ -175,11 +175,11 @@ sub map my $incomplete = 0; my ($new_id) = $mapper->map('way',$self->id); # Determine mapped ID # It is ok for the new_id to be incomplete; it may be a create request - + my @new_nodes = map { [ $mapper->map('node',$_) ] } @{$self->nodes}; map { $incomplete |= $_->[1] } @new_nodes; # incomplete tracks if any of the segs are incomplete - + my $new_ent = new Geo::OSM::Way( {id=>$new_id, timestamp=>$self->timestamp}, $self->tags, [map {$_->[0]} @new_nodes] ); return($new_ent,$incomplete); } @@ -204,7 +204,7 @@ sub new { $arg = { type => $arg->[0], ref => $arg->[1], role => $arg->[2] } } } if( ref($arg) eq "HASH" ) - { + { if( ref $arg->{ref} ) { $arg = [ $arg->{ref}->type, $arg->{ref}->id, $arg->{role} ] } else @@ -217,7 +217,7 @@ sub new croak "Bad member id '$arg->[1]'" unless $arg->[1] =~ /^-?\d+$/; $arg->[2] ||= ""; - + return bless $arg, $class; } @@ -249,14 +249,14 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags, $members) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_members($members); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); - + return $obj; } @@ -298,7 +298,7 @@ sub map { my($self,$mapper) = @_; my $incomplete = 0; - + my ($new_id) = $mapper->map('relation',$self->id); my @new_members = map { [ $_->map($mapper) ] } @{$self->members}; map { $incomplete |= $_->[1] } @new_members; @@ -314,9 +314,9 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); @@ -327,7 +327,7 @@ sub new } $obj->{lon} = $attr->{lon}; $obj->{lat} = $attr->{lat}; - + return $obj; } @@ -354,7 +354,7 @@ sub xml my $self = shift; my $str = ""; my $writer = $self->_get_writer(\$str); - + $writer->startTag( "node", id => $self->id, lat => $self->lat, lon => $self->lon, timestamp => $self->timestamp ); $self->tag_xml( $writer ); $writer->endTag( "node" ); diff --git a/navit/script/osm/Geo/OSM/EntitiesV6.pm b/navit/script/osm/Geo/OSM/EntitiesV6.pm index 8747c17f0..4a9b49cbb 100644 --- a/navit/script/osm/Geo/OSM/EntitiesV6.pm +++ b/navit/script/osm/Geo/OSM/EntitiesV6.pm @@ -67,9 +67,9 @@ sub tag_xml { my ($self,$writer) = @_; my @a = @{$self->{tags}}; - + my $str = ""; - + while( my($k,$v) = splice @a, 0, 2 ) { $writer->emptyTag( "tag", 'k' => $k, 'v' => $v ); @@ -83,9 +83,9 @@ sub set_id my($self,$id) = @_; if( not defined $id ) - { $id = $_ID-- } + { $id = $_ID-- } $self->{id} = $id; -} +} sub id { @@ -143,16 +143,16 @@ use Carp; sub new { my($class, $attr, $tags, $nodes) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_nodes($nodes); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); $obj->set_changeset( $attr->{changeset} ); $obj->set_version( $attr->{version} ); - + return $obj; } @@ -199,11 +199,11 @@ sub map my $incomplete = 0; my ($new_id) = $mapper->map('way',$self->id); # Determine mapped ID # It is ok for the new_id to be incomplete; it may be a create request - + my @new_nodes = map { [ $mapper->map('node',$_) ] } @{$self->nodes}; map { $incomplete |= $_->[1] } @new_nodes; # incomplete tracks if any of the segs are incomplete - + my $new_ent = new Geo::OSM::Way( {id=>$new_id, timestamp=>$self->timestamp}, $self->tags, [map {$_->[0]} @new_nodes] ); return($new_ent,$incomplete); } @@ -228,7 +228,7 @@ sub new { $arg = { type => $arg->[0], ref => $arg->[1], role => $arg->[2] } } } if( ref($arg) eq "HASH" ) - { + { if( ref $arg->{ref} ) { $arg = [ $arg->{ref}->type, $arg->{ref}->id, $arg->{role} ] } else @@ -241,7 +241,7 @@ sub new croak "Bad member id '$arg->[1]'" unless $arg->[1] =~ /^-?\d+$/; $arg->[2] ||= ""; - + return bless $arg, $class; } @@ -273,16 +273,16 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags, $members) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_members($members); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); $obj->set_changeset( $attr->{changeset} ); $obj->set_version( $attr->{version} ); - + return $obj; } @@ -324,7 +324,7 @@ sub map { my($self,$mapper) = @_; my $incomplete = 0; - + my ($new_id) = $mapper->map('relation',$self->id); my @new_members = map { [ $_->map($mapper) ] } @{$self->members}; map { $incomplete |= $_->[1] } @new_members; @@ -341,9 +341,9 @@ our @ISA = qw(Geo::OSM::Entity); sub new { my($class, $attr, $tags) = @_; - + my $obj = bless $class->SUPER::_new(), $class; - + $obj->set_tags($tags); $obj->set_id($attr->{id} ); $obj->set_timestamp( $attr->{timestamp} ); @@ -356,7 +356,7 @@ sub new } $obj->{lon} = $attr->{lon}; $obj->{lat} = $attr->{lat}; - + return $obj; } @@ -383,7 +383,7 @@ sub xml my $self = shift; my $str = ""; my $writer = $self->_get_writer(\$str); - + $writer->startTag( "node", id => $self->id, lat => $self->lat, lon => $self->lon, timestamp => $self->timestamp, changeset => $self->changeset, version => $self->version); $self->tag_xml( $writer ); $writer->endTag( "node" ); diff --git a/navit/script/osm/Geo/OSM/MapFeatures.pm b/navit/script/osm/Geo/OSM/MapFeatures.pm index c4ae62f89..473ff20de 100644 --- a/navit/script/osm/Geo/OSM/MapFeatures.pm +++ b/navit/script/osm/Geo/OSM/MapFeatures.pm @@ -49,7 +49,7 @@ sub load($;$){ return; } my $self = XMLin($fh); - + if (not $self) { print STDERR "WARNING: Could not parse osm data from $filename\n"; return; @@ -61,7 +61,7 @@ sub load($;$){ #warn Dumper(\$self->{rule}); #warn Dumper(keys %{$self}); #warn Dumper(%{$self}); - + bless($self,$class); return $self; } @@ -97,7 +97,7 @@ sub load_icons($$){ last; } } - + if ( ! $rule->{png} ) { warn "missing $img\n"; } @@ -139,7 +139,7 @@ sub get_icons($$$){ my $condition = $rule->{condition}; # print STDERR "condition: $condition->{k}=$condition->{v}\n"; - if ( defined ( $attr{scale_max}) && + if ( defined ( $attr{scale_max}) && $scale > $attr{scale_max}) { next; } @@ -150,7 +150,7 @@ sub get_icons($$$){ print STDERR "get_icon() image: $img\t"; $png = $rule->{png}; } - + return $png if $png; } return undef; diff --git a/navit/script/osm/Geo/OSM/OsmChangeReaderV3.pm b/navit/script/osm/Geo/OSM/OsmChangeReaderV3.pm index 65103a36e..ff99e4043 100644 --- a/navit/script/osm/Geo/OSM/OsmChangeReaderV3.pm +++ b/navit/script/osm/Geo/OSM/OsmChangeReaderV3.pm @@ -32,7 +32,7 @@ use constant FILETYPE_OSMCHANGE => 1; use constant FILETYPE_OSM => 2; sub new -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -46,7 +46,7 @@ sub new # With this initialiser, your process will get called with instantiated objects rather than useless details sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -61,12 +61,12 @@ sub init sub _process { my($self, $command, $entity, $attr, $tags, $segs) = @_; - + if( defined $self->{oldproc} ) { return $self->{oldproc}->($command, $entity, $attr, $tags, $segs); } - + my $ent; if( $entity eq "node" ) { @@ -90,7 +90,7 @@ sub load{ $self->{filetype} = FILETYPE_UNKNOWN; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -120,7 +120,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -145,7 +145,7 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{filetype} == FILETYPE_UNKNOWN ) @@ -161,7 +161,7 @@ sub DoStart } elsif($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; $self->{filetype} = FILETYPE_OSM; - + if( $Attr{version} ne "0.3" and $Attr{version} ne "0.4" ) { die "OsmChangeReaderV3 can only read 0.3 and 0.4 files, found '$Attr{version}'\n" } } else { @@ -284,7 +284,7 @@ OsmChangeReaderV3 - Module for reading OpenStreetMap V3 Change XML data files my $OSM = new Geo::OSM::OsmChangeReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $command, $entity, $attr, $tags, $segs) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm b/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm index fdc65e1a9..50dfeea6d 100644 --- a/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm +++ b/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm @@ -33,7 +33,7 @@ use constant FILETYPE_OSM => 2; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -48,12 +48,12 @@ sub init sub _process { my($self, $command, $entity, $attr, $tags, $members) = @_; - + if( defined $self->{oldproc} ) { return $self->{oldproc}->($command, $entity, $attr, $tags, $members); } - + my $ent; if( $entity eq "node" ) { @@ -77,7 +77,7 @@ sub load{ $self->{filetype} = FILETYPE_UNKNOWN; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -107,7 +107,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -132,7 +132,7 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{filetype} == FILETYPE_UNKNOWN ) @@ -148,7 +148,7 @@ sub DoStart } elsif($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; $self->{filetype} = FILETYPE_OSM; - + if( $Attr{version} ne "0.5" ) { die "OsmChangeReaderV3 can only read 0.5 files, found '$Attr{version}'\n" } } else { @@ -276,7 +276,7 @@ OsmChangeReaderV5 - Module for reading OpenStreetMap V5 Change XML data files my $OSM = new Geo::OSM::OsmChangeReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $command, $entity) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmChangeReaderV6.pm b/navit/script/osm/Geo/OSM/OsmChangeReaderV6.pm index e67397829..4e312f519 100644 --- a/navit/script/osm/Geo/OSM/OsmChangeReaderV6.pm +++ b/navit/script/osm/Geo/OSM/OsmChangeReaderV6.pm @@ -33,7 +33,7 @@ use constant FILETYPE_OSM => 2; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -48,12 +48,12 @@ sub init sub _process { my($self, $command, $entity, $attr, $tags, $members) = @_; - + if( defined $self->{oldproc} ) { return $self->{oldproc}->($command, $entity, $attr, $tags, $members); } - + my $ent; if( $entity eq "node" ) { @@ -77,7 +77,7 @@ sub load{ $self->{filetype} = FILETYPE_UNKNOWN; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -107,7 +107,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -132,7 +132,7 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{filetype} == FILETYPE_UNKNOWN ) @@ -148,7 +148,7 @@ sub DoStart } elsif($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; $self->{filetype} = FILETYPE_OSM; - + if( $Attr{version} ne "0.6" ) { die "OsmChangeReaderV6 can only read 0.6 files, found '$Attr{version}'\n" } } else { @@ -276,7 +276,7 @@ OsmChangeReaderV6 - Module for reading OpenStreetMap V6 Change XML data files my $OSM = new Geo::OSM::OsmChangeReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $command, $entity) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmReaderV3.pm b/navit/script/osm/Geo/OSM/OsmReaderV3.pm index b01963470..6cc64b899 100644 --- a/navit/script/osm/Geo/OSM/OsmReaderV3.pm +++ b/navit/script/osm/Geo/OSM/OsmReaderV3.pm @@ -26,7 +26,7 @@ use constant STATE_EXPECT_BODY => 4; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -41,7 +41,7 @@ sub init sub _process { my($self, $entity, $attr, $tags, $members) = @_; - + my $ent; if( $entity eq "node" ) { @@ -65,7 +65,7 @@ sub load($) my ($self, $file_name) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -94,7 +94,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -119,14 +119,14 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{state} == STATE_INIT ) { if($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; - + if( $Attr{version} ne "0.3" and $Attr{version} ne "0.4") { die "OsmReaderV5 can only read 0.3 or 0.4 files, found '$Attr{version}'\n" } } else { @@ -206,7 +206,7 @@ OsmReaderV3 - Module for reading OpenStreetMap V3 XML data files my $OSM = new Geo::OSM::OsmReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $entity) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmReaderV5.pm b/navit/script/osm/Geo/OSM/OsmReaderV5.pm index 37a477b1a..315e4dddf 100644 --- a/navit/script/osm/Geo/OSM/OsmReaderV5.pm +++ b/navit/script/osm/Geo/OSM/OsmReaderV5.pm @@ -26,7 +26,7 @@ use constant STATE_EXPECT_BODY => 4; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -41,7 +41,7 @@ sub init sub _process { my($self, $entity, $attr, $tags, $members) = @_; - + my $ent; if( $entity eq "node" ) { @@ -65,7 +65,7 @@ sub load($) my ($self, $file_name) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -94,7 +94,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -119,14 +119,14 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{state} == STATE_INIT ) { if($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; - + if( $Attr{version} ne "0.5" ) { die "OsmReaderV5 can only read 0.5 files, found '$Attr{version}'\n" } } else { @@ -209,7 +209,7 @@ OsmReaderV5 - Module for reading OpenStreetMap V5 XML data files my $OSM = new Geo::OSM::OsmReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $entity) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmReaderV6.pm b/navit/script/osm/Geo/OSM/OsmReaderV6.pm index 4f6a683d2..7ad3c736a 100644 --- a/navit/script/osm/Geo/OSM/OsmReaderV6.pm +++ b/navit/script/osm/Geo/OSM/OsmReaderV6.pm @@ -26,7 +26,7 @@ use constant STATE_EXPECT_BODY => 4; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -41,7 +41,7 @@ sub init sub _process { my($self, $entity, $attr, $tags, $members) = @_; - + my $ent; if( $entity eq "node" ) { @@ -65,7 +65,7 @@ sub load($) my ($self, $file_name) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -94,7 +94,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -119,14 +119,14 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{state} == STATE_INIT ) { if($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; - + if( $Attr{version} ne "0.6" ) { die "OsmReaderV6 can only read 0.6 files, found '$Attr{version}'\n" } } else { @@ -209,7 +209,7 @@ OsmReaderV6 - Module for reading OpenStreetMap V6 XML data files my $OSM = new Geo::OSM::OsmReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $entity) = @_; diff --git a/navit/script/osm/Geo/OSM/OsmXML.pm b/navit/script/osm/Geo/OSM/OsmXML.pm index 60f458db7..f37d269c3 100644 --- a/navit/script/osm/Geo/OSM/OsmXML.pm +++ b/navit/script/osm/Geo/OSM/OsmXML.pm @@ -51,7 +51,7 @@ sub bounds(){ sub DoStart() { my ($Expat, $Name, %Attr) = @_; - + if($Name eq "node"){ undef %OsmXML::Tags; %OsmXML::MainAttr = %Attr; @@ -97,7 +97,7 @@ sub DoEnd(){ $OsmXML::Ways{$ID}{"segments"} = join(",",@OsmXML::WaySegments); foreach(keys(%OsmXML::Tags)){ $OsmXML::Ways{$ID}{$_} = $OsmXML::Tags{$_}; - } + } } } @@ -118,16 +118,16 @@ OsmXML - Module for reading OpenStreetMap XML data files $OSM = new OsmXML(); $OSM->load("Data/nottingham.osm"); - + foreach $Way(%OsmXML::Ways){ @Segments = split(/,/, $Way->{"segments"}); - + foreach $SegmentID(@Segments){ $Segment = $OsmXML::Segments{$SegmentID}; - + $Node1 = $OsmXML::Nodes{$Segment->{"from"}}; $Node2 = $OsmXML::Nodes{$Segment->{"to"}}; - + printf "Node at %f,%f, named %s, is a %s", $Node2->{"lat"}, $Node2->{"lon"}, diff --git a/navit/script/osm/Geo/OSM/Planet.pm b/navit/script/osm/Geo/OSM/Planet.pm index 25c533eb7..260b96b5f 100644 --- a/navit/script/osm/Geo/OSM/Planet.pm +++ b/navit/script/osm/Geo/OSM/Planet.pm @@ -64,10 +64,10 @@ my $estimations = { }; # ------------------------------------------------------------------ -# This routine estimates the maximum id for way,elem,seg,... +# This routine estimates the maximum id for way,elem,seg,... # The values are taken from older planet.osm Files # So they mostly are a little bit to low -# ARGS: +# ARGS: # $type: line|way|tag|... # RETURNS: # $result: number of estimated max_id @@ -81,10 +81,10 @@ sub estimated_max_id($){ } # ------------------------------------------------------------------ -# This routine estimates the maximim number of elements for way,elem,seg,... +# This routine estimates the maximim number of elements for way,elem,seg,... # The values are taken from older planet.osm Files # So they mostly are a little bit to low -# ARGS: +# ARGS: # $type: line|way|tag|... # RETURNS: # $result: number of estimated elements @@ -112,7 +112,7 @@ sub osm_dir() { chomp $home; $home = "/home/$home"; } - + $dir = "$home/osm"; return $dir; } @@ -144,22 +144,22 @@ sub sort_unique(@){ } return @erg } - + # ------------------------------------------------------------------ # mirror the newest planet.osm File to # ~/osm/planet/planet.osm.bz2 -# and the resulting +# and the resulting # Filename is returned # -# the file is -----NO LONGER--- Sanitized afterwards +# the file is -----NO LONGER--- Sanitized afterwards sub mirror_planet(){ my $planet_server="http://planet.openstreetmap.org"; my $url = "$planet_server"; my $mirror_dir=planet_dir(); mkdir_if_needed( $mirror_dir ); - + my $current_file; if ( !$Utils::LWP::Utils::NO_MIRROR ) { # Get Index.html of Planet.osm.org @@ -194,11 +194,11 @@ sub mirror_planet(){ print STDERR "Existing Files: \n\t".join("\n\t",@files)."\n"; } $current_file = $files[0]; - + if ( $DEBUG) { print STDERR "Chosen File: $current_file\n"; } - + return undef unless $current_file; # $current_file = UTF8sanitize($current_file); @@ -220,7 +220,7 @@ sub mirror_planet(){ # ~/osm/planet/planet-07XXXX-a.osm.bz2 # If a recent enought Version is found in ~/osm/planet/ # nothing is done, but the filename of the file is returned -# if the routine finds an uncompressed up to date Version +# if the routine finds an uncompressed up to date Version # ~/osm/planet/planet-07XXXX-a.osm # this Filename is returned. sub UTF8sanitize($){ @@ -259,7 +259,7 @@ sub UTF8sanitize($){ print "Command: $cmd" if $DEBUG || $VERBOSE; my $result = `$cmd`; print $result if $DEBUG || $VERBOSE; - + print "Sanitized $filename " if $DEBUG || $VERBOSE; print_time($start_time); @@ -279,7 +279,7 @@ sub UTF8sanitize($){ } # ------------------------------------------------------------------ -# find a file in the current Perl Search path. For now this was the +# find a file in the current Perl Search path. For now this was the # easiest solution to find programms like UTF8Sanitize # ARGS: relative filename (relative to @INC-path # RETURNS: Absolute path to file @@ -295,7 +295,7 @@ sub find_file_in_perl_path($){ last; }; } - + print "find_file_in_perl_path($file): --> $found_file\n" if $DEBUG; return $found_file; } diff --git a/navit/script/osm/Geo/OSM/SegmentList.pm b/navit/script/osm/Geo/OSM/SegmentList.pm index 0de35ebf5..8523173ce 100644 --- a/navit/script/osm/Geo/OSM/SegmentList.pm +++ b/navit/script/osm/Geo/OSM/SegmentList.pm @@ -54,7 +54,7 @@ sub load_segment_list($;$){ my $osm_filename = "${path}/csv/osm-segments.csv"; $osm_filename =~ s,\~/,$home/,; printf STDERR "check $osm_filename for loading\n" if $DEBUG; - + die "Cannot open $osm_filename\n" unless -s $osm_filename; $osm_segments = Geo::OSM::SegmentList::LoadOSM_segment_csv($osm_filename, $bounds); }; @@ -111,7 +111,7 @@ sub LoadOSM_segment_csv($;$){ $main::dont_write_osm_storable=1 || $check_bounds; $main::dont_read_osm_storable=1; - if ( -s "$filename.storable" && + if ( -s "$filename.storable" && ! file_needs_re_generation($filename,"$filename.storable") && ! $main::dont_read_osm_storable ) { # later we should compare if the file also is newer than the source @@ -178,7 +178,7 @@ sub LoadOSM_segment_csv($;$){ # ------------------------------------------------------- # Load the segment list from postgis # Args: {lat_min=> .., lat_max => ..., lon_min => .., lon_max => .. } -# This is a test to see if we can handle all segments of the world +# This is a test to see if we can handle all segments of the world # with reasonable query times sub LoadOSM_segment_postgis($;$){ my $bounds = shift; @@ -192,7 +192,7 @@ sub LoadOSM_segment_postgis($;$){ my $sth; use DBI; - + my $dbname="gis"; my $dbhost="/var/run/postgresql"; my $dbh = DBI->connect("dbi:Pg:dbname=$dbname;host=$dbhost", "", "", {AutoCommit => 0}); @@ -205,7 +205,7 @@ sub LoadOSM_segment_postgis($;$){ # WHERE the_geom && setsrid('BOX(47.36 21.40,51.185 21.53)'::box2d, 42102) # WHERE GeomFromText('POINT(25.3 25.40)', 42102) && the_geom \ # AND distance(the_geom, GeomFromText('POINT(25.7 5.3)', 42102)) = 0 - # WHERE distance(the_geom, setsrid('BOX(4.36 2.3,1.5 2.8)'::box2d, 42102)) = 0 + # WHERE distance(the_geom, setsrid('BOX(4.36 2.3,1.5 2.8)'::box2d, 42102)) = 0 # WHERE the_point && setsrid('BOX(295149 2315499, 465992 2163790)'::box2d, -1) ############################## @@ -223,12 +223,12 @@ sub LoadOSM_segment_postgis($;$){ my $polygon_text=sprintf("POLYGON((%.5f %.5f,%.5f %.5f,%.5f %.5f,%.5f %.5f,%.5f %.5f))", $bounds->{lat_min}-0.1 , $bounds->{lon_min}-0.1, - $bounds->{lat_max}+0.1 , $bounds->{lon_min}-0.1 , - $bounds->{lat_max}+0.1 , $bounds->{lon_max}+0.1 , - $bounds->{lat_min}-0.1 , $bounds->{lon_max}+0.1 , + $bounds->{lat_max}+0.1 , $bounds->{lon_min}-0.1 , + $bounds->{lat_max}+0.1 , $bounds->{lon_max}+0.1 , + $bounds->{lat_min}-0.1 , $bounds->{lon_max}+0.1 , $bounds->{lat_min}-0.1 , $bounds->{lon_min}-0.1); my $polygon="transform(GeomFromText('$polygon_text',${SRID_WGS84}),$SRID_OSM)"; - + my $select = "select osm_id,highway,name from planet_osm_line where highway is not null and way && ". " $polygon ". "limit 5;"; @@ -240,9 +240,9 @@ sub LoadOSM_segment_postgis($;$){ } printf STDERR "---------------------------------------------------------------\n" if $DEBUG || $VERBOSE; - + # $select = "SELECT name ,astext(way),$distance FROM planet_osm_roads WHERE $distance < 500 order by $distance;"; - + #SELECT * FROM planet_osm_roads WHERE way in ?", #$select = "SELECT name FROM planet_osm_roads WHERE distance(way,GeomFromText('POINT(856371.58 6683083.41)', 3395)) < 1000;"; # my $distance="distance(way, GeomFromText('POINT(856371.58 6683083.41)', 3395))"; @@ -277,7 +277,7 @@ sub LoadOSM_segment_postgis($;$){ } printf STDERR "---------------------------------------------------------------\n" if $DEBUG || $VERBOSE; - + my $count=0; my $count_read=0; while ( @row = $sth->fetchrow_array ) { @@ -359,7 +359,7 @@ my $from_node=0; sub DoStart() { my ($Expat, $Name, %Attr) = @_; - + if($Name eq "node"){ undef %Tags; %MainAttr = %Attr; @@ -389,7 +389,7 @@ sub DoStart() my $to_node = $Attr{"ref"}; if ( $from_node && defined($Nodes{$from_node}) && - defined($Nodes{$to_node}) + defined($Nodes{$to_node}) ) { my ($lat1,$lon1)=split(",",$Nodes{$from_node}); my ($lat2,$lon2)=split(",",$Nodes{$to_node}); @@ -407,12 +407,12 @@ sub DoStart() sub DoEnd(){ my ($Expat, $Element) = @_; my $ID = $MainAttr{"id"}; - + if($Element eq "node"){ my $node={}; $node->{"lat"} = $MainAttr{"lat"}; $node->{"lon"} = $MainAttr{"lon"}; - + if ( $AREA_FILTER->inside($node) ) { $Nodes{$ID} = sprintf("%f,%f",$MainAttr{lat}, $MainAttr{lon}); foreach(keys(%Tags)){ @@ -452,16 +452,16 @@ sub read_osm_file($;$) { # Insert Segments from osm File print("Reading OSM Segment from File $filename\n") if $VERBOSE || $DEBUG; if ( file_needs_re_generation($filename,"$filename.storable")) { print "$filename: ".(-s $filename)." Bytes\n" if $DEBUG; - + print STDERR "Parsing file: $filename\n" if $DEBUG; my $p = new XML::Parser( Handlers => { - Start => \&DoStart, - End => \&DoEnd, + Start => \&DoStart, + End => \&DoEnd, Char => \&DoChar, }, ErrorContext => 10, ); - + my $fh = data_open($filename); if (not $fh) { print STDERR "WARNING: Could not open osm data from $filename\n"; @@ -476,7 +476,7 @@ sub read_osm_file($;$) { # Insert Segments from osm File return; } #warn Dumper(\$read_osm_segments); - Storable_save($filename,$read_osm_segments); + Storable_save($filename,$read_osm_segments); } else { $read_osm_segments=Storable_load($filename); } diff --git a/navit/script/osm/Geo/OSM/Tracks2OSM.pm b/navit/script/osm/Geo/OSM/Tracks2OSM.pm index 4016f8c02..87302abc9 100644 --- a/navit/script/osm/Geo/OSM/Tracks2OSM.pm +++ b/navit/script/osm/Geo/OSM/Tracks2OSM.pm @@ -33,7 +33,7 @@ sub create_node($$) { my $osm_nodes = shift; my $elem = shift; - printf STDERR "create_node(): lat or lon undefined : $elem->{lat},$elem->{lon} ".Dumper(\$elem)."\n" + printf STDERR "create_node(): lat or lon undefined : $elem->{lat},$elem->{lon} ".Dumper(\$elem)."\n" unless defined($elem->{lat}) && defined($elem->{lon}) ; my $id=0; @@ -95,7 +95,7 @@ sub tracks2osm($){ }; for my $elem ( @{$track} ) { my $node_id = $elem->{node_id} || create_node($osm_nodes,$elem); - + # -------------------------------------------- Add to Way push(@{$osm_ways->{$osm_way_number}->{nd}},$node_id); $count_valid_points_for_ways++; diff --git a/navit/script/osm/Geo/OSM/Upload.pm b/navit/script/osm/Geo/OSM/Upload.pm index da18e97ec..7cd4de8cc 100644 --- a/navit/script/osm/Geo/OSM/Upload.pm +++ b/navit/script/osm/Geo/OSM/Upload.pm @@ -24,12 +24,12 @@ sub tempfiles(){ sub uploadWay(){ my ($self, $Tags, @Segments) = @_; $Tags .= sprintf("<tag k=\"created_by\" v=\"%s\"/>", $self->{UserAgent}); - + my $Segments = ""; foreach $Segment(@Segments){ $Segments .= "<seg id=\"$Segment\"/>"; } - + my $Way = "<way id=\"0\">$Segments$Tags</way>"; my $OSM = "<osm version=\"0.3\">$Way</osm>"; my $data = "<?xml version=\"1.0\"?>\n$OSM"; @@ -42,45 +42,45 @@ sub uploadWay(){ sub uploadSegment(){ my ($self, $Node1,$Node2,$Tags) = @_; $Tags .= sprintf("<tag k=\"created_by\" v=\"%s\"/>", $self->{UserAgent}); - + my $Segment = sprintf("<segment id=\"0\" from=\"%d\" to=\"%d\">$Tags</segment>", $Node1,$Node2); my $OSM = "<osm version=\"0.3\">$Segment</osm>"; my $data = "<?xml version=\"1.0\"?>\n$OSM"; my $path = "segment/0"; my ($response, $http_code) = $self->upload($data, $path); - - + + return($response); } sub uploadNode(){ my ($self, $Lat, $Long, $Tags) = @_; $Tags .= sprintf("<tag k=\"created_by\" v=\"%s\"/>", $self->{UserAgent}); - + my $Node = sprintf("<node id=\"0\" lon=\"%f\" lat=\"%f\">$Tags</node>", $Long, $Lat); my $OSM = "<osm version=\"0.3\">$Node</osm>"; my $data = "<?xml version=\"1.0\"?>\n$OSM"; my $path = "node/0"; my ($response, $http_code) = $self->upload($data, $path); - + return($response); } sub upload(){ my($self, $data, $path) = @_; - + my $curl = new WWW::Curl::easy; my $login = sprintf("%s:%s", $self->{Username}, $self->{Password}); - + open(my $FileToSend, ">", $self->{file1}); print $FileToSend $data; close $FileToSend; - - my $url = "http://www.openstreetmap.org/api/0.3/$path"; - + + my $url = "http://www.openstreetmap.org/api/0.3/$path"; + open(my $TxFile, "<", $self->{file1}); open(my $RxFile, ">",$self->{file2}); $curl->setopt(CURLOPT_URL,$url); @@ -91,20 +91,20 @@ sub upload(){ $curl->setopt(CURLOPT_INFILE,$TxFile); $curl->setopt(CURLOPT_INFILESIZE, -s $self->{file1}); $curl->setopt(CURLOPT_FILE, $RxFile); - + $curl->perform(); my $http_code = $curl->getinfo(CURLINFO_HTTP_CODE); my $err = $curl->errbuf; $curl->close(); close $TxFile; close $RxFile; - + open(my $ResponseFile, "<", $self->{file2}); my $response = int(<$ResponseFile>); close $ResponseFile; - + print "Code $http_code\n" if($http_code != 200); - + return($response, $http_code); } diff --git a/navit/script/osm/Geo/OSM/Write.pm b/navit/script/osm/Geo/OSM/Write.pm index 463c2d0cd..68c093b35 100644 --- a/navit/script/osm/Geo/OSM/Write.pm +++ b/navit/script/osm/Geo/OSM/Write.pm @@ -22,7 +22,7 @@ use Utils::Math; # ------------------------------------------------------------------ sub tags2osm($){ my $obj = shift; - + my $erg = ""; for my $k ( keys %{$obj->{tag}} ) { my $v = $obj->{tag}{$k}; @@ -73,10 +73,10 @@ sub write_osm_file($$) { # Write an osm File print $fh "<osm version=\'0.5\' generator=\'".$osm->{tool}."\'>\n"; if ( defined ( $osm->{bounds} ) ) { my $bounds = $osm->{bounds}; - my $bounds_sting = "$bounds->{lat_min},$bounds->{lon_min},$bounds->{lat_max},$bounds->{lon_max}"; + my $bounds_sting = "$bounds->{lat_min},$bounds->{lon_min},$bounds->{lat_max},$bounds->{lon_max}"; # -90,-180,90,180 print $fh " <bound box=\"$bounds_sting\" origin=\"OSM-perl-writer\" />\n"; - + } # --- Nodes @@ -90,9 +90,9 @@ sub write_osm_file($$) { # Write an osm File next; } print $fh " <node id=\'$node_id\' "; - print $fh " timestamp=\'".$node->{timestamp}."\' " + print $fh " timestamp=\'".$node->{timestamp}."\' " if defined $node->{timestamp}; - print $fh " changeset=\'".$node->{changeset}."\' " + print $fh " changeset=\'".$node->{changeset}."\' " if defined $node->{changeset}; print $fh " lat=\'$lat\' "; print $fh " lon=\'$lon\' "; @@ -109,10 +109,10 @@ sub write_osm_file($$) { # Write an osm File next unless scalar( @{$way->{nd}} )>1; print $fh " <way id=\'$way_id\'"; - print $fh " timestamp=\'".$way->{timestamp}."\'" + print $fh " timestamp=\'".$way->{timestamp}."\'" if defined $way->{timestamp}; print $fh ">"; - + for my $way_nd ( @{$way->{nd}} ) { next unless $way_nd; print $fh " <nd ref=\'$way_nd\' />\n"; @@ -120,7 +120,7 @@ sub write_osm_file($$) { # Write an osm File print $fh tags2osm($way); print $fh " </way>\n"; $count_ways++; - + } print $fh "</osm>\n"; diff --git a/navit/script/osm/border_follower.pl b/navit/script/osm/border_follower.pl index 3a5b31167..2ce699798 100755 --- a/navit/script/osm/border_follower.pl +++ b/navit/script/osm/border_follower.pl @@ -122,10 +122,10 @@ do { } } if ($count == 0) { - error "No connection" - } else { + error "No connection" + } else { if ($count > 1) { - error "Multiple connections ($count)" + error "Multiple connections ($count)" } else { $path="$path $wayid"; } diff --git a/navit/script/wiki2def b/navit/script/wiki2def index bbbbb5ba2..901f6d05e 100755 --- a/navit/script/wiki2def +++ b/navit/script/wiki2def @@ -29,9 +29,9 @@ EOT done type="n" wget -O - "http://wiki.navit-project.org/index.php/Item_def.h?action=edit" | -awk '/<textarea/,/<\/textarea/ { print $0 }' | +awk '/<textarea/,/<\/textarea/ { print $0 }' | grep "^| " | -sed -e 's/^| *//' -e 's/ *$//' -e 's/ *|/|/g' -e 's/| */|/g' -e 's/||/|/g' | +sed -e 's/^| *//' -e 's/ *$//' -e 's/ *|/|/g' -e 's/| */|/g' -e 's/||/|/g' | while read id item description osmtags dummy do if [[ "$id" == colspan=* ]] diff --git a/navit/speech/dbus/CMakeLists.txt b/navit/speech/dbus/CMakeLists.txt index 87413018a..c2e32eb8c 100644 --- a/navit/speech/dbus/CMakeLists.txt +++ b/navit/speech/dbus/CMakeLists.txt @@ -1 +1 @@ -module_add_library(speech_dbus speech_dbus.c) +module_add_library(speech_dbus speech_dbus.c) diff --git a/navit/speech/iphone/speech_iphone.m b/navit/speech/iphone/speech_iphone.m index 854ae097b..571f6784b 100644 --- a/navit/speech/iphone/speech_iphone.m +++ b/navit/speech/iphone/speech_iphone.m @@ -30,7 +30,7 @@ struct speech_priv { VSSpeechSynthesizer *speech; }; -static int +static int speech_iphone_say(struct speech_priv *this, const char *text) { dbg(0,"enter %s",text); @@ -41,7 +41,7 @@ speech_iphone_say(struct speech_priv *this, const char *text) return 1; } -static void +static void speech_iphone_destroy(struct speech_priv *this) { [this->speech release]; diff --git a/navit/start_apple.m b/navit/start_apple.m index ca41b5b68..114fd4bbe 100644 --- a/navit/start_apple.m +++ b/navit/start_apple.m @@ -28,7 +28,7 @@ main(int argc, char **argv) int ret; NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; NSString *appFolderPath = [[NSBundle mainBundle] resourcePath]; - NSString *locale = [[NSLocale currentLocale] localeIdentifier]; + NSString *locale = [[NSLocale currentLocale] localeIdentifier]; char *lang=g_strdup_printf("%s.UTF-8",[locale UTF8String]); dbg(0,"lang %s",lang); setenv("LANG",lang,0); diff --git a/navit/start_real.h b/navit/start_real.h index 898251433..3228e1a36 100644 --- a/navit/start_real.h +++ b/navit/start_real.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef NAVIT_MAIN_REAL_H -#define NAVIT_MAIN_REAL_H +#ifndef NAVIT_MAIN_REAL_H +#define NAVIT_MAIN_REAL_H int main_real(int argc, char * const* argv); diff --git a/navit/startonce.sh b/navit/startonce.sh index d0bfafdcc..e38bdc6c8 100755 --- a/navit/startonce.sh +++ b/navit/startonce.sh @@ -22,7 +22,7 @@ NAVIT="./navit" function check_wmctrl() { which wmctrl > /dev/null - + if [ $? -ne 0 ] ; then echo "I need the 'wmctrl' program. Exit." exit 1 @@ -33,7 +33,7 @@ function start_navit() { if [ "x" != "x$CONFIG" ] ; then $NAVIT -c $CONFIG & - else + else $NAVIT & fi diff --git a/navit/sunriset.h b/navit/sunriset.h index 36a770935..60ad4fa76 100644 --- a/navit/sunriset.h +++ b/navit/sunriset.h @@ -8,7 +8,7 @@ extern long int timezone_offset; #define MINUTES(h) ((int)(60*(h-floor(h)))) #ifndef ABS -#define ABS(x) ((x)<0?-(x):(x)) +#define ABS(x) ((x)<0?-(x):(x)) #endif /* A macro to compute the number of days elapsed since 2000 Jan 0.0 */ diff --git a/navit/tools/asc2navit b/navit/tools/asc2navit index 77ba4ad15..096f56ded 100755 --- a/navit/tools/asc2navit +++ b/navit/tools/asc2navit @@ -38,7 +38,7 @@ my $pipe = open_outputhandle(); # ...feed the pipe... run(); -# ...and close it properly +# ...and close it properly close $pipe; ############################################################################### @@ -110,7 +110,7 @@ sub determine_filename { $filename = "$onefile.bin"; $filename = "$onefile.xml" if ($write_osm); } - + print "$0 writing output to $filename\n"; } @@ -119,14 +119,14 @@ sub run { print $pipe '<?xml version="1.0" encoding="UTF-8"?>' . "\n"; print $pipe '<osm version="0.5">' . "\n"; - # set the amenity and + # set the amenity and my @amenities = keys %files; while (my $amenity = shift @amenities) { foreach my $file (@{$files{$amenity}}) { process_file($file); } } - + # close the osm file print $pipe '</osm>'; # and show up some stats diff --git a/navit/tools/cleanattr.sh b/navit/tools/cleanattr.sh index 22e561f66..536ea4b8f 100755 --- a/navit/tools/cleanattr.sh +++ b/navit/tools/cleanattr.sh @@ -1,7 +1,7 @@ #!/bin/sh -# This script scans the navit sources for attributes that -# remained in attr_def.h but are no longer used. +# This script scans the navit sources for attributes that +# remained in attr_def.h but are no longer used. ATTRFILE=attr_def.h TMPDIR=/tmp @@ -37,7 +37,7 @@ for ATTRNAME in $ATTRLIST ; do grep -rI $ATTR ./* > /dev/null - if [ $? -ne 0 ] ; then + if [ $? -ne 0 ] ; then echo "Unused attribute: $ATTR" grep -v "ATTR($ATTRNAME)" $TMPFILE > $TMPFILE2 mv $TMPFILE2 $TMPFILE diff --git a/navit/tools/gpx2navit_txt/COPYING b/navit/tools/gpx2navit_txt/COPYING index 514d6c73f..fc2670632 100644 --- a/navit/tools/gpx2navit_txt/COPYING +++ b/navit/tools/gpx2navit_txt/COPYING @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest diff --git a/navit/tools/gpx2navit_txt/INSTALL b/navit/tools/gpx2navit_txt/INSTALL index b5dbb9e31..7eae212e3 100644 --- a/navit/tools/gpx2navit_txt/INSTALL +++ b/navit/tools/gpx2navit_txt/INSTALL @@ -11,7 +11,7 @@ It's not special. Just type below like others. ./configure make - su + su make install gpx2navit_txt image will be at /usr/local/bin. diff --git a/navit/tools/gpx2navit_txt/NEWS b/navit/tools/gpx2navit_txt/NEWS index 7bd167323..d6f88c478 100644 --- a/navit/tools/gpx2navit_txt/NEWS +++ b/navit/tools/gpx2navit_txt/NEWS @@ -5,7 +5,7 @@ - Compile warning fixes by Toshihiro Hiraoka - Bug fix - + 0.68-1 ====== by Petter Reinholdtsen @@ -14,7 +14,7 @@ - RPM package for Vine 3.1 0.68 -==== +==== by Toshihiro Hiraoka - Change XML parser from libxml2 to expat for big file support - Remake almost all strucutes. @@ -27,7 +27,7 @@ - README - AUTHORS - Change comment style to javadoc style. - - Structures flow + - Structures flow - Error code 0.65-1 diff --git a/navit/tools/gpx2navit_txt/README b/navit/tools/gpx2navit_txt/README index ecb3f995f..d353cb50e 100644 --- a/navit/tools/gpx2navit_txt/README +++ b/navit/tools/gpx2navit_txt/README @@ -1,14 +1,14 @@ ============== gpx2navit_txt README ============== -bodenseepingu +bodenseepingu 4/01/2008 What's This =========== gpx2navit_txt is a converter from GPX file to Navit Text map format -For gpx2navit_txt was the original code from gpx2shp used and modified. +For gpx2navit_txt was the original code from gpx2shp used and modified. This is a output of Metro Manila Transit Map Project by JOCV (Japan Overseas Cooperation Volunteers) program of JICA (Japan International Cooperation Agency in 2004. It is provided you on GPL2. @@ -28,7 +28,7 @@ Please try to convert a sample file "pinatest2.gpx" in this archive. prompt> gpx2navit_txt pinatest2.gpx prompt> ls - pinatest2.gpx (source gpx) + pinatest2.gpx (source gpx) pinatest2_meta.txt (meta data may be there) You can convert only a certain type of data like only waypoint or @@ -42,7 +42,7 @@ track point using option '-w' (waypoint), '-t' (trackpoint) or '-r' you can convert it other ways using option '-p'(convert as point) and '-e' (as edge). The edge file has '_edg' in the filename and the point file has '_pnt' in the filename. - + prompt> gpx2navit_txt -p -e pinatest2.gpx - Statistics @@ -87,14 +87,14 @@ try a example below. - Length and time units You can choose any length related units that are supported by proj4 -for attribute table using - '--length-unit' (for length column, default: m), - '--time-unit' (for time column, default: sec), +for attribute table using + '--length-unit' (for length column, default: m), + '--time-unit' (for time column, default: sec), '--speed-length-unit' (for speed column, default: km), '--speed-time-unit' (for speed column, default: hour) and '--length-ellipsoid' (for length calculation, default: UGS84). - You can see the supported units by 'geod -lu' and 'geod -le' command. - Supported time unit are 'sec', 'min', 'hour' and 'day'. + You can see the supported units by 'geod -lu' and 'geod -le' command. + Supported time unit are 'sec', 'min', 'hour' and 'day'. - Other futures There are other futures in gpx2navit_txt. Please check the option list using diff --git a/navit/tools/gpx2navit_txt/autogen.sh b/navit/tools/gpx2navit_txt/autogen.sh index ba84850ab..3951daa17 100755 --- a/navit/tools/gpx2navit_txt/autogen.sh +++ b/navit/tools/gpx2navit_txt/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh for pkg in pkg-config libtool automake aclocal autoreconf:autoconf autopoint:gettext do - if ! ${pkg%%:*} --version >/dev/null + if ! ${pkg%%:*} --version >/dev/null then echo "You need to install ${pkg##*:}" exit 1 diff --git a/navit/tools/gpx2navit_txt/install-sh b/navit/tools/gpx2navit_txt/install-sh index 11870f1b0..a06f46705 100755 --- a/navit/tools/gpx2navit_txt/install-sh +++ b/navit/tools/gpx2navit_txt/install-sh @@ -115,7 +115,7 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - + if [ -d $dst ]; then instcmd=: chmodcmd="" @@ -125,7 +125,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f "$src" ] || [ -d "$src" ] @@ -135,7 +135,7 @@ else echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ] then echo "install: no destination specified" @@ -202,17 +202,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -243,7 +243,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 index c04165efb..a0a07495a 100644 --- a/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 +++ b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1 @@ -1,103 +1,103 @@ -.\" +.\" .TH "gpx2navit_txt" "1" "0.1" "bodenseepingu" "" .SH "NAME" gpx2navit_txt \- Convert GPX files to navit txt files .SH "SYNOPSIS" gpx2navit_txt [options] [\-o output file] gpxfile .SH "DESCRIPTION" -gpx2navit_txt is a converter from GPX file to navit txt file +gpx2navit_txt is a converter from GPX file to navit txt file The original gpx2shp was used for that program. This is a output of Metro Manila Transit Map Project by JOCV (Japan Overseas Cooperation Volunteers) program of JICA (Japan International Cooperation Agency) in 2004. It is provided you on GPL2. .SH "OPTIONS" -.TP +.TP .B \-o, \-\-output Sets output basename. The default is (source file name) \- (extention name) -.TP +.TP .B \-w, \-\-waypoints Converts only waypoints data from a gpx file. -.TP +.TP .B \-t, \-\-trackpoints Converts only trackpoints data from a gpx file. -.TP +.TP .B \-r, \-\-routes Converts only routes data from a gpx file. -.TP +.TP .B \-a, \-\-all Converts all types of data from a gpx file.(default) -.TP +.TP .B \-e, \-\-as\-edge Makes a separated output by each edges. -.TP +.TP .B \-p, \-\-as\-point Makes a separated output by each points. -.TP +.TP .B \-s, \-\-stats Shows simple statistics of the outputs. -.TP +.TP .B \-b, \-\-basic\-columns Stores only basic data as attribures to reduce memory and storage usage. (ele, name, cmt, type, time, fix, sym and number). -.TP +.TP .B \-L, \-\-no\-length Removes length column from a waypoint or trackpoint attribute table. -.TP +.TP .B \-S, \-\-no\-speed Removes speed column from a waypoint or trackpoint attribute table. -.TP +.TP .B \-T, \-\-no\-time Removes time column from an attribute table. -.TP +.TP .B \-g, \-\-gpxline Adds line number of GPX file as attribures. -.TP +.TP .B \-f, \-\-fast Make it faster without any checks. -.TP +.TP .B \-3, \-\-3d Converts data using 3d format. (It's not compatible for Arcview 3.x.) -.TP +.TP .B \-\-min\-points Sets path minimum points to convert for noise reduction. Default is 2. -.TP +.TP .B \-\-min\-length Sets path minimum length to convert for noise reduction. Default is 0. -.TP +.TP .B \-\-min\-time Sets path minimum time period to convert for noise reduction. Default is 0. -.TP +.TP .B \-\-length\-unit Sets length unit from m,km,feet,mi and etc. The default is m. You can see the unit list from "geod \-lu" command. -.TP +.TP .B \-\-time\-unit Sets time unit. The default is sec. You can set from day, hour, min and sec. -.TP -.B \-\-speed\-length\-unit +.TP +.B \-\-speed\-length\-unit Sets length unit for speed. The default is km. You can see the unit list from "geod \-lu" command. -.TP +.TP .B \-\-speed\-time\-unit Sets time unit for speed calulation. Default is hour. You can set from day, hour, min and sec. -.TP +.TP .B \-\-length\-ellipsoid Sets length ellipsoid like UGS84, clrk66. The default is UGS84. You can see the unit list from "geod \-le" command. -.TP +.TP .B \-\-no\-speed-check Disables checking the track speed to be non-zero. -.TP +.TP .B \-v, \-\-verbose Gives many messages. -.TP +.TP .B \-\-version Shows version. -.TP +.TP .B \-h, \-\-help Shows this list. .SH "AUTHORS" Toshihiro Hiraoka -.br +.br Petter Reinholdtsen .SH "BUGS or OPINIONS" Please e\-mail your bugs or opinions to -.br +.br washitoshi at yahoo.co.jp .SH "SEE ALSO" diff --git a/navit/tools/gpx2navit_txt/src/errorcode.h b/navit/tools/gpx2navit_txt/src/errorcode.h index f12d6cffd..29636fc1d 100644 --- a/navit/tools/gpx2navit_txt/src/errorcode.h +++ b/navit/tools/gpx2navit_txt/src/errorcode.h @@ -34,7 +34,7 @@ #define ERR_ISNOTGPX 31 #define ERR_PARSEERROR 32 /* unit */ -#define ERR_ELLPSUNIT 41 +#define ERR_ELLPSUNIT 41 #define ERR_LENGTHUNIT 42 #define ERR_TIMEUNIT 43 diff --git a/navit/tools/gpx2navit_txt/src/geodesic.h b/navit/tools/gpx2navit_txt/src/geodesic.h index 5f818c37a..200f98659 100644 --- a/navit/tools/gpx2navit_txt/src/geodesic.h +++ b/navit/tools/gpx2navit_txt/src/geodesic.h @@ -56,10 +56,10 @@ GEOD_EXTERN struct geodesic { # define f64 GEODESIC.FLAT64 # define ellipse GEODESIC.ELLIPSE - + GEOD_EXTERN int n_alpha, n_S; GEOD_EXTERN double to_meter, fr_meter, del_alpha; - + void geod_set(int, char **); void geod_for(void); void geod_pre(void); diff --git a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h index 038ca8605..9b37f0031 100644 --- a/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h +++ b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h @@ -150,7 +150,7 @@ typedef struct g2sattr { } g2sattr; /** - * statistics structure + * statistics structure */ typedef struct g2sstats { int trkpoints; /** track point total count */ @@ -161,12 +161,12 @@ typedef struct g2sstats { double rtelength; /** route total length */ int wptpoints; /** way point total count */ int trkunconverted; /** unconverted track path count */ - int rteunconverted; /** unconverted route path count */ + int rteunconverted; /** unconverted route path count */ } g2sstats; /** * cluster of all dbfhandles - */ + */ //typedef struct dbfhandles { // DBFHandle trk; /** for track */ // DBFHandle wpt; /** for waypoint */ @@ -224,7 +224,7 @@ typedef struct g2sprop { } g2sprop; /** - * userdata structure between expat methods + * userdata structure between expat methods */ typedef struct parsedata { int depth; /** xml path depth */ diff --git a/navit/track.c b/navit/track.c index 3f04b60db..77ccc76c6 100644 --- a/navit/track.c +++ b/navit/track.c @@ -138,7 +138,7 @@ tracking_init_cdf(struct cdf_data *cdf, int hist_size) { // Minimum average speed #define CDF_MINAVG 1.f // Maximum average speed -#define CDF_MAXAVG 6.f // only ~ 20 km/h +#define CDF_MAXAVG 6.f // only ~ 20 km/h // We need a low value here because otherwise we would extrapolate whenever we are not accelerating // Mininum distance (square of it..), below which we ignore gps updates diff --git a/navit/vehicle/gpsd_dbus/CMakeLists.txt b/navit/vehicle/gpsd_dbus/CMakeLists.txt index 435a987a0..a38e65539 100644 --- a/navit/vehicle/gpsd_dbus/CMakeLists.txt +++ b/navit/vehicle/gpsd_dbus/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(vehicle_gpsd_dbus vehicle_gpsd_dbus.c) +module_add_library(vehicle_gpsd_dbus vehicle_gpsd_dbus.c) diff --git a/navit/vehicle/iphone/corelocation.h b/navit/vehicle/iphone/corelocation.h index 8a3ee8c51..0ff715964 100644 --- a/navit/vehicle/iphone/corelocation.h +++ b/navit/vehicle/iphone/corelocation.h @@ -20,7 +20,7 @@ #define VEHICLE_IPHONE_CORELOCATION_H typedef void(*FT_LOCATION_CB)(void *, double , double , double , double, char *, double); -void corelocation_update(double lat, +void corelocation_update(double lat, double lng, double dir, double spd, diff --git a/navit/vehicle/iphone/corelocation.m b/navit/vehicle/iphone/corelocation.m index 5b13c283f..5f02500f3 100644 --- a/navit/vehicle/iphone/corelocation.m +++ b/navit/vehicle/iphone/corelocation.m @@ -39,7 +39,7 @@ void corelocation_init(void * pv_arg, FT_LOCATION_CB pf_cb) { /** Save callbacks */ locationcontroller->pv_arg = pv_arg; - locationcontroller->pf_cb = pf_cb; + locationcontroller->pf_cb = pf_cb; /** Start location process */ [locationcontroller.locationManager startUpdatingLocation]; @@ -64,7 +64,7 @@ void corelocation_exit(void) { self = [super init]; if (self != nil) { self.locationManager = [[[CLLocationManager alloc] init] autorelease]; - self.locationManager.distanceFilter = kCLDistanceFilterNone; + self.locationManager.distanceFilter = kCLDistanceFilterNone; self.locationManager.delegate = self; // send loc updates to myself self.pf_cb = NULL; self.pv_arg = NULL; @@ -82,7 +82,7 @@ fromLocation:(CLLocation *)oldLocation { NSLog(@"New Location: %@", [newLocation description]); NSString *newDateString = [self.dateFormatter stringFromDate:newLocation.timestamp]; - const char* cString = [newDateString cStringUsingEncoding:NSASCIIStringEncoding]; + const char* cString = [newDateString cStringUsingEncoding:NSASCIIStringEncoding]; if(self.pf_cb) { self.pf_cb( diff --git a/navit/vehicle/maemo/CMakeLists.txt b/navit/vehicle/maemo/CMakeLists.txt index 2e74763dd..011e5dce9 100644 --- a/navit/vehicle/maemo/CMakeLists.txt +++ b/navit/vehicle/maemo/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(vehicle_maemo vehicle_maemo.c) +module_add_library(vehicle_maemo vehicle_maemo.c) diff --git a/navit/vehicle/webos/cJSON.h b/navit/vehicle/webos/cJSON.h index 97d529aea..61500858f 100644 --- a/navit/vehicle/webos/cJSON.h +++ b/navit/vehicle/webos/cJSON.h @@ -1,16 +1,16 @@ /* Copyright (c) 2009 Dave Gamble - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -36,7 +36,7 @@ extern "C" #define cJSON_String 4 #define cJSON_Array 5 #define cJSON_Object 6 - + #define cJSON_IsReference 256 /* The cJSON structure: */ @@ -80,7 +80,7 @@ extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string); /* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */ extern const char *cJSON_GetErrorPtr(void); - + /* These calls create a cJSON item of the appropriate type. */ extern cJSON *cJSON_CreateNull(void); extern cJSON *cJSON_CreateTrue(void); @@ -109,7 +109,7 @@ extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which); extern void cJSON_DeleteItemFromArray(cJSON *array,int which); extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string); extern void cJSON_DeleteItemFromObject(cJSON *object,const char *string); - + /* Update array items. */ extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem); extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem); diff --git a/navit/xslt/iphone.xslt b/navit/xslt/iphone.xslt index 1e9540503..d5a403bb9 100644 --- a/navit/xslt/iphone.xslt +++ b/navit/xslt/iphone.xslt @@ -5,7 +5,7 @@ <xsl:param name="ICON_MEDIUM" select="32"/> <xsl:param name="ICON_BIG" select="64"/> <xsl:param name="OSD_USE_OVERLAY">yes</xsl:param> - + <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/> <xsl:include href="osd_minimum.xslt"/> <xsl:template match="/config/navit/graphics"> diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt index 5c9c8a0b3..fc4e1f593 100644 --- a/navit/xslt/osd_minimum.xslt +++ b/navit/xslt/osd_minimum.xslt @@ -4,7 +4,7 @@ <xsl:param name="NEXT_TURN_SIZE"><xsl:value-of select="round(12*number($OSD_SIZE)+number($ICON_BIG))"/></xsl:param> <xsl:param name="NEXT_TURN_TEXT_HIGHT"><xsl:value-of select="round(20*number($OSD_SIZE))"/></xsl:param> <xsl:param name="OSD_USE_OVERLAY"><xsl:value-of select="$OSD_USE_OVERLAY='yes' or $OSD_USE_OVERLAY='true' or $OSD_USE_OVERLAY='1'"/></xsl:param> - + <osd type="compass" enabled="yes" x="{round(-60*number($OSD_SIZE))}" y="{round(-80*number($OSD_SIZE))}" w="{round(60*number($OSD_SIZE))}" h="{round(80*number($OSD_SIZE))}" font_size="{round(200*number($OSD_SIZE))}" enable_expression="vehicle.position_valid"/> <xsl:text>
 </xsl:text> <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="{round(-60*number($OSD_SIZE))}" y="0" w="{round(60*number($OSD_SIZE))}" h="{round(40*number($OSD_SIZE))}" font_size="{round(200*number($OSD_SIZE))}" enable_expression="navigation.nav_status>=3"/> diff --git a/navit/xslt/tomtom.xslt b/navit/xslt/tomtom.xslt index 3e34d9224..fd8031ea2 100644 --- a/navit/xslt/tomtom.xslt +++ b/navit/xslt/tomtom.xslt @@ -11,7 +11,7 @@ <xsl:copy> <xsl:apply-templates select="navit"/> </xsl:copy> - </xsl:template> + </xsl:template> <xsl:template match="navit"> <xsl:copy> @@ -30,7 +30,7 @@ <osd enabled="yes" type="compass" x="400" y="80" w="80" h="112" background_color="#00008080" font_size="300"/> <osd enabled="yes" type="gps_status" x="0" y="80" w="80" h="40" background_color="#00008080"/> <osd enabled="yes" type="speed_warner" x="0" y="120" w="80" h="72" background_color="#00008080" font_size="300"/> - <osd enabled="yes" type="navigation_next_turn" x="0" y="192" w="80" h="80" icon_w="48" icon_h="48" icon_src="%s_wh_48_48.png" background_color="#00008080"/> + <osd enabled="yes" type="navigation_next_turn" x="0" y="192" w="80" h="80" icon_w="48" icon_h="48" icon_src="%s_wh_48_48.png" background_color="#00008080"/> <osd enabled="yes" type="button" x="400" y="0" command="zoom_in()" src="tomtom_plus_80_80.png"/> <osd enabled="yes" type="button" x="0" y="0" command="zoom_out()" src="tomtom_minus_80_80.png"/> <vehicle name="Local GPS" profilename="car" enabled="yes" active="yes" follow="1" source="file:/var/run/gpspipe"> @@ -39,13 +39,13 @@ </vehicle> <vehicle name="Demo" profilename="car" enabled="yes" active="no" follow="1" source="demo://" speed="100"/> <xsl:copy-of select="tracking"/> - + <xsl:copy-of select="vehicleprofile[@name='car']"/> <xsl:copy-of select="vehicleprofile[@name='car_shortest']"/> <xsl:copy-of select="vehicleprofile[@name='car_avoid_tolls']"/> <xsl:copy-of select="vehicleprofile[@name='bike']"/> <xsl:copy-of select="vehicleprofile[@name='pedestrian']"/> - + <xsl:copy-of select="route"/> <xsl:copy-of select="navigation"/> diff --git a/navit/zipfile.h b/navit/zipfile.h index bb3ed1c56..8002e48d9 100644 --- a/navit/zipfile.h +++ b/navit/zipfile.h @@ -119,7 +119,7 @@ struct zip_enc { short version; char vendor_id1,vendor_id2; char encryption_strength; - short compress_method; + short compress_method; } ATTRIBUTE_PACKED; #define zip_eoc_sig 0x6054b50 diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index f0b55ce3b..b907e17d9 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -52,7 +52,7 @@ ADD_CUSTOM_COMMAND( COMMAND ${XGETTEXT} --no-location --default-domain=navit_tmp --add-comments --keyword=_ --keyword=_n --keyword=navit_nls_gettext --keyword=navit_nls_ngettext:1,2 ${POTFILES} COMMAND ${CMAKE_COMMAND} -DMATCHES="CHARSET" -DREPLACE="utf-8" -DSRC=${CMAKE_CURRENT_BINARY_DIR}/navit_tmp.po -DDST=${CMAKE_CURRENT_BINARY_DIR}/navit.pot - -P ${PROJECT_SOURCE_DIR}/cmake/replace.cmake + -P ${PROJECT_SOURCE_DIR}/cmake/replace.cmake ) FILE(GLOB POIN_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po.in") @@ -73,8 +73,8 @@ foreach (LANG ${LANGUAGES}) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check --verbose --statistics --output-file="${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo" "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po" - COMMAND ${CMAKE_COMMAND} -E make_directory "${PROJECT_BINARY_DIR}/locale/${LANG}/LC_MESSAGES" + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check --verbose --statistics --output-file="${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo" "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po" + COMMAND ${CMAKE_COMMAND} -E make_directory "${PROJECT_BINARY_DIR}/locale/${LANG}/LC_MESSAGES" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo" "${PROJECT_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/navit.mo" ) SET(MOFILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo ${MOFILES}) diff --git a/po/af.po.in b/po/af.po.in index 9e8ed0ff7..f966374b3 100644 --- a/po/af.po.in +++ b/po/af.po.in @@ -357,7 +357,7 @@ msgstr "Draai om %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1929,10 +1929,10 @@ 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" diff --git a/po/ar.po.in b/po/ar.po.in index 8768d21f6..3a8af7491 100644 --- a/po/ar.po.in +++ b/po/ar.po.in @@ -373,7 +373,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "اتبع" @@ -1954,10 +1954,10 @@ 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" diff --git a/po/ast.po.in b/po/ast.po.in index 1a8c7d738..57704bb4b 100644 --- a/po/ast.po.in +++ b/po/ast.po.in @@ -351,7 +351,7 @@ msgstr "De la vuelta %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "siga" @@ -1923,10 +1923,10 @@ 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" diff --git a/po/be.po.in b/po/be.po.in index 71326297c..d8b680519 100644 --- a/po/be.po.in +++ b/po/be.po.in @@ -354,7 +354,7 @@ msgstr "Развярніцеся %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1926,10 +1926,10 @@ 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" diff --git a/po/bg.po.in b/po/bg.po.in index c744854d0..8cba7b8d2 100644 --- a/po/bg.po.in +++ b/po/bg.po.in @@ -355,7 +355,7 @@ msgstr "Обърнете %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/bs.po.in b/po/bs.po.in index 5ee1a68f7..2e9a96061 100644 --- a/po/bs.po.in +++ b/po/bs.po.in @@ -355,7 +355,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/ca.po.in b/po/ca.po.in index 0bbb0c966..d4b7111f8 100644 --- a/po/ca.po.in +++ b/po/ca.po.in @@ -362,7 +362,7 @@ msgstr "Doneu mitja volta %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "seguiu" @@ -1934,10 +1934,10 @@ 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" diff --git a/po/ckb.po.in b/po/ckb.po.in index 258d101cc..549d8f26e 100644 --- a/po/ckb.po.in +++ b/po/ckb.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/cs.po.in b/po/cs.po.in index 1705aa79e..4b6a3ae95 100644 --- a/po/cs.po.in +++ b/po/cs.po.in @@ -372,7 +372,7 @@ msgstr "Otočte se %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "následujte" @@ -2055,10 +2055,10 @@ msgstr "Body trasy" msgid "Enter Coordinates" msgstr "Zadejte souřadnice" -#. +#. #. 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" diff --git a/po/cy.po.in b/po/cy.po.in index 92251c27c..db524f7f2 100644 --- a/po/cy.po.in +++ b/po/cy.po.in @@ -355,7 +355,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/da.po.in b/po/da.po.in index 570b72a9c..e3c1d3c5b 100644 --- a/po/da.po.in +++ b/po/da.po.in @@ -361,7 +361,7 @@ msgstr "Vend om %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "følg" @@ -1933,10 +1933,10 @@ 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" diff --git a/po/de.po.in b/po/de.po.in index a01949d76..16fa0717b 100644 --- a/po/de.po.in +++ b/po/de.po.in @@ -382,7 +382,7 @@ msgstr "Wenden Sie %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "folgen" @@ -1977,10 +1977,10 @@ msgstr "Wegpunkte" msgid "Enter Coordinates" msgstr "Koordinaten eingeben" -#. +#. #. 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" diff --git a/po/de_CH.po.in b/po/de_CH.po.in index 309047f4d..a31b5840b 100644 --- a/po/de_CH.po.in +++ b/po/de_CH.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/el.po.in b/po/el.po.in index a1c63d17a..41b5e38f8 100644 --- a/po/el.po.in +++ b/po/el.po.in @@ -357,7 +357,7 @@ msgstr "Κάνε αναστροφή %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1929,10 +1929,10 @@ 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" diff --git a/po/en_AU.po.in b/po/en_AU.po.in index bf7d7a65d..b65529d3a 100644 --- a/po/en_AU.po.in +++ b/po/en_AU.po.in @@ -353,7 +353,7 @@ msgstr "Make a U-turn %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1926,10 +1926,10 @@ 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" diff --git a/po/en_CA.po.in b/po/en_CA.po.in index b0ee764cd..93672159c 100644 --- a/po/en_CA.po.in +++ b/po/en_CA.po.in @@ -350,7 +350,7 @@ msgstr "Make a U-turn %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1923,10 +1923,10 @@ 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" diff --git a/po/en_GB.po.in b/po/en_GB.po.in index 81ca21295..7cb179f3b 100644 --- a/po/en_GB.po.in +++ b/po/en_GB.po.in @@ -359,7 +359,7 @@ msgstr "Make a U-turn %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "follow" @@ -1942,10 +1942,10 @@ msgstr "Waypoints" msgid "Enter Coordinates" msgstr "Enter Coordinates" -#. +#. #. 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" diff --git a/po/eo.po.in b/po/eo.po.in index 8ac6d2526..cc9826086 100644 --- a/po/eo.po.in +++ b/po/eo.po.in @@ -355,7 +355,7 @@ msgstr "Ĉirkaŭturnu %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "sekvu" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/es.po.in b/po/es.po.in index fc43a6a87..18bb0af56 100644 --- a/po/es.po.in +++ b/po/es.po.in @@ -369,7 +369,7 @@ msgstr "Dé la vuelta %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "continúe" @@ -1960,10 +1960,10 @@ msgstr "Puntos de paso" msgid "Enter Coordinates" msgstr "Introduzca coordenadas" -#. +#. #. 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" diff --git a/po/et.po.in b/po/et.po.in index 52fa1f929..6b81f10c3 100644 --- a/po/et.po.in +++ b/po/et.po.in @@ -355,7 +355,7 @@ msgstr "Pööra ümber %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1929,10 +1929,10 @@ msgstr "Teekonnapunktid" msgid "Enter Coordinates" msgstr "Sisesta koordinaadid" -#. +#. #. 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" diff --git a/po/eu.po.in b/po/eu.po.in index 71158c04b..7ecec298e 100644 --- a/po/eu.po.in +++ b/po/eu.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/fa.po.in b/po/fa.po.in index 0492353c8..753087ba1 100644 --- a/po/fa.po.in +++ b/po/fa.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/fi.po.in b/po/fi.po.in index d318c22ee..cdcc582f3 100644 --- a/po/fi.po.in +++ b/po/fi.po.in @@ -357,7 +357,7 @@ msgstr "Tee u-käännös %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1934,10 +1934,10 @@ 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" diff --git a/po/fil.po.in b/po/fil.po.in index ccf4cb877..b3ba50fd8 100644 --- a/po/fil.po.in +++ b/po/fil.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/fo.po.in b/po/fo.po.in index 8c71ca69b..24c638b61 100644 --- a/po/fo.po.in +++ b/po/fo.po.in @@ -352,7 +352,7 @@ msgstr "Vend um %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/fr.po.in b/po/fr.po.in index 0a561a1fe..60d708f76 100644 --- a/po/fr.po.in +++ b/po/fr.po.in @@ -378,7 +378,7 @@ msgstr "Faites demi-tour %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "suivre" @@ -1971,10 +1971,10 @@ msgstr "Étapes" msgid "Enter Coordinates" msgstr "Saisissez les coordonnées" -#. +#. #. 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" diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in index a32aa6ed6..e6db9a30c 100644 --- a/po/fr_CH.po.in +++ b/po/fr_CH.po.in @@ -355,7 +355,7 @@ msgstr "Faites demi-tour %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "suivez" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/fy.po.in b/po/fy.po.in index 9f13fe11a..1667983ec 100644 --- a/po/fy.po.in +++ b/po/fy.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/gl.po.in b/po/gl.po.in index 75a724aa7..3d04375ea 100644 --- a/po/gl.po.in +++ b/po/gl.po.in @@ -354,7 +354,7 @@ msgstr "Dea a volta %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1926,10 +1926,10 @@ 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" diff --git a/po/he.po.in b/po/he.po.in index 199ae7044..ba1954926 100644 --- a/po/he.po.in +++ b/po/he.po.in @@ -355,7 +355,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/hi.po.in b/po/hi.po.in index 2e5fa87f3..7a7f7981e 100644 --- a/po/hi.po.in +++ b/po/hi.po.in @@ -352,7 +352,7 @@ msgstr "चारों ओर मोड़ %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/hr.po.in b/po/hr.po.in index 3f4a63f55..3cc37c313 100644 --- a/po/hr.po.in +++ b/po/hr.po.in @@ -357,7 +357,7 @@ msgstr "Okrenite se %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1929,10 +1929,10 @@ 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" diff --git a/po/hu.po.in b/po/hu.po.in index 6aa19c503..1b891c290 100644 --- a/po/hu.po.in +++ b/po/hu.po.in @@ -357,7 +357,7 @@ msgstr "Fordujon meg %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1941,10 +1941,10 @@ msgstr "Útvonalpontok" msgid "Enter Coordinates" msgstr "Koordináták megadása" -#. +#. #. 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" diff --git a/po/id.po.in b/po/id.po.in index 45c74dc0d..cb8395731 100644 --- a/po/id.po.in +++ b/po/id.po.in @@ -354,7 +354,7 @@ msgstr "Balik arah %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1926,10 +1926,10 @@ 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" diff --git a/po/it.po.in b/po/it.po.in index b3073d7b1..562981647 100644 --- a/po/it.po.in +++ b/po/it.po.in @@ -367,7 +367,7 @@ msgstr "Invertire il senso di marcia %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "seguire" @@ -1943,10 +1943,10 @@ msgstr "Waypoints" msgid "Enter Coordinates" msgstr "Inserire Coordinate" -#. +#. #. 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" diff --git a/po/ja.po.in b/po/ja.po.in index 5761862d0..65d7ecb32 100644 --- a/po/ja.po.in +++ b/po/ja.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/jv.po.in b/po/jv.po.in index 56ae5c2a2..4b98e6cdf 100644 --- a/po/jv.po.in +++ b/po/jv.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/kk.po.in b/po/kk.po.in index 65f250701..ab5701b42 100644 --- a/po/kk.po.in +++ b/po/kk.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/kn.po.in b/po/kn.po.in index 6a2adc742..d063f7648 100644 --- a/po/kn.po.in +++ b/po/kn.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/ko.po.in b/po/ko.po.in index f65870083..03703ef16 100644 --- a/po/ko.po.in +++ b/po/ko.po.in @@ -347,7 +347,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1919,10 +1919,10 @@ 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" diff --git a/po/ku.po.in b/po/ku.po.in index 8073de5d7..473aa44b0 100644 --- a/po/ku.po.in +++ b/po/ku.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/lb.po.in b/po/lb.po.in index 143cc2543..78a6c5437 100644 --- a/po/lb.po.in +++ b/po/lb.po.in @@ -350,7 +350,7 @@ msgstr "Dreinen %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/lt.po.in b/po/lt.po.in index 626cb5bd4..207694d35 100644 --- a/po/lt.po.in +++ b/po/lt.po.in @@ -361,7 +361,7 @@ msgstr "Apsisukite %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "laikykitės kelio" @@ -1935,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "Įvėskite koordinates" -#. +#. #. 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" diff --git a/po/lv.po.in b/po/lv.po.in index d947bf182..3cbcc23b6 100644 --- a/po/lv.po.in +++ b/po/lv.po.in @@ -359,7 +359,7 @@ msgstr "Apgriezieties %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "turpiniet" @@ -1933,10 +1933,10 @@ msgstr "Pieturpunkti" msgid "Enter Coordinates" msgstr "Ievadiet Koordinātes" -#. +#. #. 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" diff --git a/po/mk.po.in b/po/mk.po.in index 4e5f164f1..d5e9ed1a4 100644 --- a/po/mk.po.in +++ b/po/mk.po.in @@ -355,7 +355,7 @@ msgstr "Свртете %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1930,10 +1930,10 @@ 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" diff --git a/po/ml.po.in b/po/ml.po.in index 27320e951..1e70bc149 100644 --- a/po/ml.po.in +++ b/po/ml.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1925,10 +1925,10 @@ 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" diff --git a/po/mn.po.in b/po/mn.po.in index 8fa8def8e..e95f1d2fd 100644 --- a/po/mn.po.in +++ b/po/mn.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/mr.po.in b/po/mr.po.in index 9fca9a747..a2dcc1df2 100644 --- a/po/mr.po.in +++ b/po/mr.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/nb.po.in b/po/nb.po.in index 7537c06b0..f3d660bbd 100644 --- a/po/nb.po.in +++ b/po/nb.po.in @@ -359,7 +359,7 @@ msgstr "Snu %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "følg" @@ -1931,10 +1931,10 @@ 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" diff --git a/po/nds.po.in b/po/nds.po.in index 4d6ea6993..c45dc2152 100644 --- a/po/nds.po.in +++ b/po/nds.po.in @@ -359,7 +359,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1931,10 +1931,10 @@ 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" diff --git a/po/nl.po.in b/po/nl.po.in index 9a4470d27..353b12e44 100644 --- a/po/nl.po.in +++ b/po/nl.po.in @@ -368,7 +368,7 @@ msgstr "%1$s rechtsomkeren" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "volg" @@ -2055,10 +2055,10 @@ msgstr "route punten" msgid "Enter Coordinates" msgstr "voer coordinaten in" -#. +#. #. 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" diff --git a/po/nn.po.in b/po/nn.po.in index 8c0a2514d..a069fb307 100644 --- a/po/nn.po.in +++ b/po/nn.po.in @@ -353,7 +353,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1925,10 +1925,10 @@ 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" diff --git a/po/pl.po.in b/po/pl.po.in index e6d950141..b88aa8842 100644 --- a/po/pl.po.in +++ b/po/pl.po.in @@ -369,7 +369,7 @@ msgstr "Zawróc %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1943,10 +1943,10 @@ msgstr "Punkty trasy" msgid "Enter Coordinates" msgstr "Wprowadź współrzędne" -#. +#. #. 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" diff --git a/po/pms.po.in b/po/pms.po.in index 971d5381b..967002ea9 100644 --- a/po/pms.po.in +++ b/po/pms.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/pt.po.in b/po/pt.po.in index 58f2a7302..99ea00ef8 100644 --- a/po/pt.po.in +++ b/po/pt.po.in @@ -364,7 +364,7 @@ msgstr "Dê meia-volta à direita %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "siga" @@ -1948,10 +1948,10 @@ msgstr "Pontos" msgid "Enter Coordinates" msgstr "Introduzir coordenadas" -#. +#. #. 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" diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in index 7248d436d..348bd0725 100644 --- a/po/pt_BR.po.in +++ b/po/pt_BR.po.in @@ -367,7 +367,7 @@ msgstr "Faça o retorno a direita %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "siga por" @@ -1952,10 +1952,10 @@ msgstr "Pontos da via" msgid "Enter Coordinates" msgstr "Digite as coordenadas" -#. +#. #. 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" diff --git a/po/ro.po.in b/po/ro.po.in index af94e5c83..ad18c4e34 100644 --- a/po/ro.po.in +++ b/po/ro.po.in @@ -363,7 +363,7 @@ msgstr "Întoarceţi %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1935,10 +1935,10 @@ 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" diff --git a/po/ru.po.in b/po/ru.po.in index 2e140b8f2..224da3412 100644 --- a/po/ru.po.in +++ b/po/ru.po.in @@ -377,7 +377,7 @@ msgstr "%1$s разворот направо" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "следуйте" @@ -1951,10 +1951,10 @@ 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" diff --git a/po/sc.po.in b/po/sc.po.in index 12a7f7477..c3362c962 100644 --- a/po/sc.po.in +++ b/po/sc.po.in @@ -351,7 +351,7 @@ msgstr "Torra in daesecusu %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "sichi" @@ -1923,10 +1923,10 @@ 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" diff --git a/po/si.po.in b/po/si.po.in index 32a6d1db1..d7bf212ac 100644 --- a/po/si.po.in +++ b/po/si.po.in @@ -350,7 +350,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1922,10 +1922,10 @@ 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" diff --git a/po/sk.po.in b/po/sk.po.in index e8a6be27d..4d0eb0ce1 100644 --- a/po/sk.po.in +++ b/po/sk.po.in @@ -362,7 +362,7 @@ msgstr "Otočte sa %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1937,10 +1937,10 @@ msgstr "Body trasy" msgid "Enter Coordinates" msgstr "Vložte súradnice" -#. +#. #. 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" diff --git a/po/sl.po.in b/po/sl.po.in index 803222366..bf1d34e09 100644 --- a/po/sl.po.in +++ b/po/sl.po.in @@ -359,7 +359,7 @@ msgstr "Obrnite čim %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1931,10 +1931,10 @@ 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" diff --git a/po/sq.po.in b/po/sq.po.in index 1cb93ac25..a2ef1b237 100644 --- a/po/sq.po.in +++ b/po/sq.po.in @@ -349,7 +349,7 @@ msgstr "Bëni një U-kthim %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "ndiqni" @@ -1921,10 +1921,10 @@ 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" diff --git a/po/sr.po.in b/po/sr.po.in index 61b168660..fe3ef64dc 100644 --- a/po/sr.po.in +++ b/po/sr.po.in @@ -361,7 +361,7 @@ msgstr "Променити смер %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -2035,10 +2035,10 @@ 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" diff --git a/po/sv.po.in b/po/sv.po.in index 752757fc6..0a294fb63 100644 --- a/po/sv.po.in +++ b/po/sv.po.in @@ -358,7 +358,7 @@ msgstr "Vänd %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "följ" @@ -1930,10 +1930,10 @@ 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" diff --git a/po/sw.po.in b/po/sw.po.in index 207f2a08f..b8e85634a 100644 --- a/po/sw.po.in +++ b/po/sw.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/ta.po.in b/po/ta.po.in index ff176435f..5e5f2112c 100644 --- a/po/ta.po.in +++ b/po/ta.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/te.po.in b/po/te.po.in index 240168138..62a274a0e 100644 --- a/po/te.po.in +++ b/po/te.po.in @@ -352,7 +352,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1924,10 +1924,10 @@ 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" diff --git a/po/th.po.in b/po/th.po.in index daf3a8093..407a360e4 100644 --- a/po/th.po.in +++ b/po/th.po.in @@ -349,7 +349,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1921,10 +1921,10 @@ 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" diff --git a/po/tr.po.in b/po/tr.po.in index 19ad72810..c59d0cf25 100644 --- a/po/tr.po.in +++ b/po/tr.po.in @@ -362,7 +362,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "takip edin" @@ -1944,10 +1944,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "Koordinat Gir" -#. +#. #. 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" diff --git a/po/uk.po.in b/po/uk.po.in index 10422f902..83fe79e50 100644 --- a/po/uk.po.in +++ b/po/uk.po.in @@ -359,7 +359,7 @@ msgstr "То розверніться %1$s" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1931,10 +1931,10 @@ 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" diff --git a/po/ur.po.in b/po/ur.po.in index cd9a0e884..78532dd3b 100644 --- a/po/ur.po.in +++ b/po/ur.po.in @@ -373,7 +373,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1926,10 +1926,10 @@ 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" diff --git a/po/vi.po.in b/po/vi.po.in index 91f5dbcf0..085f8de54 100644 --- a/po/vi.po.in +++ b/po/vi.po.in @@ -351,7 +351,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1923,10 +1923,10 @@ 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" diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in index 27186f960..3445bb425 100644 --- a/po/zh_CN.po.in +++ b/po/zh_CN.po.in @@ -355,7 +355,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1927,10 +1927,10 @@ 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" diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in index 9fe382c65..3c17dc8f6 100644 --- a/po/zh_HK.po.in +++ b/po/zh_HK.po.in @@ -353,7 +353,7 @@ msgstr "" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1925,10 +1925,10 @@ 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" diff --git a/po/zh_TW.po.in b/po/zh_TW.po.in index 6511c9154..426155840 100644 --- a/po/zh_TW.po.in +++ b/po/zh_TW.po.in @@ -345,7 +345,7 @@ msgstr "%1$s 右迴轉" #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "沿著" @@ -1924,10 +1924,10 @@ 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" diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh index f84d247af..90ba8a9a0 100644 --- a/scripts/build_linux.sh +++ b/scripts/build_linux.sh @@ -18,11 +18,11 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/ export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH - + cmake ${cmake_opts} ../ cov-build --dir cov-int make -j $(nproc --all) tar czvf navit.tgz cov-int - + curl --form token=$COVERITY_TOKEN \ --form email=$COVERITY_EMAIL \ --form file=@navit.tgz \ diff --git a/scripts/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh index 51a15f815..a4f19fda3 100644 --- a/scripts/build_tomtom_plugin.sh +++ b/scripts/build_tomtom_plugin.sh @@ -11,7 +11,7 @@ cp Toolchain/$ARCH.cmake /tmp # toolchain export TOMTOM_SDK_DIR=/opt/tomtom-sdk -mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk +mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include" @@ -27,7 +27,7 @@ export STRIP=$ARCH-strip export OBJCOPY=$ARCH-objcopy export LN_S="ln -s" export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig -JOBS=$(nproc --all) +JOBS=$(nproc --all) echo "Jobs" echo $JOBS @@ -99,7 +99,7 @@ cp $PREFIX/usr/bin/testvidinfo $OUT_PATH/navit/sdl # navit executable and wrapper cp $PREFIX/bin/navit $OUT_PATH/navit/bin -cp ../contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper +cp ../contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper # fonts cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh index 6e0514e1c..af6620477 100644 --- a/scripts/build_wince.sh +++ b/scripts/build_wince.sh @@ -2,7 +2,7 @@ set -e mkdir wince && cd wince -cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=y +cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=y make mkdir output diff --git a/scripts/docker/tomtom/Dockerfile b/scripts/docker/tomtom/Dockerfile index adddbdbf8..01942d1d2 100644 --- a/scripts/docker/tomtom/Dockerfile +++ b/scripts/docker/tomtom/Dockerfile @@ -53,7 +53,7 @@ RUN wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5. && tar xzf freetype-2.5.0.tar.gz && cd freetype-2.5.0 \ && ./configure --prefix=$PREFIX --host=$ARCH && make && make install \ && rm -rf /tmp/freetype-2.5.0 /tmp/freetype-2.5.0.tar.gz - + # freetype-config --cflags # glib diff --git a/scripts/generate_contributors.sh b/scripts/generate_contributors.sh index b957d486d..cec9c4511 100644 --- a/scripts/generate_contributors.sh +++ b/scripts/generate_contributors.sh @@ -21,12 +21,12 @@ git log --encoding=utf-8 --full-history --date=short --use-mailmap "--format=for IFS=';'; arrLine=($line); unset IFS; author=${arrLine[1]} commitDate=`date +%s --date="${arrLine[0]}"` - + # Exclude circleci if [[ $author =~ [Cc]ircle\s*[Cc][Ii] ]]; then continue fi - + # indicates that the commits are now older than 2 years so we print the # sorted list of active contributors and reset the authors array if [ "$retiredTitleWritten" = false ]; then @@ -38,7 +38,7 @@ git log --encoding=utf-8 --full-history --date=short --use-mailmap "--format=for retiredTitleWritten=true fi fi - + # using the map as an easy way to check if the author has already been listed if [ -z "${CONTRIBUTORS[${author}]}" ]; then CONTRIBUTORS[${author}]=${arrLine[0]} diff --git a/scripts/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh index 98d6de3cd..4e8415daf 100644 --- a/scripts/setup_tomtom_requirements.sh +++ b/scripts/setup_tomtom_requirements.sh @@ -17,7 +17,7 @@ cp Toolchain/$ARCH.cmake /tmp # toolchain export TOMTOM_SDK_DIR=/opt/tomtom-sdk -mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk +mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include" @@ -33,7 +33,7 @@ export STRIP=$ARCH-strip export OBJCOPY=$ARCH-objcopy export LN_S="ln -s" export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig -JOBS=$(nproc --all) +JOBS=$(nproc --all) echo "Jobs" echo $JOBS @@ -41,12 +41,12 @@ echo $JOBS mkdir -p ~/tomtom_assets if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ] - then + then wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets fi if ! test -f "~/tomtom_assets/libpng-1.6.29.tar.gz" -then +then wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P ~/tomtom_assets fi @@ -77,7 +77,7 @@ make install # libpng cd /tmp/ tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz -cd libpng-1.6.29/ +cd libpng-1.6.29/ ./configure --prefix=$PREFIX --host=$ARCH make -j$JOBS make install diff --git a/scripts/update_download_center.sh b/scripts/update_download_center.sh index 34d4a95de..9b59b457e 100644 --- a/scripts/update_download_center.sh +++ b/scripts/update_download_center.sh @@ -56,7 +56,7 @@ trap cleanup EXIT ############################################# echo "Init Git Repo" -export GIT_TERMINAL_PROMPT=0 +export GIT_TERMINAL_PROMPT=0 cd $TMP_DIR mkdir -p ~/.ssh/ ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts @@ -83,7 +83,7 @@ git config --global push.default simple git config user.name "Circle CI" git config user.email "circleci@navit-project.org" git add ${BUILD_NUM}.json -git commit -m "add:artifacts:Add artifacts for build #${BUILD_NUM} with SHA1:${CIRCLE_SHA1}" +git commit -m "add:artifacts:Add artifacts for build #${BUILD_NUM} with SHA1:${CIRCLE_SHA1}" git push RC=$? if [ $RC -ne 0 ]; then |