summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjkoan <jkoan@users.noreply.github.com>2020-01-15 20:58:49 +0100
committerGitHub <noreply@github.com>2020-01-15 20:58:49 +0100
commit7e2d98408e353499a4103233646eb68fe2885d7c (patch)
tree187b81557e15173f6cc4fa0adcf12f141c0c776a
parentb7aa28cab20901f39d1ea636d770cd60b0696c01 (diff)
parent7feda7533796bb96e88dddba0ff7f5301b8e82b7 (diff)
downloadnavit-7e2d98408e353499a4103233646eb68fe2885d7c.tar.gz
Merge branch 'trunk' into android_hole
-rw-r--r--.circleci/config.yml40
-rw-r--r--.gitignore1
-rw-r--r--checkstyle.xml12
-rw-r--r--docs/development/programming_guidelines.rst151
-rw-r--r--logo_catalog.svg344
-rw-r--r--navit/android/build.gradle2
-rw-r--r--navit/android/res/drawable-hdpi/icon.pngbin5949 -> 4562 bytes
-rw-r--r--navit/android/res/drawable-ldpi/icon.pngbin2208 -> 2092 bytes
-rw-r--r--navit/android/res/drawable-mdpi/icon.pngbin3353 -> 2868 bytes
-rw-r--r--navit/android/res/drawable-xhdpi/icon.pngbin8858 -> 6201 bytes
-rw-r--r--navit/android/res/drawable-xxhdpi/icon.pngbin15235 -> 9396 bytes
-rw-r--r--navit/binding/dbus/binding_dbus.c13
-rw-r--r--navit/font/freetype/font_freetype.c20
-rw-r--r--navit/geom.c8
-rw-r--r--navit/geom.h25
-rw-r--r--navit/graphics/opengl/graphics_opengl.c23
-rw-r--r--navit/gui/gtk/destination.c11
-rw-r--r--navit/gui/gtk/gui_gtk_statusbar.c23
-rw-r--r--navit/gui/internal/gui_internal.c6
-rw-r--r--navit/gui/internal/gui_internal_command.c205
-rw-r--r--navit/gui/internal/gui_internal_command.h2
-rw-r--r--navit/gui/internal/gui_internal_html.c1
-rw-r--r--navit/gui/internal/gui_internal_keyboard.c2
-rw-r--r--navit/gui/internal/gui_internal_search.c3
-rw-r--r--navit/gui/internal/gui_internal_widget.c8
-rw-r--r--navit/gui/qml/navitProxy.h270
-rw-r--r--navit/map/binfile/binfile.c2
-rw-r--r--navit/map/filter/filter.c6
-rw-r--r--navit/map/shapefile/shapefile.c6
-rw-r--r--navit/map/textfile/textfile.c5
-rw-r--r--navit/maptool/osm.c9
-rw-r--r--navit/osd/core/osd_core.c29
-rw-r--r--navit/roadprofile.c2
-rw-r--r--navit/roadprofile.h10
-rw-r--r--navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp7
-rw-r--r--navit/traffic/traff_android/traffic_traff_android.c3
-rw-r--r--navit/vehicle.c2
-rw-r--r--navit/vehicle.h8
-rw-r--r--navit/vehicleprofile.c7
-rw-r--r--navit/vehicleprofile.h53
-rw-r--r--navit/xslt/tomtom.xslt8
-rw-r--r--po/sv.po.in1269
-rw-r--r--scripts/build_tomtom_minimal.sh6
-rw-r--r--scripts/build_tomtom_plugin.sh5
-rwxr-xr-xscripts/check_need_build.sh35
-rw-r--r--scripts/setup_sanitycheck_requirements.sh2
-rw-r--r--scripts/setup_tomtom_requirements.sh2
47 files changed, 1565 insertions, 1081 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d1a085d23..d936b010b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,19 +4,27 @@ defaults: &defaults
- image: ubuntu:18.04
jobs:
sanity_check:
- <<: *defaults
+ docker:
+ - image: navit/sanity_check:latest
steps:
- checkout
- run:
- name: Setup requirements
- command: bash scripts/setup_sanitycheck_requirements.sh
- - run:
name: run sanity check script
command: bash scripts/ci_sanity_checks.sh
+ - run:
+ name: Run CheckStyle Test
+ command: ./gradlew checkstyleMain
+ - store_artifacts:
+ name: Store checkstyle report
+ path: navit/android/checkstyle
+ destination: reports
build_linux:
<<: *defaults
steps:
- checkout
+ - run: |
+ apt-get update && apt-get install -y git
+ if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: Id
command: cat /etc/*release
@@ -38,6 +46,7 @@ jobs:
<<: *defaults
steps:
- checkout
+ - run: if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: Install doxygen and other essentials
command: apt-get update && apt-get -y install doxygen ca-certificates git rsync
@@ -53,6 +62,7 @@ jobs:
machine: true
steps:
- checkout
+ - run: if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: install docker
command: circleci-install docker
@@ -74,6 +84,7 @@ jobs:
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
steps:
- checkout
+ - run: if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: Id
command: cat /etc/*release
@@ -97,9 +108,6 @@ jobs:
mkdir /home/circleci/code/test-results
./gradlew lint test
- run:
- name: Run CheckStyle Test
- command: ./gradlew checkstyleMain
- - run:
name: Run Javadoc
command: ./gradlew generateDebugJavadoc
- store_artifacts:
@@ -118,10 +126,6 @@ jobs:
name: Store Lint reports
path: navit/android/build/reports
destination: reports
- - store_artifacts:
- name: Store checkstyle report
- path: /home/circleci/code/navit/android/checkstyle
- destination: reports
- store_test_results:
path: test-results
- run:
@@ -133,6 +137,9 @@ jobs:
- image: ubuntu:14.04
steps:
- checkout
+ - run: |
+ apt-get update && apt-get install -y git
+ if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: Prepare the Windows build environment
command: |
@@ -156,6 +163,9 @@ jobs:
- image: navit/dockerfiles:wince
steps:
- checkout
+ - run: |
+ apt-get update && apt-get install -y git-core
+ if scripts/check_need_build.sh; then circleci step halt; fi
- run:
name: Prepare the WinCE build environment
command: |
@@ -175,10 +185,12 @@ jobs:
- image: navit/tomtom-ng
steps:
- checkout
+ - run: if scripts/check_need_build.sh; then circleci step halt; fi
- run:
- name: Setup common requirements
+ name: Prepare the tomtom build environment
command: |
bash scripts/setup_common_requirements.sh
+ apt-get install -y xsltproc
- run:
name: Build for Tomtom (minimal)
command: |
@@ -195,10 +207,12 @@ jobs:
- image: navit/tomtom-ng
steps:
- checkout
+ - run: if scripts/check_need_build.sh; then circleci step halt; fi
- run:
- name: Setup common requirements
+ name: Prepare the tomtom build environment
command: |
bash scripts/setup_common_requirements.sh
+ apt-get install -y xsltproc
- run:
name: Build for Tomtom (plugin)
command: |
diff --git a/.gitignore b/.gitignore
index f24de854c..698c9f5e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/CMakeLists.txt.user*
/navit/android/cmake_plugin_settings.txt
/nbproject/
+navit/android/checkstyle
diff --git a/checkstyle.xml b/checkstyle.xml
index 6c232edce..8a19f6944 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -31,6 +31,12 @@
<property name="eachLine" value="true"/>
</module>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="severity" value="error"/>
+ </module>
+
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
@@ -45,11 +51,6 @@
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
- <module name="LineLength">
- <property name="max" value="120"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
- <property name="severity" value="error"/>
- </module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
@@ -258,7 +259,6 @@
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
- <property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
diff --git a/docs/development/programming_guidelines.rst b/docs/development/programming_guidelines.rst
index 3aecabcf7..66dc257a4 100644
--- a/docs/development/programming_guidelines.rst
+++ b/docs/development/programming_guidelines.rst
@@ -5,6 +5,26 @@ Programming guidelines
NAVIT is a team-project, thus a lot of coders are working on it's development and code base.
To get a unified coding style and make it easier for everybody to work with parts, that someone else wrote, we tried to specify the formatting of our source and how we deal with third party modules as following.
+Enforced guidelines via CircleCI
+================================
+
+The 1st step of the checks enforced after a PR is created or updated is what we call "sanity checks".
+Those enforce the coding style for our C and Java files. During this phase we have several steps:
+ * verification that the modified files don't contain trailing spaces.
+ You can use `sed 's/\s*$//' -i "$f"` if you want to clean your files before pushing your PR.
+ * verification that the style of our C and C++ code is respected using `astyle`
+ (to the exception of the following folders: `navit/support/`, `navit/fib-1.1/`, `navit/traffic/permanentrestrictions/`).
+ You can use the following command on the files you are modifying (replacing `$f` by your file name):
+ `astyle --indent=spaces=4 --style=attach -n --max-code-length=120 -xf -xh "${f}"`
+ * check for compliance with the DTD using xmllint on the modified files. You can check this locally by using:
+ `xmllint --noout --dtdvalid navit/navit.dtd "$f"`
+ * verification that the style of our Java code follows our standards using `./gradlew checkstyleMain`
+
+.. note::
+
+ When you submit a PR make sure your branch is up-to-date with the trunk branch to avoid having checks on files you did
+ not modified.
+
Coding Style
============
@@ -18,14 +38,14 @@ To help us keeping a coherent indentation, we use astyle on C, C++ and java file
.. code-block:: C
- astyle --indent=spaces=4 --style=attach -n --max-code-length=120 -xf -xh my_file.c
+ astyle --indent=spaces=4 --style=attach -n --max-code-length=120 -xf -xh my_file.c
.. note::
- Because of the bug: [https://sourceforge.net/p/astyle/bugs/230/](https://sourceforge.net/p/astyle/bugs/230/) on astyle,
- we cannot rely on astyle to handle properly the line length of 120 characters that we choose.
- It would be recommended to set that line length in the editor you are using.
+ Because of the bug: [https://sourceforge.net/p/astyle/bugs/230/](https://sourceforge.net/p/astyle/bugs/230/) on astyle,
+ we cannot rely on astyle to handle properly the line length of 120 characters that we choose.
+ It would be recommended to set that line length in the editor you are using.
Character encoding and line breaks
----------------------------------
@@ -42,20 +62,20 @@ Instead of
.. code-block:: C
- {
- do_something();
- int a=do_something_else();
- }
+ {
+ do_something();
+ int a=do_something_else();
+ }
use
.. code-block:: C
- {
- int a;
- do_something();
- a=do_something_else();
- }
+ {
+ int a;
+ do_something();
+ a=do_something_else();
+ }
* No dynamic arrays
@@ -63,17 +83,17 @@ Instead of
.. code-block:: C
- void myfunc(int count) {
- struct mystruct x[count]
- }
+ void myfunc(int count) {
+ struct mystruct x[count]
+ }
use
.. code-block:: C
- void myfunc(int count) {
- struct mystruct *x=g_alloca(count*sizeof(struct mystruct));
- }
+ void myfunc(int count) {
+ struct mystruct *x=g_alloca(count*sizeof(struct mystruct));
+ }
* No empty initializers
@@ -81,19 +101,19 @@ Instead of
.. code-block:: C
- struct mystruct m={};
+ struct mystruct m={};
use
.. code-block:: C
- struct mystruct m={0,};
+ struct mystruct m={0,};
* Use `/*` and `*/` for comments instead of `//`
.. note::
- The restriction to C95 exists mainly to help the [[WinCE]] port, which uses a compiler without full support for C99. Once all platforms supported by Navit use a compiler capable of C99, this decision may be reconsidered.
+ The restriction to C95 exists mainly to help the [[WinCE]] port, which uses a compiler without full support for C99. Once all platforms supported by Navit use a compiler capable of C99, this decision may be reconsidered.
Use of libraries
@@ -121,18 +141,18 @@ Example :
.. code-block:: C
- /**
- * @brief Change the current zoom level, zooming closer to the ground.
- *
- * This sentence starts the "detailed" description (because this is a new
- * paragraph).
- *
- * @param navit The navit instance
- * @param factor The zoom factor, usually 2
- * @param p The invariant point (if set to NULL, default to center)
- * @returns nothing
- */
- void navit_zoom_in(struct navit *this_, int factor, struct point *p)
+ /**
+ * @brief Change the current zoom level, zooming closer to the ground.
+ *
+ * This sentence starts the "detailed" description (because this is a new
+ * paragraph).
+ *
+ * @param navit The navit instance
+ * @param factor The zoom factor, usually 2
+ * @param p The invariant point (if set to NULL, default to center)
+ * @returns nothing
+ */
+ void navit_zoom_in(struct navit *this_, int factor, struct point *p)
Templates
`````````
@@ -144,18 +164,18 @@ Files
.. code-block:: C
- /** @file can.cpp
- * @brief CAN-Camera Framework :: CAN container class and high level functions
- *
- * Some documentation regarding this file.
- *
- * @Author Stefan Klumpp <sk@....>
- * @date 2008
- */
- <include "can.h">
- .
- .
- .
+ /** @file can.cpp
+ * @brief CAN-Camera Framework :: CAN container class and high level functions
+ *
+ * Some documentation regarding this file.
+ *
+ * @Author Stefan Klumpp <sk@....>
+ * @date 2008
+ */
+ <include "can.h">
+ .
+ .
+ .
Classes/Structs/Functions/Methods
'''''''''''''''''''''''''''''''''
@@ -163,18 +183,31 @@ Classes/Structs/Functions/Methods
.. code-block:: C
- /**
- * @brief A short description of this function
- *
- * A lot more of documentation regarding this function.
- * @param raw_data Some string to pass to the function
- * @return Nothing
- */
-
- void CanData::processData(string &raw_data) {
- .
- .
- .
- }
+ /**
+ * @brief A short description of this function
+ *
+ * A lot more of documentation regarding this function.
+ * @param raw_data Some string to pass to the function
+ * @return Nothing
+ */
+
+ void CanData::processData(string &raw_data) {
+ .
+ .
+ .
+ }
+
+
+Java standards
+--------------
+
+For the Java code we follow the Google coding conventions from Google Java Style that can be found at `<https://google.github.io/styleguide/javaguide.html>`_.
+
+This style is enforced by using Checkstyle. Its definition file can be found at the root of the repository:
+`checkstyle.xml <https://github.com/navit-gps/navit/blob/trunk/checkstyle.xml>`_
+
+.. note::
+
+ Checkstyle 8.25 minimum is required if you want to run checkstyle without using gradle.
Please add yourself to the list of authors, if you make a significant change.
diff --git a/logo_catalog.svg b/logo_catalog.svg
index cb1bcf95a..de1db37e0 100644
--- a/logo_catalog.svg
+++ b/logo_catalog.svg
@@ -10,13 +10,13 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="70"
- height="44.677155"
- viewBox="0 0 18.520833 11.820831"
+ width="74.666664"
+ height="71.845627"
+ viewBox="0 0 17.82 17.821084"
version="1.1"
id="svg870"
- inkscape:version="0.91 r13725"
- sodipodi:docname="navit_logo_full_vect_no_font.svg"
+ inkscape:version="0.92.1 r15371"
+ sodipodi:docname="logo_catalog.svg"
inkscape:export-filename="C:\Daten\Navit\Logo\example3.png "
inkscape:export-xdpi="960"
inkscape:export-ydpi="960">
@@ -87,17 +87,17 @@
</linearGradient>
<inkscape:perspective
id="perspective10"
- inkscape:persp3d-origin="372.04724 : 350.7874 : 1"
- inkscape:vp_z="744.09448 : 526.1811 : 1"
+ inkscape:persp3d-origin="357.96889 : 350.78739 : 1"
+ inkscape:vp_z="715.93779 : 526.18111 : 1"
inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="15.556349 : 133.02972 : 1"
+ inkscape:vp_x="14.967694 : 133.02972 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective10-9"
- inkscape:persp3d-origin="372.04724 : 350.7874 : 1"
- inkscape:vp_z="744.09448 : 526.1811 : 1"
+ inkscape:persp3d-origin="357.96889 : 350.78739 : 1"
+ inkscape:vp_z="715.93779 : 526.18111 : 1"
inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="15.556349 : 133.02972 : 1"
+ inkscape:vp_x="14.967694 : 133.02972 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
gradientUnits="userSpaceOnUse"
@@ -239,7 +239,7 @@
<linearGradient
x1="7.6364002"
y1="87.731003"
- gradientTransform="matrix(0.99050725,0.13746049,-0.13746049,0.99050725,14.944999,0.47323873)"
+ gradientTransform="rotate(7.9009223,4.046115,108.44273)"
x2="58.390999"
gradientUnits="userSpaceOnUse"
y2="38.450001"
@@ -327,7 +327,8 @@
x1="12.7"
y1="290.99969"
x2="18.520834"
- y2="285.17914" />
+ y2="285.17914"
+ gradientTransform="translate(0,-6.0002555)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3728"
@@ -336,7 +337,28 @@
y1="290.99969"
x2="18.520834"
y2="285.17914"
- gradientUnits="userSpaceOnUse" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-6.0002555)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3728"
+ id="linearGradient5108-62"
+ gradientUnits="userSpaceOnUse"
+ x1="12.7"
+ y1="290.99969"
+ x2="18.520832"
+ y2="285.17914"
+ gradientTransform="translate(0,-4.4354145e-6)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3728"
+ id="linearGradient5120-2"
+ x1="12.7"
+ y1="290.99969"
+ x2="18.520834"
+ y2="285.17914"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-4.4354145e-6)" />
</defs>
<sodipodi:namedview
id="base"
@@ -346,16 +368,16 @@
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="9.8169452"
- inkscape:cx="24.108432"
- inkscape:cy="18.988232"
+ inkscape:cx="11.799262"
+ inkscape:cy="23.694936"
inkscape:document-units="mm"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="g880"
showgrid="false"
units="px"
inkscape:window-width="1920"
- inkscape:window-height="1028"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:window-height="926"
+ inkscape:window-x="0"
+ inkscape:window-y="31"
inkscape:window-maximized="1"
showborder="false"
showguides="true"
@@ -381,7 +403,7 @@
id="layer7"
inkscape:label="app store"
style="display:none"
- transform="translate(-1.0093054e-6,6.0000232)">
+ transform="translate(-1.0093054e-6,12.000277)">
<image
y="-11.819534"
x="-3.6395657"
@@ -398,7 +420,7 @@
id="layer8"
inkscape:label="app store 1"
style="display:none"
- transform="translate(-1.0093054e-6,6.0000232)">
+ transform="translate(-1.0093054e-6,12.000277)">
<image
y="-4.8220072"
x="-2.8631649"
@@ -429,11 +451,11 @@
id="text1359-0-6-2"
y="0.25854397"
x="4.3547387"
- style="font-style:normal;font-weight:normal;font-size:1.76408911px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
xml:space="preserve"><tspan
dy="3.8687227"
dx="1.3912151"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
y="0.25854397"
x="4.3547387"
id="tspan1357-4-2-4"
@@ -457,9 +479,9 @@
id="text1359-05"
y="4.1740093"
x="1.6200342"
- style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.26458332"
xml:space="preserve"><tspan
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#4c4c4c;fill-opacity:1;stroke-width:0.26458332"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#4c4c4c;fill-opacity:1;stroke-width:0.26458332"
y="4.1740093"
x="1.6200342"
id="tspan1357-7"
@@ -468,7 +490,7 @@
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
inkscape:connector-curvature="0"
id="path1363-3"
- d="m 2.9575481,5.02422 -2.41e-4,-0.62413 0.070552,-0.005 C 3.3799157,4.36919 3.7092195,4.21835 3.9601415,3.96815 4.2043569,3.72465 4.3518677,3.41659 4.3882054,3.07419 c 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 0.6160776,0 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 C 4.7596017,3.53663 4.7178887,3.65047 4.6577572,3.77266 4.6133182,3.86296 4.5848732,3.91207 4.5256785,4.00067 4.2608924,4.39699 3.8681493,4.67469 3.3968118,4.79887 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z M 2.7227834,5.2669 C 2.6375794,5.07016 2.5671347,4.90725 2.566239,4.90488 c -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z M 2.8282123,4.85572 C 2.7189471,4.85172 2.567831,4.82932 2.4516807,4.80072 2.1386846,4.72352 1.8563965,4.57191 1.6090613,4.34807 1.4447115,4.19934 1.2910355,3.99599 1.1892409,3.79257 1.0637819,3.54185 1.0019076,3.30502 0.98407422,3.00727 l -0.00277,-0.0463 0.22997238,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 C 1.1522788,2.01381 1.4065994,1.63457 1.7588639,1.37125 1.9046085,1.26228 2.074838,1.16951 2.2472792,1.10503 c 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 C 2.5633728,1.46028 2.2883315,1.55747 2.0666059,1.7147 1.9650218,1.7867 1.8414484,1.90265 1.7680301,1.99477 1.6300624,2.16789 1.535546,2.35885 1.4836476,2.56933 1.4610276,2.66103 1.4425766,2.7898 1.4425766,2.85587 l 0,0.0275 -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z M 4.3945836,2.85759 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 C 4.3437516,2.34758 4.1218525,1.96796 3.7743086,1.71868 3.6241917,1.61101 3.4524679,1.53206 3.2707615,1.4872 3.1737605,1.4632 3.0559948,1.4462 2.9869776,1.4462 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 l -0.2302216,0 z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,0.94482 C 3.202197,0.92892 3.0549789,0.91272 2.9885071,0.91262 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
+ d="m 2.9575481,5.02422 -2.41e-4,-0.62413 0.070552,-0.005 C 3.3799157,4.36919 3.7092195,4.21835 3.9601415,3.96815 4.2043569,3.72465 4.3518677,3.41659 4.3882054,3.07419 c 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 h 0.6160776 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 C 4.7596017,3.53663 4.7178887,3.65047 4.6577572,3.77266 4.6133182,3.86296 4.5848732,3.91207 4.5256785,4.00067 4.2608924,4.39699 3.8681493,4.67469 3.3968118,4.79887 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z M 2.7227834,5.2669 C 2.6375794,5.07016 2.5671347,4.90725 2.566239,4.90488 c -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z M 2.8282123,4.85572 C 2.7189471,4.85172 2.567831,4.82932 2.4516807,4.80072 2.1386846,4.72352 1.8563965,4.57191 1.6090613,4.34807 1.4447115,4.19934 1.2910355,3.99599 1.1892409,3.79257 1.0637819,3.54185 1.0019076,3.30502 0.98407422,3.00727 l -0.00277,-0.0463 H 1.2112766 1.4412488 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 C 1.1522788,2.01381 1.4065994,1.63457 1.7588639,1.37125 1.9046085,1.26228 2.074838,1.16951 2.2472792,1.10503 c 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 C 2.5633728,1.46028 2.2883315,1.55747 2.0666059,1.7147 1.9650218,1.7867 1.8414484,1.90265 1.7680301,1.99477 1.6300624,2.16789 1.535546,2.35885 1.4836476,2.56933 1.4610276,2.66103 1.4425766,2.7898 1.4425766,2.85587 v 0.0275 L 0.81323102,2.88309 0.18388532,2.88282 Z M 4.3945836,2.85759 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 C 4.3437516,2.34758 4.1218525,1.96796 3.7743086,1.71868 3.6241917,1.61101 3.4524679,1.53206 3.2707615,1.4872 3.1737605,1.4632 3.0559948,1.4462 2.9869776,1.4462 H 2.9573086 V 1.21551 0.98481 l 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 H 4.3945838 Z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,0.94482 C 3.202197,0.92892 3.0549789,0.91272 2.9885071,0.91262 l -0.031198,-4e-5 V 0.5504 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
style="fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1" />
</g>
<rect
@@ -484,7 +506,7 @@
inkscape:export-ydpi="96" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:1.76408911px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.13230668"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.13230668"
x="61.702393"
y="0.37577355"
id="text1359-0-6-2-1"
@@ -494,7 +516,7 @@
id="tspan1357-4-2-4-7"
x="61.702393"
y="0.37577355"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.13230668"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.13230668"
dx="1.3912151"
dy="3.8687227">Navit</tspan></text>
<ellipse
@@ -514,7 +536,7 @@
r="1.3229166" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="58.96769"
y="4.2912388"
id="text1359-05-6"><tspan
@@ -522,10 +544,10 @@
id="tspan1357-7-4"
x="58.96769"
y="4.2912388"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#4c4c4c;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#4c4c4c;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
<path
style="fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 60.305202,5.1414496 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.681361,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 0,0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155992,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595285,-0.22881 -0.84262,-0.45265 -0.16435,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 0.229973,0 0.229972,0 0.0027,0.0539 c 0.0033,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.42680003 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867003 -0.05702,0.003 c -0.25946,0.0127 -0.534502,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 l 0,0.0275 -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503548,-0.23148 -0.097,-0.024 -0.214766,-0.041 -0.283783,-0.041 l -0.02967,0 0,-0.23069 0,-0.2307 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230221,0 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 0,-0.36218003 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549003 0.375743,0.76512003 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 60.305202,5.1414496 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.681361,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155992,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595285,-0.22881 -0.84262,-0.45265 -0.16435,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0033,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.42680003 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867003 -0.05702,0.003 c -0.25946,0.0127 -0.534502,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503548,-0.23148 -0.097,-0.024 -0.214766,-0.041 -0.283783,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 V 0.66762957 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549003 0.375743,0.76512003 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
id="path1363-3-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
@@ -542,7 +564,7 @@
inkscape:export-ydpi="96" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:1.76408911px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
x="16.560181"
y="32.438137"
id="text1359-0-6-2-5"
@@ -552,7 +574,7 @@
id="tspan1357-4-2-4-4"
x="16.560181"
y="32.438137"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055634px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
dx="1.3912151"
dy="3.8687227">Navit</tspan></text>
<ellipse
@@ -572,7 +594,7 @@
r="1.3229166" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="13.825477"
y="36.353603"
id="text1359-05-0"><tspan
@@ -580,10 +602,10 @@
id="tspan1357-7-8"
x="13.825477"
y="36.353603"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
<path
style="fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 15.16299,37.203813 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -10e-4,-0.003 0.0043,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 0,0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 0.229973,0 0.229972,0 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535002,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145745,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 l 0,0.0275 -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 l -0.02967,0 0,-0.23069 0,-0.2307 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230221,0 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 0,-0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 15.16299,37.203813 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -10e-4,-0.003 0.0043,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535002,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145745,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 v -0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
id="path1363-3-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
@@ -600,7 +622,7 @@
inkscape:export-ydpi="96" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:1.76408911px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.13230668"
x="45.30043"
y="36.965458"
id="text1359-0-6-2-4"
@@ -610,7 +632,7 @@
id="tspan1357-4-2-4-9"
x="45.30043"
y="36.965458"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.17499995px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.17499995px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#f5820b;fill-opacity:1;stroke-width:0.13230668"
dx="1.3912151"
dy="3.8687227">Navit</tspan></text>
<ellipse
@@ -630,7 +652,7 @@
r="1.3229166" />
<text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="49.211739"
y="36.537701"
id="text1359-05-5"><tspan
@@ -638,10 +660,10 @@
id="tspan1357-7-40"
x="49.211739"
y="36.537701"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.88055563px;line-height:1.25;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">N</tspan></text>
<path
style="fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 50.549251,37.387911 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.681361,-0.17674 0.932283,-0.42694 0.244215,-0.2435 0.391726,-0.55156 0.428063,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02436,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -10e-4,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 0,0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155992,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.16435,-0.14873 -0.318025,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 0.229973,0 0.229972,0 0.0027,0.0539 c 0.0033,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535002,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0049,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145745,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534502,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 l 0,0.0275 -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 l -0.02967,0 0,-0.23069 0,-0.2307 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234225,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103585,0.003 -0.230208,0.003 l -0.230221,0 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 0,-0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 50.549251,37.387911 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.681361,-0.17674 0.932283,-0.42694 0.244215,-0.2435 0.391726,-0.55156 0.428063,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02436,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -10e-4,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.92e-4,0 -0.07079,-0.161 -0.155992,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.16435,-0.14873 -0.318025,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0033,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535002,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0049,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145745,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534502,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234225,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103585,0.003 -0.230208,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 v -0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
id="path1363-3-55"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
@@ -650,7 +672,7 @@
inkscape:label="navit original"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-1.0093054e-6,-285.17914)"
+ transform="translate(-1.0093054e-6,-279.17889)"
style="display:none">
<g
id="layer4"
@@ -672,7 +694,7 @@
transform="matrix(0.26458333,0,0,0.26458333,7.7609289,290.63952)">
<g
id="g3256"
- transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,36.903806,-19.093668)"
+ transform="rotate(45,41.499999,35)"
style="opacity:0.5">
<path
transform="translate(67.5,7)"
@@ -751,27 +773,27 @@
style="fill:url(#linearGradient1092)"
inkscape:connector-curvature="0"
id="N"
- d="m 79,1.25 -75.25,75.5 33,0 L 90.5,23 l 28.25,53.75 36.5,0 75.5,-75.5 -33,0 -54.25,55.25 -28,-55.25 z" />
+ d="M 79,1.25 3.75,76.75 h 33 L 90.5,23 118.75,76.75 h 36.5 l 75.5,-75.5 h -33 L 143.5,56.5 115.5,1.25 Z" />
<path
style="fill:url(#linearGradient1094)"
inkscape:connector-curvature="0"
id="A"
- d="m 256.75,1.25 -75.5,75.5 33,0 20.656,-19.75 51.375,0 10.469,19.75 33,0 -36.5,-75.5 z M 268.5,22.5 278.88,43 248.5,43 Z" />
+ d="m 256.75,1.25 -75.5,75.5 h 33 L 234.906,57 h 51.375 l 10.469,19.75 h 33 L 293.25,1.25 Z M 268.5,22.5 278.88,43 H 248.5 Z" />
<path
style="fill:url(#linearGradient1096)"
inkscape:connector-curvature="0"
id="V"
- d="m 318.25,1.25 38,75.5 36.5,0 75,-75.5 -33,0 L 378.5,56.5 351.25,1.25 Z" />
+ d="m 318.25,1.25 38,75.5 h 36.5 l 75,-75.5 h -33 L 378.5,56.5 351.25,1.25 Z" />
<path
style="fill:url(#linearGradient1098)"
inkscape:connector-curvature="0"
id="i"
- d="m 464.34,31 -45.59,45.75 33,0 L 497.5,31 Z" />
+ d="m 464.34,31 -45.59,45.75 h 33 L 497.5,31 Z" />
<path
style="fill:url(#linearGradient1100)"
inkscape:connector-curvature="0"
id="T"
- d="m 645.75,1.25 -16,16 -59.5,0 -59.5,59.5 -33,0 59.303,-59.5 -59.053,0 16,-16 z" />
+ d="m 645.75,1.25 -16,16 h -59.5 l -59.5,59.5 h -33 l 59.303,-59.5 H 478 l 16,-16 z" />
</g>
<g
id="g3114"
@@ -793,7 +815,7 @@
id="layer2-5">
<g
id="g3336-0"
- transform="translate(20,0)">
+ transform="translate(20)">
<path
style="fill:url(#linearGradient3934)"
inkscape:connector-curvature="0"
@@ -826,7 +848,7 @@
<g
style="opacity:0.5"
id="g3256-0"
- transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,36.903806,-19.093668)">
+ transform="rotate(45,41.499999,35)">
<path
style="fill:#167bd9"
inkscape:connector-curvature="0"
@@ -885,220 +907,250 @@
inkscape:label="New logo"
inkscape:groupmode="layer"
id="g880"
- transform="translate(-1.0093054e-6,-285.17914)"
+ transform="translate(-1.0093054e-6,-279.17889)"
style="display:inline">
<ellipse
- transform="translate(0,-4.4354145e-6)"
ry="1.5709635"
rx="1.984375"
- cy="287.47018"
+ cy="281.46994"
cx="9.2320681"
id="ellipse5119"
style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<path
- transform="translate(0,-4.4354145e-6)"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
inkscape:connector-curvature="0"
id="path5121"
- d="m 9.3075485,290.38249 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520568,-0.0259 0.6813605,-0.17674 0.9322825,-0.42694 0.244216,-0.2435 0.391726,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181882,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01298,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.1288667,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.2101177,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-10e-4 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.2051667,-0.7853 l -0.00277,-0.0463 0.2299724,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.2614515,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.4267961,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 l 0,0.0275 -0.6293456,-2.8e-4 -0.6293457,-2.7e-4 z m 3.7839028,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.1501167,-0.10767 -0.3218407,-0.18662 -0.5035467,-0.23148 -0.097,-0.024 -0.2147671,-0.041 -0.2837843,-0.041 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535563,0.0142 0.4768073,0.0672 0.698864,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125362,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230225,0 z m 0.530239,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.6439937,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.2923218,-0.0322 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795078,0.76549 0.3757428,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 9.3075485,284.38223 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520568,-0.0259 0.6813605,-0.17674 0.9322825,-0.42694 0.244216,-0.2435 0.391726,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181882,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01298,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.1288667,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.2101177,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.2051667,-0.7853 l -0.00277,-0.0463 H 7.561277 7.7912492 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-0.001 -0.041956,-0.002 z m -2.2614515,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.4267961,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 v 0.0275 l -0.6293456,-2.8e-4 -0.6293457,-2.7e-4 z m 3.7839028,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.1501167,-0.10767 -0.3218407,-0.18662 -0.5035467,-0.23148 -0.097,-0.024 -0.2147671,-0.041 -0.2837843,-0.041 H 9.307339 v -0.23069 -0.2307 l 0.052714,0.003 c 0.2535563,0.0142 0.4768073,0.0672 0.698864,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125362,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230225 z m 0.530239,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.6439937,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.2923218,-0.0322 l -0.031198,-4e-5 v -0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795078,0.76549 0.3757428,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
- <rect
- transform="translate(0,-4.4354145e-6)"
- style="display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.53104264;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect886-2"
- width="5.8208332"
- height="5.8208332"
- x="0"
- y="291.17914"
- ry="1.0408999"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <ellipse
- transform="translate(0,-4.4354145e-6)"
- style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
- id="ellipse1361"
- cx="2.8820686"
- cy="293.29111"
- rx="1.984375"
- ry="1.5709635"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
<path
- transform="translate(0,-4.4354145e-6)"
- style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 2.9575481,296.20336 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 0.6160776,0 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 0.22997238,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 l 0,0.0275 -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 l -0.2302216,0 z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,292.12396 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
- id="path1363"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
- <path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.28327119;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.444535,291.17915 0,0.008 c -1.45969,0.0818 -2.623569,1.22704 -2.733166,2.6789 l -0.01137,0 0,0.22325 0,2.91041 2.910416,0 0.165882,0 0,-0.008 c 1.45969,-0.0818 2.623569,-1.22705 2.733166,-2.67891 l 0.01137,0 0,-0.22324 0,-2.91042 -2.910417,0 z"
+ d="m 15.444535,285.17889 v 0.008 c -1.45969,0.0818 -2.623569,1.22704 -2.733166,2.6789 h -0.01137 v 0.22325 2.91041 h 2.910416 0.165882 v -0.008 c 1.45969,-0.0818 2.623569,-1.22705 2.733166,-2.67891 h 0.01137 v -0.22324 -2.91042 h -2.910417 z"
id="rect886-2-0-5-6"
inkscape:connector-curvature="0" />
<ellipse
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
id="ellipse1361-21"
cx="15.582068"
- cy="293.29111"
+ cy="287.29086"
rx="1.984375"
ry="1.5709635"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 15.657548,296.20337 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-10e-4 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 0,0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.91e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 0.229973,0 0.229972,0 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-0.001 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 l 0,0.0275 -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 l -0.02967,0 0,-0.23069 0,-0.2307 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230221,0 z m 0.530238,-0.0551 c -0.0056,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 0,-0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 15.657548,290.20311 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.91e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0056,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 v -0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
id="path1363-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:url(#linearGradient5108);fill-opacity:1;stroke:none;stroke-width:0.28327119;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.444535,285.17915 0,0.008 c -1.45969,0.0818 -2.623569,1.22704 -2.733166,2.6789 l -0.01137,0 0,0.22325 0,2.91041 2.910417,0 0.165881,0 0,-0.008 c 1.459691,-0.0818 2.623569,-1.22705 2.733166,-2.67891 l 0.01137,0 0,-0.22324 0,-2.91042 -2.910416,0 z"
+ d="m 15.444535,279.17889 v 0.008 c -1.45969,0.0818 -2.623569,1.22704 -2.733166,2.6789 h -0.01137 v 0.22325 2.91041 h 2.910417 0.165881 v -0.008 c 1.459691,-0.0818 2.623569,-1.22705 2.733166,-2.67891 h 0.01137 v -0.22324 -2.91042 h -2.910416 z"
id="rect886-2-0-5-6-4"
inkscape:connector-curvature="0"
inkscape:export-xdpi="960"
inkscape:export-ydpi="960" />
<circle
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="circle1355-6-5"
cx="15.610416"
- cy="288.08957"
+ cy="282.08932"
r="1.3229166"
inkscape:export-xdpi="960"
inkscape:export-ydpi="960" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 15.657548,290.20337 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-10e-4 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 0,0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.91e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 0.229973,0 0.229972,0 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-0.001 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 l 0,0.0275 -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 l -0.02967,0 0,-0.23069 0,-0.2307 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230221,0 z m 0.530238,-0.0551 c -0.0056,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 0,-0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ d="m 15.657548,284.20311 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-0.001 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.91e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-10e-4 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0056,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 v -0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
id="path1363-0-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
inkscape:export-xdpi="960"
inkscape:export-ydpi="960" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:url(#linearGradient5120);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.610423,286.76689 a 1.3229166,1.3229166 0 0 1 0.0925,0.005 1.3229166,1.3229166 0 0 0 -0.0925,-0.005 z m 0,0 a 1.3229166,1.3229166 0 0 0 -0.116272,0.006 1.3229166,1.3229166 0 0 1 0.116272,-0.006 z m -0.116272,0.006 a 1.3229166,1.3229166 0 0 0 -0.04806,0.006 1.3229166,1.3229166 0 0 1 0.04806,-0.006 z m -0.04806,0.006 a 1.3229166,1.3229166 0 0 0 -0.08785,0.0134 1.3229166,1.3229166 0 0 1 0.08785,-0.0134 z m -0.08785,0.0134 a 1.3229166,1.3229166 0 0 0 -0.03256,0.007 1.3229166,1.3229166 0 0 1 0.03256,-0.007 z m -0.03256,0.007 a 1.3229166,1.3229166 0 0 0 -0.100769,0.0258 1.3229166,1.3229166 0 0 1 0.100769,-0.0258 z m -0.100769,0.0258 a 1.3229166,1.3229166 0 0 0 -0.0088,0.003 l 0,5.2e-4 a 1.3229166,1.3229166 0 0 1 0.0088,-0.003 z m -0.0088,0.003 a 1.3229166,1.3229166 0 0 0 -0.590661,0.37982 l 0,1.76113 a 1.3229166,1.3229166 0 0 1 -0.232028,-0.36483 1.3229166,1.3229166 0 0 0 0.892969,0.76584 1.3229166,1.3229166 0 0 1 -0.117822,-0.0362 l 0,-0.88212 c 0,-0.15005 -0.0088,-0.30521 -0.02687,-0.4656 -0.01552,-0.1604 -0.02996,-0.3104 -0.04289,-0.4501 l 0.0155,0 0.248563,0.55138 0.657841,1.25781 a 1.3229166,1.3229166 0 0 0 0.587561,-0.38912 l 0,-1.73323 a 1.3229166,1.3229166 0 0 0 -0.543119,-0.37414 l 0,0.86196 c 0,0.15005 0.0077,0.30779 0.02325,0.47336 0.01811,0.16557 0.03357,0.31557 0.04651,0.4501 l -0.0155,0 -0.248047,-0.55862 -0.655257,-1.24747 z m 1.392163,2.12804 a 1.3229166,1.3229166 0 0 0 0.08165,-0.10387 1.3229166,1.3229166 0 0 1 -0.08165,0.10387 z m 0.08165,-0.10387 a 1.3229166,1.3229166 0 0 0 0.06718,-0.10542 1.3229166,1.3229166 0 0 1 -0.06718,0.10542 z m -1.403532,0.51779 a 1.3229166,1.3229166 0 0 0 0.01654,0.004 1.3229166,1.3229166 0 0 1 -0.01654,-0.004 z m 0.01654,0.004 a 1.3229166,1.3229166 0 0 0 0.109037,0.0212 1.3229166,1.3229166 0 0 1 -0.109037,-0.0212 z m 0.109037,0.0212 a 1.3229166,1.3229166 0 0 0 0.02222,0.004 1.3229166,1.3229166 0 0 1 -0.02222,-0.004 z m 0.02222,0.004 a 1.3229166,1.3229166 0 0 0 0.09302,0.009 1.3229166,1.3229166 0 0 1 -0.09302,-0.009 z m 0.09302,0.009 a 1.3229166,1.3229166 0 0 0 0.0832,0.004 1.3229166,1.3229166 0 0 1 -0.0832,-0.004 z m 0.0832,0.004 a 1.3229166,1.3229166 0 0 0 0.116789,-0.006 1.3229166,1.3229166 0 0 1 -0.116789,0.006 z m 0.116789,-0.006 a 1.3229166,1.3229166 0 0 0 0.05013,-0.006 1.3229166,1.3229166 0 0 1 -0.05013,0.006 z m 0.05013,-0.006 a 1.3229166,1.3229166 0 0 0 0.08423,-0.0134 1.3229166,1.3229166 0 0 1 -0.08423,0.0134 z m 0.08423,-0.0134 a 1.3229166,1.3229166 0 0 0 0.03256,-0.007 1.3229166,1.3229166 0 0 1 -0.03256,0.007 z m 0.03256,-0.007 a 1.3229166,1.3229166 0 0 0 0.10697,-0.0279 1.3229166,1.3229166 0 0 1 -0.10697,0.0279 z m -1.500684,-0.77515 a 1.3229166,1.3229166 0 0 1 -0.03824,-0.10284 1.3229166,1.3229166 0 0 0 0.03824,0.10284 z m -0.03824,-0.10284 a 1.3229166,1.3229166 0 0 1 -0.01085,-0.0331 1.3229166,1.3229166 0 0 0 0.01085,0.0331 z m -0.01085,-0.0331 a 1.3229166,1.3229166 0 0 1 -0.02274,-0.0894 1.3229166,1.3229166 0 0 0 0.02274,0.0894 z m -0.02274,-0.0894 a 1.3229166,1.3229166 0 0 1 -0.0083,-0.0388 1.3229166,1.3229166 0 0 0 0.0083,0.0388 z m -0.0083,-0.0388 a 1.3229166,1.3229166 0 0 1 -0.01344,-0.0842 1.3229166,1.3229166 0 0 0 0.01344,0.0842 z m -0.01344,-0.0842 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.0512 1.3229166,1.3229166 0 0 0 0.0062,0.0512 z m -0.0062,-0.0512 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.11576 1.3229166,1.3229166 0 0 0 0.0062,0.11576 z m -0.0062,-0.11576 a 1.3229166,1.3229166 0 0 1 0.0036,-0.0729 1.3229166,1.3229166 0 0 0 -0.0036,0.0729 z m 0.0036,-0.0729 a 1.3229166,1.3229166 0 0 1 0.0067,-0.0811 1.3229166,1.3229166 0 0 0 -0.0067,0.0811 z m 0.0067,-0.0811 a 1.3229166,1.3229166 0 0 1 0.0078,-0.0527 1.3229166,1.3229166 0 0 0 -0.0078,0.0527 z m 0.0078,-0.0527 a 1.3229166,1.3229166 0 0 1 0.01447,-0.0796 1.3229166,1.3229166 0 0 0 -0.01447,0.0796 z m 0.01447,-0.0796 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0486 1.3229166,1.3229166 0 0 0 -0.0124,0.0486 z m 0.0124,-0.0486 a 1.3229166,1.3229166 0 0 1 0.02325,-0.0806 1.3229166,1.3229166 0 0 0 -0.02325,0.0806 z m 0.02325,-0.0806 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0341 1.3229166,1.3229166 0 0 0 -0.0124,0.0341 z m 0.0124,-0.0341 a 1.3229166,1.3229166 0 0 1 0.03772,-0.094 1.3229166,1.3229166 0 0 0 -0.03772,0.094 z m 0.03772,-0.094 a 1.3229166,1.3229166 0 0 1 0.01085,-0.0222 1.3229166,1.3229166 0 0 0 -0.01085,0.0222 z m 0.01085,-0.0222 a 1.3229166,1.3229166 0 0 1 0.05116,-0.0977 1.3229166,1.3229166 0 0 0 -0.05116,0.0977 z m 1.286226,-0.75241 a 1.3229166,1.3229166 0 0 1 0.0894,0.009 1.3229166,1.3229166 0 0 0 -0.0894,-0.009 z m 0.0894,0.009 a 1.3229166,1.3229166 0 0 1 0.03101,0.005 1.3229166,1.3229166 0 0 0 -0.03101,-0.005 z m 0.03101,0.005 a 1.3229166,1.3229166 0 0 1 0.108004,0.0227 1.3229166,1.3229166 0 0 0 -0.108004,-0.0227 z m 0.108004,0.0227 a 1.3229166,1.3229166 0 0 1 0.01499,0.004 1.3229166,1.3229166 0 0 0 -0.01499,-0.004 z m 0.01499,0.004 a 1.3229166,1.3229166 0 0 1 0.112655,0.0346 1.3229166,1.3229166 0 0 0 -0.112655,-0.0346 z m -1.3224,0.39791 a 1.3229166,1.3229166 0 0 0 -0.07855,0.0977 1.3229166,1.3229166 0 0 1 0.07855,-0.0977 z m 1.996778,0.0279 a 1.3229166,1.3229166 0 0 1 0.07751,0.10128 1.3229166,1.3229166 0 0 0 -0.07751,-0.10128 z m -2.07946,0.0749 a 1.3229166,1.3229166 0 0 0 -0.06615,0.10128 1.3229166,1.3229166 0 0 1 0.06615,-0.10128 z m 2.161625,0.0326 a 1.3229166,1.3229166 0 0 1 0.06356,0.10387 1.3229166,1.3229166 0 0 0 -0.06356,-0.10387 z m 0.06873,0.11318 a 1.3229166,1.3229166 0 0 1 0.05219,0.10748 1.3229166,1.3229166 0 0 0 -0.05219,-0.10748 z m 0.05788,0.12092 a 1.3229166,1.3229166 0 0 1 0.03411,0.092 1.3229166,1.3229166 0 0 0 -0.03411,-0.092 z m 0.03411,0.092 a 1.3229166,1.3229166 0 0 1 0.01344,0.0403 1.3229166,1.3229166 0 0 0 -0.01344,-0.0403 z m 0.01344,0.0403 a 1.3229166,1.3229166 0 0 1 0.02325,0.0899 1.3229166,1.3229166 0 0 0 -0.02325,-0.0899 z m 0.02325,0.0899 a 1.3229166,1.3229166 0 0 1 0.0078,0.0356 1.3229166,1.3229166 0 0 0 -0.0078,-0.0356 z m 0.0078,0.0356 a 1.3229166,1.3229166 0 0 1 0.01343,0.0879 1.3229166,1.3229166 0 0 0 -0.01343,-0.0879 z m 0.01343,0.0879 a 1.3229166,1.3229166 0 0 1 0.0057,0.0476 1.3229166,1.3229166 0 0 0 -0.0057,-0.0476 z m 0.0057,0.0476 a 1.3229166,1.3229166 0 0 1 0.0062,0.11678 1.3229166,1.3229166 0 0 0 -0.0062,-0.11678 z m 0.0062,0.11678 a 1.3229166,1.3229166 0 0 1 -0.0031,0.0687 1.3229166,1.3229166 0 0 0 0.0031,-0.0687 z m -0.0031,0.0687 a 1.3229166,1.3229166 0 0 1 -0.0052,0.0775 1.3229166,1.3229166 0 0 0 0.0052,-0.0775 z m -0.0052,0.0775 a 1.3229166,1.3229166 0 0 1 -0.0072,0.0481 1.3229166,1.3229166 0 0 0 0.0072,-0.0481 z m -0.0072,0.0481 a 1.3229166,1.3229166 0 0 1 -0.01344,0.0786 1.3229166,1.3229166 0 0 0 0.01344,-0.0786 z m -0.01344,0.0786 a 1.3229166,1.3229166 0 0 1 -0.0124,0.0501 1.3229166,1.3229166 0 0 0 0.0124,-0.0501 z m -0.0124,0.0501 a 1.3229166,1.3229166 0 0 1 -0.02325,0.0842 1.3229166,1.3229166 0 0 0 0.02325,-0.0842 z m -0.03204,0.10801 a 1.3229166,1.3229166 0 0 1 -0.03669,0.0961 1.3229166,1.3229166 0 0 0 0.03669,-0.0961 z m -0.03669,0.0961 a 1.3229166,1.3229166 0 0 1 -0.01654,0.0346 1.3229166,1.3229166 0 0 0 0.01654,-0.0346 z m -0.01654,0.0346 a 1.3229166,1.3229166 0 0 1 -0.04496,0.0884 1.3229166,1.3229166 0 0 0 0.04496,-0.0884 z"
+ d="m 15.610423,280.76663 a 1.3229166,1.3229166 0 0 1 0.0925,0.005 1.3229166,1.3229166 0 0 0 -0.0925,-0.005 z m 0,0 a 1.3229166,1.3229166 0 0 0 -0.116272,0.006 1.3229166,1.3229166 0 0 1 0.116272,-0.006 z m -0.116272,0.006 a 1.3229166,1.3229166 0 0 0 -0.04806,0.006 1.3229166,1.3229166 0 0 1 0.04806,-0.006 z m -0.04806,0.006 a 1.3229166,1.3229166 0 0 0 -0.08785,0.0134 1.3229166,1.3229166 0 0 1 0.08785,-0.0134 z m -0.08785,0.0134 a 1.3229166,1.3229166 0 0 0 -0.03256,0.007 1.3229166,1.3229166 0 0 1 0.03256,-0.007 z m -0.03256,0.007 a 1.3229166,1.3229166 0 0 0 -0.100769,0.0258 1.3229166,1.3229166 0 0 1 0.100769,-0.0258 z m -0.100769,0.0258 a 1.3229166,1.3229166 0 0 0 -0.0088,0.003 v 5.2e-4 a 1.3229166,1.3229166 0 0 1 0.0088,-0.003 z m -0.0088,0.003 a 1.3229166,1.3229166 0 0 0 -0.590661,0.37982 v 1.76113 a 1.3229166,1.3229166 0 0 1 -0.232028,-0.36483 1.3229166,1.3229166 0 0 0 0.892969,0.76584 1.3229166,1.3229166 0 0 1 -0.117822,-0.0362 v -0.88212 c 0,-0.15005 -0.0088,-0.30521 -0.02687,-0.4656 -0.01552,-0.1604 -0.02996,-0.3104 -0.04289,-0.4501 h 0.0155 l 0.248563,0.55138 0.657841,1.25781 a 1.3229166,1.3229166 0 0 0 0.587561,-0.38912 v -1.73323 a 1.3229166,1.3229166 0 0 0 -0.543119,-0.37414 v 0.86196 c 0,0.15005 0.0077,0.30779 0.02325,0.47336 0.01811,0.16557 0.03357,0.31557 0.04651,0.4501 h -0.0155 l -0.248047,-0.55862 -0.655257,-1.24747 z m 1.392163,2.12804 a 1.3229166,1.3229166 0 0 0 0.08165,-0.10387 1.3229166,1.3229166 0 0 1 -0.08165,0.10387 z m 0.08165,-0.10387 a 1.3229166,1.3229166 0 0 0 0.06718,-0.10542 1.3229166,1.3229166 0 0 1 -0.06718,0.10542 z m -1.403532,0.51779 a 1.3229166,1.3229166 0 0 0 0.01654,0.004 1.3229166,1.3229166 0 0 1 -0.01654,-0.004 z m 0.01654,0.004 a 1.3229166,1.3229166 0 0 0 0.109037,0.0212 1.3229166,1.3229166 0 0 1 -0.109037,-0.0212 z m 0.109037,0.0212 a 1.3229166,1.3229166 0 0 0 0.02222,0.004 1.3229166,1.3229166 0 0 1 -0.02222,-0.004 z m 0.02222,0.004 a 1.3229166,1.3229166 0 0 0 0.09302,0.009 1.3229166,1.3229166 0 0 1 -0.09302,-0.009 z m 0.09302,0.009 a 1.3229166,1.3229166 0 0 0 0.0832,0.004 1.3229166,1.3229166 0 0 1 -0.0832,-0.004 z m 0.0832,0.004 a 1.3229166,1.3229166 0 0 0 0.116789,-0.006 1.3229166,1.3229166 0 0 1 -0.116789,0.006 z m 0.116789,-0.006 a 1.3229166,1.3229166 0 0 0 0.05013,-0.006 1.3229166,1.3229166 0 0 1 -0.05013,0.006 z m 0.05013,-0.006 a 1.3229166,1.3229166 0 0 0 0.08423,-0.0134 1.3229166,1.3229166 0 0 1 -0.08423,0.0134 z m 0.08423,-0.0134 a 1.3229166,1.3229166 0 0 0 0.03256,-0.007 1.3229166,1.3229166 0 0 1 -0.03256,0.007 z m 0.03256,-0.007 a 1.3229166,1.3229166 0 0 0 0.10697,-0.0279 1.3229166,1.3229166 0 0 1 -0.10697,0.0279 z m -1.500684,-0.77515 a 1.3229166,1.3229166 0 0 1 -0.03824,-0.10284 1.3229166,1.3229166 0 0 0 0.03824,0.10284 z m -0.03824,-0.10284 a 1.3229166,1.3229166 0 0 1 -0.01085,-0.0331 1.3229166,1.3229166 0 0 0 0.01085,0.0331 z m -0.01085,-0.0331 a 1.3229166,1.3229166 0 0 1 -0.02274,-0.0894 1.3229166,1.3229166 0 0 0 0.02274,0.0894 z m -0.02274,-0.0894 a 1.3229166,1.3229166 0 0 1 -0.0083,-0.0388 1.3229166,1.3229166 0 0 0 0.0083,0.0388 z m -0.0083,-0.0388 a 1.3229166,1.3229166 0 0 1 -0.01344,-0.0842 1.3229166,1.3229166 0 0 0 0.01344,0.0842 z m -0.01344,-0.0842 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.0512 1.3229166,1.3229166 0 0 0 0.0062,0.0512 z m -0.0062,-0.0512 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.11576 1.3229166,1.3229166 0 0 0 0.0062,0.11576 z m -0.0062,-0.11576 a 1.3229166,1.3229166 0 0 1 0.0036,-0.0729 1.3229166,1.3229166 0 0 0 -0.0036,0.0729 z m 0.0036,-0.0729 a 1.3229166,1.3229166 0 0 1 0.0067,-0.0811 1.3229166,1.3229166 0 0 0 -0.0067,0.0811 z m 0.0067,-0.0811 a 1.3229166,1.3229166 0 0 1 0.0078,-0.0527 1.3229166,1.3229166 0 0 0 -0.0078,0.0527 z m 0.0078,-0.0527 a 1.3229166,1.3229166 0 0 1 0.01447,-0.0796 1.3229166,1.3229166 0 0 0 -0.01447,0.0796 z m 0.01447,-0.0796 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0486 1.3229166,1.3229166 0 0 0 -0.0124,0.0486 z m 0.0124,-0.0486 a 1.3229166,1.3229166 0 0 1 0.02325,-0.0806 1.3229166,1.3229166 0 0 0 -0.02325,0.0806 z m 0.02325,-0.0806 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0341 1.3229166,1.3229166 0 0 0 -0.0124,0.0341 z m 0.0124,-0.0341 a 1.3229166,1.3229166 0 0 1 0.03772,-0.094 1.3229166,1.3229166 0 0 0 -0.03772,0.094 z m 0.03772,-0.094 a 1.3229166,1.3229166 0 0 1 0.01085,-0.0222 1.3229166,1.3229166 0 0 0 -0.01085,0.0222 z m 0.01085,-0.0222 a 1.3229166,1.3229166 0 0 1 0.05116,-0.0977 1.3229166,1.3229166 0 0 0 -0.05116,0.0977 z m 1.286226,-0.75241 a 1.3229166,1.3229166 0 0 1 0.0894,0.009 1.3229166,1.3229166 0 0 0 -0.0894,-0.009 z m 0.0894,0.009 a 1.3229166,1.3229166 0 0 1 0.03101,0.005 1.3229166,1.3229166 0 0 0 -0.03101,-0.005 z m 0.03101,0.005 a 1.3229166,1.3229166 0 0 1 0.108004,0.0227 1.3229166,1.3229166 0 0 0 -0.108004,-0.0227 z m 0.108004,0.0227 a 1.3229166,1.3229166 0 0 1 0.01499,0.004 1.3229166,1.3229166 0 0 0 -0.01499,-0.004 z m 0.01499,0.004 a 1.3229166,1.3229166 0 0 1 0.112655,0.0346 1.3229166,1.3229166 0 0 0 -0.112655,-0.0346 z m -1.3224,0.39791 a 1.3229166,1.3229166 0 0 0 -0.07855,0.0977 1.3229166,1.3229166 0 0 1 0.07855,-0.0977 z m 1.996778,0.0279 a 1.3229166,1.3229166 0 0 1 0.07751,0.10128 1.3229166,1.3229166 0 0 0 -0.07751,-0.10128 z m -2.07946,0.0749 a 1.3229166,1.3229166 0 0 0 -0.06615,0.10128 1.3229166,1.3229166 0 0 1 0.06615,-0.10128 z m 2.161625,0.0326 a 1.3229166,1.3229166 0 0 1 0.06356,0.10387 1.3229166,1.3229166 0 0 0 -0.06356,-0.10387 z m 0.06873,0.11318 a 1.3229166,1.3229166 0 0 1 0.05219,0.10748 1.3229166,1.3229166 0 0 0 -0.05219,-0.10748 z m 0.05788,0.12092 a 1.3229166,1.3229166 0 0 1 0.03411,0.092 1.3229166,1.3229166 0 0 0 -0.03411,-0.092 z m 0.03411,0.092 a 1.3229166,1.3229166 0 0 1 0.01344,0.0403 1.3229166,1.3229166 0 0 0 -0.01344,-0.0403 z m 0.01344,0.0403 a 1.3229166,1.3229166 0 0 1 0.02325,0.0899 1.3229166,1.3229166 0 0 0 -0.02325,-0.0899 z m 0.02325,0.0899 a 1.3229166,1.3229166 0 0 1 0.0078,0.0356 1.3229166,1.3229166 0 0 0 -0.0078,-0.0356 z m 0.0078,0.0356 a 1.3229166,1.3229166 0 0 1 0.01343,0.0879 1.3229166,1.3229166 0 0 0 -0.01343,-0.0879 z m 0.01343,0.0879 a 1.3229166,1.3229166 0 0 1 0.0057,0.0476 1.3229166,1.3229166 0 0 0 -0.0057,-0.0476 z m 0.0057,0.0476 a 1.3229166,1.3229166 0 0 1 0.0062,0.11678 1.3229166,1.3229166 0 0 0 -0.0062,-0.11678 z m 0.0062,0.11678 a 1.3229166,1.3229166 0 0 1 -0.0031,0.0687 1.3229166,1.3229166 0 0 0 0.0031,-0.0687 z m -0.0031,0.0687 a 1.3229166,1.3229166 0 0 1 -0.0052,0.0775 1.3229166,1.3229166 0 0 0 0.0052,-0.0775 z m -0.0052,0.0775 a 1.3229166,1.3229166 0 0 1 -0.0072,0.0481 1.3229166,1.3229166 0 0 0 0.0072,-0.0481 z m -0.0072,0.0481 a 1.3229166,1.3229166 0 0 1 -0.01344,0.0786 1.3229166,1.3229166 0 0 0 0.01344,-0.0786 z m -0.01344,0.0786 a 1.3229166,1.3229166 0 0 1 -0.0124,0.0501 1.3229166,1.3229166 0 0 0 0.0124,-0.0501 z m -0.0124,0.0501 a 1.3229166,1.3229166 0 0 1 -0.02325,0.0842 1.3229166,1.3229166 0 0 0 0.02325,-0.0842 z m -0.03204,0.10801 a 1.3229166,1.3229166 0 0 1 -0.03669,0.0961 1.3229166,1.3229166 0 0 0 0.03669,-0.0961 z m -0.03669,0.0961 a 1.3229166,1.3229166 0 0 1 -0.01654,0.0346 1.3229166,1.3229166 0 0 0 0.01654,-0.0346 z m -0.01654,0.0346 a 1.3229166,1.3229166 0 0 1 -0.04496,0.0884 1.3229166,1.3229166 0 0 0 0.04496,-0.0884 z"
id="circle1355-6-5-2"
inkscape:connector-curvature="0" />
+ <g
+ id="g4816"
+ transform="translate(0,-6.0002511)">
+ <path
+ transform="matrix(0.26458334,0,0,0.26458334,-2.5232634e-7,291.17915)"
+ inkscape:connector-curvature="0"
+ id="circle1307"
+ d="m 11,-16 a 4.9999998,4.9999998 0 0 0 -1.4902344,0.232422 l 2.4765624,4.716797 0.9375,2.1113279 h 0.05859 c -0.04889,-0.5084445 -0.107337,-1.0753939 -0.175781,-1.7011719 -0.05867,-0.625778 -0.08789,-1.221951 -0.08789,-1.789063 v -3.259765 A 4.9999998,4.9999998 0 0 0 11,-16 Z m -3.7226562,1.669922 A 4.9999998,4.9999998 0 0 0 6,-11 4.9999998,4.9999998 0 0 0 7.2773438,-7.6738281 Z m 7.4941402,0.05664 v 6.5507818 A 4.9999998,4.9999998 0 0 0 16,-11 4.9999998,4.9999998 0 0 0 14.771484,-14.273438 Z m -5.7050778,1.183594 c 0.048889,0.528 0.1034428,1.09495 0.1621094,1.701172 0.068445,0.606222 0.1015625,1.192655 0.1015625,1.7597658 v 3.3339843 A 4.9999998,4.9999998 0 0 0 11,-6 4.9999998,4.9999998 0 0 0 12.550781,-6.2519531 L 10.064453,-11.005859 9.125,-13.089844 Z"
+ style="display:inline;fill:url(#linearGradient1341);fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <ellipse
+ inkscape:export-ydpi="96"
+ inkscape:export-xdpi="96"
+ ry="1.5709635"
+ rx="1.984375"
+ cy="287.47018"
+ cx="2.8820686"
+ id="ellipse1313"
+ style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
+ transform="translate(0,-4.4354145e-6)" />
+ <path
+ inkscape:export-ydpi="96"
+ inkscape:export-xdpi="96"
+ sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
+ inkscape:connector-curvature="0"
+ id="path1315"
+ d="m 2.9575481,290.38249 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 h 0.6160776 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-10e-4 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 H 1.2112766 1.4412488 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 v 0.0275 l -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 h -0.029669 v -0.23069 -0.2307 l 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 H 4.3945838 Z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,286.30309 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 v -0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
+ style="display:inline;fill:url(#linearGradient1325);fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
+ transform="translate(0,-4.4354145e-6)" />
+ </g>
<path
- style="display:inline;fill:url(#linearGradient1341);fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 11,-16 a 4.9999998,4.9999998 0 0 0 -1.4902344,0.232422 l 2.4765624,4.716797 0.9375,2.1113279 0.05859,0 c -0.04889,-0.5084445 -0.107337,-1.0753939 -0.175781,-1.7011719 -0.05867,-0.625778 -0.08789,-1.221951 -0.08789,-1.789063 l 0,-3.259765 A 4.9999998,4.9999998 0 0 0 11,-16 Z m -3.7226562,1.669922 A 4.9999998,4.9999998 0 0 0 6,-11 4.9999998,4.9999998 0 0 0 7.2773438,-7.6738281 Z m 7.4941402,0.05664 0,6.5507818 A 4.9999998,4.9999998 0 0 0 16,-11 4.9999998,4.9999998 0 0 0 14.771484,-14.273438 Z m -5.7050778,1.183594 c 0.048889,0.528 0.1034428,1.09495 0.1621094,1.701172 0.068445,0.606222 0.1015625,1.192655 0.1015625,1.7597658 l 0,3.3339843 A 4.9999998,4.9999998 0 0 0 11,-6 4.9999998,4.9999998 0 0 0 12.550781,-6.2519531 L 10.064453,-11.005859 9.125,-13.089844 Z"
- id="circle1307"
- inkscape:connector-curvature="0"
- transform="matrix(0.26458334,0,0,0.26458334,-2.5232634e-7,291.17915)" />
- <ellipse
- transform="translate(0,-4.4354145e-6)"
- style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
- id="ellipse1313"
- cx="2.8820686"
- cy="287.47018"
- rx="1.984375"
- ry="1.5709635"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <path
- transform="translate(0,-4.4354145e-6)"
- style="display:inline;fill:url(#linearGradient1325);fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
- d="m 2.9575481,290.38249 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 0.6160776,0 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-10e-4 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 0.22997238,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 l 0,0.0275 -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 l -0.2302216,0 z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,286.30309 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
- id="path1315"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
- inkscape:export-xdpi="96"
- inkscape:export-ydpi="96" />
- <path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 9.260416,286.94575 a 1.3229167,1.3229167 0 0 0 -0.3942912,0.0615 l 0.6552571,1.24799 0.2480469,0.55862 0.015502,0 c -0.012935,-0.13452 -0.028399,-0.28453 -0.046509,-0.4501 -0.015523,-0.16557 -0.023254,-0.32331 -0.023254,-0.47335 l 0,-0.86248 a 1.3229167,1.3229167 0 0 0 -0.4547518,-0.0822 z m -0.9849528,0.44183 a 1.3229167,1.3229167 0 0 0 -0.3379639,0.88109 1.3229167,1.3229167 0 0 0 0.3379639,0.88005 z m 1.9828248,0.015 0,1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094687,0.31316 c 0.012935,0.1397 0.027369,0.2897 0.042891,0.4501 0.018109,0.1604 0.026872,0.31556 0.026872,0.46561 l 0,0.88211 a 1.3229167,1.3229167 0 0 0 0.4418335,0.078 1.3229167,1.3229167 0 0 0 0.4103108,-0.0667 l -0.657841,-1.2578 -0.2485636,-0.55139 z"
+ d="m 9.260416,280.94549 a 1.3229167,1.3229167 0 0 0 -0.3942912,0.0615 l 0.6552571,1.24799 0.2480469,0.55862 h 0.015502 c -0.012935,-0.13452 -0.028399,-0.28453 -0.046509,-0.4501 -0.015523,-0.16557 -0.023254,-0.32331 -0.023254,-0.47335 v -0.86248 a 1.3229167,1.3229167 0 0 0 -0.4547518,-0.0822 z m -0.9849528,0.44183 a 1.3229167,1.3229167 0 0 0 -0.3379639,0.88109 1.3229167,1.3229167 0 0 0 0.3379639,0.88005 z m 1.9828248,0.015 v 1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094687,0.31316 c 0.012935,0.1397 0.027369,0.2897 0.042891,0.4501 0.018109,0.1604 0.026872,0.31556 0.026872,0.46561 v 0.88211 a 1.3229167,1.3229167 0 0 0 0.4418335,0.078 1.3229167,1.3229167 0 0 0 0.4103108,-0.0667 l -0.657841,-1.2578 -0.2485636,-0.55139 z"
id="circle1307-3"
inkscape:connector-curvature="0" />
<rect
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.53104264;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect886"
width="5.8208332"
height="5.8208332"
x="6.3499999"
- y="291.17914"
+ y="285.17889"
ry="1.0408999"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<circle
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="circle870"
cx="9.260416"
- cy="294.08957"
+ cy="288.08932"
r="1.3229166"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<ellipse
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
id="ellipse876"
cx="9.2320681"
- cy="293.29111"
+ cy="287.29086"
rx="1.984375"
ry="1.5709635"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.00430322"
- d="m 9.3075485,296.20336 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813605,-0.17674 0.9322825,-0.42694 0.244216,-0.2435 0.391726,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 0.616078,0 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181882,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01298,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.1288668,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.2051667,-0.7853 l -0.00277,-0.0463 0.2299724,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.2614515,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.4267961,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 l 0,0.0275 -0.6293456,-2.8e-4 -0.6293457,-2.7e-4 z m 3.7839028,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.698864,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125362,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 l -0.230225,0 z m 0.530239,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.6439936,-1.85767 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
+ d="m 9.3075485,290.2031 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813605,-0.17674 0.9322825,-0.42694 0.244216,-0.2435 0.391726,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181882,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01298,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.1288668,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-10e-4 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.2051667,-0.7853 l -0.00277,-0.0463 H 7.561277 7.7912492 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-0.001 -0.041956,-0.002 z m -2.2614515,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.4267961,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 v 0.0275 l -0.6293456,-2.8e-4 -0.6293457,-2.7e-4 z m 3.7839028,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266101,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 H 9.307339 v -0.23069 -0.2307 l 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.698864,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125362,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230225 z m 0.530239,-0.0551 c -0.0055,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z M 9.6308294,286.1237 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 v -0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
id="path878"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 9.260422,292.76689 a 1.3229166,1.3229166 0 0 1 0.0925,0.005 1.3229166,1.3229166 0 0 0 -0.0925,-0.005 z m 0,0 a 1.3229166,1.3229166 0 0 0 -0.116272,0.006 1.3229166,1.3229166 0 0 1 0.116272,-0.006 z m -0.116272,0.006 a 1.3229166,1.3229166 0 0 0 -0.04806,0.006 1.3229166,1.3229166 0 0 1 0.04806,-0.006 z m -0.04806,0.006 a 1.3229166,1.3229166 0 0 0 -0.08785,0.0134 1.3229166,1.3229166 0 0 1 0.08785,-0.0134 z m -0.08785,0.0134 a 1.3229166,1.3229166 0 0 0 -0.03256,0.007 1.3229166,1.3229166 0 0 1 0.03256,-0.007 z m -0.03256,0.007 a 1.3229166,1.3229166 0 0 0 -0.1007689,0.0258 1.3229166,1.3229166 0 0 1 0.1007689,-0.0258 z m -0.1007689,0.0258 a 1.3229166,1.3229166 0 0 0 -0.0088,0.003 l 0,5.2e-4 a 1.3229166,1.3229166 0 0 1 0.0088,-0.003 z m -0.0088,0.003 a 1.3229166,1.3229166 0 0 0 -0.590661,0.37982 l 0,1.76113 a 1.3229166,1.3229166 0 0 1 -0.232028,-0.36483 1.3229166,1.3229166 0 0 0 0.892969,0.76584 1.3229166,1.3229166 0 0 1 -0.117822,-0.0362 l 0,-0.88212 c 0,-0.15005 -0.0088,-0.30521 -0.02687,-0.4656 -0.01552,-0.1604 -0.02996,-0.3104 -0.04289,-0.4501 l 0.0155,0 0.248563,0.55138 0.657841,1.25781 a 1.3229166,1.3229166 0 0 0 0.5875609,-0.38912 l 0,-1.73323 a 1.3229166,1.3229166 0 0 0 -0.543119,-0.37414 l 0,0.86196 c 0,0.15005 0.0077,0.30779 0.02325,0.47336 0.01811,0.16557 0.03357,0.31557 0.04651,0.4501 l -0.0155,0 -0.2480468,-0.55862 -0.655257,-1.24747 z m 1.3921629,2.12804 a 1.3229166,1.3229166 0 0 0 0.08165,-0.10387 1.3229166,1.3229166 0 0 1 -0.08165,0.10387 z m 0.08165,-0.10387 a 1.3229166,1.3229166 0 0 0 0.06718,-0.10542 1.3229166,1.3229166 0 0 1 -0.06718,0.10542 z m -1.4035319,0.51779 a 1.3229166,1.3229166 0 0 0 0.01654,0.004 1.3229166,1.3229166 0 0 1 -0.01654,-0.004 z m 0.01654,0.004 a 1.3229166,1.3229166 0 0 0 0.109037,0.0212 1.3229166,1.3229166 0 0 1 -0.109037,-0.0212 z m 0.109037,0.0212 a 1.3229166,1.3229166 0 0 0 0.02222,0.004 1.3229166,1.3229166 0 0 1 -0.02222,-0.004 z m 0.02222,0.004 a 1.3229166,1.3229166 0 0 0 0.09302,0.009 1.3229166,1.3229166 0 0 1 -0.09302,-0.009 z m 0.09302,0.009 a 1.3229166,1.3229166 0 0 0 0.0832,0.004 1.3229166,1.3229166 0 0 1 -0.0832,-0.004 z m 0.0832,0.004 a 1.3229166,1.3229166 0 0 0 0.1167891,-0.006 1.3229166,1.3229166 0 0 1 -0.116789,0.006 z m 0.1167891,-0.006 a 1.3229166,1.3229166 0 0 0 0.05013,-0.006 1.3229166,1.3229166 0 0 1 -0.05013,0.006 z m 0.05013,-0.006 a 1.3229166,1.3229166 0 0 0 0.08423,-0.0134 1.3229166,1.3229166 0 0 1 -0.08423,0.0134 z m 0.08423,-0.0134 a 1.3229166,1.3229166 0 0 0 0.03256,-0.007 1.3229166,1.3229166 0 0 1 -0.03256,0.007 z m 0.03256,-0.007 a 1.3229166,1.3229166 0 0 0 0.10697,-0.0279 1.3229166,1.3229166 0 0 1 -0.10697,0.0279 z m -1.500684,-0.77515 a 1.3229166,1.3229166 0 0 1 -0.03824,-0.10284 1.3229166,1.3229166 0 0 0 0.03824,0.10284 z m -0.03824,-0.10284 a 1.3229166,1.3229166 0 0 1 -0.01085,-0.0331 1.3229166,1.3229166 0 0 0 0.01085,0.0331 z m -0.01085,-0.0331 a 1.3229166,1.3229166 0 0 1 -0.02274,-0.0894 1.3229166,1.3229166 0 0 0 0.02274,0.0894 z m -0.02274,-0.0894 a 1.3229166,1.3229166 0 0 1 -0.0083,-0.0388 1.3229166,1.3229166 0 0 0 0.0083,0.0388 z m -0.0083,-0.0388 a 1.3229166,1.3229166 0 0 1 -0.01344,-0.0842 1.3229166,1.3229166 0 0 0 0.01344,0.0842 z m -0.01344,-0.0842 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.0512 1.3229166,1.3229166 0 0 0 0.0062,0.0512 z m -0.0062,-0.0512 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.11576 1.3229166,1.3229166 0 0 0 0.0062,0.11576 z m -0.0062,-0.11576 a 1.3229166,1.3229166 0 0 1 0.0036,-0.0729 1.3229166,1.3229166 0 0 0 -0.0036,0.0729 z m 0.0036,-0.0729 a 1.3229166,1.3229166 0 0 1 0.0067,-0.0811 1.3229166,1.3229166 0 0 0 -0.0067,0.0811 z m 0.0067,-0.0811 a 1.3229166,1.3229166 0 0 1 0.0078,-0.0527 1.3229166,1.3229166 0 0 0 -0.0078,0.0527 z m 0.0078,-0.0527 a 1.3229166,1.3229166 0 0 1 0.01447,-0.0796 1.3229166,1.3229166 0 0 0 -0.01447,0.0796 z m 0.01447,-0.0796 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0486 1.3229166,1.3229166 0 0 0 -0.0124,0.0486 z m 0.0124,-0.0486 a 1.3229166,1.3229166 0 0 1 0.02325,-0.0806 1.3229166,1.3229166 0 0 0 -0.02325,0.0806 z m 0.02325,-0.0806 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0341 1.3229166,1.3229166 0 0 0 -0.0124,0.0341 z m 0.0124,-0.0341 a 1.3229166,1.3229166 0 0 1 0.03772,-0.094 1.3229166,1.3229166 0 0 0 -0.03772,0.094 z m 0.03772,-0.094 a 1.3229166,1.3229166 0 0 1 0.01085,-0.0222 1.3229166,1.3229166 0 0 0 -0.01085,0.0222 z m 0.01085,-0.0222 a 1.3229166,1.3229166 0 0 1 0.05116,-0.0977 1.3229166,1.3229166 0 0 0 -0.05116,0.0977 z m 1.286226,-0.75241 a 1.3229166,1.3229166 0 0 1 0.0894,0.009 1.3229166,1.3229166 0 0 0 -0.0894,-0.009 z m 0.0894,0.009 a 1.3229166,1.3229166 0 0 1 0.03101,0.005 1.3229166,1.3229166 0 0 0 -0.03101,-0.005 z m 0.03101,0.005 a 1.3229166,1.3229166 0 0 1 0.108004,0.0227 1.3229166,1.3229166 0 0 0 -0.108004,-0.0227 z m 0.108004,0.0227 a 1.3229166,1.3229166 0 0 1 0.01499,0.004 1.3229166,1.3229166 0 0 0 -0.01499,-0.004 z m 0.01499,0.004 a 1.3229166,1.3229166 0 0 1 0.112655,0.0346 1.3229166,1.3229166 0 0 0 -0.112655,-0.0346 z m -1.3223999,0.39791 a 1.3229166,1.3229166 0 0 0 -0.07855,0.0977 1.3229166,1.3229166 0 0 1 0.07855,-0.0977 z m 1.9967787,0.0279 a 1.3229166,1.3229166 0 0 1 0.07751,0.10128 1.3229166,1.3229166 0 0 0 -0.07751,-0.10128 z m -2.0794607,0.0749 a 1.3229166,1.3229166 0 0 0 -0.06615,0.10128 1.3229166,1.3229166 0 0 1 0.06615,-0.10128 z m 2.1616257,0.0326 a 1.3229166,1.3229166 0 0 1 0.06356,0.10387 1.3229166,1.3229166 0 0 0 -0.06356,-0.10387 z m 0.06873,0.11318 a 1.3229166,1.3229166 0 0 1 0.05219,0.10748 1.3229166,1.3229166 0 0 0 -0.05219,-0.10748 z m 0.05788,0.12092 a 1.3229166,1.3229166 0 0 1 0.03411,0.092 1.3229166,1.3229166 0 0 0 -0.03411,-0.092 z m 0.03411,0.092 a 1.3229166,1.3229166 0 0 1 0.01344,0.0403 1.3229166,1.3229166 0 0 0 -0.01344,-0.0403 z m 0.01344,0.0403 a 1.3229166,1.3229166 0 0 1 0.02325,0.0899 1.3229166,1.3229166 0 0 0 -0.02325,-0.0899 z m 0.02325,0.0899 a 1.3229166,1.3229166 0 0 1 0.0078,0.0356 1.3229166,1.3229166 0 0 0 -0.0078,-0.0356 z m 0.0078,0.0356 a 1.3229166,1.3229166 0 0 1 0.01343,0.0879 1.3229166,1.3229166 0 0 0 -0.01343,-0.0879 z m 0.01343,0.0879 a 1.3229166,1.3229166 0 0 1 0.0057,0.0476 1.3229166,1.3229166 0 0 0 -0.0057,-0.0476 z m 0.0057,0.0476 a 1.3229166,1.3229166 0 0 1 0.0062,0.11678 1.3229166,1.3229166 0 0 0 -0.0062,-0.11678 z m 0.0062,0.11678 a 1.3229166,1.3229166 0 0 1 -0.0031,0.0687 1.3229166,1.3229166 0 0 0 0.0031,-0.0687 z m -0.0031,0.0687 a 1.3229166,1.3229166 0 0 1 -0.0052,0.0775 1.3229166,1.3229166 0 0 0 0.0052,-0.0775 z m -0.0052,0.0775 a 1.3229166,1.3229166 0 0 1 -0.0072,0.0481 1.3229166,1.3229166 0 0 0 0.0072,-0.0481 z m -0.0072,0.0481 a 1.3229166,1.3229166 0 0 1 -0.01344,0.0786 1.3229166,1.3229166 0 0 0 0.01344,-0.0786 z m -0.01344,0.0786 a 1.3229166,1.3229166 0 0 1 -0.0124,0.0501 1.3229166,1.3229166 0 0 0 0.0124,-0.0501 z m -0.0124,0.0501 a 1.3229166,1.3229166 0 0 1 -0.02325,0.0842 1.3229166,1.3229166 0 0 0 0.02325,-0.0842 z m -0.03204,0.10801 a 1.3229166,1.3229166 0 0 1 -0.03669,0.0961 1.3229166,1.3229166 0 0 0 0.03669,-0.0961 z m -0.03669,0.0961 a 1.3229166,1.3229166 0 0 1 -0.01654,0.0346 1.3229166,1.3229166 0 0 0 0.01654,-0.0346 z m -0.01654,0.0346 a 1.3229166,1.3229166 0 0 1 -0.04496,0.0884 1.3229166,1.3229166 0 0 0 0.04496,-0.0884 z"
+ d="m 9.260422,286.76663 a 1.3229166,1.3229166 0 0 1 0.0925,0.005 1.3229166,1.3229166 0 0 0 -0.0925,-0.005 z m 0,0 a 1.3229166,1.3229166 0 0 0 -0.116272,0.006 1.3229166,1.3229166 0 0 1 0.116272,-0.006 z m -0.116272,0.006 a 1.3229166,1.3229166 0 0 0 -0.04806,0.006 1.3229166,1.3229166 0 0 1 0.04806,-0.006 z m -0.04806,0.006 a 1.3229166,1.3229166 0 0 0 -0.08785,0.0134 1.3229166,1.3229166 0 0 1 0.08785,-0.0134 z m -0.08785,0.0134 a 1.3229166,1.3229166 0 0 0 -0.03256,0.007 1.3229166,1.3229166 0 0 1 0.03256,-0.007 z m -0.03256,0.007 a 1.3229166,1.3229166 0 0 0 -0.1007689,0.0258 1.3229166,1.3229166 0 0 1 0.1007689,-0.0258 z m -0.1007689,0.0258 a 1.3229166,1.3229166 0 0 0 -0.0088,0.003 v 5.2e-4 a 1.3229166,1.3229166 0 0 1 0.0088,-0.003 z m -0.0088,0.003 a 1.3229166,1.3229166 0 0 0 -0.590661,0.37982 v 1.76113 a 1.3229166,1.3229166 0 0 1 -0.232028,-0.36483 1.3229166,1.3229166 0 0 0 0.892969,0.76584 1.3229166,1.3229166 0 0 1 -0.117822,-0.0362 v -0.88212 c 0,-0.15005 -0.0088,-0.30521 -0.02687,-0.4656 -0.01552,-0.1604 -0.02996,-0.3104 -0.04289,-0.4501 h 0.0155 l 0.248563,0.55138 0.657841,1.25781 a 1.3229166,1.3229166 0 0 0 0.5875609,-0.38912 v -1.73323 a 1.3229166,1.3229166 0 0 0 -0.543119,-0.37414 v 0.86196 c 0,0.15005 0.0077,0.30779 0.02325,0.47336 0.01811,0.16557 0.03357,0.31557 0.04651,0.4501 h -0.0155 l -0.2480468,-0.55862 -0.655257,-1.24747 z m 1.3921629,2.12804 a 1.3229166,1.3229166 0 0 0 0.08165,-0.10387 1.3229166,1.3229166 0 0 1 -0.08165,0.10387 z m 0.08165,-0.10387 a 1.3229166,1.3229166 0 0 0 0.06718,-0.10542 1.3229166,1.3229166 0 0 1 -0.06718,0.10542 z m -1.4035319,0.51779 a 1.3229166,1.3229166 0 0 0 0.01654,0.004 1.3229166,1.3229166 0 0 1 -0.01654,-0.004 z m 0.01654,0.004 a 1.3229166,1.3229166 0 0 0 0.109037,0.0212 1.3229166,1.3229166 0 0 1 -0.109037,-0.0212 z m 0.109037,0.0212 a 1.3229166,1.3229166 0 0 0 0.02222,0.004 1.3229166,1.3229166 0 0 1 -0.02222,-0.004 z m 0.02222,0.004 a 1.3229166,1.3229166 0 0 0 0.09302,0.009 1.3229166,1.3229166 0 0 1 -0.09302,-0.009 z m 0.09302,0.009 a 1.3229166,1.3229166 0 0 0 0.0832,0.004 1.3229166,1.3229166 0 0 1 -0.0832,-0.004 z m 0.0832,0.004 a 1.3229166,1.3229166 0 0 0 0.1167891,-0.006 1.3229166,1.3229166 0 0 1 -0.1167891,0.006 z m 0.1167891,-0.006 a 1.3229166,1.3229166 0 0 0 0.05013,-0.006 1.3229166,1.3229166 0 0 1 -0.05013,0.006 z m 0.05013,-0.006 a 1.3229166,1.3229166 0 0 0 0.08423,-0.0134 1.3229166,1.3229166 0 0 1 -0.08423,0.0134 z m 0.08423,-0.0134 a 1.3229166,1.3229166 0 0 0 0.03256,-0.007 1.3229166,1.3229166 0 0 1 -0.03256,0.007 z m 0.03256,-0.007 a 1.3229166,1.3229166 0 0 0 0.10697,-0.0279 1.3229166,1.3229166 0 0 1 -0.10697,0.0279 z m -1.500684,-0.77515 a 1.3229166,1.3229166 0 0 1 -0.03824,-0.10284 1.3229166,1.3229166 0 0 0 0.03824,0.10284 z m -0.03824,-0.10284 a 1.3229166,1.3229166 0 0 1 -0.01085,-0.0331 1.3229166,1.3229166 0 0 0 0.01085,0.0331 z m -0.01085,-0.0331 a 1.3229166,1.3229166 0 0 1 -0.02274,-0.0894 1.3229166,1.3229166 0 0 0 0.02274,0.0894 z m -0.02274,-0.0894 a 1.3229166,1.3229166 0 0 1 -0.0083,-0.0388 1.3229166,1.3229166 0 0 0 0.0083,0.0388 z m -0.0083,-0.0388 a 1.3229166,1.3229166 0 0 1 -0.01344,-0.0842 1.3229166,1.3229166 0 0 0 0.01344,0.0842 z m -0.01344,-0.0842 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.0512 1.3229166,1.3229166 0 0 0 0.0062,0.0512 z m -0.0062,-0.0512 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.11576 1.3229166,1.3229166 0 0 0 0.0062,0.11576 z m -0.0062,-0.11576 a 1.3229166,1.3229166 0 0 1 0.0036,-0.0729 1.3229166,1.3229166 0 0 0 -0.0036,0.0729 z m 0.0036,-0.0729 a 1.3229166,1.3229166 0 0 1 0.0067,-0.0811 1.3229166,1.3229166 0 0 0 -0.0067,0.0811 z m 0.0067,-0.0811 a 1.3229166,1.3229166 0 0 1 0.0078,-0.0527 1.3229166,1.3229166 0 0 0 -0.0078,0.0527 z m 0.0078,-0.0527 a 1.3229166,1.3229166 0 0 1 0.01447,-0.0796 1.3229166,1.3229166 0 0 0 -0.01447,0.0796 z m 0.01447,-0.0796 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0486 1.3229166,1.3229166 0 0 0 -0.0124,0.0486 z m 0.0124,-0.0486 a 1.3229166,1.3229166 0 0 1 0.02325,-0.0806 1.3229166,1.3229166 0 0 0 -0.02325,0.0806 z m 0.02325,-0.0806 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0341 1.3229166,1.3229166 0 0 0 -0.0124,0.0341 z m 0.0124,-0.0341 a 1.3229166,1.3229166 0 0 1 0.03772,-0.094 1.3229166,1.3229166 0 0 0 -0.03772,0.094 z m 0.03772,-0.094 a 1.3229166,1.3229166 0 0 1 0.01085,-0.0222 1.3229166,1.3229166 0 0 0 -0.01085,0.0222 z m 0.01085,-0.0222 a 1.3229166,1.3229166 0 0 1 0.05116,-0.0977 1.3229166,1.3229166 0 0 0 -0.05116,0.0977 z m 1.286226,-0.75241 a 1.3229166,1.3229166 0 0 1 0.0894,0.009 1.3229166,1.3229166 0 0 0 -0.0894,-0.009 z m 0.0894,0.009 a 1.3229166,1.3229166 0 0 1 0.03101,0.005 1.3229166,1.3229166 0 0 0 -0.03101,-0.005 z m 0.03101,0.005 a 1.3229166,1.3229166 0 0 1 0.108004,0.0227 1.3229166,1.3229166 0 0 0 -0.108004,-0.0227 z m 0.108004,0.0227 a 1.3229166,1.3229166 0 0 1 0.01499,0.004 1.3229166,1.3229166 0 0 0 -0.01499,-0.004 z m 0.01499,0.004 a 1.3229166,1.3229166 0 0 1 0.112655,0.0346 1.3229166,1.3229166 0 0 0 -0.112655,-0.0346 z m -1.3223999,0.39791 a 1.3229166,1.3229166 0 0 0 -0.07855,0.0977 1.3229166,1.3229166 0 0 1 0.07855,-0.0977 z m 1.9967787,0.0279 a 1.3229166,1.3229166 0 0 1 0.07751,0.10128 1.3229166,1.3229166 0 0 0 -0.07751,-0.10128 z m -2.0794607,0.0749 a 1.3229166,1.3229166 0 0 0 -0.06615,0.10128 1.3229166,1.3229166 0 0 1 0.06615,-0.10128 z m 2.1616257,0.0326 a 1.3229166,1.3229166 0 0 1 0.06356,0.10387 1.3229166,1.3229166 0 0 0 -0.06356,-0.10387 z m 0.06873,0.11318 a 1.3229166,1.3229166 0 0 1 0.05219,0.10748 1.3229166,1.3229166 0 0 0 -0.05219,-0.10748 z m 0.05788,0.12092 a 1.3229166,1.3229166 0 0 1 0.03411,0.092 1.3229166,1.3229166 0 0 0 -0.03411,-0.092 z m 0.03411,0.092 a 1.3229166,1.3229166 0 0 1 0.01344,0.0403 1.3229166,1.3229166 0 0 0 -0.01344,-0.0403 z m 0.01344,0.0403 a 1.3229166,1.3229166 0 0 1 0.02325,0.0899 1.3229166,1.3229166 0 0 0 -0.02325,-0.0899 z m 0.02325,0.0899 a 1.3229166,1.3229166 0 0 1 0.0078,0.0356 1.3229166,1.3229166 0 0 0 -0.0078,-0.0356 z m 0.0078,0.0356 a 1.3229166,1.3229166 0 0 1 0.01343,0.0879 1.3229166,1.3229166 0 0 0 -0.01343,-0.0879 z m 0.01343,0.0879 a 1.3229166,1.3229166 0 0 1 0.0057,0.0476 1.3229166,1.3229166 0 0 0 -0.0057,-0.0476 z m 0.0057,0.0476 a 1.3229166,1.3229166 0 0 1 0.0062,0.11678 1.3229166,1.3229166 0 0 0 -0.0062,-0.11678 z m 0.0062,0.11678 a 1.3229166,1.3229166 0 0 1 -0.0031,0.0687 1.3229166,1.3229166 0 0 0 0.0031,-0.0687 z m -0.0031,0.0687 a 1.3229166,1.3229166 0 0 1 -0.0052,0.0775 1.3229166,1.3229166 0 0 0 0.0052,-0.0775 z m -0.0052,0.0775 a 1.3229166,1.3229166 0 0 1 -0.0072,0.0481 1.3229166,1.3229166 0 0 0 0.0072,-0.0481 z m -0.0072,0.0481 a 1.3229166,1.3229166 0 0 1 -0.01344,0.0786 1.3229166,1.3229166 0 0 0 0.01344,-0.0786 z m -0.01344,0.0786 a 1.3229166,1.3229166 0 0 1 -0.0124,0.0501 1.3229166,1.3229166 0 0 0 0.0124,-0.0501 z m -0.0124,0.0501 a 1.3229166,1.3229166 0 0 1 -0.02325,0.0842 1.3229166,1.3229166 0 0 0 0.02325,-0.0842 z m -0.03204,0.10801 a 1.3229166,1.3229166 0 0 1 -0.03669,0.0961 1.3229166,1.3229166 0 0 0 0.03669,-0.0961 z m -0.03669,0.0961 a 1.3229166,1.3229166 0 0 1 -0.01654,0.0346 1.3229166,1.3229166 0 0 0 0.01654,-0.0346 z m -0.01654,0.0346 a 1.3229166,1.3229166 0 0 1 -0.04496,0.0884 1.3229166,1.3229166 0 0 0 0.04496,-0.0884 z"
id="circle1355-6-5-2-1"
inkscape:connector-curvature="0" />
<path
style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.610416,292.76667 a 1.3229167,1.3229167 0 0 0 -0.394291,0.0615 l 0.655257,1.24799 0.248047,0.55862 0.0155,0 c -0.01294,-0.13452 -0.0284,-0.28453 -0.04651,-0.4501 -0.01552,-0.16557 -0.02325,-0.32331 -0.02325,-0.47335 l 0,-0.86248 a 1.3229167,1.3229167 0 0 0 -0.454752,-0.0822 z m -0.984953,0.44183 a 1.3229167,1.3229167 0 0 0 -0.337964,0.88109 1.3229167,1.3229167 0 0 0 0.337964,0.88005 z m 1.982825,0.015 0,1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.509468,0.31316 c 0.01293,0.1397 0.02737,0.2897 0.04289,0.4501 0.01811,0.1604 0.02687,0.31556 0.02687,0.46561 l 0,0.88211 a 1.3229167,1.3229167 0 0 0 0.441833,0.078 1.3229167,1.3229167 0 0 0 0.410311,-0.0667 l -0.657841,-1.2578 -0.248564,-0.55139 z"
+ d="m 15.610416,286.76642 a 1.3229167,1.3229167 0 0 0 -0.394291,0.0615 l 0.655257,1.24799 0.248047,0.55862 h 0.0155 c -0.01294,-0.13452 -0.0284,-0.28453 -0.04651,-0.4501 -0.01552,-0.16557 -0.02325,-0.32331 -0.02325,-0.47335 v -0.86248 a 1.3229167,1.3229167 0 0 0 -0.454752,-0.0822 z m -0.984953,0.44183 a 1.3229167,1.3229167 0 0 0 -0.337964,0.88109 1.3229167,1.3229167 0 0 0 0.337964,0.88005 z m 1.982825,0.015 v 1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.509468,0.31316 c 0.01293,0.1397 0.02737,0.2897 0.04289,0.4501 0.01811,0.1604 0.02687,0.31556 0.02687,0.46561 v 0.88211 a 1.3229167,1.3229167 0 0 0 0.441833,0.078 1.3229167,1.3229167 0 0 0 0.410311,-0.0667 l -0.657841,-1.2578 -0.248564,-0.55139 z"
id="circle1307-3-2"
inkscape:connector-curvature="0" />
- <path
- style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 2.9104166,292.76667 a 1.3229167,1.3229167 0 0 0 -0.3942909,0.0615 l 0.6552569,1.24799 0.248047,0.55862 0.0155,0 c -0.01294,-0.13452 -0.0284,-0.28453 -0.04651,-0.4501 -0.01552,-0.16557 -0.02325,-0.32331 -0.02325,-0.47335 l 0,-0.86248 a 1.3229167,1.3229167 0 0 0 -0.454752,-0.0822 z m -0.9849529,0.44183 a 1.3229167,1.3229167 0 0 0 -0.337964,0.88109 1.3229167,1.3229167 0 0 0 0.337964,0.88005 z m 1.9828249,0.015 0,1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094679,0.31316 c 0.01293,0.1397 0.02737,0.2897 0.04289,0.4501 0.01811,0.1604 0.02687,0.31556 0.02687,0.46561 l 0,0.88211 a 1.3229167,1.3229167 0 0 0 0.4418329,0.078 1.3229167,1.3229167 0 0 0 0.410311,-0.0667 l -0.657841,-1.2578 -0.248564,-0.55139 z"
- id="circle1307-3-2-0"
- inkscape:connector-curvature="0" />
+ <g
+ id="g1141"
+ transform="translate(0,-6.0002511)">
+ <rect
+ inkscape:export-ydpi="96"
+ inkscape:export-xdpi="96"
+ ry="1.0408999"
+ y="291.17914"
+ x="0"
+ height="5.8208332"
+ width="5.8208332"
+ id="rect886-2"
+ style="display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.53104264;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ transform="translate(0,-4.4354145e-6)" />
+ <ellipse
+ inkscape:export-ydpi="96"
+ inkscape:export-xdpi="96"
+ ry="1.5709635"
+ rx="1.984375"
+ cy="293.29111"
+ cx="2.8820686"
+ id="ellipse1361"
+ style="display:inline;fill:#000000;fill-opacity:0;stroke-width:0.26458332"
+ transform="translate(0,-4.4354145e-6)" />
+ <path
+ sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
+ inkscape:connector-curvature="0"
+ id="path1363"
+ d="m 2.9575481,296.20336 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 h 0.6160776 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 H 1.2112766 1.4412488 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 v 0.0275 l -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 h -0.029669 v -0.23069 -0.2307 l 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 H 4.3945838 Z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,292.12396 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 v -0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
+ style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1"
+ transform="translate(0,-4.4354145e-6)" />
+ <path
+ inkscape:connector-curvature="0"
+ id="circle1307-3-2-0"
+ d="m 2.9104166,292.76667 a 1.3229167,1.3229167 0 0 0 -0.3942909,0.0615 l 0.6552569,1.24799 0.248047,0.55862 h 0.0155 c -0.01294,-0.13452 -0.0284,-0.28453 -0.04651,-0.4501 -0.01552,-0.16557 -0.02325,-0.32331 -0.02325,-0.47335 v -0.86248 a 1.3229167,1.3229167 0 0 0 -0.454752,-0.0822 z m -0.9849529,0.44183 a 1.3229167,1.3229167 0 0 0 -0.337964,0.88109 1.3229167,1.3229167 0 0 0 0.337964,0.88005 z m 1.9828249,0.015 v 1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094679,0.31316 c 0.01293,0.1397 0.02737,0.2897 0.04289,0.4501 0.01811,0.1604 0.02687,0.31556 0.02687,0.46561 v 0.88211 a 1.3229167,1.3229167 0 0 0 0.4418329,0.078 1.3229167,1.3229167 0 0 0 0.410311,-0.0667 l -0.657841,-1.2578 -0.248564,-0.55139 z"
+ style="display:inline;fill:#f5820b;fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="translate(-12.699935,5.9968769)"
+ style="display:inline"
+ inkscape:export-filename="/tmp/g199.png"
+ inkscape:export-xdpi="960"
+ inkscape:export-ydpi="960"
+ id="g199">
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ inkscape:export-ydpi="960"
+ inkscape:export-xdpi="960"
+ inkscape:connector-curvature="0"
+ id="rect886-2-0-5-6-4-7"
+ d="m 13.659376,285.18715 c -0.493981,5.4e-4 -0.9658,0.44059 -0.959375,0.95457 -2e-6,1.13426 -2e-6,2.71962 -2e-6,3.89856 0,0.53485 0.462699,0.95943 0.959448,0.95943 1.135438,0.004 2.766605,0.005 3.902025,1e-5 0.523457,0 0.959391,-0.45615 0.959391,-0.95944 v -3.89856 c 0,-0.6274 -0.430497,-0.95448 -0.959391,-0.95448 -1.32227,-0.002 -2.625807,-0.006 -3.902096,-10e-5 z"
+ style="display:inline;fill:url(#linearGradient5108-62);fill-opacity:1;stroke:none;stroke-width:0.28327119;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <ellipse
+ ry="1.2755401"
+ rx="1.2754397"
+ inkscape:export-ydpi="960"
+ inkscape:export-xdpi="960"
+ cy="288.08957"
+ cx="15.610312"
+ id="circle1355-6-5-0"
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.48207495;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:export-ydpi="960"
+ inkscape:export-xdpi="960"
+ sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz"
+ inkscape:connector-curvature="0"
+ id="path1363-0-6-9"
+ d="m 15.657548,290.20337 -2.41e-4,-0.62413 0.07055,-0.005 c 0.352057,-0.0259 0.68136,-0.17674 0.932282,-0.42694 0.244216,-0.2435 0.391727,-0.55156 0.428064,-0.89396 0.0035,-0.0326 0.0063,-0.0713 0.0063,-0.0861 l 4.8e-5,-0.0269 h 0.616078 c 0.338842,0 0.61527,7.8e-4 0.614284,0.002 -9.86e-4,9.6e-4 -0.181883,0.0796 -0.401992,0.17477 -0.22011,0.0951 -0.401857,0.17455 -0.403882,0.17643 -0.002,0.002 -0.01299,0.0399 -0.02435,0.0845 -0.03511,0.13774 -0.07683,0.25158 -0.136959,0.37377 -0.04444,0.0903 -0.07288,0.13941 -0.132079,0.22801 -0.264786,0.39632 -0.657529,0.67402 -1.128866,0.7982 l -0.01879,0.005 -0.210118,0.42249 -0.210118,0.4225 -2.41e-4,-0.62413 z m -0.234765,0.24268 c -0.0852,-0.19674 -0.155648,-0.35965 -0.156544,-0.36202 -0.001,-0.003 0.0042,-0.003 0.01426,-10e-4 0.04532,0.008 0.147125,0.0199 0.218668,0.0246 l 0.08069,0.005 v 0.34566 c 0,0.1901 -4.84e-4,0.34563 -0.0011,0.34561 -5.91e-4,0 -0.07079,-0.161 -0.155991,-0.35774 z m 0.105429,-0.41118 c -0.109265,-0.004 -0.260381,-0.0264 -0.376531,-0.055 -0.312996,-0.0772 -0.595284,-0.22881 -0.84262,-0.45265 -0.164349,-0.14873 -0.318026,-0.35208 -0.41982,-0.5555 -0.125459,-0.25072 -0.187333,-0.48755 -0.205167,-0.7853 l -0.0028,-0.0463 h 0.229973 0.229972 l 0.0027,0.0539 c 0.0032,0.0641 0.01626,0.15737 0.0315,0.22583 0.121036,0.54384 0.535001,0.97183 1.076066,1.11252 0.08699,0.0226 0.23861,0.0451 0.304516,0.0451 h 0.02379 v 0.23022 0.23021 l -0.0097,-8.5e-4 c -0.0053,-4.7e-4 -0.02421,-0.001 -0.04196,-0.002 z m -2.261451,-1.70506 -0.378573,-0.18901 0.35974,-3.3e-4 0.35974,-3.3e-4 0.0029,0.0592 c 0.0047,0.0942 0.02719,0.27123 0.03968,0.31198 0.0013,0.004 6.75e-4,0.008 -0.0013,0.008 -0.002,0 -0.173986,-0.085 -0.382201,-0.18901 z m 0.04392,-0.47993 0.426796,-0.21224 0.0048,-0.0188 c 0.109952,-0.42588 0.364272,-0.80512 0.716537,-1.06844 0.145744,-0.10897 0.315974,-0.20174 0.488415,-0.26622 0.03961,-0.0148 0.150541,-0.0496 0.188753,-0.0592 l 0.01878,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.72e-4,0.62868 1.73e-4,0.62867 -0.05702,0.003 c -0.25946,0.0127 -0.534501,0.10989 -0.756227,0.26712 -0.101584,0.072 -0.225158,0.18795 -0.298576,0.28007 -0.137968,0.17312 -0.232484,0.36408 -0.284382,0.57456 -0.02262,0.0917 -0.04107,0.22047 -0.04107,0.28654 v 0.0275 l -0.629346,-2.8e-4 -0.629346,-2.7e-4 z m 3.783903,0.18686 c 0,-0.0143 -0.003,-0.0544 -0.0066,-0.0891 -0.0442,-0.42091 -0.266102,-0.80053 -0.613645,-1.04981 -0.150117,-0.10767 -0.321841,-0.18662 -0.503547,-0.23148 -0.097,-0.024 -0.214767,-0.041 -0.283784,-0.041 h -0.02967 v -0.23069 -0.2307 l 0.05271,0.003 c 0.253556,0.0142 0.476807,0.0672 0.698863,0.16595 0.285606,0.12702 0.541913,0.32735 0.736247,0.57544 0.04542,0.058 0.125363,0.17768 0.160218,0.23989 0.123736,0.22085 0.204553,0.46733 0.234224,0.71434 0.0051,0.0427 0.01532,0.17268 0.01544,0.19687 0,0.002 -0.103584,0.003 -0.230207,0.003 h -0.230221 z m 0.530238,-0.0551 c -0.0056,-0.0869 -0.01714,-0.18204 -0.03097,-0.25435 -0.0047,-0.0247 -0.0081,-0.0452 -0.0076,-0.0456 5.61e-4,-3.8e-4 0.173364,0.085 0.384006,0.18984 l 0.382987,0.19053 -0.36164,2.8e-4 -0.361639,2.8e-4 -0.0052,-0.081 z m -1.643993,-1.85767 c -0.07863,-0.0159 -0.22585,-0.0321 -0.292322,-0.0322 l -0.0312,-4e-5 v -0.36218 c 0,-0.19921 6.93e-4,-0.36138 0.0015,-0.3604 0.0084,0.01 0.379508,0.76549 0.375743,0.76512 -0.0028,-2.7e-4 -0.02697,-0.005 -0.05376,-0.0103 z"
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.00430322;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="circle1355-6-5-2-3"
+ d="m 15.610423,286.76689 a 1.3229166,1.3229166 0 0 1 0.0925,0.005 1.3229166,1.3229166 0 0 0 -0.0925,-0.005 z m 0,0 a 1.3229166,1.3229166 0 0 0 -0.116272,0.006 1.3229166,1.3229166 0 0 1 0.116272,-0.006 z m -0.116272,0.006 a 1.3229166,1.3229166 0 0 0 -0.04806,0.006 1.3229166,1.3229166 0 0 1 0.04806,-0.006 z m -0.04806,0.006 a 1.3229166,1.3229166 0 0 0 -0.08785,0.0134 1.3229166,1.3229166 0 0 1 0.08785,-0.0134 z m -0.08785,0.0134 a 1.3229166,1.3229166 0 0 0 -0.03256,0.007 1.3229166,1.3229166 0 0 1 0.03256,-0.007 z m -0.03256,0.007 a 1.3229166,1.3229166 0 0 0 -0.100769,0.0258 1.3229166,1.3229166 0 0 1 0.100769,-0.0258 z m -0.100769,0.0258 a 1.3229166,1.3229166 0 0 0 -0.0088,0.003 v 5.2e-4 a 1.3229166,1.3229166 0 0 1 0.0088,-0.003 z m -0.0088,0.003 a 1.3229166,1.3229166 0 0 0 -0.590661,0.37982 v 1.76113 a 1.3229166,1.3229166 0 0 1 -0.232028,-0.36483 1.3229166,1.3229166 0 0 0 0.892969,0.76584 1.3229166,1.3229166 0 0 1 -0.117822,-0.0362 v -0.88212 c 0,-0.15005 -0.0088,-0.30521 -0.02687,-0.4656 -0.01552,-0.1604 -0.02996,-0.3104 -0.04289,-0.4501 h 0.0155 l 0.248563,0.55138 0.657841,1.25781 a 1.3229166,1.3229166 0 0 0 0.587561,-0.38912 v -1.73323 a 1.3229166,1.3229166 0 0 0 -0.543119,-0.37414 v 0.86196 c 0,0.15005 0.0077,0.30779 0.02325,0.47336 0.01811,0.16557 0.03357,0.31557 0.04651,0.4501 h -0.0155 l -0.248047,-0.55862 -0.655257,-1.24747 z m 1.392163,2.12804 a 1.3229166,1.3229166 0 0 0 0.08165,-0.10387 1.3229166,1.3229166 0 0 1 -0.08165,0.10387 z m 0.08165,-0.10387 a 1.3229166,1.3229166 0 0 0 0.06718,-0.10542 1.3229166,1.3229166 0 0 1 -0.06718,0.10542 z m -1.403532,0.51779 a 1.3229166,1.3229166 0 0 0 0.01654,0.004 1.3229166,1.3229166 0 0 1 -0.01654,-0.004 z m 0.01654,0.004 a 1.3229166,1.3229166 0 0 0 0.109037,0.0212 1.3229166,1.3229166 0 0 1 -0.109037,-0.0212 z m 0.109037,0.0212 a 1.3229166,1.3229166 0 0 0 0.02222,0.004 1.3229166,1.3229166 0 0 1 -0.02222,-0.004 z m 0.02222,0.004 a 1.3229166,1.3229166 0 0 0 0.09302,0.009 1.3229166,1.3229166 0 0 1 -0.09302,-0.009 z m 0.09302,0.009 a 1.3229166,1.3229166 0 0 0 0.0832,0.004 1.3229166,1.3229166 0 0 1 -0.0832,-0.004 z m 0.0832,0.004 a 1.3229166,1.3229166 0 0 0 0.116789,-0.006 1.3229166,1.3229166 0 0 1 -0.116789,0.006 z m 0.116789,-0.006 a 1.3229166,1.3229166 0 0 0 0.05013,-0.006 1.3229166,1.3229166 0 0 1 -0.05013,0.006 z m 0.05013,-0.006 a 1.3229166,1.3229166 0 0 0 0.08423,-0.0134 1.3229166,1.3229166 0 0 1 -0.08423,0.0134 z m 0.08423,-0.0134 a 1.3229166,1.3229166 0 0 0 0.03256,-0.007 1.3229166,1.3229166 0 0 1 -0.03256,0.007 z m 0.03256,-0.007 a 1.3229166,1.3229166 0 0 0 0.10697,-0.0279 1.3229166,1.3229166 0 0 1 -0.10697,0.0279 z m -1.500684,-0.77515 a 1.3229166,1.3229166 0 0 1 -0.03824,-0.10284 1.3229166,1.3229166 0 0 0 0.03824,0.10284 z m -0.03824,-0.10284 a 1.3229166,1.3229166 0 0 1 -0.01085,-0.0331 1.3229166,1.3229166 0 0 0 0.01085,0.0331 z m -0.01085,-0.0331 a 1.3229166,1.3229166 0 0 1 -0.02274,-0.0894 1.3229166,1.3229166 0 0 0 0.02274,0.0894 z m -0.02274,-0.0894 a 1.3229166,1.3229166 0 0 1 -0.0083,-0.0388 1.3229166,1.3229166 0 0 0 0.0083,0.0388 z m -0.0083,-0.0388 a 1.3229166,1.3229166 0 0 1 -0.01344,-0.0842 1.3229166,1.3229166 0 0 0 0.01344,0.0842 z m -0.01344,-0.0842 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.0512 1.3229166,1.3229166 0 0 0 0.0062,0.0512 z m -0.0062,-0.0512 a 1.3229166,1.3229166 0 0 1 -0.0062,-0.11576 1.3229166,1.3229166 0 0 0 0.0062,0.11576 z m -0.0062,-0.11576 a 1.3229166,1.3229166 0 0 1 0.0036,-0.0729 1.3229166,1.3229166 0 0 0 -0.0036,0.0729 z m 0.0036,-0.0729 a 1.3229166,1.3229166 0 0 1 0.0067,-0.0811 1.3229166,1.3229166 0 0 0 -0.0067,0.0811 z m 0.0067,-0.0811 a 1.3229166,1.3229166 0 0 1 0.0078,-0.0527 1.3229166,1.3229166 0 0 0 -0.0078,0.0527 z m 0.0078,-0.0527 a 1.3229166,1.3229166 0 0 1 0.01447,-0.0796 1.3229166,1.3229166 0 0 0 -0.01447,0.0796 z m 0.01447,-0.0796 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0486 1.3229166,1.3229166 0 0 0 -0.0124,0.0486 z m 0.0124,-0.0486 a 1.3229166,1.3229166 0 0 1 0.02325,-0.0806 1.3229166,1.3229166 0 0 0 -0.02325,0.0806 z m 0.02325,-0.0806 a 1.3229166,1.3229166 0 0 1 0.0124,-0.0341 1.3229166,1.3229166 0 0 0 -0.0124,0.0341 z m 0.0124,-0.0341 a 1.3229166,1.3229166 0 0 1 0.03772,-0.094 1.3229166,1.3229166 0 0 0 -0.03772,0.094 z m 0.03772,-0.094 a 1.3229166,1.3229166 0 0 1 0.01085,-0.0222 1.3229166,1.3229166 0 0 0 -0.01085,0.0222 z m 0.01085,-0.0222 a 1.3229166,1.3229166 0 0 1 0.05116,-0.0977 1.3229166,1.3229166 0 0 0 -0.05116,0.0977 z m 1.286226,-0.75241 a 1.3229166,1.3229166 0 0 1 0.0894,0.009 1.3229166,1.3229166 0 0 0 -0.0894,-0.009 z m 0.0894,0.009 a 1.3229166,1.3229166 0 0 1 0.03101,0.005 1.3229166,1.3229166 0 0 0 -0.03101,-0.005 z m 0.03101,0.005 a 1.3229166,1.3229166 0 0 1 0.108004,0.0227 1.3229166,1.3229166 0 0 0 -0.108004,-0.0227 z m 0.108004,0.0227 a 1.3229166,1.3229166 0 0 1 0.01499,0.004 1.3229166,1.3229166 0 0 0 -0.01499,-0.004 z m 0.01499,0.004 a 1.3229166,1.3229166 0 0 1 0.112655,0.0346 1.3229166,1.3229166 0 0 0 -0.112655,-0.0346 z m -1.3224,0.39791 a 1.3229166,1.3229166 0 0 0 -0.07855,0.0977 1.3229166,1.3229166 0 0 1 0.07855,-0.0977 z m 1.996778,0.0279 a 1.3229166,1.3229166 0 0 1 0.07751,0.10128 1.3229166,1.3229166 0 0 0 -0.07751,-0.10128 z m -2.07946,0.0749 a 1.3229166,1.3229166 0 0 0 -0.06615,0.10128 1.3229166,1.3229166 0 0 1 0.06615,-0.10128 z m 2.161625,0.0326 a 1.3229166,1.3229166 0 0 1 0.06356,0.10387 1.3229166,1.3229166 0 0 0 -0.06356,-0.10387 z m 0.06873,0.11318 a 1.3229166,1.3229166 0 0 1 0.05219,0.10748 1.3229166,1.3229166 0 0 0 -0.05219,-0.10748 z m 0.05788,0.12092 a 1.3229166,1.3229166 0 0 1 0.03411,0.092 1.3229166,1.3229166 0 0 0 -0.03411,-0.092 z m 0.03411,0.092 a 1.3229166,1.3229166 0 0 1 0.01344,0.0403 1.3229166,1.3229166 0 0 0 -0.01344,-0.0403 z m 0.01344,0.0403 a 1.3229166,1.3229166 0 0 1 0.02325,0.0899 1.3229166,1.3229166 0 0 0 -0.02325,-0.0899 z m 0.02325,0.0899 a 1.3229166,1.3229166 0 0 1 0.0078,0.0356 1.3229166,1.3229166 0 0 0 -0.0078,-0.0356 z m 0.0078,0.0356 a 1.3229166,1.3229166 0 0 1 0.01343,0.0879 1.3229166,1.3229166 0 0 0 -0.01343,-0.0879 z m 0.01343,0.0879 a 1.3229166,1.3229166 0 0 1 0.0057,0.0476 1.3229166,1.3229166 0 0 0 -0.0057,-0.0476 z m 0.0057,0.0476 a 1.3229166,1.3229166 0 0 1 0.0062,0.11678 1.3229166,1.3229166 0 0 0 -0.0062,-0.11678 z m 0.0062,0.11678 a 1.3229166,1.3229166 0 0 1 -0.0031,0.0687 1.3229166,1.3229166 0 0 0 0.0031,-0.0687 z m -0.0031,0.0687 a 1.3229166,1.3229166 0 0 1 -0.0052,0.0775 1.3229166,1.3229166 0 0 0 0.0052,-0.0775 z m -0.0052,0.0775 a 1.3229166,1.3229166 0 0 1 -0.0072,0.0481 1.3229166,1.3229166 0 0 0 0.0072,-0.0481 z m -0.0072,0.0481 a 1.3229166,1.3229166 0 0 1 -0.01344,0.0786 1.3229166,1.3229166 0 0 0 0.01344,-0.0786 z m -0.01344,0.0786 a 1.3229166,1.3229166 0 0 1 -0.0124,0.0501 1.3229166,1.3229166 0 0 0 0.0124,-0.0501 z m -0.0124,0.0501 a 1.3229166,1.3229166 0 0 1 -0.02325,0.0842 1.3229166,1.3229166 0 0 0 0.02325,-0.0842 z m -0.03204,0.10801 a 1.3229166,1.3229166 0 0 1 -0.03669,0.0961 1.3229166,1.3229166 0 0 0 0.03669,-0.0961 z m -0.03669,0.0961 a 1.3229166,1.3229166 0 0 1 -0.01654,0.0346 1.3229166,1.3229166 0 0 0 0.01654,-0.0346 z m -0.01654,0.0346 a 1.3229166,1.3229166 0 0 1 -0.04496,0.0884 1.3229166,1.3229166 0 0 0 0.04496,-0.0884 z"
+ style="display:inline;fill:url(#linearGradient5120-2);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
</g>
<g
inkscape:label="Overpass"
inkscape:groupmode="layer"
id="g5135"
- transform="translate(-1.0093054e-6,-285.17914)"
+ transform="translate(-1.0093054e-6,-279.17889)"
style="display:none">
<ellipse
style="fill:#000000;fill-opacity:0;stroke-width:0.26458332"
id="ellipse5131"
cx="2.8820686"
- cy="293.29111"
+ cy="288.08929"
rx="1.984375"
ry="1.5709635" />
<path
style="fill:#000000;stroke-width:0.00430322"
- d="m 2.9575481,296.20336 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 0.6160776,0 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-0.001 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 0,0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 0.22997238,0 0.2299722,0 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 l 0.02379,0 0,0.23022 0,0.23021 -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-10e-4 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 l 0,0.0275 -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 l -0.029669,0 0,-0.23069 0,-0.2307 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 l -0.2302216,0 z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,292.12396 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 0,-0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
+ d="m 2.9575481,290.19547 -2.41e-4,-0.62413 0.070552,-0.005 c 0.3520566,-0.0259 0.6813604,-0.17674 0.9322824,-0.42694 0.2442154,-0.2435 0.3917262,-0.55156 0.4280639,-0.89396 0.00346,-0.0326 0.00631,-0.0713 0.00633,-0.0861 l 4.77e-5,-0.0269 h 0.6160776 c 0.3388423,0 0.6152703,7.8e-4 0.6142844,0.002 -9.863e-4,9.6e-4 -0.1818828,0.0796 -0.4019924,0.17477 -0.2201096,0.0951 -0.4018565,0.17455 -0.403882,0.17643 -0.00203,0.002 -0.012985,0.0399 -0.024355,0.0845 -0.035114,0.13774 -0.076827,0.25158 -0.1369585,0.37377 -0.044439,0.0903 -0.072884,0.13941 -0.1320787,0.22801 -0.2647861,0.39632 -0.6575292,0.67402 -1.1288667,0.7982 l -0.018789,0.005 -0.210118,0.42249 -0.2101176,0.4225 -2.409e-4,-0.62413 z m -0.2347647,0.24268 c -0.085204,-0.19674 -0.1556487,-0.35965 -0.1565444,-0.36202 -0.00103,-0.003 0.00425,-0.003 0.014258,-10e-4 0.045318,0.008 0.1471249,0.0199 0.2186682,0.0246 l 0.080685,0.005 v 0.34566 c 0,0.1901 -4.841e-4,0.34563 -0.00108,0.34561 -5.917e-4,0 -0.070788,-0.161 -0.1559917,-0.35774 z m 0.1054289,-0.41118 c -0.1092652,-0.004 -0.2603813,-0.0264 -0.3765316,-0.055 -0.3129961,-0.0772 -0.5952842,-0.22881 -0.8426194,-0.45265 -0.1643498,-0.14873 -0.3180258,-0.35208 -0.4198204,-0.5555 -0.125459,-0.25072 -0.1873333,-0.48755 -0.20516668,-0.7853 l -0.00277,-0.0463 H 1.2112766 1.4412488 l 0.00273,0.0539 c 0.00325,0.0641 0.016262,0.15737 0.0315,0.22583 0.1210361,0.54384 0.5350017,0.97183 1.0760666,1.11252 0.086994,0.0226 0.2386098,0.0451 0.3045154,0.0451 h 0.02379 v 0.23022 0.23021 l -0.00968,-8.5e-4 c -0.00533,-4.7e-4 -0.024206,-0.001 -0.041956,-0.002 z m -2.26145148,-1.70506 -0.378573,-0.18901 0.3597398,-3.3e-4 0.35974,-3.3e-4 0.00294,0.0592 c 0.00468,0.0942 0.027189,0.27123 0.039677,0.31198 0.00127,0.004 6.749e-4,0.008 -0.00132,0.008 -0.00199,0 -0.1739854,-0.085 -0.3822006,-0.18901 z m 0.04392,-0.47993 0.42679608,-0.21224 0.00485,-0.0188 c 0.1099519,-0.42588 0.3642725,-0.80512 0.716537,-1.06844 0.1457446,-0.10897 0.3159741,-0.20174 0.4884153,-0.26622 0.03961,-0.0148 0.1505411,-0.0496 0.1887531,-0.0592 l 0.018776,-0.005 0.212349,-0.4268 0.212349,-0.4268 1.721e-4,0.62868 1.722e-4,0.62867 -0.057018,0.003 c -0.2594598,0.0127 -0.5345011,0.10989 -0.7562267,0.26712 -0.1015841,0.072 -0.2251575,0.18795 -0.2985758,0.28007 -0.1379677,0.17312 -0.2324841,0.36408 -0.2843825,0.57456 -0.02262,0.0917 -0.041071,0.22047 -0.041071,0.28654 v 0.0275 l -0.62934558,-2.8e-4 -0.6293457,-2.7e-4 z m 3.78390278,0.18686 c 0,-0.0143 -0.00298,-0.0544 -0.00663,-0.0891 -0.044202,-0.42091 -0.2661011,-0.80053 -0.613645,-1.04981 -0.1501169,-0.10767 -0.3218407,-0.18662 -0.5035471,-0.23148 -0.097001,-0.024 -0.2147667,-0.041 -0.2837839,-0.041 h -0.029669 v -0.23069 -0.2307 l 0.052714,0.003 c 0.2535564,0.0142 0.476807,0.0672 0.6988638,0.16595 0.2856059,0.12702 0.5419129,0.32735 0.7362467,0.57544 0.045423,0.058 0.1253626,0.17768 0.1602178,0.23989 0.123736,0.22085 0.2045531,0.46733 0.2342246,0.71434 0.00513,0.0427 0.015322,0.17268 0.015437,0.19687 0,0.002 -0.1035849,0.003 -0.2302071,0.003 H 4.3945838 Z m 0.5302383,-0.0551 c -0.00555,-0.0869 -0.017138,-0.18204 -0.030972,-0.25435 -0.00472,-0.0247 -0.00813,-0.0452 -0.00757,-0.0456 5.611e-4,-3.8e-4 0.1733637,0.085 0.3840063,0.18984 l 0.3829864,0.19053 -0.3616394,2.8e-4 -0.3616395,2.8e-4 -0.00517,-0.081 z M 3.280829,286.11607 c -0.078632,-0.0159 -0.2258501,-0.0321 -0.2923219,-0.0322 l -0.031198,-4e-5 v -0.36218 c 0,-0.19921 6.933e-4,-0.36138 0.00154,-0.3604 0.00836,0.01 0.3795081,0.76549 0.3757428,0.76512 -0.00278,-2.7e-4 -0.026974,-0.005 -0.053764,-0.0103 z"
id="path5133"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccscccccscccccccccccsccccccccccccccsccccccccccccscccccccccccccccccsccccccccscccccccccsccccccccccczccscccz" />
<path
- transform="translate(0,-4.4354145e-6)"
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 2.9104165,292.76667 a 1.3229167,1.3229167 0 0 0 -0.3942912,0.0615 l 0.6552571,1.24799 0.2480469,0.55862 0.015502,0 c -0.012935,-0.13452 -0.028399,-0.28453 -0.046509,-0.4501 -0.015523,-0.16557 -0.023254,-0.32331 -0.023254,-0.47335 l 0,-0.86248 a 1.3229167,1.3229167 0 0 0 -0.4547518,-0.0822 z m -0.9849529,0.44183 a 1.3229167,1.3229167 0 0 0 -0.3379638,0.88109 1.3229167,1.3229167 0 0 0 0.3379638,0.88005 z m 1.9828249,0.015 0,1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094687,0.31316 c 0.012935,0.1397 0.027369,0.2897 0.042891,0.4501 0.018109,0.1604 0.026872,0.31556 0.026872,0.46561 l 0,0.88211 a 1.3229167,1.3229167 0 0 0 0.4418335,0.078 1.3229167,1.3229167 0 0 0 0.4103108,-0.0667 l -0.657841,-1.2578 -0.2485636,-0.55139 z"
+ d="m 2.9104165,286.7664 a 1.3229167,1.3229167 0 0 0 -0.3942912,0.0615 l 0.6552571,1.24799 0.2480469,0.55862 h 0.015502 c -0.012935,-0.13452 -0.028399,-0.28453 -0.046509,-0.4501 -0.015523,-0.16557 -0.023254,-0.32331 -0.023254,-0.47335 v -0.86248 a 1.3229167,1.3229167 0 0 0 -0.4547518,-0.0822 z m -0.9849529,0.44183 a 1.3229167,1.3229167 0 0 0 -0.3379638,0.88109 1.3229167,1.3229167 0 0 0 0.3379638,0.88005 z m 1.9828249,0.015 v 1.73323 a 1.3229167,1.3229167 0 0 0 0.325045,-0.86713 1.3229167,1.3229167 0 0 0 -0.325045,-0.8661 z m -1.5094687,0.31316 c 0.012935,0.1397 0.027369,0.2897 0.042891,0.4501 0.018109,0.1604 0.026872,0.31556 0.026872,0.46561 v 0.88211 a 1.3229167,1.3229167 0 0 0 0.4418335,0.078 1.3229167,1.3229167 0 0 0 0.4103108,-0.0667 l -0.657841,-1.2578 -0.2485636,-0.55139 z"
id="circle1307-3-7"
inkscape:connector-curvature="0" />
</g>
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index 55455958a..b18bad109 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -68,7 +68,7 @@ android {
}
checkstyle {
- toolVersion = '8.10'
+ toolVersion = '8.26'
}
}
applicationVariants.all { variant ->
diff --git a/navit/android/res/drawable-hdpi/icon.png b/navit/android/res/drawable-hdpi/icon.png
index 311c57b59..ce18b5780 100644
--- a/navit/android/res/drawable-hdpi/icon.png
+++ b/navit/android/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/navit/android/res/drawable-ldpi/icon.png b/navit/android/res/drawable-ldpi/icon.png
index da2553687..183e2f829 100644
--- a/navit/android/res/drawable-ldpi/icon.png
+++ b/navit/android/res/drawable-ldpi/icon.png
Binary files differ
diff --git a/navit/android/res/drawable-mdpi/icon.png b/navit/android/res/drawable-mdpi/icon.png
index f8f68e8bc..1bde1888e 100644
--- a/navit/android/res/drawable-mdpi/icon.png
+++ b/navit/android/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/navit/android/res/drawable-xhdpi/icon.png b/navit/android/res/drawable-xhdpi/icon.png
index 649fb32d4..041c61c03 100644
--- a/navit/android/res/drawable-xhdpi/icon.png
+++ b/navit/android/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/navit/android/res/drawable-xxhdpi/icon.png b/navit/android/res/drawable-xxhdpi/icon.png
index 398945c23..ad89bd0b5 100644
--- a/navit/android/res/drawable-xxhdpi/icon.png
+++ b/navit/android/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index 84ed7fe00..3470bdd4e 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -626,13 +626,13 @@ static char *get_iter_name(char *type) {
}
static DBusHandlerResult request_attr_iter(DBusConnection *connection, DBusMessage *message, char *type,
- struct attr_iter *(*func)(void)) {
+ struct attr_iter *(*func)(void*)) {
DBusMessage *reply;
char *iter_name;
char *opath;
struct attr_iter *attr_iter;
- attr_iter=(*func)();
+ attr_iter=(*func)(NULL);
iter_name=get_iter_name(type);
opath=object_new(iter_name,attr_iter);
g_free(iter_name);
@@ -833,7 +833,7 @@ static DBusHandlerResult request_config_get_attr(DBusConnection *connection, DBu
}
static DBusHandlerResult request_config_attr_iter(DBusConnection *connection, DBusMessage *message) {
- return request_attr_iter(connection, message, "config", (struct attr_iter * (*)(void))config_attr_iter_new);
+ return request_attr_iter(connection, message, "config", (struct attr_iter * (*)(void*))config_attr_iter_new);
}
static DBusHandlerResult request_config_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) {
@@ -941,7 +941,7 @@ static DBusHandlerResult request_map_dump(DBusConnection *connection, DBusMessag
/* mapset */
static DBusHandlerResult request_mapset_attr_iter(DBusConnection *connection, DBusMessage *message) {
- return request_attr_iter(connection, message, "mapset", (struct attr_iter * (*)(void))mapset_attr_iter_new);
+ return request_attr_iter(connection, message, "mapset", (struct attr_iter * (*)(void*))mapset_attr_iter_new);
}
static DBusHandlerResult request_mapset_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) {
@@ -986,7 +986,7 @@ static DBusHandlerResult request_roadprofile_set_attr(DBusConnection *connection
}
static DBusHandlerResult request_roadprofile_attr_iter(DBusConnection *connection, DBusMessage *message) {
- return request_attr_iter(connection, message, "roadprofile", (struct attr_iter * (*)(void))roadprofile_attr_iter_new);
+ return request_attr_iter(connection, message, "roadprofile", (struct attr_iter * (*)(void*))roadprofile_attr_iter_new);
}
static DBusHandlerResult request_roadprofile_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) {
@@ -1232,6 +1232,7 @@ static DBusHandlerResult request_navit_traffic_export_gpx(DBusConnection *connec
" xmlns='http://www.topografix.com/GPX/1/1'\n"
" xsi:schemaLocation='http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd'>\n";
char *trailer = "</gpx>\n";
+ memset(&c_last, 0, sizeof(c_last));
navit = object_get_from_message(message, "navit");
if (! navit)
@@ -1955,7 +1956,7 @@ static DBusHandlerResult request_vehicleprofile_set_attr(DBusConnection *connect
static DBusHandlerResult request_vehicleprofile_attr_iter(DBusConnection *connection, DBusMessage *message) {
return request_attr_iter(connection, message, "vehicleprofile",
- (struct attr_iter * (*)(void))vehicleprofile_attr_iter_new);
+ (struct attr_iter * (*)(void*))vehicleprofile_attr_iter_new);
}
static DBusHandlerResult request_vehicleprofile_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) {
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c
index bb3a88d21..e96bdce48 100644
--- a/navit/font/freetype/font_freetype.c
+++ b/navit/font/freetype/font_freetype.c
@@ -86,7 +86,8 @@ static int library_init = 0;
static int library_deinit = 0;
-static void font_freetype_get_text_bbox(struct graphics_priv *gr, struct font_freetype_font *font, char *text, int dx, int dy, struct point *ret, int estimate) {
+static void font_freetype_get_text_bbox(struct graphics_priv *gr, struct font_freetype_font *font, char *text, int dx,
+ int dy, struct point *ret, int estimate) {
char *p = text;
FT_BBox bbox;
FT_UInt glyph_index;
@@ -233,8 +234,12 @@ static struct font_freetype_text *font_freetype_text_new(char *text, struct font
#else
fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, text, textlen, unicode_text);
#endif
- fribidi_log2vis(unicode_text, unicode_len, &base, visual_unicode_text, NULL, NULL, NULL);
- // TODO: check return value
+ /* fribidi_log2vis seems to be deprecated, but I don't know what to replace it with */
+ if(fribidi_log2vis(unicode_text, unicode_len, &base, visual_unicode_text, NULL, NULL, NULL) == 0) {
+ dbg(lvl_error,"fribidi_log2vis error condition detected. Try to recover");
+ /* error condition. Continue withthe original unicode text instead */
+ memcpy(visual_unicode_text, unicode_text, sizeof(unicode_text));
+ }
#ifdef FRIBIDIOLD
fribidi_unicode_to_utf8(visual_unicode_text, unicode_len, visual_text);
#else
@@ -362,7 +367,8 @@ static FT_Error face_requester( FTC_FaceID face_id, FT_Library library, FT_Point
#endif
/** Implementation of font_freetype_methods.font_new */
-static struct font_freetype_font *font_freetype_font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, char *fontfamily, int size, int flags) {
+static struct font_freetype_font *font_freetype_font_new(struct graphics_priv *gr, struct graphics_font_methods *meth,
+ char *fontfamily, int size, int flags) {
struct font_freetype_font *font =
g_new(struct font_freetype_font, 1);
int exact, found=0;
@@ -503,7 +509,8 @@ static struct font_freetype_font *font_freetype_font_new(struct graphics_priv *g
}
/** Implementation of font_freetype_methods.get_shadow. */
-static int font_freetype_glyph_get_shadow(struct font_freetype_glyph *g, unsigned char *data, int stride, struct color *foreground, struct color *background) {
+static int font_freetype_glyph_get_shadow(struct font_freetype_glyph *g, unsigned char *data, int stride,
+ struct color *foreground, struct color *background) {
int x, y, w = g->w, h = g->h;
unsigned int bg, fg;
unsigned char *pm, *psp,*ps,*psn;
@@ -555,7 +562,8 @@ static int font_freetype_glyph_get_shadow(struct font_freetype_glyph *g, unsigne
}
/** Implementation of font_freetype_methods.get_glyph. */
-static int font_freetype_glyph_get_glyph(struct font_freetype_glyph *g, unsigned char *data, int stride, struct color *fg, struct color *bg, struct color *transparent) {
+static int font_freetype_glyph_get_glyph(struct font_freetype_glyph *g, unsigned char *data, int stride,
+ struct color *fg, struct color *bg, struct color *transparent) {
int x, y, w = g->w, h = g->h;
unsigned int tr;
unsigned char v,vi,*pm, *ps;
diff --git a/navit/geom.c b/navit/geom.c
index e4b28fbd3..e118338dd 100644
--- a/navit/geom.c
+++ b/navit/geom.c
@@ -191,7 +191,8 @@ int geom_poly_point_inside(struct coord *cp, int count, struct coord *c) {
-GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second, struct geom_poly_segment *third) {
+GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second,
+ struct geom_poly_segment *third) {
int count;
struct geom_poly_segment *ret;
struct coord *pos;
@@ -226,7 +227,8 @@ GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, s
return list;
}
-void geom_poly_segment_destroy(struct geom_poly_segment *seg) {
+/* unused id for GFunc compatibiliy */
+void geom_poly_segment_destroy(struct geom_poly_segment *seg, void * unused) {
g_free(seg->first);
g_free(seg);
}
@@ -234,7 +236,7 @@ void geom_poly_segment_destroy(struct geom_poly_segment *seg) {
GList *geom_poly_segments_remove(GList *list, struct geom_poly_segment *seg) {
if (seg) {
list=g_list_remove(list, seg);
- geom_poly_segment_destroy(seg);
+ geom_poly_segment_destroy(seg, NULL);
}
return list;
}
diff --git a/navit/geom.h b/navit/geom.h
index 9de2e6d86..5969d86ef 100644
--- a/navit/geom.h
+++ b/navit/geom.h
@@ -32,21 +32,23 @@ extern "C" {
#define sq(x) ((double)(x)*(x))
-struct rect {struct coord l,h;};
+struct rect {
+ struct coord l,h;
+};
enum geom_poly_segment_type {
- geom_poly_segment_type_none,
- geom_poly_segment_type_way_inner,
- geom_poly_segment_type_way_outer,
- geom_poly_segment_type_way_left_side,
- geom_poly_segment_type_way_right_side,
- geom_poly_segment_type_way_unknown,
+ geom_poly_segment_type_none,
+ geom_poly_segment_type_way_inner,
+ geom_poly_segment_type_way_outer,
+ geom_poly_segment_type_way_left_side,
+ geom_poly_segment_type_way_right_side,
+ geom_poly_segment_type_way_unknown,
};
struct geom_poly_segment {
- enum geom_poly_segment_type type;
- struct coord *first,*last;
+ enum geom_poly_segment_type type;
+ struct coord *first,*last;
};
/* prototypes */
void geom_coord_copy(struct coord *from, struct coord *to, int count, int reverse);
@@ -56,8 +58,9 @@ long long geom_poly_area(struct coord *c, int count);
int geom_poly_centroid(struct coord *c, int count, struct coord *r);
int geom_poly_point_inside(struct coord *cp, int count, struct coord *c);
int geom_poly_closest_point(struct coord *pl, int count, struct coord *p, struct coord *c);
-GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second, struct geom_poly_segment *third);
-void geom_poly_segment_destroy(struct geom_poly_segment *seg);
+GList *geom_poly_segments_insert(GList *list, struct geom_poly_segment *first, struct geom_poly_segment *second,
+ struct geom_poly_segment *third);
+void geom_poly_segment_destroy(struct geom_poly_segment *seg, void * unused);
GList *geom_poly_segments_remove(GList *list, struct geom_poly_segment *seg);
int geom_poly_segment_compatible(struct geom_poly_segment *s1, struct geom_poly_segment *s2, int dir);
GList *geom_poly_segments_sort(GList *in, enum geom_poly_segment_type type);
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index 2789061f1..09292b306 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -350,9 +350,12 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
return gc;
}
+#ifdef HAVE_FREEIMAGE
static struct graphics_image_priv image_error;
+#endif
-static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot, int rotation) {
+static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path,
+ int *w, int *h, struct point *hot, int rotation) {
#ifdef HAVE_FREEIMAGE
FIBITMAP *image;
RGBQUAD aPixel;
@@ -797,7 +800,8 @@ static void draw_rectangle(struct graphics_priv *gr, struct graphics_gc_priv *gc
graphics_priv_root->dirty = 1;
}
-static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, int color, struct point *p) {
+static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg,
+ struct graphics_gc_priv *bg, int color, struct point *p) {
int i, x, y, stride;
struct font_freetype_glyph *g, **gp;
unsigned char *shadow, *glyph;
@@ -927,7 +931,8 @@ static void display_text_draw(struct font_freetype_text *text, struct graphics_p
}
}
-static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
+static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg,
+ struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
if ((gr->parent && !gr->parent->overlay_enabled)
|| (gr->parent && gr->parent->overlay_enabled
&& !gr->overlay_enabled)) {
@@ -955,7 +960,8 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str
}
-static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img) {
+static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p,
+ struct graphics_image_priv *img) {
#ifdef USE_OPENGLES
draw_image_es(gr, p, img->w, img->h, img->data);
#else
@@ -1159,7 +1165,8 @@ static void *get_data(struct graphics_priv *this, const char *type) {
this->platform=graphics_opengl_egl_new(this->window_system_methods->get_display(this->window_system),
this->window_system_methods->get_window(this->window_system),
&this->platform_methods);
- this->window_system_methods->set_callbacks(this->window_system, this, resize_callback_do, click_notify_do, motion_notify_do, NULL);
+ this->window_system_methods->set_callbacks(this->window_system, this, resize_callback_do, click_notify_do,
+ motion_notify_do, NULL);
resize_callback(this->width,this->height);
#if 0
glClearColor ( 0.4, 0.4, 0.4, 1);
@@ -1398,7 +1405,8 @@ static void motion_notify(int x, int y) {
static gboolean graphics_opengl_idle(void *data) {
static int opengl_init_ok = 0;
if (!opengl_init_ok) {
- callback_list_call_attr_2(graphics_priv_root->cbl, attr_resize, GINT_TO_POINTER (graphics_priv_root->width), GINT_TO_POINTER (graphics_priv_root->height));
+ callback_list_call_attr_2(graphics_priv_root->cbl, attr_resize, GINT_TO_POINTER (graphics_priv_root->width),
+ GINT_TO_POINTER (graphics_priv_root->height));
opengl_init_ok = 1;
} else {
@@ -1494,7 +1502,8 @@ static void glut_close(void) {
}
-static struct graphics_priv *graphics_opengl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) {
+static struct graphics_priv *graphics_opengl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs,
+ struct callback_list *cbl) {
struct attr *attr;
if (!event_request_system("glib", "graphics_opengl_new"))
diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c
index 6a0fbb5b7..34c840200 100644
--- a/navit/gui/gtk/destination.c
+++ b/navit/gui/gtk/destination.c
@@ -33,7 +33,9 @@
#include "projection.h"
#include "navit_nls.h"
#include "bookmarks.h"
-
+#ifndef _WIN32
+#include <errno.h>
+#endif
#define COL_COUNT 8
static struct search_param {
@@ -78,7 +80,6 @@ static void button_map(GtkWidget *widget, struct search_param *search) {
GtkTreeViewColumn *focus_column;
struct pcoord *point=NULL; /* A pointer on the geographical position of the selected map point */
GtkTreeIter iter;
- char *label;
GList* p;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(search->treeview), &path, &focus_column);
@@ -368,6 +369,7 @@ static void parse_xkbd_args (const char *cmd, char **argv) {
bufp = buf;
break;
}
+ /* fall through */
default:
*bufp++ = *p;
break;
@@ -399,7 +401,10 @@ static int spawn_xkbd (char *xkbd_path, char *xkbd_str) {
int a = 0;
size_t n;
- pipe (fd);
+ if(pipe (fd) < 0) {
+ dbg(lvl_error,"Unable to create pipe (%s). Do not try to spawn keyboard.", strerror(errno));
+ return 0;
+ }
kbd_pid = fork ();
if (kbd_pid == 0) {
close (fd[0]);
diff --git a/navit/gui/gtk/gui_gtk_statusbar.c b/navit/gui/gtk/gui_gtk_statusbar.c
index f245312d1..e67201b56 100644
--- a/navit/gui/gtk/gui_gtk_statusbar.c
+++ b/navit/gui/gtk/gui_gtk_statusbar.c
@@ -38,7 +38,7 @@
struct statusbar_priv {
struct gui_priv *gui;
GtkWidget *hbox;
- char gps_text[128];
+ char gps_text[500];
GtkWidget *gps;
char route_text[128];
GtkWidget *route;
@@ -88,7 +88,7 @@ static void statusbar_route_update(struct statusbar_priv *this, struct navit *na
double route_len=0; /* Distance to destination. We get it in kilometers. */
time_t eta;
struct tm *eta_tm=NULL;
- char buffer[128];
+ char buffer[109];
double lng, lat, direction=0, height=0, speed=0, hdop=0;
int sats=0, qual=0;
int status=0;
@@ -155,15 +155,16 @@ static void statusbar_route_update(struct statusbar_priv *this, struct navit *na
qual=attr.u.num;
coord_format(lat,lng,DEGREES_MINUTES_SECONDS,buffer,sizeof(buffer));
- sprintf(this->gps_text,"GPS:%s %02d/%02d HD:%02.2f %s %4.0f%s %3.0f°%-2s %3.1f%s",
- status_fix2str(status),
- sats, qual, hdop, buffer,
- imperial ? height * FEET_PER_METER : height,
- imperial == TRUE ? "\'" : "m",
- direction, dir,
- imperial == TRUE ? speed * KILOMETERS_TO_MILES : speed,
- imperial == TRUE ? " mph" : "km/h"
- );
+ snprintf(this->gps_text,sizeof(this->gps_text),"GPS:%s %02d/%02d HD:%02.2f %s %4.0f%s %3.0f°%-2s %3.1f%s",
+ status_fix2str(status),
+ sats, qual, hdop, buffer,
+ imperial ? height * FEET_PER_METER : height,
+ imperial == TRUE ? "\'" : "m",
+ direction, dir,
+ imperial == TRUE ? speed * KILOMETERS_TO_MILES : speed,
+ imperial == TRUE ? " mph" : "km/h"
+ );
+ this->gps_text[sizeof(this->gps_text)-1] = 0;
gtk_label_set_text(GTK_LABEL(this->gps), this->gps_text);
}
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 61756b485..d9fea2d28 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -1641,6 +1641,7 @@ char *gui_internal_cmd_match_expand(char *pattern, struct attr **in) {
break;
case '\\':
p=*pattern++;
+ /* fall through */
default:
*r++=p;
}
@@ -1662,6 +1663,7 @@ static int gui_internal_match(const char *pattern, const char *string) {
break;
case '\\':
p=*pattern++;
+ /* fall through */
default:
if (*string++ != p)
return 0;
@@ -1705,7 +1707,7 @@ int gui_internal_set(char *remove, char *add) {
static void gui_internal_window_closed(struct gui_priv *this) {
- gui_internal_cmd2_quit(this, NULL, NULL, NULL, NULL);
+ gui_internal_cmd2_quit(this, NULL, NULL, NULL);
}
@@ -1914,7 +1916,7 @@ static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
static void save_vehicle_xml(struct vehicle *v) {
struct attr attr;
- struct attr_iter *iter=vehicle_attr_iter_new();
+ struct attr_iter *iter=vehicle_attr_iter_new(NULL);
int childs=0;
printf("<vehicle");
while (vehicle_get_attr(v, attr_any_xml, &attr, iter)) {
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index ffd795b7d..73def7b18 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -41,16 +41,15 @@
#include <arpa/inet.h>
#endif
-static void gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct attr escaped;
if (!in || !in[0]) {
dbg(lvl_error,"first parameter missing or wrong type");
- return;
+ return 0;
}
if (!out) {
dbg(lvl_error,"output missing");
- return;
+ return 0;
}
if (ATTR_IS_STRING(in[0]->type)) {
escaped.type=in[0]->type;
@@ -60,15 +59,15 @@ static void gui_internal_cmd_escape(struct gui_priv *this, char *function, struc
escaped.u.str=g_strdup_printf("%ld",in[0]->u.num);
} else {
dbg(lvl_error,"first parameter wrong type");
- return;
+ return 0;
}
dbg(lvl_debug,"in %s result %s",in[0]->u.str,escaped.u.str);
*out=attr_generic_add_attr(*out, attr_dup(&escaped));
g_free(escaped.u.str);
+ return 0;
}
-static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct widget *menu,*wb,*w;
char *text;
@@ -134,15 +133,15 @@ static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struc
gui_internal_menu_render(this);
graphics_draw_mode(this->gra, draw_mode_end);
+ return 0;
}
-static void gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
gui_internal_select_waypoint(this, _("Waypoints"), NULL, NULL, gui_internal_cmd_position, (void*)2);
+ return 0;
}
-static void gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct widget *w, *wb, *wk, *wr, *we, *wnext, *row;
wb=gui_internal_menu(this, _("Enter Coordinates"));
w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill);
@@ -183,18 +182,18 @@ static void gui_internal_cmd_enter_coord(struct gui_priv *this, char *function,
else
gui_internal_keyboard_show_native(this, w, VKBD_DEGREE, NULL);
gui_internal_menu_render(this);
+ return 0;
}
-static void gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
if (this->sl)
search_list_select(this->sl, attr_country_all, 0, 0);
gui_internal_search(this,_("Town"),"Town",1);
+ return 0;
}
-static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in,
- struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
struct attr attr,attr2,vattr;
struct widget *w,*wb,*wl;
struct attr_iter *iter;
@@ -205,7 +204,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
navit_attr_iter_destroy(iter);
gui_internal_menu_vehicle_settings(this, attr.u.vehicle, vattr.u.str);
- return;
+ return 0;
}
navit_attr_iter_destroy(iter);
@@ -227,10 +226,11 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
}
navit_attr_iter_destroy(iter);
gui_internal_menu_render(this);
+ return 0;
}
-static void gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
struct widget *wb,*w;
struct attr on,off;
wb=gui_internal_menu(this, _("Rules"));
@@ -264,10 +264,10 @@ static void gui_internal_cmd2_setting_rules(struct gui_priv *this, char *functio
gravity_left_center|orientation_horizontal|flags_fill,
&on, &off));
gui_internal_menu_render(this);
+ return 0;
}
-static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct attr attr, on, off, description, type, data, url, active;
struct widget *w,*wb,*row,*wma;
char *label;
@@ -309,12 +309,11 @@ static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function
}
navit_attr_iter_destroy(iter);
gui_internal_menu_render(this);
-
+ return 0;
}
-static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in,
- struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
struct attr attr;
struct widget *w,*wb,*wl,*row;
struct attr_iter *iter;
@@ -333,6 +332,7 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
}
navit_attr_iter_destroy(iter);
gui_internal_menu_render(this);
+ return 0;
}
/*
@@ -345,9 +345,8 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
* comply with *.heightlines.bin
*
*/
-static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in,
- struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
struct widget * menu, *box;
struct map * map=NULL;
struct map_rect * mr=NULL;
@@ -431,7 +430,7 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
w->flags=gravity_bottom_center|orientation_horizontal|flags_fill;
g_free(text);
gui_internal_menu_render(this);
- return;
+ return 0;
}
}
}
@@ -497,7 +496,7 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
gui_internal_menu_render(this);
if(diagram_points)
g_free(diagram_points);
- return;
+ return 0;
}
gui_internal_menu_render(this);
@@ -559,11 +558,11 @@ static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *
diagram_points=diagram_points->next;
g_free(diagram_point);
}
+ return 0;
}
-static void gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in,
- struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
struct widget * menu;
@@ -598,11 +597,10 @@ static void gui_internal_cmd2_route_description(struct gui_priv *this, char *fun
gui_internal_widget_append(menu,box);
gui_internal_populate_route_table(this,this->nav);
gui_internal_menu_render(this);
-
+ return 0;
}
-static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct widget *w;
struct poi_param *param;
struct attr pro;
@@ -610,11 +608,11 @@ static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct
dbg(lvl_debug,"enter");
if (!in || !in[0])
- return;
+ return 0;
if (!ATTR_IS_COORD_GEO(in[0]->type))
- return;
+ return 0;
if (!navit_get_attr(this->nav, attr_projection, &pro, NULL))
- return;
+ return 0;
w=g_new0(struct widget,1);
param=g_new0(struct poi_param,1);
if (in[1] && ATTR_IS_STRING(in[1]->type)) {
@@ -630,10 +628,10 @@ static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct
gui_internal_cmd_pois(this, w, param);
g_free(w);
gui_internal_poi_param_free(param);
+ return 0;
}
-static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct widget *menu,*wb,*w;
char *text;
@@ -676,6 +674,7 @@ static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, stru
gui_internal_menu_render(this);
graphics_draw_mode(this->gra, draw_mode_end);
+ return 0;
}
/**
@@ -688,8 +687,7 @@ static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, stru
* Currently only works on non Windows systems.
*
*/
-static void gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
#if HAS_IFADDRS
struct widget *menu,*wb,*w;
char *text;
@@ -723,10 +721,10 @@ static void gui_internal_cmd2_network_info(struct gui_priv *this, char *function
#else
dbg(lvl_error, "Cannot show network info: ifaddr.h not found");
#endif
+ return 0;
}
-static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct widget *wb,*w,*wbm,*tbl=NULL;
struct map *formerdests;
struct map_rect *mr_formerdests;
@@ -736,15 +734,15 @@ static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function,
enum projection projection;
if(!navit_get_attr(this->nav, attr_former_destination_map, &attr, NULL))
- return;
+ return 0;
formerdests=attr.u.map;
if(!formerdests)
- return;
+ return 0;
mr_formerdests=map_rect_new(formerdests, NULL);
if(!mr_formerdests)
- return;
+ return 0;
projection = map_projection(formerdests);
@@ -790,46 +788,48 @@ static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function,
}
gui_internal_menu_render(this);
map_rect_destroy(mr_formerdests);
+ return 0;
}
-static void gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
char *str=NULL;
if (in && in[0] && ATTR_IS_STRING(in[0]->type)) {
str=in[0]->u.str;
}
gui_internal_cmd_bookmarks(this, NULL, str);
+ return 0;
}
-static void gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in,
- struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in,
+ struct attr ***out) {
navit_set_destination(this->nav, NULL, NULL, 0);
+ return 0;
}
-static void gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
graphics_draw_mode(this->gra, draw_mode_begin);
gui_internal_back(this, NULL, NULL);
graphics_draw_mode(this->gra, draw_mode_end);
gui_internal_check_exit(this);
+ return 0;
}
-static void gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
gui_internal_prune_menu(this, NULL);
gui_internal_check_exit(this);
+ return 0;
}
-static void gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
+static int gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
struct attr private_data = { attr_private_data, {(void *)&priv->data}};
if (out)
*out=attr_generic_add_attr(*out, &private_data);
+ return 0;
}
-static void gui_internal_cmd_log(struct gui_priv *this) {
+static int gui_internal_cmd_log(struct gui_priv *this, char *command, struct attr **in, struct attr ***out) {
struct widget *w,*wb,*wk,*wl,*we,*wnext;
gui_internal_enter(this, 1);
gui_internal_set_click_coord(this, NULL);
@@ -859,10 +859,10 @@ static void gui_internal_cmd_log(struct gui_priv *this) {
getenv("LANG"));
gui_internal_menu_render(this);
gui_internal_leave(this);
+ return 0;
}
-static void gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
char *href=NULL;
int i=0, ignore=0, replace=0;
@@ -877,23 +877,23 @@ static void gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct
if (this->root.children) {
if (!href)
- return;
+ return 0;
gui_internal_html_load_href(this, href, replace);
- return;
+ return 0;
}
gui_internal_cmd_menu(this, ignore, href);
+ return 0;
}
-static void gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
const char *name=_("Position");
int flags=-1;
dbg(lvl_debug,"enter");
if (!in || !in[0])
- return;
+ return 0;
if (!ATTR_IS_COORD_GEO(in[0]->type))
- return;
+ return 0;
if (in[1] && ATTR_IS_STRING(in[1]->type)) {
name=in[1]->u.str;
if (in[2] && ATTR_IS_INT(in[2]->type))
@@ -901,26 +901,26 @@ static void gui_internal_cmd2_position(struct gui_priv *this, char *function, st
}
dbg(lvl_debug,"flags=0x%x",flags);
gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags);
+ return 0;
}
-static void gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
this->redraw=1;
+ return 0;
}
-static void gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
char *href=g_strdup(this->href);
gui_internal_html_load_href(this, href, 1);
g_free(href);
+ return 0;
}
-static void gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
char *pattern,*command=NULL;
if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) {
dbg(lvl_error,"first parameter missing or wrong type");
- return;
+ return 0;
}
pattern=in[0]->u.str;
dbg(lvl_debug,"pattern %s",pattern);
@@ -933,16 +933,17 @@ static void gui_internal_cmd2_set(struct gui_priv *this, char *function, struct
} else {
gui_internal_set(pattern, NULL);
}
-
+ return 0;
}
-void gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+int gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
struct attr navit;
gui_internal_prune_menu(this, NULL);
navit.type=attr_navit;
navit.u.navit=this->nav;
config_remove_attr(config, &navit);
event_main_loop_quit();
+ return 0;
}
static char *gui_internal_append_attr(char *str, enum escape_mode mode, char *pre, struct attr *attr, char *post) {
@@ -962,12 +963,11 @@ static char *gui_internal_append_attr(char *str, enum escape_mode mode, char *pr
return str;
}
-static void gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
char *str=NULL;
- dbg(lvl_debug,"enter %s %p %p %p",function,in,out,valid);
+ dbg(lvl_debug,"enter %s %p %p",function,in,out);
if (!in)
- return;
+ return 0;
while (*in) {
str=gui_internal_append_attr(str, escape_mode_none, "", *in, "");
in++;
@@ -980,6 +980,7 @@ static void gui_internal_cmd_write(struct gui_priv * this, char *function, struc
gui_internal_html_parse_text(this, str);
}
g_free(str);
+ return 0;
}
static void gui_internal_onclick(struct attr ***in, char **onclick, char *set) {
@@ -1060,8 +1061,7 @@ error:
return;
}
-static void gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
char *str=g_strdup("<img"),*suffix=NULL,*onclick=g_strdup(""),*html;
if (ATTR_IS_STRING((*in)->type)) {
@@ -1108,11 +1108,10 @@ static void gui_internal_cmd_img(struct gui_priv * this, char *function, struct
error:
g_free(suffix);
g_free(str);
- return;
+ return 0;
}
-static void gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out) {
char *str;
dbg(lvl_debug,"begin");
if (in) {
@@ -1124,9 +1123,10 @@ static void gui_internal_cmd_debug(struct gui_priv * this, char *function, struc
}
}
dbg(lvl_debug,"done");
+ return 0;
}
-static void gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
int entering=0;
int ignore=1;
if (in && in[0] && ATTR_IS_INT(in[0]->type)) {
@@ -1142,40 +1142,41 @@ static void gui_internal_cmd2(struct gui_priv *this, char *function, struct attr
}
if(!strcmp(function, "bookmarks"))
- gui_internal_cmd2_bookmarks(this, function, in, out, valid);
+ gui_internal_cmd2_bookmarks(this, function, in, out);
else if(!strcmp(function, "formerdests"))
- gui_internal_cmd_formerdests(this, function, in, out, valid);
+ gui_internal_cmd_formerdests(this, function, in, out);
else if(!strcmp(function, "locale"))
- gui_internal_cmd2_locale(this, function, in, out, valid);
+ gui_internal_cmd2_locale(this, function, in, out);
else if(!strcmp(function, "network_info"))
- gui_internal_cmd2_network_info(this, function, in, out, valid);
+ gui_internal_cmd2_network_info(this, function, in, out);
else if(!strcmp(function, "position"))
- gui_internal_cmd2_position(this, function, in, out, valid);
+ gui_internal_cmd2_position(this, function, in, out);
else if(!strcmp(function, "pois"))
- gui_internal_cmd2_pois(this, function, in, out, valid);
+ gui_internal_cmd2_pois(this, function, in, out);
else if(!strcmp(function, "route_description"))
- gui_internal_cmd2_route_description(this, function, in, out, valid);
+ gui_internal_cmd2_route_description(this, function, in, out);
else if(!strcmp(function, "route_height_profile"))
- gui_internal_cmd2_route_height_profile(this, function, in, out, valid);
+ gui_internal_cmd2_route_height_profile(this, function, in, out);
else if(!strcmp(function, "setting_layout"))
- gui_internal_cmd2_setting_layout(this, function, in, out, valid);
+ gui_internal_cmd2_setting_layout(this, function, in, out);
else if(!strcmp(function, "setting_maps"))
- gui_internal_cmd2_setting_maps(this, function, in, out, valid);
+ gui_internal_cmd2_setting_maps(this, function, in, out);
else if(!strcmp(function, "setting_rules"))
- gui_internal_cmd2_setting_rules(this, function, in, out, valid);
+ gui_internal_cmd2_setting_rules(this, function, in, out);
else if(!strcmp(function, "setting_vehicle"))
- gui_internal_cmd2_setting_vehicle(this, function, in, out, valid);
+ gui_internal_cmd2_setting_vehicle(this, function, in, out);
else if(!strcmp(function, "town"))
- gui_internal_cmd2_town(this, function, in, out, valid);
+ gui_internal_cmd2_town(this, function, in, out);
else if(!strcmp(function, "enter_coord"))
- gui_internal_cmd_enter_coord(this, function, in, out, valid);
+ gui_internal_cmd_enter_coord(this, function, in, out);
else if(!strcmp(function, "waypoints"))
- gui_internal_cmd2_waypoints(this, function, in, out, valid);
+ gui_internal_cmd2_waypoints(this, function, in, out);
else if(!strcmp(function, "about"))
- gui_internal_cmd2_about(this, function, in, out, valid);
+ gui_internal_cmd2_about(this, function, in, out);
if(entering)
graphics_draw_mode(this->gra, draw_mode_end);
+ return 0;
}
static struct command_table commands[] = {
diff --git a/navit/gui/internal/gui_internal_command.h b/navit/gui/internal/gui_internal_command.h
index ff8a70f9c..206a5c2a0 100644
--- a/navit/gui/internal/gui_internal_command.h
+++ b/navit/gui/internal/gui_internal_command.h
@@ -3,6 +3,6 @@ struct attr;
struct gui_priv;
struct pcoord;
char *gui_internal_coordinates(struct pcoord *pc, char sep);
-void gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid);
+int gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out);
void gui_internal_command_init(struct gui_priv *this, struct attr **attrs);
/* end of prototypes */
diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c
index 41dab9f50..48ad227e5 100644
--- a/navit/gui/internal/gui_internal_html.c
+++ b/navit/gui/internal/gui_internal_html.c
@@ -320,6 +320,7 @@ static void gui_internal_html_end(xml_context *dummy, const char *tag_name, void
switch (html->tag) {
case html_tag_div:
this->html_container=html->container;
+ /* fall through */
case html_tag_img:
case html_tag_input:
gui_internal_widget_append(this->html_container, html->w);
diff --git a/navit/gui/internal/gui_internal_keyboard.c b/navit/gui/internal/gui_internal_keyboard.c
index 19e48c468..00cd8fa64 100644
--- a/navit/gui/internal/gui_internal_keyboard.c
+++ b/navit/gui/internal/gui_internal_keyboard.c
@@ -801,7 +801,7 @@ struct widget * gui_internal_keyboard_show_native(struct gui_priv *this, struct
switch(res) {
case -1:
dbg(lvl_error, "graphics has no show_native_keyboard method, cannot display keyboard");
- /* no break */
+ /* fall through */
case 0:
g_free(kbd);
return NULL;
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index 221c23fa4..66524e407 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -21,6 +21,9 @@
#include "gui_internal_menu.h"
#include "gui_internal_keyboard.h"
#include "gui_internal_search.h"
+#ifdef HAVE_API_ANDROID
+#include "util.h"
+#endif
static void gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data) {
gui_internal_prune_menu_count(this, 1, 0);
diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c
index 3b979f011..92823fa4b 100644
--- a/navit/gui/internal/gui_internal_widget.c
+++ b/navit/gui/internal/gui_internal_widget.c
@@ -1187,6 +1187,10 @@ static GList *gui_internal_compute_table_dimensions(struct gui_priv * this,struc
return column_desc;
}
+/* to adapt g_free to GFunc */
+static void g_free_helper(void * data, void * user_data) {
+ g_free(data);
+}
/**
* @brief Computes the height and width for the table.
@@ -1248,7 +1252,7 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w) {
/*
* Deallocate column descriptions.
*/
- g_list_foreach(column_data,(GFunc)g_free,NULL);
+ g_list_foreach(column_data,(GFunc)g_free_helper,NULL);
g_list_free(column_data);
}
@@ -1477,7 +1481,7 @@ void gui_internal_table_render(struct gui_priv * this, struct widget * w) {
/*
* Deallocate column descriptions.
*/
- g_list_foreach(column_desc,(GFunc)g_free,NULL);
+ g_list_foreach(column_desc,(GFunc)g_free_helper,NULL);
g_list_free(column_desc);
}
diff --git a/navit/gui/qml/navitProxy.h b/navit/gui/qml/navitProxy.h
index d3f8a0e86..0abc88cce 100644
--- a/navit/gui/qml/navitProxy.h
+++ b/navit/gui/qml/navitProxy.h
@@ -7,139 +7,149 @@ class NGQProxyNavit : public NGQProxy {
Q_OBJECT;
public:
- NGQProxyNavit(struct gui_priv* object, QObject* parent) : NGQProxy(object,parent) { };
+ NGQProxyNavit(struct gui_priv* object, QObject* parent) : NGQProxy(object,parent) { };
public slots:
- void quit() {
- struct attr navit;
- navit.type=attr_navit;
- navit.u.navit=this->object->nav;
- navit_destroy(navit.u.navit);
- event_main_loop_quit();
- }
- void setObjectByName(const QString& attr_name,const QString& attr_value) {
- if (attr_name=="layout") {
- navit_set_layout_by_name(this->object->nav,attr_value.toStdString().c_str());
- }
- if (attr_name=="vehicle") {
- navit_set_vehicle_by_name(this->object->nav,attr_value.toStdString().c_str());
- }
- return;
- }
- QString getAttrList(const QString &attr_name) {
- struct attr attr;
- struct attr_iter *iter;
- int counter=0;
- QString currentValue;
- QDomDocument retDoc;
- QDomElement entries;
-
- entries=retDoc.createElement("attributes");
- retDoc.appendChild(entries);
-
- //Find current value
- getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL) ;
- if (attr.type==attr_layout) {
- currentValue=attr.u.layout->name;
- }
-
- //Fill da list
- iter=getIterFunc();
- if (iter == NULL) {
- return QString();
- }
-
- while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) {
- QStandardItem* curItem=new QStandardItem();
- //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);
- curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemValue);
- if (currentValue==attr.u.layout->name) {
- this->_itemId=counter;
- }
- }
- if (attr.type==attr_vehicle) {
- QStandardItem* curItem=new QStandardItem();
- QDomElement entry=retDoc.createElement("vehicle");
- entries.appendChild(entry);
-
- this->object->currVehicle=attr.u.vehicle;
- curItem->setData(QVariant(this->object->vehicleProxy->getAttr("name")),NGQStandardItemModel::ItemName);
- entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter)));
- entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"), QString(this->object->vehicleProxy->getAttr("name"))));
-
- //Detecting current vehicle
- struct attr vehicle_attr;
- navit_get_attr(this->object->nav, attr_vehicle, &vehicle_attr, NULL);
- if (vehicle_attr.u.vehicle==attr.u.vehicle) {
- this->_itemId=counter;
- }
- }
- counter++;
- }
-
- dropIterFunc(iter);
-
- dbg(lvl_debug,QString::number(_itemId).toStdString().c_str());
-
- return retDoc.toString();
- }
- QString getDestination() {
- struct attr attr;
- struct coord c;
-
- if (getAttrFunc(attr_destination, &attr, NULL) ) {
- c.x=attr.u.pcoord->x;
- c.y=attr.u.pcoord->y;
- __setNewPoint(this->object,&c,Destination);
- return this->object->currentPoint->pointName();
- }
- return QString();
- }
- void setDestination() {
- navit_set_destination(this->object->nav,this->object->currentPoint->pc(),this->object->currentPoint->coordString().toStdString().c_str(),1);
- }
- void stopNavigation() {
- navit_set_destination(this->object->nav,NULL,NULL,0);
- }
- QString getPosition() {
- struct attr attr;
- struct pcoord pc;
- struct coord c;
- struct transformation *trans;
-
- trans=navit_get_trans(this->object->nav);
-
- getAttrFunc(attr_vehicle, &attr, NULL);
- this->object->currVehicle=attr.u.vehicle;
-
- if (vehicle_get_attr(this->object->currVehicle, attr_position_coord_geo, &attr, NULL)) {
- pc.pro=transform_get_projection(trans);
- transform_from_geo(pc.pro, attr.u.coord_geo, &c);
- __setNewPoint(this->object,&c,Position);
- return this->object->currentPoint->pointName();
- }
- return QString();
- }
- void setPosition() {
- navit_set_position(this->object->nav,this->object->currentPoint->pc());
- }
- void setCenter() {
- navit_set_center(this->object->nav,this->object->currentPoint->pc(),1);
- }
- void command(QString command) {
- struct attr navit;
- navit.type=attr_navit;
- navit.u.navit=this->object->nav;
- command_evaluate(&navit,command.toLocal8Bit().constData());
- }
+ void quit() {
+ struct attr navit;
+ navit.type=attr_navit;
+ navit.u.navit=this->object->nav;
+ navit_destroy(navit.u.navit);
+ event_main_loop_quit();
+ }
+ void setObjectByName(const QString& attr_name,const QString& attr_value) {
+ if (attr_name=="layout") {
+ navit_set_layout_by_name(this->object->nav,attr_value.toStdString().c_str());
+ }
+ if (attr_name=="vehicle") {
+ navit_set_vehicle_by_name(this->object->nav,attr_value.toStdString().c_str());
+ }
+ return;
+ }
+ QString getAttrList(const QString &attr_name) {
+ struct attr attr;
+ struct attr_iter *iter;
+ int counter=0;
+ QString currentValue;
+ QDomDocument retDoc;
+ QDomElement entries;
+
+ entries=retDoc.createElement("attributes");
+ retDoc.appendChild(entries);
+
+ //Find current value
+ getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL) ;
+ if (attr.type==attr_layout) {
+ currentValue=attr.u.layout->name;
+ }
+
+ //Fill da list
+ iter=getIterFunc();
+ if (iter == NULL) {
+ return QString();
+ }
+
+ while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) {
+ QStandardItem* curItem=new QStandardItem();
+ //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);
+ curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemValue);
+ if (currentValue==attr.u.layout->name) {
+ this->_itemId=counter;
+ }
+ }
+ if (attr.type==attr_vehicle) {
+ QStandardItem* curItem=new QStandardItem();
+ QDomElement entry=retDoc.createElement("vehicle");
+ entries.appendChild(entry);
+
+ this->object->currVehicle=attr.u.vehicle;
+ curItem->setData(QVariant(this->object->vehicleProxy->getAttr("name")),NGQStandardItemModel::ItemName);
+ entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter)));
+ entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"),
+ QString(this->object->vehicleProxy->getAttr("name"))));
+
+ //Detecting current vehicle
+ struct attr vehicle_attr;
+ navit_get_attr(this->object->nav, attr_vehicle, &vehicle_attr, NULL);
+ if (vehicle_attr.u.vehicle==attr.u.vehicle) {
+ this->_itemId=counter;
+ }
+ }
+ counter++;
+ }
+
+ dropIterFunc(iter);
+
+ dbg(lvl_debug,QString::number(_itemId).toStdString().c_str());
+
+ return retDoc.toString();
+ }
+ QString getDestination() {
+ struct attr attr;
+ struct coord c;
+
+ if (getAttrFunc(attr_destination, &attr, NULL) ) {
+ c.x=attr.u.pcoord->x;
+ c.y=attr.u.pcoord->y;
+ __setNewPoint(this->object,&c,Destination);
+ return this->object->currentPoint->pointName();
+ }
+ return QString();
+ }
+ void setDestination() {
+ navit_set_destination(this->object->nav,this->object->currentPoint->pc(),
+ this->object->currentPoint->coordString().toStdString().c_str(),1);
+ }
+ void stopNavigation() {
+ navit_set_destination(this->object->nav,NULL,NULL,0);
+ }
+ QString getPosition() {
+ struct attr attr;
+ struct pcoord pc;
+ struct coord c;
+ struct transformation *trans;
+
+ trans=navit_get_trans(this->object->nav);
+
+ getAttrFunc(attr_vehicle, &attr, NULL);
+ this->object->currVehicle=attr.u.vehicle;
+
+ if (vehicle_get_attr(this->object->currVehicle, attr_position_coord_geo, &attr, NULL)) {
+ pc.pro=transform_get_projection(trans);
+ transform_from_geo(pc.pro, attr.u.coord_geo, &c);
+ __setNewPoint(this->object,&c,Position);
+ return this->object->currentPoint->pointName();
+ }
+ return QString();
+ }
+ void setPosition() {
+ navit_set_position(this->object->nav,this->object->currentPoint->pc());
+ }
+ void setCenter() {
+ navit_set_center(this->object->nav,this->object->currentPoint->pc(),1);
+ }
+ void command(QString command) {
+ struct attr navit;
+ navit.type=attr_navit;
+ navit.u.navit=this->object->nav;
+ command_evaluate(&navit,command.toLocal8Bit().constData());
+ }
protected:
- int getAttrFunc(enum attr_type type, struct attr* attr, struct attr_iter* iter) { return navit_get_attr(this->object->nav, type, attr, iter); }
- int setAttrFunc(struct attr* attr) {return navit_set_attr(this->object->nav,attr); }
- struct attr_iter* getIterFunc() { return navit_attr_iter_new(); };
- void dropIterFunc(struct attr_iter* iter) { navit_attr_iter_destroy(iter); };
+ int getAttrFunc(enum attr_type type, struct attr* attr, struct attr_iter* iter) {
+ return navit_get_attr(this->object->nav, type, attr, iter);
+ }
+ int setAttrFunc(struct attr* attr) {
+ return navit_set_attr(this->object->nav,attr);
+ }
+ struct attr_iter* getIterFunc() {
+ return navit_attr_iter_new(NULL);
+ };
+ void dropIterFunc(struct attr_iter* iter) {
+ navit_attr_iter_destroy(iter);
+ };
private:
diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index 18a4166b1..865e3d72b 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -2326,7 +2326,7 @@ static void binmap_search_destroy(struct map_search_priv *ms) {
if (ms->mr)
map_rect_destroy_binfile(ms->mr);
while(ms->boundaries) {
- geom_poly_segment_destroy(ms->boundaries->data);
+ geom_poly_segment_destroy(ms->boundaries->data, NULL);
ms->boundaries=g_list_delete_link(ms->boundaries,ms->boundaries);
}
g_free(ms);
diff --git a/navit/map/filter/filter.c b/navit/map/filter/filter.c
index 8d46db564..c8f4f1029 100644
--- a/navit/map/filter/filter.c
+++ b/navit/map/filter/filter.c
@@ -124,12 +124,14 @@ static enum item_type filter_type(struct map_priv *m, struct item *item) {
return item->type;
}
-static void free_filter_entry(struct filter_entry *filter) {
+/* user_data is for compatibility with GFunc */
+static void free_filter_entry(struct filter_entry *filter, void * user_data) {
g_free(filter->cond_str);
g_free(filter);
}
-static void free_filter(struct filter *filter) {
+/* user_data is for compatibility with GFunc */
+static void free_filter(struct filter *filter, void * user_data) {
g_list_foreach(filter->old, (GFunc)free_filter_entry, NULL);
g_list_free(filter->old);
filter->old=NULL;
diff --git a/navit/map/shapefile/shapefile.c b/navit/map/shapefile/shapefile.c
index df4d64ea5..1031b6903 100644
--- a/navit/map/shapefile/shapefile.c
+++ b/navit/map/shapefile/shapefile.c
@@ -171,7 +171,8 @@ static void longest_match_add_match(struct longest_match *lm, struct longest_mat
lmi->match_idx[lmi->match_idx_count++]=idx;
}
-static void longest_match_item_destroy(struct longest_match_list_item *lmi, long flags) {
+static void longest_match_item_destroy(struct longest_match_list_item *lmi, gpointer p_flags) {
+ long flags = (long) p_flags;
if (!lmi)
return;
if (flags & 2) {
@@ -195,7 +196,8 @@ static struct longest_match_list *longest_match_list_new(struct longest_match *l
return ret;
}
-static void longest_match_list_destroy(struct longest_match_list *lml, long flags) {
+static void longest_match_list_destroy(struct longest_match_list *lml, gpointer p_flags) {
+ long flags = (long) p_flags;
if (!lml)
return;
if (flags & 1) {
diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c
index a7310e224..12381d6c0 100644
--- a/navit/map/textfile/textfile.c
+++ b/navit/map/textfile/textfile.c
@@ -50,7 +50,10 @@ static void get_line(struct map_rect_priv *mr) {
mr->pos=ftell(mr->f);
else
mr->pos+=mr->lastlen;
- fgets(mr->line, TEXTFILE_LINE_SIZE, mr->f);
+ if(fgets(mr->line, TEXTFILE_LINE_SIZE, mr->f) == NULL) {
+ dbg(lvl_error, "Unable to get line (%s)", strerror(errno));
+ mr->line[0]=0;
+ }
dbg(lvl_debug,"read textfile line: %s", mr->line);
remove_comment_line(mr->line);
mr->lastlen=strlen(mr->line)+1;
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index c6308c2b4..ddf4e99a1 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -2592,6 +2592,11 @@ static void process_associated_streets_setup(FILE *in, struct relations *relatio
relations_add_relation_default_entry(relations, relations_func);
}
+/* to adapt g_free to GFunc */
+static void g_free_helper(void * data, void * user_data) {
+ g_free(data);
+}
+
void process_associated_streets(FILE *in, struct files_relation_processing *files_relproc) {
struct relations *relations=relations_new();
struct process_relation_member_func_priv fp= {NULL,NULL};
@@ -2618,7 +2623,7 @@ void process_associated_streets(FILE *in, struct files_relation_processing *file
}
relations_destroy(relations);
- g_list_foreach(fp.allocations, (GFunc)free, NULL);
+ g_list_foreach(fp.allocations, (GFunc)g_free_helper, NULL);
g_list_free(fp.allocations);
}
@@ -2674,7 +2679,7 @@ void process_house_number_interpolations(FILE *in, struct files_relation_process
}
relations_destroy(relations);
- g_list_foreach(fp.allocations, (GFunc)free, NULL);
+ g_list_foreach(fp.allocations, (GFunc)g_free_helper, NULL);
g_list_free(fp.allocations);
}
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index fbf025cc3..d0b96a51e 100644
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -82,8 +82,7 @@ struct odometer;
int set_std_osd_attr(struct osd_priv *priv, struct attr*the_attr);
static void osd_odometer_reset(struct osd_priv_common *opc, int flags);
-static void osd_cmd_odometer_reset(struct navit *this, char *function, struct attr **in, struct attr ***out,
- int *valid);
+static int osd_cmd_odometer_reset(struct navit *this, char *function, struct attr **in, struct attr ***out);
static void osd_odometer_draw(struct osd_priv_common *opc, struct navit *nav, struct vehicle *v);
static struct osd_text_item * oti_new(struct osd_text_item * parent);
int osd_button_set_attr(struct osd_priv_common *opc, struct attr* attr);
@@ -583,8 +582,7 @@ struct odometer {
double acceleration;
};
-static void osd_cmd_odometer_reset(struct navit *this, char *function, struct attr **in, struct attr ***out,
- int *valid) {
+static int osd_cmd_odometer_reset(struct navit *this, char *function, struct attr **in, struct attr ***out) {
if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str) {
GList* list = odometer_list;
while(list) {
@@ -595,6 +593,7 @@ static void osd_cmd_odometer_reset(struct navit *this, char *function, struct at
list = g_list_next(list);
}
}
+ return 0;
}
static char* str_replace(char*output, char*input, char*pattern, char*replacement) {
@@ -767,6 +766,7 @@ static void draw_aligned_osd_text(char *buffer, int align, struct osd_item *osd_
if (do_draw) {
osd_std_resize(osd_item);
}
+ /* fall through */
default:
p.y=(osd_item->h-lines*(height+yspacing)-yspacing)/2;
}
@@ -1595,7 +1595,7 @@ static void osd_button_adjust_sizes(struct osd_priv_common *opc, struct graphics
opc->osd_item.h=img->height;
}
-static void osd_button_draw(struct osd_priv_common *opc, struct navit *nav) {
+static void osd_button_draw(struct osd_priv_common *opc, struct navit *nav, struct vehicle * unused) {
struct osd_button *this = (struct osd_button *)opc->data;
// FIXME: Do we need this check?
@@ -1680,7 +1680,7 @@ static void osd_button_init(struct osd_priv_common *opc, struct navit *nav) {
}
navit_add_callback(nav, this->navit_init_cb = callback_new_attr_1(callback_cast (osd_std_click), attr_button,
&opc->osd_item));
- osd_button_draw(opc,nav);
+ osd_button_draw(opc,nav, NULL);
}
static char *osd_button_icon_path(struct osd_button *this_, char *src) {
@@ -1715,7 +1715,8 @@ int osd_button_set_attr(struct osd_priv_common *opc, struct attr* attr) {
if(navit_get_blocked(nav)&1)
return 1;
- osd_button_draw(opc,nav);
+ osd_button_draw(opc,nav,NULL);
+
navit_draw(opc->osd_item.navit);
return 1;
}
@@ -1806,7 +1807,7 @@ static void osd_image_init(struct osd_priv_common *opc, struct navit *nav) {
opc->osd_item.graphic_bg=graphics_gc_new(opc->osd_item.gr);
graphics_add_callback(gra, this->draw_cb=callback_new_attr_2(callback_cast(osd_button_draw), attr_postdraw, opc, nav));
}
- osd_button_draw(opc,nav);
+ osd_button_draw(opc,nav,NULL);
}
static struct osd_priv *osd_image_new(struct navit *nav, struct osd_methods *meth,
@@ -2974,6 +2975,7 @@ static char *osd_text_format_attr(struct attr *attr, char *format, int imperial)
g_free(tmp);
return ret;
}
+ break;
case attr_position_time_iso8601:
if ((!format) || (!strcmp(format,"iso8601"))) {
break;
@@ -3238,6 +3240,7 @@ static void osd_text_draw(struct osd_priv_common *opc, struct navit *navit, stru
if (do_draw) {
osd_std_resize(&opc->osd_item);
}
+ /* fall through */
default:
p.y=(opc->osd_item.h-lines*(height+yspacing)-yspacing)/2;
}
@@ -3594,7 +3597,7 @@ struct volume {
struct callback *click_cb;
};
-static void osd_volume_draw(struct osd_priv_common *opc, struct navit *navit) {
+static void osd_volume_draw(struct osd_priv_common *opc, struct navit *navit, struct vehicle * unused) {
struct volume *this = (struct volume *)opc->data;
struct point p;
@@ -3633,7 +3636,7 @@ static void osd_volume_click(struct osd_priv_common *opc, struct navit *nav, int
this->strength=0;
if (this->strength > 5)
this->strength=5;
- osd_volume_draw(opc, nav);
+ osd_volume_draw(opc, nav, NULL);
}
}
static void osd_volume_init(struct osd_priv_common *opc, struct navit *nav) {
@@ -3641,7 +3644,7 @@ static void osd_volume_init(struct osd_priv_common *opc, struct navit *nav) {
osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc);
navit_add_callback(nav, this->click_cb = callback_new_attr_1(callback_cast (osd_volume_click), attr_button, opc));
- osd_volume_draw(opc, nav);
+ osd_volume_draw(opc, nav, NULL);
}
static struct osd_priv *osd_volume_new(struct navit *nav, struct osd_methods *meth,
@@ -3709,7 +3712,7 @@ static int round_to_nice_value(double value) {
return mantissa*nearest_power_of10;
}
-static void osd_scale_draw(struct osd_priv_common *opc, struct navit *nav) {
+static void osd_scale_draw(struct osd_priv_common *opc, struct navit *nav, struct vehicle *unused) {
struct osd_scale *this = (struct osd_scale *)opc->data;
struct point item_pos,scale_line_start,scale_line_end;
@@ -3808,7 +3811,7 @@ static void osd_scale_init(struct osd_priv_common *opc, struct navit *nav) {
graphics_add_callback(gra, this->draw_cb=callback_new_attr_2(callback_cast(osd_scale_draw), attr_postdraw, opc, nav));
if (navit_get_ready(nav) == 3)
- osd_scale_draw(opc, nav);
+ osd_scale_draw(opc, nav, NULL);
}
static struct osd_priv *osd_scale_new(struct navit *nav, struct osd_methods *meth,
diff --git a/navit/roadprofile.c b/navit/roadprofile.c
index 81033d46d..96e8361c0 100644
--- a/navit/roadprofile.c
+++ b/navit/roadprofile.c
@@ -74,7 +74,7 @@ int roadprofile_remove_attr(struct roadprofile *this_, struct attr *attr) {
}
struct attr_iter *
-roadprofile_attr_iter_new(void) {
+roadprofile_attr_iter_new(void * unused) {
return (struct attr_iter *)g_new0(void *,1);
}
diff --git a/navit/roadprofile.h b/navit/roadprofile.h
index a4ff65076..69ca6f4bc 100644
--- a/navit/roadprofile.h
+++ b/navit/roadprofile.h
@@ -22,10 +22,10 @@
extern "C" {
#endif
struct roadprofile {
- NAVIT_OBJECT
- int speed;
- int route_weight;
- int maxspeed;
+ NAVIT_OBJECT
+ int speed;
+ int route_weight;
+ int maxspeed;
};
struct roadprofile * roadprofile_new(struct attr *parent, struct attr **attrs);
@@ -33,7 +33,7 @@ int roadprofile_get_attr(struct roadprofile *this_, enum attr_type type, struct
int roadprofile_set_attr(struct roadprofile *this_, struct attr *attr);
int roadprofile_add_attr(struct roadprofile *this_, struct attr *attr);
int roadprofile_remove_attr(struct roadprofile *this_, struct attr *attr);
-struct attr_iter *roadprofile_attr_iter_new(void);
+struct attr_iter *roadprofile_attr_iter_new(void* unused);
void roadprofile_attr_iter_destroy(struct attr_iter *iter);
#ifdef __cplusplus
}
diff --git a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp
index f8f8339eb..09df647f5 100644
--- a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp
+++ b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp
@@ -81,15 +81,16 @@ void Qt5EspeakAudioOut::handleStateChanged(QAudio::State newState) {
break;
case QAudio::StoppedState:
break;
-// Sailfish's QT version doesn't have this. Doesn't do anything either.
-// case QAudio::InterruptedState:
-// break;
case QAudio::IdleState:
/*remove all data that was already read*/
data->remove(0, buffer->pos());
buffer->seek(0);
dbg(lvl_debug, "Size %d", data->size());
break;
+// Sailfish's QT version doesn't have this. Doesn't do anything either.
+// case QAudio::InterruptedState:
+ default:
+ break;
}
}
diff --git a/navit/traffic/traff_android/traffic_traff_android.c b/navit/traffic/traff_android/traffic_traff_android.c
index 1612b3a5f..266f51a0c 100644
--- a/navit/traffic/traff_android/traffic_traff_android.c
+++ b/navit/traffic/traff_android/traffic_traff_android.c
@@ -42,6 +42,7 @@
#include "plugin.h"
#include "callback.h"
#include "debug.h"
+#include "navit.h"
/**
* @brief Stores information about the plugin instance.
@@ -86,7 +87,7 @@ static void traffic_traff_android_on_feed_received(struct traffic_priv * this_,
dbg(lvl_debug, "enter");
attr = g_new0(struct attr, 1);
- a_iter = navit_attr_iter_new();
+ a_iter = navit_attr_iter_new(NULL);
if (navit_get_attr(this_->nav, attr_traffic, attr, a_iter))
traffic = (struct traffic *) attr->u.navit_object;
navit_attr_iter_destroy(a_iter);
diff --git a/navit/vehicle.c b/navit/vehicle.c
index f0094e804..fee989638 100644
--- a/navit/vehicle.c
+++ b/navit/vehicle.c
@@ -185,7 +185,7 @@ void vehicle_destroy(struct vehicle *this_) {
* Creates an attribute iterator to be used with vehicles
*/
struct attr_iter *
-vehicle_attr_iter_new(void) {
+vehicle_attr_iter_new(void * unused) {
return (struct attr_iter *)g_new0(void *,1);
}
diff --git a/navit/vehicle.h b/navit/vehicle.h
index 54cc15771..15cdf4e3c 100644
--- a/navit/vehicle.h
+++ b/navit/vehicle.h
@@ -28,9 +28,9 @@ struct point;
struct vehicle_priv;
struct vehicle_methods {
- void (*destroy)(struct vehicle_priv *priv);
- int (*position_attr_get)(struct vehicle_priv *priv, enum attr_type type, struct attr *attr);
- int (*set_attr)(struct vehicle_priv *priv, struct attr *attr);
+ void (*destroy)(struct vehicle_priv *priv);
+ int (*position_attr_get)(struct vehicle_priv *priv, enum attr_type type, struct attr *attr);
+ int (*set_attr)(struct vehicle_priv *priv, struct attr *attr);
};
/* prototypes */
@@ -43,7 +43,7 @@ struct point;
struct vehicle;
struct vehicle *vehicle_new(struct attr *parent, struct attr **attrs);
void vehicle_destroy(struct vehicle *this_);
-struct attr_iter *vehicle_attr_iter_new(void);
+struct attr_iter *vehicle_attr_iter_new(void * unused);
void vehicle_attr_iter_destroy(struct attr_iter *iter);
int vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
int vehicle_set_attr(struct vehicle *this_, struct attr *attr);
diff --git a/navit/vehicleprofile.c b/navit/vehicleprofile.c
index d20603d73..905d2defa 100644
--- a/navit/vehicleprofile.c
+++ b/navit/vehicleprofile.c
@@ -182,7 +182,7 @@ static void vehicleprofile_debug_roadprofile(gpointer key, gpointer value, gpoin
}
static void vehicleprofile_update(struct vehicleprofile *this_) {
- struct attr_iter *iter=vehicleprofile_attr_iter_new();
+ struct attr_iter *iter=vehicleprofile_attr_iter_new(NULL);
struct attr profile_option;
dbg(lvl_debug,"enter");
vehicleprofile_clear(this_);
@@ -227,7 +227,7 @@ vehicleprofile_new(struct attr *parent, struct attr **attrs) {
}
struct attr_iter *
-vehicleprofile_attr_iter_new(void) {
+vehicleprofile_attr_iter_new(void* unused) {
return (struct attr_iter *)g_new0(void *,1);
}
@@ -276,8 +276,9 @@ char *vehicleprofile_get_name(struct vehicleprofile *this_) {
return this_->name;
}
-static void vehicleprofile_init(struct vehicleprofile *this_) {
+static int vehicleprofile_init(struct vehicleprofile *this_) {
vehicleprofile_update(this_);
+ return 0;
}
struct object_func vehicleprofile_func = {
diff --git a/navit/vehicleprofile.h b/navit/vehicleprofile.h
index 4e1b6a340..58ffa1489 100644
--- a/navit/vehicleprofile.h
+++ b/navit/vehicleprofile.h
@@ -24,40 +24,41 @@ extern "C" {
enum maxspeed_handling {
- maxspeed_enforce = 0, /*!< Always enforce maxspeed of segment */
- maxspeed_restrict = 1, /*!< Enforce maxspeed of segment only if it restricts the speed */
- maxspeed_ignore = 2, /*!< Ignore maxspeed of segment, always use {@code route_weight} of road profile */
+ maxspeed_enforce = 0, /*!< Always enforce maxspeed of segment */
+ maxspeed_restrict = 1, /*!< Enforce maxspeed of segment only if it restricts the speed */
+ maxspeed_ignore = 2, /*!< Ignore maxspeed of segment, always use {@code route_weight} of road profile */
};
struct vehicleprofile {
- NAVIT_OBJECT
- int mode; /**< 0 = Auto, 1 = On-Road, 2 = Off-Road */
- int flags_forward_mask; /**< Flags mask for moving in positive direction */
- int flags_reverse_mask; /**< Flags mask for moving in reverse direction */
- int flags; /**< Required flags to move through a segment */
- int maxspeed_handling; /**< How to handle maxspeed of segment, see {@code enum maxspeed_handling} */
- int static_speed; /**< Maximum speed of vehicle to consider it stationary */
- int static_distance; /**< Maximum distance of previous position of vehicle to consider it stationary */
- char *name; /**< the vehicle profile name */
- char *route_depth; /**< the route depth attribute */
- int width; /**< Width of the vehicle in cm */
- int height; /**< Height of the vehicle in cm */
- int length; /**< Length of the vehicle in cm */
- int weight; /**< Weight of the vehicle in kg */
- int axle_weight; /**< Axle Weight of the vehicle in kg */
- int dangerous_goods; /**< Flags of dangerous goods present */
- int through_traffic_penalty; /**< Penalty when driving on a through traffic limited road */
- GHashTable *roadprofile_hash;
- struct attr active_callback;
- int turn_around_penalty; /**< Penalty when turning around */
- int turn_around_penalty2; /**< Penalty when turning around, for planned turn arounds */
+ NAVIT_OBJECT
+ int mode; /**< 0 = Auto, 1 = On-Road, 2 = Off-Road */
+ int flags_forward_mask; /**< Flags mask for moving in positive direction */
+ int flags_reverse_mask; /**< Flags mask for moving in reverse direction */
+ int flags; /**< Required flags to move through a segment */
+ int maxspeed_handling; /**< How to handle maxspeed of segment, see {@code enum maxspeed_handling} */
+ int static_speed; /**< Maximum speed of vehicle to consider it stationary */
+ int static_distance; /**< Maximum distance of previous position of vehicle to consider it stationary */
+ char *name; /**< the vehicle profile name */
+ char *route_depth; /**< the route depth attribute */
+ int width; /**< Width of the vehicle in cm */
+ int height; /**< Height of the vehicle in cm */
+ int length; /**< Length of the vehicle in cm */
+ int weight; /**< Weight of the vehicle in kg */
+ int axle_weight; /**< Axle Weight of the vehicle in kg */
+ int dangerous_goods; /**< Flags of dangerous goods present */
+ int through_traffic_penalty; /**< Penalty when driving on a through traffic limited road */
+ GHashTable *roadprofile_hash;
+ struct attr active_callback;
+ int turn_around_penalty; /**< Penalty when turning around */
+ int turn_around_penalty2; /**< Penalty when turning around, for planned turn arounds */
};
struct vehicleprofile * vehicleprofile_new(struct attr *parent, struct attr **attrs);
-struct attr_iter *vehicleprofile_attr_iter_new(void);
+struct attr_iter *vehicleprofile_attr_iter_new(void * unused);
void vehicleprofile_attr_iter_destroy(struct attr_iter *iter);
-int vehicleprofile_get_attr(struct vehicleprofile *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
+int vehicleprofile_get_attr(struct vehicleprofile *this_, enum attr_type type, struct attr *attr,
+ struct attr_iter *iter);
int vehicleprofile_set_attr(struct vehicleprofile *this_, struct attr *attr);
int vehicleprofile_add_attr(struct vehicleprofile *this_, struct attr *attr);
int vehicleprofile_remove_attr(struct vehicleprofile *this_, struct attr *attr);
diff --git a/navit/xslt/tomtom.xslt b/navit/xslt/tomtom.xslt
index dac69f3d3..0a93aac69 100644
--- a/navit/xslt/tomtom.xslt
+++ b/navit/xslt/tomtom.xslt
@@ -11,6 +11,7 @@
<xsl:template match="/">
<xsl:apply-templates select="config"/>
+ <xsl:apply-templates select="layout"/>
</xsl:template>
<xsl:template match="config">
@@ -52,6 +53,13 @@
</mapset>
<xsl:copy-of select="layer"/>
<xsl:copy-of select="layout"/>
+ <xsl:copy-of select="xi:include"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="layout">
+ <xsl:copy>
+ <xsl:copy-of select="@*|node()"/>
</xsl:copy>
</xsl:template>
</xsl:transform>
diff --git a/po/sv.po.in b/po/sv.po.in
index 0a294fb63..5c283e2db 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -1,5 +1,5 @@
# Swedish translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2019 The Navit Team
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Erik Lundin https://launchpad.net/~erik-lundin
@@ -8,15 +8,17 @@
# Mikael Olofsson https://launchpad.net/~michlos
# Mikko Virkkilä https://launchpad.net/~virkkila
# Squall Leonhart https://launchpad.net/~webmaster-square-one
+# blabla2019 https://launchpad.net/~blabla2019
+# ilovekiruna https://launchpad.net/~ilovekiruna
# nairobie https://launchpad.net/~samuel-ostman
# pipe https://launchpad.net/~pipatron
msgid ""
msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 04:00+0000\n"
-"Last-Translator: Michael von Glasow <Unknown>\n"
+"PO-Revision-Date: 2019-10-29 19:15+0000\n"
+"Last-Translator: blabla2019 <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,6 +30,10 @@ msgstr ""
msgid "Running from source directory\n"
msgstr "Körs från källkodsbiblioteket\n"
+#. libc of navit returns "dummy"
+msgid "Error getting current path. use ./ \n"
+msgstr ""
+
#, c-format
msgid "setting '%s' to '%s'\n"
msgstr "sätter '%s' till '%s'\n"
@@ -56,25 +62,25 @@ msgstr "sjätte"
#. TRANSLATORS: the following counts refer to roundabout exits
msgid "zeroth exit"
-msgstr "ingen avfart"
+msgstr "nollte utfarten"
msgid "first exit"
msgstr "första avfarten"
msgid "second exit"
-msgstr "andra avfarten"
+msgstr "andra utfarten"
msgid "third exit"
-msgstr "tredje avfarten"
+msgstr "tredje utfarten"
msgid "fourth exit"
-msgstr "fjärde avfarten"
+msgstr "fjärde utfarten"
msgid "fifth exit"
-msgstr "femte avfarten"
+msgstr "femte utfarten"
msgid "sixth exit"
-msgstr "sjätte avfarten"
+msgstr "sjätte utfarten"
#, c-format
msgid "%d feet"
@@ -95,14 +101,14 @@ msgstr ""
#, c-format
msgid "one mile"
msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "en engelsk mil"
+msgstr[1] "%d mil"
#, c-format
msgid "in one mile"
msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "efter en mil"
+msgstr[1] "efter %d mil"
#, c-format
msgid "%d meters"
@@ -155,9 +161,8 @@ msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$s ut på %2$s"
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
msgid "onto the motorway ramp"
msgstr "ut på påfarten"
@@ -192,7 +197,7 @@ msgstr "Vänd när det går"
#. TRANSLATORS: the argument is the destination to follow
#, c-format
msgid "towards %s"
-msgstr ""
+msgstr "mot %s"
#, c-format
msgid "Follow the road for the next %s"
@@ -247,7 +252,7 @@ msgid "on your left"
msgstr ""
msgid "on your right"
-msgstr ""
+msgstr "på högra sidan"
#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
#, c-format
@@ -264,37 +269,37 @@ msgid "at interchange"
msgstr ""
msgid "at exit"
-msgstr ""
+msgstr "vid avfarten"
#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
msgid "then continue straight%1$s"
-msgstr ""
+msgstr "sedan fortsätt rakt fram%1$s"
#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Fortsätt rakt fram %1$s%2$s%3$s"
#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
msgid "then keep right%1$s"
-msgstr ""
+msgstr "sedan håll höger%1$s"
#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Håll höger %1$s%2$s%3$s"
#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
msgid "then keep left%1$s"
-msgstr ""
+msgstr "sedan håll vänster%1$s"
#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Håll vänster%1$s%2$s%3$s"
#. TRANSLATORS: "right" as in "turn right"
msgid "right"
@@ -318,7 +323,7 @@ msgstr ""
#, c-format
msgid "Take the %1$s road to the %2$s"
-msgstr "Ta %1$s vägen mot %2$s"
+msgstr "Ta %1$s vägen till %2$s"
#, c-format
msgid "after %i roads"
@@ -370,7 +375,6 @@ msgstr "sedan har du nått din destination."
msgid "You have reached your destination %s"
msgstr "Du har nått din destination %s"
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
msgid "Interchange"
msgstr "Korsning"
@@ -387,9 +391,15 @@ msgstr "Kommando"
msgid "Length"
msgstr "Sträcka"
+msgid "mi"
+msgstr ""
+
msgid "km"
msgstr "km"
+msgid "feet"
+msgstr "fötter"
+
msgid "m"
msgstr "m"
@@ -403,14 +413,14 @@ msgid "Destination Time"
msgstr "Restid"
msgid "Roadbook"
-msgstr "Vägbok"
+msgstr "Roadbook"
#, c-format
msgid "Waypoint %d"
-msgstr ""
+msgstr "Brytpunkt %d"
msgid "Visit before..."
-msgstr ""
+msgstr "Besök före"
msgid "Set as position"
msgstr "Ange som position"
@@ -450,6 +460,7 @@ msgid "Anguilla"
msgstr "Anguilla"
#. 008
+#. Android resource: @strings/albania
msgid "Albania"
msgstr "Albanien"
@@ -462,6 +473,7 @@ msgid "Netherlands Antilles"
msgstr "Nederländska Antillerna"
#. 024
+#. Android resource: @strings/angola
msgid "Angola"
msgstr "Angola"
@@ -470,6 +482,7 @@ msgid "Antarctica"
msgstr "Antarktis"
#. 032
+#. Android resource: @strings/argentina
msgid "Argentina"
msgstr "Argentina"
@@ -478,10 +491,12 @@ msgid "American Samoa"
msgstr "Amerikanska Samoa"
#. 040
+#. Android resource: @strings/austria
msgid "Austria"
msgstr "Österrike"
#. 036
+#. Android resource: @strings/australia
msgid "Australia"
msgstr "Australien"
@@ -494,10 +509,12 @@ msgid "Aland Islands"
msgstr "Åland"
#. 031
+#. Android resource: @strings/azerbaijan
msgid "Azerbaijan"
msgstr "Azerbajdzjan"
#. 070
+#. Android resource: @strings/bosnia_and_herzegovina
msgid "Bosnia and Herzegovina"
msgstr "Bosnien-Hercegovina"
@@ -510,6 +527,7 @@ msgid "Bangladesh"
msgstr "Bangladesh"
#. 056
+#. Android resource: @strings/belgium
msgid "Belgium"
msgstr "Belgien"
@@ -518,6 +536,7 @@ msgid "Burkina Faso"
msgstr "Burkina Faso"
#. 100
+#. Android resource: @strings/bulgaria
msgid "Bulgaria"
msgstr "Bulgarien"
@@ -526,6 +545,7 @@ msgid "Bahrain"
msgstr "Bahrain"
#. 108
+#. Android resource: @strings/burundi
msgid "Burundi"
msgstr "Burundi"
@@ -546,14 +566,16 @@ msgid "Brunei Darussalam"
msgstr "Brunei"
#. 068
+#. Android resource: @strings/bolivia
msgid "Bolivia"
msgstr "Bolivia"
#. 535
msgid "Bonaire, Sint Eustatius and Saba"
-msgstr ""
+msgstr "Bonaire, Sint Eustatius och Saba"
#. 076
+#. Android resource: @strings/brazil
msgid "Brazil"
msgstr "Brasilien"
@@ -570,10 +592,12 @@ msgid "Bouvet Island"
msgstr "Bouvetön"
#. 072
+#. Android resource: @strings/botswana
msgid "Botswana"
msgstr "Botswana"
#. 112
+#. Android resource: @strings/belarus
msgid "Belarus"
msgstr "Vitryssland"
@@ -582,6 +606,7 @@ msgid "Belize"
msgstr "Belize"
#. 124
+#. Android resource: @strings/canada
msgid "Canada"
msgstr "Kanada"
@@ -590,6 +615,7 @@ msgid "Cocos (Keeling) Islands"
msgstr "Kokosöarna"
#. 180
+#. Android resource: @strings/congo
msgid "Congo, Democratic Republic of the"
msgstr "Kongo, Demokratiska republiken"
@@ -602,10 +628,12 @@ msgid "Congo"
msgstr "Kongo"
#. 756
+#. Android resource: @strings/switzerland
msgid "Switzerland"
msgstr "Schweiz"
#. 384
+#. Android resource: @strings/cotedivoire
msgid "Cote d'Ivoire"
msgstr "Elfenbenskusten"
@@ -614,6 +642,7 @@ msgid "Cook Islands"
msgstr "Cooköarna"
#. 152
+#. Android resource: @strings/chile
msgid "Chile"
msgstr "Chile"
@@ -622,10 +651,12 @@ msgid "Cameroon"
msgstr "Kamerun"
#. 156
+#. Android resource: @strings/china
msgid "China"
msgstr "Kina"
#. 170
+#. Android resource: @strings/colombia
msgid "Colombia"
msgstr "Colombia"
@@ -634,6 +665,7 @@ msgid "Costa Rica"
msgstr "Costa Rica"
#. 192
+#. Android resource: @strings/cuba
msgid "Cuba"
msgstr "Kuba"
@@ -643,21 +675,24 @@ msgstr "Kap Verde"
#. 531
msgid "Curacao"
-msgstr ""
+msgstr "Curaçao"
#. 162
msgid "Christmas Island"
msgstr "Julön"
#. 196
+#. Android resource: @strings/cyprus
msgid "Cyprus"
msgstr "Cypern"
#. 203
+#. Android resource: @strings/czech_republic
msgid "Czech Republic"
msgstr "Tjeckien"
#. 276
+#. Android resource: @strings/germany
msgid "Germany"
msgstr "Tyskland"
@@ -666,6 +701,7 @@ msgid "Djibouti"
msgstr "Djibouti"
#. 208
+#. Android resource: @strings/denmark
msgid "Denmark"
msgstr "Danmark"
@@ -674,6 +710,7 @@ msgid "Dominica"
msgstr "Dominica"
#. 214
+#. Android resource: @strings/dominican_republic
msgid "Dominican Republic"
msgstr "Dominikanska republiken"
@@ -682,10 +719,12 @@ msgid "Algeria"
msgstr "Algeriet"
#. 218
+#. Android resource: @strings/ecuador
msgid "Ecuador"
msgstr "Ecuador"
#. 233
+#. Android resource: @strings/estonia
msgid "Estonia"
msgstr "Estland"
@@ -702,14 +741,17 @@ msgid "Eritrea"
msgstr "Eritrea"
#. 724
+#. Android resource: @strings/spain
msgid "Spain"
msgstr "Spanien"
#. 231
+#. Android resource: @strings/ethiopia
msgid "Ethiopia"
msgstr "Etiopien"
#. 246
+#. Android resource: @strings/finland
msgid "Finland"
msgstr "Finland"
@@ -726,10 +768,12 @@ msgid "Micronesia, Federated States of"
msgstr "Mikronesien, federala staterna"
#. 234
+#. Android resource: @strings/faroe_islands
msgid "Faroe Islands"
msgstr "Färöarna"
#. 250
+#. Android resource: @strings/france
msgid "France"
msgstr "Frankrike"
@@ -738,6 +782,7 @@ msgid "Gabon"
msgstr "Gabon"
#. 826
+#. Android resource: @strings/united_kingdom
msgid "United Kingdom"
msgstr "Storbritannien"
@@ -774,6 +819,7 @@ msgid "Gambia"
msgstr "Gambia"
#. 324
+#. Android resource: @strings/guinea
msgid "Guinea"
msgstr "Guinea"
@@ -786,6 +832,7 @@ msgid "Equatorial Guinea"
msgstr "Ekvatorialguinea"
#. 300
+#. Android resource: @strings/greece
msgid "Greece"
msgstr "Grekland"
@@ -806,6 +853,7 @@ msgid "Guinea-Bissau"
msgstr "Guinea-Bissau"
#. 328
+#. Android resource: @strings/guyana
msgid "Guyana"
msgstr "Guyana"
@@ -822,26 +870,32 @@ msgid "Honduras"
msgstr "Honduras"
#. 191
+#. Android resource: @strings/croatia
msgid "Croatia"
msgstr "Kroatien"
#. 332
+#. Android resource: @strings/haiti
msgid "Haiti"
msgstr "Haiti"
#. 348
+#. Android resource: @strings/hungary
msgid "Hungary"
msgstr "Ungern"
#. 360
+#. Android resource: @strings/indonesia
msgid "Indonesia"
msgstr "Indonesien"
#. 372
+#. Android resource: @strings/ireland
msgid "Ireland"
msgstr "Irland"
#. 376
+#. Android resource: @strings/israel
msgid "Israel"
msgstr "Israel"
@@ -850,6 +904,7 @@ msgid "Isle of Man"
msgstr "Isle of Man"
#. 356
+#. Android resource: @strings/india
msgid "India"
msgstr "Indien"
@@ -858,18 +913,22 @@ msgid "British Indian Ocean Territory"
msgstr "Brittiska territoriet i Indiska Oceanen"
#. 368
+#. Android resource: @strings/iraq
msgid "Iraq"
msgstr "Irak"
#. 364
+#. Android resource: @strings/iran
msgid "Iran, Islamic Republic of"
msgstr "Iran, islamiska republiken"
#. 352
+#. Android resource: @strings/iceland
msgid "Iceland"
msgstr "Island"
#. 380
+#. Android resource: @strings/italy
msgid "Italy"
msgstr "Italien"
@@ -878,6 +937,7 @@ msgid "Jersey"
msgstr "Jersey"
#. 388
+#. Android resource: @strings/jamaica
msgid "Jamaica"
msgstr "Jamaica"
@@ -886,14 +946,17 @@ msgid "Jordan"
msgstr "Jordanien"
#. 392
+#. Android resource: @strings/japan
msgid "Japan"
msgstr "Japan"
#. 404
+#. Android resource: @strings/kenya
msgid "Kenya"
msgstr "Kenya"
#. 417
+#. Android resource: @strings/kyrgyzsyan
msgid "Kyrgyzstan"
msgstr "Kirgizistan"
@@ -930,6 +993,7 @@ msgid "Cayman Islands"
msgstr "Caymanöarna"
#. 398
+#. Android resource: @strings/kazakhstan
msgid "Kazakhstan"
msgstr "Kazakstan"
@@ -954,28 +1018,34 @@ msgid "Sri Lanka"
msgstr "Sri Lanka"
#. 430
+#. Android resource: @strings/liberia
msgid "Liberia"
msgstr "Liberia"
#. 426
+#. Android resource: @strings/lesotho
msgid "Lesotho"
msgstr "Lesotho"
#. 440
+#. Android resource: @strings/lithuania
msgid "Lithuania"
msgstr "Litauen"
#. 442
+#. Android resource: @strings/luxembourg
msgid "Luxembourg"
msgstr "Luxemburg"
#. 428
+#. Android resource: @strings/latvia
msgid "Latvia"
msgstr "Lettland"
#. 434
+#. Android resource: @strings/libya
msgid "Libya"
-msgstr ""
+msgstr "Libyen"
#. 504
msgid "Morocco"
@@ -998,6 +1068,7 @@ msgid "Saint Martin (French part)"
msgstr "Saint Martin (Franksa delen)"
#. 450
+#. Android resource: @strings/madagascar
msgid "Madagascar"
msgstr "Madagaskar"
@@ -1018,6 +1089,7 @@ msgid "Myanmar"
msgstr "Burma (Myanmar)"
#. 496
+#. Android resource: @strings/mongolia
msgid "Mongolia"
msgstr "Mongoliet"
@@ -1058,10 +1130,12 @@ msgid "Malawi"
msgstr "Malawi"
#. 484
+#. Android resource: @strings/mexico
msgid "Mexico"
msgstr "Mexiko"
#. 458
+#. Android resource: @strings/malaysia
msgid "Malaysia"
msgstr "Malaysia"
@@ -1070,10 +1144,12 @@ msgid "Mozambique"
msgstr "Moçambique"
#. 516
+#. Android resource: @strings/namibia
msgid "Namibia"
msgstr "Namibia"
#. 540
+#. Android resource: @strings/new_caledonia
msgid "New Caledonia"
msgstr "Nya Kaledonien"
@@ -1094,6 +1170,7 @@ msgid "Nicaragua"
msgstr "Nicaragua"
#. 528
+#. Android resource: @strings/netherlands
msgid "Netherlands"
msgstr "Nederländerna"
@@ -1102,6 +1179,7 @@ msgid "Norway"
msgstr "Norge"
#. 524
+#. Android resource: @strings/nepal
msgid "Nepal"
msgstr "Nepal"
@@ -1114,6 +1192,7 @@ msgid "Niue"
msgstr "Niue"
#. 554
+#. Android resource: @strings/newzealand
msgid "New Zealand"
msgstr "Nya Zeeland"
@@ -1126,6 +1205,7 @@ msgid "Panama"
msgstr "Panama"
#. 604
+#. Android resource: @strings/peru
msgid "Peru"
msgstr "Peru"
@@ -1138,14 +1218,17 @@ msgid "Papua New Guinea"
msgstr "Papua Nya Guinea"
#. 608
+#. Android resource: @strings/philippines
msgid "Philippines"
msgstr "Filippinerna"
#. 586
+#. Android resource: @strings/pakistan
msgid "Pakistan"
msgstr "Pakistan"
#. 616
+#. Android resource: @strings/poland
msgid "Poland"
msgstr "Polen"
@@ -1166,6 +1249,7 @@ msgid "Palestinian Territory, Occupied"
msgstr "Palestinska självstyret"
#. 620
+#. Android resource: @strings/portugal
msgid "Portugal"
msgstr "Portugal"
@@ -1174,6 +1258,7 @@ msgid "Palau"
msgstr "Palau"
#. 600
+#. Android resource: @strings/paraguay
msgid "Paraguay"
msgstr "Paraguay"
@@ -1182,10 +1267,12 @@ msgid "Qatar"
msgstr "Qatar"
#. 638
+#. Android resource: @strings/reunion
msgid "Reunion"
msgstr "Reunion"
#. 642
+#. Android resource: @strings/romania
msgid "Romania"
msgstr "Rumänien"
@@ -1194,14 +1281,17 @@ msgid "Serbia"
msgstr "Serbien"
#. 643
+#. Android resource: @strings/russian_federation
msgid "Russian Federation"
msgstr "Ryssland"
#. 646
+#. Android resource: @strings/rwanda
msgid "Rwanda"
msgstr "Rwanda"
#. 682
+#. Android resource: @strings/saudi_arabia
msgid "Saudi Arabia"
msgstr "Saudiarabien"
@@ -1222,6 +1312,7 @@ msgid "Sweden"
msgstr "Sverige"
#. 702
+#. Android resource: @strings/singapore
msgid "Singapore"
msgstr "Singapore"
@@ -1238,6 +1329,7 @@ msgid "Svalbard and Jan Mayen"
msgstr "Svalbard och Jan Mayen"
#. 703
+#. Android resource: @strings/slovakia
msgid "Slovakia"
msgstr "Slovakien"
@@ -1258,12 +1350,13 @@ msgid "Somalia"
msgstr "Somalia"
#. 740
+#. Android resource: @strings/suriname
msgid "Suriname"
msgstr "Surinam"
#. 728
msgid "South Sudan"
-msgstr ""
+msgstr "Sydsudan"
#. 678
msgid "Sao Tome and Principe"
@@ -1275,7 +1368,7 @@ msgstr "El Salvador"
#. 534
msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (nederländska delen)"
#. 760
msgid "Syrian Arab Republic"
@@ -1302,6 +1395,7 @@ msgid "Togo"
msgstr "Togo"
#. 764
+#. Android resource: @strings/thailand
msgid "Thailand"
msgstr "Thailand"
@@ -1318,6 +1412,7 @@ msgid "Timor-Leste"
msgstr "Östtimor"
#. 795
+#. Android resource: @strings/turkmenistan
msgid "Turkmenistan"
msgstr "Turkmenistan"
@@ -1330,6 +1425,7 @@ msgid "Tonga"
msgstr "Tonga"
#. 792
+#. Android resource: @strings/turkey
msgid "Turkey"
msgstr "Turkiet"
@@ -1346,14 +1442,17 @@ msgid "Taiwan, Province of China"
msgstr "Taiwan, provins i Kina"
#. 834
+#. Android resource: @strings/tanzania
msgid "Tanzania, United Republic of"
msgstr "Tanzania"
#. 804
+#. Android resource: @strings/ukraine
msgid "Ukraine"
msgstr "Ukraina"
#. 800
+#. Android resource: @strings/uganda
msgid "Uganda"
msgstr "Uganda"
@@ -1366,6 +1465,7 @@ msgid "United States"
msgstr "USA"
#. 858
+#. Android resource: @strings/uruguay
msgid "Uruguay"
msgstr "Uruguay"
@@ -1382,6 +1482,7 @@ msgid "Saint Vincent and the Grenadines"
msgstr "Saint Vincent och Grenadinerna"
#. 862
+#. Android resource: @strings/venezuela
msgid "Venezuela"
msgstr "Venezuela"
@@ -1409,6 +1510,10 @@ msgstr "Wallis och Futuna"
msgid "Samoa"
msgstr "Samoa"
+#. 412
+msgid "Kosovo"
+msgstr "Kosovo"
+
#. 887
msgid "Yemen"
msgstr "Jemen"
@@ -1418,6 +1523,7 @@ msgid "Mayotte"
msgstr "Mayotte"
#. 710
+#. Android resource: @strings/south_africa
msgid "South Africa"
msgstr "Sydafrika"
@@ -1445,34 +1551,34 @@ msgid ""
msgstr ""
#. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
+msgid "No config file navit.xml, navit.xml.local found"
+msgstr "Kan inte hitta konfigurationsfil navit.xml, navit.xml.local"
#, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
msgstr ""
#, c-format
-msgid "Using config file '%s'\n"
-msgstr ""
+msgid "Using config file '%s'"
+msgstr "Använder konfigurationsfil '%s'"
#, c-format
-msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgid "Error: No configuration found in config file '%s'"
+msgstr "Fel: Ingen konfiguration hittat i konfigurationsfil '%s'"
msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
msgstr ""
msgid "unknown street"
-msgstr ""
+msgstr "okänd gata"
#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Namnlöst fordon"
msgid "Failed to write bookmarks file"
-msgstr ""
+msgstr "kan inte skriva bokmärkefil"
#. Strings from navit_shipped.xml
msgid "Map Point"
@@ -1573,16 +1679,16 @@ msgid "_Info"
msgstr "Info"
msgid "Set _destination"
-msgstr ""
+msgstr "Ställ in destinationen"
msgid "Opens address search dialog"
msgstr "Öppna adressökning"
msgid "_POI search"
-msgstr ""
+msgstr "_Intressepunkt sökning"
msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Öppnar sökdialogrutan för intressepunkt"
msgid "_Stop Navigation"
msgstr "Avsluta navigering"
@@ -1597,13 +1703,16 @@ msgid "Quit the application"
msgstr "Avsluta programmet"
msgid "Show position _cursor"
-msgstr ""
+msgstr "Visa positionsmarkör"
msgid "_Lock on Road"
msgstr "Lås till vägen"
+msgid "_Follow Vehicle"
+msgstr "_Följ fordonet"
+
msgid "_Keep orientation to the North"
-msgstr ""
+msgstr "_Håll riktningen mott norr (eller håll nordlig riktning)"
msgid "Switches map orientation to the north or the vehicle"
msgstr "Växlar orientering mot norr eller enligt rörelse"
@@ -1627,92 +1736,94 @@ msgid "Data"
msgstr "Data"
msgid "Pharmacy"
-msgstr ""
+msgstr "Apotek"
msgid "Restaurant"
-msgstr ""
+msgstr "Restaurang"
msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Snabbmatsrestaurang"
msgid "Hotel"
-msgstr ""
+msgstr "Hotell"
msgid "Car parking"
-msgstr ""
+msgstr "Bilparkering"
msgid "Fuel station"
-msgstr ""
+msgstr "bensinstation"
msgid "Bank"
-msgstr ""
+msgstr "Bank"
msgid "Hospital"
-msgstr ""
+msgstr "Sjukhus"
msgid "Cinema"
-msgstr ""
+msgstr "Biograf"
msgid "Train station"
-msgstr ""
+msgstr "Tågstation"
msgid "School"
-msgstr ""
+msgstr "Skola"
msgid "Police"
-msgstr ""
+msgstr "Polisstation"
msgid "Justice"
-msgstr ""
+msgstr "Menar du Justice department? Eller RÄTTVISA"
msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
msgid "Shopping"
+msgstr "Shopping"
+
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
msgstr ""
-msgid "Select a search radius from screen center"
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
msgstr ""
#, c-format
msgid "POI %s. %s"
-msgstr ""
+msgstr "Intressepunkt %s. %s"
#, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
msgstr ""
#, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
msgstr ""
#, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
msgstr ""
msgid "POI search"
-msgstr ""
+msgstr "Intressepunktssökning"
msgid "Select a category"
-msgstr ""
-
-msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Välj en kategori"
msgid "Select a POI"
-msgstr ""
+msgstr "Välj en intressepunkt"
msgid " "
-msgstr ""
+msgstr " "
msgid "Category"
-msgstr ""
+msgstr "Kategori"
msgid "Direction"
msgstr ""
-msgid "Distance(m)"
-msgstr ""
+msgid "Distance"
+msgstr "Avstånd"
msgid "Name"
msgstr ""
@@ -1758,8 +1869,8 @@ msgid "OT"
msgstr "OT"
#, c-format
-msgid "Route %4.0fkm %02d:%02d ETA"
-msgstr "Rutt %4.0fkm %02d:%02d Ankomsttid"
+msgid "Route %4.1f%s %02d:%02d ETA"
+msgstr ""
msgid "Route 0000km 0+00:00 ETA"
msgstr "Rutt 0000km 0+00:00 Ankomsttid"
@@ -1836,7 +1947,7 @@ msgid "Replace with waypoints"
msgstr ""
msgid "Delete Folder"
-msgstr ""
+msgstr "Ta bort mapp"
#. Adds the Bookmark folders
msgid "Add Bookmark folder"
@@ -1852,7 +1963,7 @@ msgstr "Bokmärk %s"
#, c-format
msgid "Download %s"
-msgstr ""
+msgstr "Hämta %s"
msgid "Map Download"
msgstr ""
@@ -1861,7 +1972,7 @@ msgid "Active"
msgstr ""
msgid "Download Enabled"
-msgstr ""
+msgstr "Nedladdning aktiverad"
msgid "Download completely"
msgstr ""
@@ -1969,12 +2080,21 @@ msgstr "Layout"
msgid "Height Profile"
msgstr "Höjdprofil"
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
msgid "Route Description"
msgstr "Vägbeskrivning"
msgid "Show Locale"
msgstr "Visa språk"
+msgid "Network info"
+msgstr ""
+
msgid "Former Destinations"
msgstr "Tidigare destinationer"
@@ -1997,7 +2117,7 @@ msgid "House number"
msgstr "Husnummer"
msgid "Next"
-msgstr ""
+msgstr "Nästa"
msgid "Prev"
msgstr ""
@@ -2007,739 +2127,890 @@ msgstr ""
#. warning told
msgid "Look out! Camera!"
-msgstr ""
+msgstr "Se upp! Kamera!"
#. warning told
msgid "Please decrease your speed"
-msgstr ""
+msgstr "Var snäll och sänk hastigheten"
-msgid "partial match"
-msgstr ""
+msgid "Vehicle Position"
+msgstr "Fordonsposition"
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
+msgid "Main menu"
+msgstr "Huvudmeny"
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
msgstr ""
+"Visa\n"
+"Karta"
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
+msgid "Settings"
+msgstr "Inställningar"
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Tools"
+msgstr "Verktyg"
+
+msgid "Route"
+msgstr "Rutt"
+
+msgid "About"
+msgstr "Om"
+
+msgid "Quit"
+msgstr "Avsluta"
+
+msgid "Actions"
+msgstr "Åtgärder"
msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
msgstr ""
-msgid "Downloaded maps"
-msgstr ""
+msgid "Coordinates"
+msgstr "Koordinater"
msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
msgstr ""
+"Stoppa\n"
+"Navigering"
-msgid "Cancel"
-msgstr ""
+msgid "Display"
+msgstr "Visa"
-msgid "filenamePath"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Helskärm"
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
-msgstr ""
+msgid "Window Mode"
+msgstr "Fönsterläge"
-msgid "Whole Planet"
+msgid "Auto zoom"
msgstr ""
-msgid "Africa"
+msgid "Manual zoom"
msgstr ""
-msgid "Canary Islands"
+msgid "Layers"
msgstr ""
-msgid "Asia"
+msgid "Zoom to route"
msgstr ""
-msgid "Korea"
-msgstr ""
+msgid "Description"
+msgstr "Beskrivning"
-msgid "Taiwan"
+msgid ""
+"Drop last\n"
+"Waypoint"
msgstr ""
-msgid "UAE+Other"
+msgid ""
+"Drop next\n"
+"Waypoint"
msgstr ""
-msgid "Oceania"
+msgid "Satellite Status"
msgstr ""
-msgid "Tasmania"
+msgid "NMEA Data"
msgstr ""
-msgid "Victoria"
-msgstr ""
+msgid "car_shortest"
+msgstr "bil_kortast"
-msgid "New South Wales"
+msgid "car_avoid_tolls"
msgstr ""
-msgid "Europe"
+msgid "car_pedantic"
msgstr ""
-msgid "Western Europe"
-msgstr ""
+msgid "horse"
+msgstr "häst"
-msgid "Azores"
+msgid "Truck"
msgstr ""
-msgid "BeNeLux"
-msgstr ""
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr "Ja"
-msgid "Alsace"
-msgstr ""
+#. Android resource: @strings/cancel
+msgid "Cancel"
+msgstr "Avbryt"
-msgid "Aquitaine"
-msgstr ""
+#. Android resource: @strings/channel_name
+msgid "Navit"
+msgstr "Navit"
-msgid "Auvergne"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
msgstr ""
-msgid "Basse-Normandie"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
msgstr ""
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
msgstr ""
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
msgstr ""
-msgid "Centre"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
msgstr ""
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
msgstr ""
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
msgstr ""
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
msgstr ""
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
msgstr ""
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
msgstr ""
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
msgstr ""
-msgid "Limousin"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
msgstr ""
-msgid "Lorraine"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
msgstr ""
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
msgstr ""
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/position_popup_view
+msgid "View"
msgstr ""
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/use_position_with
+msgid "Use position with"
msgstr ""
-msgid "Picardie"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
msgstr ""
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
msgstr ""
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
msgstr ""
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
msgstr ""
-msgid "Baden-Wuerttemberg"
-msgstr ""
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "klar"
-msgid "Bayern"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
msgstr ""
-msgid "Mittelfranken"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
msgstr ""
-msgid "Niederbayern"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
msgstr ""
-msgid "Oberbayern"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
msgstr ""
-msgid "Oberfranken"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
msgstr ""
-msgid "Oberpfalz"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
msgstr ""
-msgid "Schwaben"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
msgstr ""
-msgid "Unterfranken"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
msgstr ""
-msgid "Berlin"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
msgstr ""
-msgid "Brandenburg"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
msgstr ""
-msgid "Bremen"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
msgstr ""
-msgid "Hamburg"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
msgstr ""
-msgid "Hessen"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
msgstr ""
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
msgstr ""
-msgid "Niedersachsen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
msgstr ""
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_button
+msgid "Search"
msgstr ""
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
msgstr ""
-msgid "Saarland"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
msgstr ""
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
msgstr ""
-msgid "Sachsen"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
msgstr ""
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
msgstr ""
-msgid "Thueringen"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
msgstr ""
-msgid "Mallorca"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
msgstr ""
-msgid "Galicia"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
msgstr ""
-msgid "Scandinavia"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
msgstr ""
-msgid "England"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
msgstr ""
-msgid "Buckinghamshire"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
msgstr ""
-msgid "Cambridgeshire"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
msgstr ""
-msgid "Cumbria"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
msgstr ""
-msgid "East yorkshire with hull"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
msgstr ""
-msgid "Essex"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
msgstr ""
-msgid "Herefordshire"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
msgstr ""
-msgid "Kent"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
msgstr ""
-msgid "Lancashire"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
msgstr ""
-msgid "Leicestershire"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
msgstr ""
-msgid "Norfolk"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
msgstr ""
-msgid "Nottinghamshire"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
msgstr ""
-msgid "Oxfordshire"
+#. Android resource: @strings/backup
+msgid "Backup"
msgstr ""
-msgid "Shropshire"
+#. Android resource: @strings/restore
+msgid "Restore"
msgstr ""
-msgid "Somerset"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
msgstr ""
-msgid "South yorkshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
msgstr ""
-msgid "Suffolk"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
msgstr ""
-msgid "Surrey"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
msgstr ""
-msgid "Wiltshire"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
msgstr ""
-msgid "Scotland"
+#. Android resource: @strings/africa
+msgid "Africa"
msgstr ""
-msgid "Wales"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
msgstr ""
-msgid "Crete"
-msgstr ""
+#. Android resource: @strings/asia
+msgid "Asia"
+msgstr "Asien"
-msgid "North America"
-msgstr ""
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
+msgstr "Taiwan"
-msgid "Alaska"
-msgstr ""
+#. Android resource: @strings/korea
+msgid "Korea"
+msgstr "Korea"
-msgid "Hawaii"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
msgstr ""
-msgid "USA"
+#. Android resource: @strings/oceania
+msgid "Oceania"
msgstr ""
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
msgstr ""
-msgid "Midwest"
+#. Android resource: @strings/victoria
+msgid "Victoria"
msgstr ""
-msgid "Michigan"
-msgstr ""
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
+msgstr "Nya Sydwales"
-msgid "Ohio"
-msgstr ""
+#. Android resource: @strings/europe
+msgid "Europe"
+msgstr "Europa"
-msgid "Northeast"
-msgstr ""
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
+msgstr "Västeuropa"
-msgid "Massachusetts"
-msgstr ""
+#. Android resource: @strings/azores
+msgid "Azores"
+msgstr "Azorerna"
-msgid "Vermont"
-msgstr ""
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
+msgstr "BeNeLux"
-msgid "Pacific"
-msgstr ""
+#. Android resource: @strings/alsace
+msgid "Alsace"
+msgstr "Alsace"
-msgid "South"
-msgstr ""
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
+msgstr "Aquitaine"
-msgid "Arkansas"
-msgstr ""
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
+msgstr "Auvergne"
-msgid "District of Columbia"
+#. Android resource: @strings/centre
+msgid "Centre"
msgstr ""
-msgid "Florida"
-msgstr ""
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
+msgstr "Bretagne"
-msgid "Louisiana"
-msgstr ""
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
+msgstr "Bourgogne"
-msgid "Maryland"
-msgstr ""
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
+msgstr "Basse-Normandie"
-msgid "Mississippi"
-msgstr ""
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
+msgstr "Champagne-Ardenne"
-msgid "Oklahoma"
-msgstr ""
+#. Android resource: @strings/corse
+msgid "Corse"
+msgstr "Korsika"
-msgid "Texas"
-msgstr ""
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
+msgstr "Franche-Comté"
-msgid "Virginia"
-msgstr ""
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
+msgstr "Haute-Normandie"
-msgid "West Virginia"
-msgstr ""
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
+msgstr "Île-de-France"
-msgid "West"
-msgstr ""
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
+msgstr "Languedoc-Roussillon"
-msgid "Arizona"
+#. Android resource: @strings/limousin
+msgid "Limousin"
msgstr ""
-msgid "California"
-msgstr ""
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
+msgstr "Lorraine"
-msgid "Colorado"
-msgstr ""
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
+msgstr "Midi-Pyrenees"
-msgid "Idaho"
-msgstr ""
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
+msgstr "Nord-pas-de-Calais"
-msgid "Montana"
-msgstr ""
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
+msgstr "Pays-de-la-Loire"
-msgid "New Mexico"
-msgstr ""
+#. Android resource: @strings/picardie
+msgid "Picardie"
+msgstr "Picardie"
-msgid "Nevada"
-msgstr ""
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
+msgstr "Poitou-Charentes"
-msgid "Oregon"
-msgstr ""
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr "Provence-Alpes-Cote-d-Azur"
-msgid "Utah"
-msgstr ""
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
+msgstr "Rhone-Alpes"
-msgid "Washington State"
-msgstr ""
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
+msgstr "Baden-Württemberg"
-msgid "South+Middle America"
-msgstr ""
+#. Android resource: @strings/bayern
+msgid "Bayern"
+msgstr "Bayern"
-msgid "Guyane Francaise"
-msgstr ""
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
+msgstr "Mittelfranken"
-msgid "downloading"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
msgstr ""
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
msgstr ""
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
msgstr ""
-msgid "Error downloading map!"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
msgstr ""
-msgid "Error writing map!"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
msgstr ""
-msgid "Map download aborted!"
-msgstr ""
+#. Android resource: @strings/berlin
+msgid "Berlin"
+msgstr "Berlin"
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
+msgstr "Brandenburg"
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
+#. Android resource: @strings/bremen
+msgid "Bremen"
+msgstr "Bremen"
-msgid "Vehicle Position"
-msgstr "Fordonsposition"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
+msgstr "Hamburg"
-msgid "Main menu"
-msgstr "Huvudmeny"
+#. Android resource: @strings/hessen
+msgid "Hessen"
+msgstr "Hessen"
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Visa\n"
-"Karta"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
+msgstr "Mecklenburg-Vorpommern"
-msgid "Settings"
-msgstr "Inställningar"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
+msgstr "Niedersachsen"
-msgid "Tools"
-msgstr "Verktyg"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
+msgstr "Nordrhein-Westfalen"
-msgid "Route"
-msgstr "Rutt"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr "Rheinland-Pfalz"
-msgid "About"
-msgstr "Om"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr "Saarland"
-msgid "Quit"
-msgstr "Avsluta"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr "Sachsen-Anhalt"
-msgid "Actions"
-msgstr "Åtgärder"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
+msgstr "Sachsen"
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
+msgstr "Schleswig-Holstein"
-msgid "Coordinates"
-msgstr ""
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
+msgstr "Thüringen"
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Stoppa\n"
-"Navigering"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr "Mallorca"
-msgid "Display"
-msgstr "Visa"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr "Galicien"
-msgid "Fullscreen"
-msgstr "Helskärm"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr "Skandinavien"
-msgid "Window Mode"
-msgstr "Fönsterläge"
+#. Android resource: @strings/england
+msgid "England"
+msgstr "England"
-msgid "Description"
-msgstr "Beskrivning"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr "Buckinghamshire"
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
+msgstr "Cambridgeshire"
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
+msgstr "Cumbria"
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
msgstr ""
-msgid "NMEA Data"
-msgstr ""
+#. Android resource: @strings/essex
+msgid "Essex"
+msgstr "Essex"
-msgid "car_shortest"
-msgstr ""
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
+msgstr "Herefordshire"
-msgid "car_avoid_tolls"
-msgstr ""
+#. Android resource: @strings/kent
+msgid "Kent"
+msgstr "Kent"
-msgid "car_pedantic"
-msgstr ""
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
+msgstr "Lancashire"
-msgid "horse"
-msgstr "häst"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr "Leicestershire"
-msgid "Truck"
-msgstr ""
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
+msgstr "Norfolk"
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
-msgstr ""
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
+msgstr "Nottinghamshire"
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
-msgstr ""
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
+msgstr "Oxfordshire"
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
-msgstr ""
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
+msgstr "Shropshire"
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
-msgstr ""
+#. Android resource: @strings/somerset
+msgid "Somerset"
+msgstr "Somerset"
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
msgstr ""
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
-msgstr ""
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
+msgstr "Suffolk"
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
-msgstr ""
+#. Android resource: @strings/surrey
+msgid "Surrey"
+msgstr "Surrey"
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
-msgstr ""
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
+msgstr "Wiltshire"
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
-msgstr ""
+#. Android resource: @strings/scotland
+msgid "Scotland"
+msgstr "Skottland"
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
-msgstr ""
+#. Android resource: @strings/wales
+msgid "Wales"
+msgstr "Wales"
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
-msgstr ""
+#. Android resource: @strings/crete
+msgid "Crete"
+msgstr "Kreta"
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
-msgstr ""
+#. Android resource: @strings/north_america
+msgid "North America"
+msgstr "Nordamerika"
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
-msgstr ""
+#. Android resource: @strings/alaska
+msgid "Alaska"
+msgstr "Alaska"
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
-msgstr ""
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
+msgstr "Hawaii"
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
-msgstr ""
+#. Android resource: @strings/usa
+msgid "USA"
+msgstr "USA"
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
msgstr ""
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
msgstr ""
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
-msgstr ""
+#. Android resource: @strings/michigan
+msgid "Michigan"
+msgstr "Michigan"
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
-msgstr ""
+#. Android resource: @strings/ohio
+msgid "Ohio"
+msgstr "Ohio"
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
msgstr ""
-#. Android resource: @strings/address_search_title
-msgid "Address search"
-msgstr ""
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
+msgstr "Massachusetts"
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
-msgstr ""
+#. Android resource: @strings/vermont
+msgid "Vermont"
+msgstr "Vermont"
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
msgstr ""
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
msgstr ""
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
-msgstr ""
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
+msgstr "Arkansas"
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
-msgstr ""
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
+msgstr "District of Columbia"
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
-msgstr ""
+#. Android resource: @strings/florida
+msgid "Florida"
+msgstr "Florida"
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
-msgstr ""
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
+msgstr "Louisiana"
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
-msgstr ""
+#. Android resource: @strings/maryland
+msgid "Maryland"
+msgstr "Maryland"
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
-msgstr ""
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
+msgstr "Mississippi"
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
-msgstr ""
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
+msgstr "Oklahoma"
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
-msgstr ""
+#. Android resource: @strings/texas
+msgid "Texas"
+msgstr "Texas"
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
-msgstr ""
+#. Android resource: @strings/virginia
+msgid "Virginia"
+msgstr "Virginia"
-#. Android resource: @strings/restoring
-msgid "Restoring..."
-msgstr ""
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
+msgstr "West Virginia"
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
msgstr ""
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
-msgstr ""
+#. Android resource: @strings/arizona
+msgid "Arizona"
+msgstr "Arizona"
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
-msgstr ""
+#. Android resource: @strings/california
+msgid "California"
+msgstr "Kalifornien"
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
-msgstr ""
+#. Android resource: @strings/colorado
+msgid "Colorado"
+msgstr "Colorado"
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
-msgstr ""
+#. Android resource: @strings/idaho
+msgid "Idaho"
+msgstr "Idaho"
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
-msgstr ""
+#. Android resource: @strings/montana
+msgid "Montana"
+msgstr "Montana"
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
-msgstr ""
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
+msgstr "Nya Mexiko"
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
-msgstr ""
+#. Android resource: @strings/nevada
+msgid "Nevada"
+msgstr "Nevada"
-#. Android resource: @strings/select_backup
-msgid "Select backup"
-msgstr ""
+#. Android resource: @strings/oregon
+msgid "Oregon"
+msgstr "Oregon"
-#. Android resource: @strings/backup
-msgid "Backup"
-msgstr ""
+#. Android resource: @strings/utah
+msgid "Utah"
+msgstr "Utah"
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
msgstr ""
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
msgstr ""
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
-msgstr ""
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
+msgstr "Franska Guyana"
+
+#, c-format
+#~ msgid "Route %4.0fkm %02d:%02d ETA"
+#~ msgstr "Rutt %4.0fkm %02d:%02d Ankomsttid"
#, c-format
#~ msgid "then leave the roundabout at the %1$s %2$s"
diff --git a/scripts/build_tomtom_minimal.sh b/scripts/build_tomtom_minimal.sh
index ba6975e0f..7c8fe091f 100644
--- a/scripts/build_tomtom_minimal.sh
+++ b/scripts/build_tomtom_minimal.sh
@@ -57,11 +57,11 @@ cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
-cd ..
-cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
+cp $PREFIX/share/navit/navit.xml $OUT_PATH/navit/share
+cp $PREFIX/share/navit/navit_layout_*.xml $OUT_PATH/navit/share
# locale
-cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share
cd $OUT_PATH
diff --git a/scripts/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh
index 47fedb59a..3cb15ffe1 100644
--- a/scripts/build_tomtom_plugin.sh
+++ b/scripts/build_tomtom_plugin.sh
@@ -115,11 +115,12 @@ cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
-cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
+cp $PREFIX/share/navit/navit.xml $OUT_PATH/navit/share
+cp $PREFIX/share/navit/navit_layout_*.xml $OUT_PATH/navit/share
# locale
-cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share
# espeak
cp -r ~/share/espeak-data $OUT_PATH/navit/share/
diff --git a/scripts/check_need_build.sh b/scripts/check_need_build.sh
new file mode 100755
index 000000000..124722e9a
--- /dev/null
+++ b/scripts/check_need_build.sh
@@ -0,0 +1,35 @@
+#!/bin/bash -e
+# ################################################################################################################### #
+# This file exits 1 if there are files of interest that should trigger a build and exits normally otherwise. #
+# The idea is also to build if the exit code is different from 0 as it means we cannot get a filtered list properly. #
+# ################################################################################################################### #
+
+# If we are on a tag, just exit 1 as we want to go on with the build
+git describe --exact-match --tags HEAD 2>&1 2>/dev/null && exit 1 || echo "Not on a tag, checking files diff"
+
+# This block constructs the list of files that differ from the trunk branch.
+# Note that if you are on the trunk or master branch it will return the files modified by the last commit.
+declare -a file_list=$(git diff --name-only refs/remotes/origin/trunk)
+# If there is no diff that might just mean that you are on the trunk or master branch
+# so you just want to check the last commit. This way we still have that check more
+# or less working when pushing directly to trunk or when merging in master.
+if [[ -z "$file_list" ]]; then
+ file_list=$(git diff --name-only HEAD^)
+fi
+
+# This block filters out those don't match the pattern we use to exclude files that should not trigger a build.
+declare -a filters=('^docs/.*' '.*\.md$' '.*\.rst$')
+for f in ${file_list[@]}; do
+ for filter in "${filters[@]}" ; do
+ echo "checking $f with filter $filter"
+ if [[ "$f" =~ $filter ]]; then
+ # This removes the element from the element matching the filter
+ file_list=(${file_list[@]/$f})
+ echo "filtering out $f"
+ break
+ fi
+ done
+done
+
+# exits with a 0 if the list is empty
+[[ -z "${file_list}" ]]
diff --git a/scripts/setup_sanitycheck_requirements.sh b/scripts/setup_sanitycheck_requirements.sh
index 263669a7c..052e47e7d 100644
--- a/scripts/setup_sanitycheck_requirements.sh
+++ b/scripts/setup_sanitycheck_requirements.sh
@@ -1,4 +1,4 @@
#!/bin/sh
set -e
-apt-get update && apt-get install -y git astyle libxml2-utils file
+apt-get update && apt-get install -y git astyle libxml2-utils file openjdk-11-jre
diff --git a/scripts/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh
index 4e8415daf..cfb4b5011 100644
--- a/scripts/setup_tomtom_requirements.sh
+++ b/scripts/setup_tomtom_requirements.sh
@@ -4,7 +4,7 @@
set -e
# install additional packages to build TT evitonment and navit
-apt-get install -y libglib2.0-dev git autogen autoconf libtool zip
+apt-get install -y libglib2.0-dev git autogen autoconf libtool zip xsltproc
dpkg --add-architecture i386
apt-get update
apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386