summaryrefslogtreecommitdiff
path: root/navit/icons
diff options
context:
space:
mode:
authorStefan Wildemann <metalstrolch@users.noreply.github.com>2017-12-04 09:52:52 +0100
committerGitHub <noreply@github.com>2017-12-04 09:52:52 +0100
commit2723aba74958ec2201511737978e9d0e91a8b7a5 (patch)
tree16e971700ae6554f3c5442bd9e24d212deb28cbe /navit/icons
parent49274bcd2cf0355ebc6e6d9292fc173abda72198 (diff)
parentd0d48666cb1dcfe53a1649e1153bbf884951a9c1 (diff)
downloadnavit-2723aba74958ec2201511737978e9d0e91a8b7a5.tar.gz
Merge branch 'trunk' into icon_dam
Diffstat (limited to 'navit/icons')
-rw-r--r--navit/icons/CMakeLists.txt3
-rw-r--r--navit/icons/bowling.svg56
-rw-r--r--navit/icons/bridge.svg106
-rw-r--r--navit/icons/communication.svg59
-rw-r--r--navit/icons/concert.svg79
-rw-r--r--navit/icons/diving.svg182
-rw-r--r--navit/icons/emergency.svg535
-rw-r--r--navit/icons/fish.svg124
-rw-r--r--navit/icons/ghost_town.svg124
-rw-r--r--navit/icons/hotspring.svg131
-rwxr-xr-xnavit/icons/navit_svg2png36
11 files changed, 718 insertions, 717 deletions
diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt
index 6d40f2a92..040f0ee5e 100644
--- a/navit/icons/CMakeLists.txt
+++ b/navit/icons/CMakeLists.txt
@@ -20,7 +20,8 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE)
set (NEW_SCALE ${SCALE})
if (${SCALE} EQUAL 0)
file(STRINGS ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"")
- string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
+ string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_LINE ${NEW_SCALE_LINE})
+ set(NEW_SCALE ${CMAKE_MATCH_1})
endif()
set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAGE_OUTPUT})
elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape")
diff --git a/navit/icons/bowling.svg b/navit/icons/bowling.svg
index 5399c594b..ebc02d520 100644
--- a/navit/icons/bowling.svg
+++ b/navit/icons/bowling.svg
@@ -9,14 +9,14 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="22"
+ height="200"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="bowling.svg"
sodipodi:version="0.32"
version="1.0"
- width="22">
+ width="200">
<defs
id="defs22">
<inkscape:perspective
@@ -49,15 +49,15 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="12.823529"
- inkscape:cy="9.1530784"
+ inkscape:cx="88.343465"
+ inkscape:cy="3.213385"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-height="725"
inkscape:window-width="1024"
inkscape:window-x="0"
inkscape:window-y="20"
- inkscape:zoom="21.018182"
+ inkscape:zoom="1"
objecttolerance="10.0"
pagecolor="#ffffff"
showgrid="false"
@@ -66,16 +66,16 @@
inkscape:measure-end="0,0" />
<g
id="g1327"
- transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+ transform="matrix(0.33403911,0,0,0.33403911,3.8232233,2.6463362)">
<path
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
id="path1329"
style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
inkscape:connector-curvature="0" />
</g>
<g
id="g2319"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2323"
@@ -84,7 +84,7 @@
</g>
<g
id="g2325"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2329"
@@ -92,30 +92,30 @@
inkscape:connector-curvature="0" />
</g>
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:11.72280502;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4536"
- cx="10.847751"
- cy="10.771626"
- r="8.3433704" />
+ cx="101.80831"
+ cy="100.42613"
+ r="91.153503" />
<ellipse
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27539206;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4538"
- cx="13.571632"
- cy="5.7164307"
- rx="0.86230391"
- ry="0.86230397" />
+ cx="131.56744"
+ cy="45.196854"
+ rx="9.4208956"
+ ry="9.4208965" />
<ellipse
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27539206;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4538-4"
- cx="16.271626"
- cy="8.6306229"
- rx="0.86230391"
- ry="0.86230397" />
+ cx="161.06557"
+ cy="77.03508"
+ rx="9.4208956"
+ ry="9.4208965" />
<ellipse
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.27539206;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.93399143;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4538-4-4"
- cx="12.655709"
- cy="9.0588236"
- rx="0.86230391"
- ry="0.86230397" />
+ cx="121.56072"
+ cy="81.713364"
+ rx="9.4208956"
+ ry="9.4208965" />
</svg>
diff --git a/navit/icons/bridge.svg b/navit/icons/bridge.svg
index 992f03e7d..0cce35558 100644
--- a/navit/icons/bridge.svg
+++ b/navit/icons/bridge.svg
@@ -9,14 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="22"
+ height="200"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="bridge.svg"
sodipodi:version="0.32"
version="1.0"
- width="22">
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\bridge.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
<defs
id="defs22">
<inkscape:perspective
@@ -49,7 +52,7 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="11.711456"
+ inkscape:cx="9.0803371"
inkscape:cy="11.667262"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
@@ -57,7 +60,7 @@
inkscape:window-width="1366"
inkscape:window-x="-8"
inkscape:window-y="-8"
- inkscape:zoom="31.82205"
+ inkscape:zoom="1"
objecttolerance="10.0"
pagecolor="#ffffff"
showgrid="false"
@@ -66,16 +69,16 @@
inkscape:measure-end="0,0" />
<g
id="g1327"
- transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+ transform="matrix(0.34319043,0,0,0.34319043,0.8232233,2.3111151)">
<path
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
id="path1329"
style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
inkscape:connector-curvature="0" />
</g>
<g
id="g2319"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2323"
@@ -84,7 +87,7 @@
</g>
<g
id="g2325"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2329"
@@ -92,66 +95,67 @@
inkscape:connector-curvature="0" />
</g>
<ellipse
- style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:8.83749676;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path5130"
- cx="11.490052"
- cy="16.147924"
- rx="8.3499136"
- ry="3.948962" />
+ cx="96.940178"
+ cy="147.61621"
+ rx="68.77198"
+ ry="32.524643" />
<path
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 0.47725717,11.030944 20.93572883,0.0059 v 6.476088 c 0,0 -1.702822,-0.0306 -2.144525,-0.03142 -0.01596,-4.621507 -5.724722,-5.218489 -8.030421,-5.205035 -2.1116789,0.01232 -7.9665318,0.09086 -8.0304209,5.236456 -0.4724108,-0.0081 -2.73036193,0 -2.73036193,0 z"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:8.85758495px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 6.5467015,96.228144 185.4400085,0.05311 v 57.362526 c 0,0 -15.08288,-0.27104 -18.99532,-0.27813 -0.14136,-40.93542 -50.70721,-46.22322 -71.13014,-46.104 -18.704369,0.10895 -70.56423,0.80515 -71.130133,46.38231 -4.18442,-0.0708 -24.1844155,0 -24.1844155,0 z"
id="path5142"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccsccc" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144"
- width="0.251398"
- height="2.671104"
- x="1.9797593"
- y="7.7534037" />
+ width="2.2267792"
+ height="23.659534"
+ x="19.855244"
+ y="67.197083" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144-7"
- width="0.251398"
- height="2.671104"
- x="5.4804759"
- y="7.7534037" />
+ width="2.2267792"
+ height="23.659534"
+ x="50.86314"
+ y="67.197083" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144-1"
- width="0.251398"
- height="2.671104"
- x="8.9811935"
- y="7.7534037" />
+ width="2.2267792"
+ height="23.659534"
+ x="81.871048"
+ y="67.197083" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144-8"
- width="0.251398"
- height="2.671104"
- x="12.481911"
- y="7.7534037" />
+ width="2.2267792"
+ height="23.659534"
+ x="112.87896"
+ y="67.197083" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144-11"
- width="0.251398"
- height="2.671104"
- x="15.982629"
- y="7.7534037" />
+ width="2.2267792"
+ height="23.659534"
+ x="143.88687"
+ y="67.197083" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.07299995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.50418949;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5144-74"
- width="0.251398"
- height="2.671104"
- x="19.483345"
- y="7.7534037"
- inkscape:transform-center-x="0.062849458" />
+ width="2.2267792"
+ height="23.659534"
+ x="174.89474"
+ y="67.197083"
+ inkscape:transform-center-x="0.55670278"
+ inkscape:transform-center-y="6.2928732e-006" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:1.05754387;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:9.36728573;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5185"
- width="20.91246"
- height="0.063668601"
- x="0.55105257"
- y="7.1559234" />
+ width="185.23392"
+ height="0.56395012"
+ x="7.2003508"
+ y="61.904907" />
</svg>
diff --git a/navit/icons/communication.svg b/navit/icons/communication.svg
index bad45d89a..35596b3c7 100644
--- a/navit/icons/communication.svg
+++ b/navit/icons/communication.svg
@@ -9,14 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="22"
+ height="200"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="communication.svg"
sodipodi:version="0.32"
version="1.0"
- width="22">
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\communication.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
<defs
id="defs22">
<inkscape:perspective
@@ -49,7 +52,7 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="14.450743"
+ inkscape:cx="9.6858801"
inkscape:cy="12.141264"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
@@ -57,7 +60,7 @@
inkscape:window-width="1366"
inkscape:window-x="-8"
inkscape:window-y="-8"
- inkscape:zoom="17.57188"
+ inkscape:zoom="1"
objecttolerance="10.0"
pagecolor="#ffffff"
showgrid="false"
@@ -66,16 +69,16 @@
inkscape:measure-end="0,0" />
<g
id="g1327"
- transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+ transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)">
<path
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
id="path1329"
style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
inkscape:connector-curvature="0" />
</g>
<g
id="g2319"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2323"
@@ -84,7 +87,7 @@
</g>
<g
id="g2325"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2329"
@@ -92,39 +95,39 @@
inkscape:connector-curvature="0" />
</g>
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.10489988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:19.34242439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path898"
- cx="7.4564438"
- cy="6.1999226"
- r="2.5702684" />
+ cx="70.480728"
+ cy="55.175976"
+ r="23.618807" />
<path
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.2851342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1.7888865,21.595802 C 1.7472225,18.024565 2.7605344,9.5386167 5.2788818,9.3760639 c 1.9139241,-0.076555 2.6380187,-0.132203 4.1544689,0 2.1751583,0.1782276 3.9757453,7.8313611 3.9921953,12.2197371 h -1.607697 c -0.229376,-3.388486 -0.611612,-5.480113 -1.301468,-7.693975 -0.153114,1.071798 -0.229671,7.693976 -0.229671,7.693976 H 4.9277222 L 4.6214943,13.901826 c -1.1217852,2.785041 -1.3214048,5.746992 -1.3014684,7.770533 z"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.80940342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 18.400196,196.65238 C 18.017335,163.8354 27.328899,85.85608 50.470592,84.362277 c 17.587504,-0.702977 24.241381,-1.214817 38.176402,0 19.988056,1.637799 36.534076,71.964233 36.685236,112.290103 h -14.77352 c -2.10778,-31.13765 -5.62024,-50.35805 -11.959493,-70.70173 -1.407001,9.84894 -2.110502,70.70173 -2.110502,70.70173 H 47.243703 l -2.814001,-70.70173 c -10.308351,25.5924 -12.142703,52.81047 -11.959503,71.40525 z"
id="path900"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccc" />
<path
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.2851342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 10.036017,7.7333484 c 0.706308,0.4985691 2.617492,-1.4126154 3.406895,-1.3710679 0.789403,0.041547 4.071655,0.9971401 5.027247,-0.1661899 C 19.425753,5.0327605 19.010277,1.2103904 17.680758,0.91955782 16.351238,0.62872539 10.243755,-0.32686724 9.4959004,1.7920554 8.7480459,3.910978 11.240895,5.3651405 11.656369,5.5313305 11.781013,6.320733 10.036017,7.7333484 10.036017,7.7333484 Z"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.80940342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 94.185039,69.267024 c 6.490431,4.581479 24.052751,-12.9809 31.306761,-12.599087 7.25402,0.382272 37.41541,9.162956 46.19657,-1.527159 8.78119,-10.690116 4.96328,-45.8147836 -7.254,-48.4872889 -12.21726,-2.6725063 -68.340379,-11.453742 -75.212592,8.0176089 -6.872212,19.47126 16.035162,32.833882 19.853062,34.361041 1.14538,7.253985 -14.889801,20.234885 -14.889801,20.234885 z"
id="path902"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssscc" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.50433594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path904"
- cx="12.427114"
- cy="3.3160748"
- r="0.24783203" />
+ cx="116.1574"
+ cy="28.675596"
+ r="2.2773874" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.50433594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path904-5"
- cx="14.454914"
- cy="3.3160748"
- r="0.24783203" />
+ cx="134.79134"
+ cy="28.675596"
+ r="2.2773874" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.50433594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:4.63446236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path904-5-5"
- cx="16.446732"
- cy="3.3160748"
- r="0.24783203" />
+ cx="153.09462"
+ cy="28.675596"
+ r="2.2773874" />
</svg>
diff --git a/navit/icons/concert.svg b/navit/icons/concert.svg
index d226e4c2d..c908b056f 100644
--- a/navit/icons/concert.svg
+++ b/navit/icons/concert.svg
@@ -9,14 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="22"
+ height="200"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="concert.svg"
sodipodi:version="0.32"
version="1.0"
- width="22">
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\concert.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
<defs
id="defs22">
<inkscape:perspective
@@ -49,7 +52,7 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="20.75586"
+ inkscape:cx="14.153144"
inkscape:cy="4.6274553"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
@@ -57,7 +60,7 @@
inkscape:window-width="1366"
inkscape:window-x="-8"
inkscape:window-y="-8"
- inkscape:zoom="12.680782"
+ inkscape:zoom="1"
objecttolerance="10.0"
pagecolor="#ffffff"
showgrid="false"
@@ -67,16 +70,16 @@
inkscape:lockguides="true" />
<g
id="g1327"
- transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)">
+ transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)">
<path
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
id="path1329"
style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
inkscape:connector-curvature="0" />
</g>
<g
id="g2319"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2323"
@@ -85,62 +88,42 @@
</g>
<g
id="g2325"
- transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)">
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
<path
d=""
id="path2329"
style="fill:#0089cd;stroke:none"
inkscape:connector-curvature="0" />
</g>
- <path
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.16406763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 11.89298,0.29824419 C 6.7920335,0.36448969 3.0245422,3.9744881 3.0160085,9.208339 c -0.00777,4.764226 8.8769715,12.089905 8.8769715,12.089905 0,0 8.399996,-7.12183 8.41325,-12.089905 C 20.3186,4.5706582 16.993926,0.29824419 11.89298,0.29824419 Z"
- id="path1492"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc" />
- <path
- style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 11.875679,1.0590326 C 7.1553836,1.1203346 3.669036,4.4609421 3.6611391,9.3042242 3.6539491,13.712926 11.875679,20.491937 11.875679,20.491937 c 0,0 7.773159,-6.590374 7.785423,-11.1877128 0.01145,-4.2916004 -3.065128,-8.2451916 -7.785423,-8.2451916 z"
- id="path1492-2"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- inkscape:transform-center-x="-1.3165584"
- inkscape:transform-center-y="3.1070785" />
- <circle
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.25710332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path1494"
- cx="11.661134"
- cy="8.7982445"
- r="7" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.50632137;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.95306969;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path1511"
- cx="8.9422398"
- cy="12.313624"
- r="1.313432" />
+ cx="54.465088"
+ cy="171.69257"
+ r="25.818937" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.50632137;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.95306969;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path1511-2"
- cx="13.315376"
- cy="10.128977"
- r="1.313432" />
+ cx="140.43051"
+ cy="128.74763"
+ r="25.818937" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.26697731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1530"
- width="1.1041681"
- height="5.7941589"
- x="9.1515036"
- y="6.3877821" />
+ width="21.705309"
+ height="113.89934"
+ x="58.578712"
+ y="55.204674" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.26697731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1530-1"
- width="1.1041681"
- height="5.7941589"
- x="13.52464"
- y="4.2824731" />
+ width="21.705309"
+ height="113.89934"
+ x="144.54413"
+ y="13.819176" />
<path
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.75124252px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 9.1557652,6.3877811 14.628808,3.7072399 V 5.1514704 L 9.1557652,7.8504332 Z"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:34.42524719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 58.662477,55.204534 166.24943,2.511515 V 30.901629 L 58.662477,83.956741 Z"
id="path1547"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
diff --git a/navit/icons/diving.svg b/navit/icons/diving.svg
index 6d152305d..66f16c2dc 100644
--- a/navit/icons/diving.svg
+++ b/navit/icons/diving.svg
@@ -41,7 +41,7 @@
<cc:license
rdf:resource="http://web.resource.org/cc/PublicDomain" />
<dc:language>en</dc:language>
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -52,7 +52,7 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="8.2895468"
+ inkscape:cx="-75.438052"
inkscape:cy="15.403137"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
@@ -96,161 +96,141 @@
inkscape:connector-curvature="0" />
</g>
<path
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:10.5320406px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 105.71659,7.77381 C 59.565172,8.3727616 25.478346,41.035119 25.401136,88.388999 c -0.0703,43.104841 80.315454,109.384811 80.315454,109.384811 0,0 75.99996,-64.43561 76.11988,-109.384811 C 181.94839,46.429038 151.868,7.77381 105.71659,7.77381 Z"
- id="path1492"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc" />
- <path
- style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:2.71428585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 105.56006,14.657148 C 62.852625,15.211767 31.309481,45.436333 31.238033,89.256485 31.172981,129.14482 105.56006,190.47871 105.56006,190.47871 c 0,0 70.32858,-59.62725 70.43954,-101.222225 0.10359,-38.828761 -27.73211,-74.599337 -70.43954,-74.599337 z"
- id="path1492-2"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- inkscape:transform-center-x="-11.911719"
- inkscape:transform-center-y="28.111661" />
- <circle
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:11.37379265;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path1494"
- cx="103.61893"
- cy="84.678642"
- r="63.333332" />
- <path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830"
sodipodi:type="arc"
- sodipodi:cx="51.743343"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="18.007557"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 59.064117,106.26794 a 7.3207736,7.4351912 0 0 1 -3.660387,6.43906 7.3207736,7.4351912 0 0 1 -7.320774,0 7.3207736,7.4351912 0 0 1 -3.660386,-6.43906" />
+ d="m 29.792122,143.67285 a 11.784565,11.968748 0 0 1 -5.892283,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.8922821,-10.36524" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-0"
sodipodi:type="arc"
- sodipodi:cx="66.556892"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="41.853569"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 73.877666,106.26794 a 7.3207736,7.4351912 0 0 1 -3.660387,6.43906 7.3207736,7.4351912 0 0 1 -7.320774,0 7.3207736,7.4351912 0 0 1 -3.660386,-6.43906" />
+ d="m 53.638134,143.67285 a 11.784565,11.968748 0 0 1 -5.892283,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.892282,-10.36524" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-0-3"
sodipodi:type="arc"
- sodipodi:cx="81.295563"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="65.579041"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="6.2639059"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 88.614976,106.1246 a 7.3207736,7.4351912 0 0 1 -3.577844,6.53409 7.3207736,7.4351912 0 0 1 -7.361137,0.0721 7.3207736,7.4351912 0 0 1 -3.701206,-6.46282" />
+ d="m 77.361415,143.44212 a 11.784565,11.968748 0 0 1 -5.759409,10.5182 11.784565,11.968748 0 0 1 -11.84954,0.11602 11.784565,11.968748 0 0 1 -5.95799,-10.40349" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-8"
sodipodi:type="arc"
- sodipodi:cx="96.486855"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="90.033112"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 103.80763,106.26794 a 7.3207736,7.4351912 0 0 1 -3.66039,6.43906 7.3207736,7.4351912 0 0 1 -7.320772,0 7.3207736,7.4351912 0 0 1 -3.660387,-6.43906" />
+ d="m 101.81768,143.67285 a 11.784565,11.968748 0 0 1 -5.892286,10.36524 11.784565,11.968748 0 0 1 -11.784565,0 11.784565,11.968748 0 0 1 -5.892282,-10.36524" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-0-7"
sodipodi:type="arc"
- sodipodi:cx="111.30039"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="113.8791"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 118.62117,106.26794 a 7.3207736,7.4351912 0 0 1 -3.66039,6.43906 7.3207736,7.4351912 0 0 1 -7.32077,0 7.3207736,7.4351912 0 0 1 -3.66039,-6.43906" />
+ d="m 125.66366,143.67285 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78457,0 11.784565,11.968748 0 0 1 -5.89228,-10.36524" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-0-3-0"
sodipodi:type="arc"
- sodipodi:cx="126.03909"
- sodipodi:cy="106.26794"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="137.60463"
+ sodipodi:cy="143.67285"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="6.2639059"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 133.35851,106.1246 a 7.3207736,7.4351912 0 0 1 -3.57785,6.53409 7.3207736,7.4351912 0 0 1 -7.36114,0.0721 7.3207736,7.4351912 0 0 1 -3.7012,-6.46282" />
+ d="m 149.387,143.44212 a 11.784565,11.968748 0 0 1 -5.7594,10.5182 11.784565,11.968748 0 0 1 -11.84955,0.11602 11.784565,11.968748 0 0 1 -5.95799,-10.40349" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-9"
sodipodi:type="arc"
- sodipodi:cx="140.80014"
- sodipodi:cy="106.69812"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="161.36612"
+ sodipodi:cy="144.36534"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 148.12091,106.69812 a 7.3207736,7.4351912 0 0 1 -3.66038,6.43906 7.3207736,7.4351912 0 0 1 -7.32078,0 7.3207736,7.4351912 0 0 1 -3.66038,-6.43906" />
+ d="m 173.15068,144.36534 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78456,0 11.784565,11.968748 0 0 1 -5.89229,-10.36524" />
<path
- style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.62517977;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.22586489;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path830-0-31"
sodipodi:type="arc"
- sodipodi:cx="155.61369"
- sodipodi:cy="106.69812"
- sodipodi:rx="7.3207736"
- sodipodi:ry="7.4351912"
+ sodipodi:cx="185.21214"
+ sodipodi:cy="144.36534"
+ sodipodi:rx="11.784565"
+ sodipodi:ry="11.968748"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
- d="m 162.93447,106.69812 a 7.3207736,7.4351912 0 0 1 -3.66039,6.43906 7.3207736,7.4351912 0 0 1 -7.32077,0 7.3207736,7.4351912 0 0 1 -3.66039,-6.43906" />
+ d="m 196.99671,144.36534 a 11.784565,11.968748 0 0 1 -5.89228,10.36524 11.784565,11.968748 0 0 1 -11.78457,0 11.784565,11.968748 0 0 1 -5.89228,-10.36524" />
<circle
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.54270792;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:4.09310675;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path1643"
- cx="129.37593"
- cy="70.390434"
- r="6.7857141" />
+ cx="142.97609"
+ cy="85.919296"
+ r="10.923257" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.05734622;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.70205581;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1645"
- width="32.729244"
- height="6.0114937"
- x="120.18913"
- y="-64.555145"
- ry="2.748287"
- rx="2.6472816"
+ width="52.685677"
+ height="9.6769609"
+ x="135.44214"
+ y="-63.360096"
+ ry="4.424036"
+ rx="4.2614436"
transform="rotate(57.709826)"
- inkscape:transform-center-y="0.64987615"
- inkscape:transform-center-x="0.15432644" />
+ inkscape:transform-center-y="1.0461464"
+ inkscape:transform-center-x="0.24843131" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.05734622;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.70205581;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1645-8"
- width="32.729244"
- height="6.0114937"
- x="77.826042"
- y="-36.33596"
- ry="2.748287"
- rx="2.6472816"
+ width="52.685677"
+ height="9.6769609"
+ x="64.138474"
+ y="-22.794872"
+ ry="4.424036"
+ rx="4.2614436"
transform="rotate(53.038857)"
- inkscape:transform-center-y="0.66027451"
- inkscape:transform-center-x="0.10088982" />
+ inkscape:transform-center-y="1.0628748"
+ inkscape:transform-center-x="0.16240914" />
<rect
- style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.19884491;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.92983234;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1645-8-8"
- width="33.038124"
- height="7.6558709"
- x="97.159592"
- y="40.117359"
- ry="3.5000503"
- rx="2.6722651"
+ width="53.182892"
+ height="12.323986"
+ x="87.769211"
+ y="52.05463"
+ ry="5.634182"
+ rx="4.3016605"
transform="matrix(0.9758835,0.21829199,-0.135073,0.99083565,0,0)"
- inkscape:transform-center-y="0.70558839"
- inkscape:transform-center-x="-0.37780337" />
+ inkscape:transform-center-y="1.135816"
+ inkscape:transform-center-x="-0.60816508" />
</svg>
diff --git a/navit/icons/emergency.svg b/navit/icons/emergency.svg
index c88c6aaa0..acffcc96b 100644
--- a/navit/icons/emergency.svg
+++ b/navit/icons/emergency.svg
@@ -9,16 +9,29 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="22"
+ height="200"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="emergency.svg"
sodipodi:version="0.32"
version="1.0"
- width="22">
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\emergency.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <defs
+ id="defs22">
+ <inkscape:perspective
+ id="perspective24"
+ inkscape:persp3d-origin="290 : 193.33333 : 1"
+ inkscape:vp_x="0 : 290 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="580 : 290 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
<metadata
- id="metadata2975">
+ id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -26,20 +39,10 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
<dc:language>en</dc:language>
<dc:title />
- <dc:description>jfitie@gmail.com</dc:description>
</cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
</rdf:RDF>
</metadata>
<sodipodi:namedview
@@ -49,456 +52,68 @@
guidetolerance="10.0"
id="base"
inkscape:current-layer="svg2"
- inkscape:cx="78.817949"
- inkscape:cy="44.555593"
- inkscape:pageopacity="0"
+ inkscape:cx="63.25448"
+ inkscape:cy="100.6273"
+ inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:window-height="874"
- inkscape:window-width="1440"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:zoom="3.6867085"
+ inkscape:window-height="705"
+ inkscape:window-width="1366"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:zoom="2.1796875"
objecttolerance="10.0"
- pagecolor="#ff1dff"
+ pagecolor="#ffffff"
showgrid="false"
- inkscape:snap-global="true"
- inkscape:snap-nodes="false"
- inkscape:snap-grids="false"
- inkscape:snap-to-guides="false"
- inkscape:window-maximized="1" />
- <defs
- id="defs4">
- <inkscape:perspective
- id="perspective2441"
- inkscape:persp3d-origin="290 : 193.33333 : 1"
- inkscape:vp_x="0 : 290 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="580 : 290 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3452"
- inkscape:persp3d-origin="30 : 20 : 1"
- inkscape:vp_x="0 : 30 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="60 : 30 : 1"
- sodipodi:type="inkscape:persp3d" />
- <symbol
- id="symbol-university"
- viewBox="244.5 110 489 219.9">
- <path
- d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
- id="path4460"
- inkscape:connector-curvature="0" />
- <path
- d="M 94,176 73,215"
- id="path4462"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:20" />
- <path
- d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
- id="path4464"
- inkscape:connector-curvature="0" />
- <path
- d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
- id="path4466"
- ill="none"
- inkscape:connector-curvature="0"
- style="stroke:#000000;stroke-width:20" />
- </symbol>
- <inkscape:perspective
- id="perspective4471"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4668"
- inkscape:persp3d-origin="6 : 4 : 1"
- inkscape:vp_x="0 : 6 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="12 : 6 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective4904"
- inkscape:persp3d-origin="16 : 10.666667 : 1"
- inkscape:vp_x="0 : 16 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="32 : 16 : 1"
- sodipodi:type="inkscape:persp3d" />
- <marker
- id="Arrow2Lend"
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- id="path4137"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Arrow1Mend"
- inkscape:stockid="Arrow1Mend"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
- id="path4125"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="TriangleOutL"
- inkscape:stockid="TriangleOutL"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
- id="path4214"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="scale(0.8,0.8)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Arrow1Lend"
- inkscape:stockid="Arrow1Lend"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
- id="path4119"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="matrix(-0.8,0,0,-0.8,-10,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Tail"
- inkscape:stockid="Tail"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <g
- id="g4152"
- transform="scale(-1.2,-1.2)">
- <path
- d="M -3.8048674,-3.9585227 0.54352094,0"
- id="path4154"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- <path
- d="M -1.2866832,-3.9585227 3.0617053,0"
- id="path4156"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- <path
- d="M 1.3053582,-3.9585227 5.6537466,0"
- id="path4158"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- <path
- d="M -3.8048674,4.1775838 0.54352094,0.21974226"
- id="path4160"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- <path
- d="M -1.2866832,4.1775838 3.0617053,0.21974226"
- id="path4162"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- <path
- d="M 1.3053582,4.1775838 5.6537466,0.21974226"
- id="path4164"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
- inkscape:connector-curvature="0" />
- </g>
- </marker>
- <marker
- id="Arrow1Sstart"
- inkscape:stockid="Arrow1Sstart"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
- id="path4128"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="matrix(0.2,0,0,0.2,1.2,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Arrow1Send"
- inkscape:stockid="Arrow1Send"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
- id="path4131"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="SemiCircleOut"
- inkscape:stockid="SemiCircleOut"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
- id="path4235"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
- transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Arrow2Send"
- inkscape:stockid="Arrow2Send"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- id="path4149"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- transform="matrix(-0.3,0,0,-0.3,0.69,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="TriangleOutS"
- inkscape:stockid="TriangleOutS"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
- id="path4220"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="scale(0.2,0.2)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="CurveIn"
- inkscape:stockid="CurveIn"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
- id="path4238"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
- transform="scale(0.6,0.6)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="InfiniteLineStart"
- inkscape:stockid="InfiniteLineStart"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <g
- id="g4298"
- transform="translate(-13,0)">
- <circle
- cx="3"
- cy="0"
- id="circle4300"
- r="0.80000001" />
- <circle
- cx="6.5"
- cy="0"
- id="circle4302"
- r="0.80000001" />
- <circle
- cx="10"
- cy="0"
- id="circle4304"
- r="0.80000001" />
- </g>
- </marker>
- <marker
- id="StopS"
- inkscape:stockid="StopS"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,5.65 0,-5.65"
- id="path4229"
- style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- transform="scale(0.2,0.2)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="Arrow2Sstart"
- inkscape:stockid="Arrow2Sstart"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
- id="path4146"
- style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
- transform="matrix(0.3,0,0,0.3,-0.69,0)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="DiamondS"
- inkscape:stockid="DiamondS"
- orient="auto"
- refX="0"
- refY="0"
- style="overflow:visible">
- <path
- d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z"
- id="path4202"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="scale(0.2,0.2)"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- id="RazorWire"
- inkscape:stockid="RazorWire"
- orient="auto"
- refX="0"
- refY="0">
- style=&quot;overflow:visible&quot;&gt;
- <path
- d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
- id="path4286"
- style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
- transform="scale(0.8,0.8)"
- inkscape:connector-curvature="0" />
-</marker>
- <inkscape:perspective
- id="perspective5233"
- inkscape:persp3d-origin="16 : 10.666667 : 1"
- inkscape:vp_x="0 : 16 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="32 : 16 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective5412"
- inkscape:persp3d-origin="250 : 166.66667 : 1"
- inkscape:vp_x="0 : 250 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="500 : 250 : 1"
- sodipodi:type="inkscape:persp3d" />
- </defs>
+ inkscape:window-maximized="1"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0"
+ inkscape:lockguides="true" />
+ <g
+ id="g1327"
+ transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+ <path
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ id="path1329"
+ style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+ inkscape:connector-curvature="0" />
+ </g>
<g
- id="layer3"
- inkscape:label="Layout"
- style="display:none;stroke:#757575;stroke-opacity:1"
- transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
- <rect
- height="10"
- id="rect4134"
- style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- width="10"
- x="1"
- y="1" />
- <rect
- height="8"
- id="rect4136"
- style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- width="8"
- x="2"
- y="2" />
+ id="g2319"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2323"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
</g>
<g
- id="g3448"
- transform="matrix(0.21007753,0,0,0.21007654,0.15074743,0.8225434)">
- <g
- transform="translate(-119.6189,31.193137)"
- id="g3440">
- <g
- id="g1327-3"
- transform="matrix(0.18023212,0,0,0.18023212,118.90132,-35.074477)"
- style="fill:#ffffff;stroke:#ffffff">
- <path
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
- id="path1329-6"
- style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:3.40799999;stroke-opacity:0"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 168.77539,-26.714844 c -24.90882,0.65124 -45.67473,25.94229543 -41.17383,50.535156 3.15319,24.278992 29.43702,42.421637 53.26172,36.228516 C 205.34548,55.121653 221.58756,26.483972 212.6543,3.0039062 206.68201,-15.179354 187.88727,-27.91809 168.77539,-26.714844 Z"
- id="path2207-7"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 135.40625,8.0332031 c 0,6.7701819 0,13.5403649 0,20.3105469 23.78385,0 47.56771,0 71.35156,0 -1.21558,-6.573853 1.68803,-13.539405 -0.66992,-19.890625 -3.17978,-5.0668552 -10.53922,-1.2344481 -15.33008,-2.4199219 -18.45052,0 -36.90104,0 -55.35156,0 l 0,1 0,1 z"
- id="rect3180-5"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 159.92773,-16.488281 c 0,23.1171873 0,46.234375 0,69.351562 6.6053,-1.239496 13.63591,1.748711 19.99805,-0.724609 5.07576,-3.54689 1.01531,-11.203263 2.31055,-16.275391 0,-18.117187 0,-36.23437475 0,-54.351562 -7.4362,0 -14.8724,0 -22.3086,0 l 0,1 0,1 z"
- id="rect3182-3"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 168.58789,-33.037109 c -26.875,0.732101 -50.02432,26.3501216 -47.70508,53.222656 1.03022,26.672013 26.49775,49.507971 53.19727,47.201172 27.06213,-1.027335 50.08523,-27.229656 47.11701,-54.273425 -1.67559,-26.180886 -26.35425,-48.021089 -52.6092,-46.150403 z"
- id="path2438-5"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(0.18023212,0,0,0.18023212,-0.6781117,-3.9155248)"
- id="g1327">
- <path
- inkscape:connector-curvature="0"
- style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
- id="path1329"
- d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
- </g>
- <circle
- r="39.915974"
- cy="48.346523"
- cx="51.502563"
- style="fill:none;stroke:#da0092;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path2207" />
- <rect
- y="-55.501747"
- x="-83.177666"
- width="63.350189"
- transform="scale(-1,-1)"
- style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3180"
- height="14.310408" />
- <rect
- y="44.34737"
- x="-80.021637"
- width="63.350189"
- transform="matrix(0,-1,1,0,0,0)"
- style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3182"
- height="14.310408" />
- <circle
- r="46.242443"
- cy="48.346523"
- cx="51.502567"
- style="fill:none;stroke:#da0092;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path2438" />
+ id="g2325"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2329"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
</g>
+ <circle
+ style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:17.50965309;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path1494"
+ cx="101.07435"
+ cy="100.33749"
+ r="97.5" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:14.25435543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1712"
+ width="125.35715"
+ height="41.785713"
+ x="38.395782"
+ y="79.444618" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:14.25435543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1712-5"
+ width="125.35715"
+ height="41.785713"
+ x="37.658913"
+ y="-121.9672"
+ transform="rotate(90)" />
</svg>
diff --git a/navit/icons/fish.svg b/navit/icons/fish.svg
new file mode 100644
index 000000000..d0abd3a4c
--- /dev/null
+++ b/navit/icons/fish.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="200"
+ id="svg2"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="fish.svg"
+ sodipodi:version="0.32"
+ version="1.0"
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\fish.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <defs
+ id="defs22">
+ <inkscape:perspective
+ id="perspective24"
+ inkscape:persp3d-origin="290 : 193.33333 : 1"
+ inkscape:vp_x="0 : 290 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="580 : 290 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
+ <dc:language>en</dc:language>
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10.0"
+ guidetolerance="10.0"
+ id="base"
+ inkscape:current-layer="svg2"
+ inkscape:cx="173.26216"
+ inkscape:cy="73.026273"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:window-height="705"
+ inkscape:window-width="1366"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:zoom="2.1796875"
+ objecttolerance="10.0"
+ pagecolor="#ffffff"
+ showgrid="false"
+ inkscape:window-maximized="1"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0"
+ inkscape:lockguides="true" />
+ <g
+ id="g1327"
+ transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+ <path
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ id="path1329"
+ style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g2319"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2323"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g2325"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2329"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ style="fill:#0089cd;fill-opacity:1;stroke:#0089cd;stroke-width:6.33289146;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.2249053,49.048542 C 30.777046,82.994317 71.553818,142.06288 121.68921,142.06288 c 50.13538,0 73.88372,-42.219274 73.88372,-42.219274 0,0 -26.26574,-51.881787 -80.48049,-50.795064 C 65.142738,50.049139 30.022314,103.05523 6.9055533,142.06288 11.156769,112.34642 9.3916793,75.312309 8.2249053,49.048542 Z"
+ id="path1729"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscscc" />
+ <ellipse
+ style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:5.6151638;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path1731"
+ cx="172.80457"
+ cy="87.727531"
+ rx="4.5818696"
+ ry="4.5818691"
+ inkscape:transform-center-x="-0.30408871"
+ inkscape:transform-center-y="1.001269e-006" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:2.11096382;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 193.21381,112.55034 c 0,0 -14.29218,0.91194 -24.93527,-3.64901"
+ id="path1733"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:2.11096382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 145.16779,58.499749 c -20.98211,23.718999 -21.89437,55.648381 0.3042,76.630301"
+ id="path1735"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+</svg>
diff --git a/navit/icons/ghost_town.svg b/navit/icons/ghost_town.svg
new file mode 100644
index 000000000..864193db3
--- /dev/null
+++ b/navit/icons/ghost_town.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="200"
+ id="svg2"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="ghost_town.svg"
+ sodipodi:version="0.32"
+ version="1.0"
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\ghost_town.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <defs
+ id="defs22">
+ <inkscape:perspective
+ id="perspective24"
+ inkscape:persp3d-origin="290 : 193.33333 : 1"
+ inkscape:vp_x="0 : 290 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="580 : 290 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
+ <dc:language>en</dc:language>
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10.0"
+ guidetolerance="10.0"
+ id="base"
+ inkscape:current-layer="svg2"
+ inkscape:cx="108.52408"
+ inkscape:cy="89.612292"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:window-height="705"
+ inkscape:window-width="1366"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:zoom="2.1796875"
+ objecttolerance="10.0"
+ pagecolor="#ffffff"
+ showgrid="false"
+ inkscape:window-maximized="1"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0"
+ inkscape:lockguides="true" />
+ <g
+ id="g2319"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2323"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g2325"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2329"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <circle
+ style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:17.50965309;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path1494"
+ cx="98.991913"
+ cy="99.878708"
+ r="97.5" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.92267895;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 123.36122,18.558431 -48.152432,33.289147 -29.688226,36.87088 1.015127,74.757012 c 0,0 1.700314,11.31404 7.680633,15.36125 6.905494,-2.8917 3.74148,-24.1956 6.665489,-26.62376 4.311778,-1.27167 7.165717,14.85941 11.262377,16.39561 4.09666,1.53632 -0.3322,-18.21148 5.11404,-21.50962 3.67801,-2.22732 -0.49641,28.67642 11.28153,34.82143 11.777912,6.14501 10.51393,-10.84451 10.51393,-10.84451 l -1.81204,-15.22769 c -1.37767,-6.38709 3.099792,-10.78977 6.142232,-7.73411 6.90551,2.49474 -2.05004,13.82842 5.63118,21.50961 7.68125,7.68133 6.6497,-9.40304 6.78105,-14.95317 0.59392,-4.62497 -0.46451,-13.00551 7.04794,-14.23708 7.25195,-1.1895 2.52321,21.47675 15.36127,18.94313 10.80322,-2.13219 11.77953,-19.46016 11.77953,-19.46016 V 61.577661 Z"
+ id="path851"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccsscccscssccc" />
+ <rect
+ style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.42024088;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect858"
+ width="13.928572"
+ height="13.928572"
+ x="55.059704"
+ y="99.090843" />
+ <rect
+ style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.42024088;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect858-0"
+ width="13.928572"
+ height="13.928572"
+ x="80.097389"
+ y="99.090843"
+ inkscape:transform-center-x="14.064738"
+ inkscape:transform-center-y="-5.625892" />
+ <rect
+ style="fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.49845934;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect858-4"
+ width="9.411725"
+ height="21.349106"
+ x="69.626968"
+ y="122.25526" />
+</svg>
diff --git a/navit/icons/hotspring.svg b/navit/icons/hotspring.svg
new file mode 100644
index 000000000..b599a2124
--- /dev/null
+++ b/navit/icons/hotspring.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="200"
+ id="svg2"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="hotspring.svg"
+ sodipodi:version="0.32"
+ version="1.0"
+ width="200"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\hotspring.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <defs
+ id="defs22">
+ <inkscape:perspective
+ id="perspective24"
+ inkscape:persp3d-origin="290 : 193.33333 : 1"
+ inkscape:vp_x="0 : 290 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="580 : 290 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
+ <dc:language>en</dc:language>
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10.0"
+ guidetolerance="10.0"
+ id="base"
+ inkscape:current-layer="svg2"
+ inkscape:cx="111.45288"
+ inkscape:cy="153.74159"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:window-height="705"
+ inkscape:window-width="1366"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:zoom="1.4142136"
+ objecttolerance="10.0"
+ pagecolor="#ffffff"
+ showgrid="false"
+ inkscape:window-maximized="1"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0"
+ inkscape:lockguides="true" />
+ <g
+ id="g1327"
+ transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)">
+ <path
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+ id="path1329"
+ style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g2319"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2323"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g2325"
+ transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)">
+ <path
+ d=""
+ id="path2329"
+ style="fill:#0089cd;stroke:none"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:11.36141205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 34.810274,85.967742 a 97.499586,42.536584 0 0 0 -31.1265883,31.110308 97.499586,42.536584 0 0 0 97.4979743,42.53709 97.499586,42.536584 0 0 0 97.50202,-42.53709 97.499586,42.536584 0 0 0 -30.89871,-30.992296 83.340637,36.359397 0 0 1 16.73732,21.795526 83.340637,36.359397 0 0 1 -83.34063,36.3598 83.340637,36.359397 0 0 1 -83.340646,-36.3598 83.340637,36.359397 0 0 1 16.96926,-21.913538 z"
+ id="path839"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 64.414602,41.752013 c -10.78766,10.430467 -14.38354,13.559606 -14.38354,21.556298 0,7.996677 17.97942,10.082769 17.46572,16.341046 -0.5137,6.258278 -17.46572,22.599343 -16.95203,25.033113"
+ id="path858"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssc" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 93.527762,25.866212 c -10.78766,10.430463 -14.38354,13.559599 -14.38354,21.556297 0,7.996673 17.97942,10.082764 17.46572,16.341041 -0.5137,6.258278 -17.46572,22.59934 -16.95202,25.033109"
+ id="path858-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssc" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 122.64091,40.204384 c -10.78765,10.430462 -14.38353,13.559601 -14.38353,21.556293 0,7.996678 17.97941,10.082769 17.46572,16.341046 -0.51369,6.258278 -17.46572,22.599337 -16.95203,25.033107"
+ id="path858-9-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssc"
+ inkscape:transform-center-x="17.205763"
+ inkscape:transform-center-y="-14.340942" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.16703176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 151.75406,27.777961 c -10.78765,10.430463 -14.38353,13.559609 -14.38353,21.556298 0,7.996678 17.97941,10.08277 17.46572,16.341046 -0.51369,6.258278 -17.46572,22.59934 -16.95202,25.033109"
+ id="path858-9-4-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssc"
+ inkscape:transform-center-x="17.205768"
+ inkscape:transform-center-y="-14.340945" />
+</svg>
diff --git a/navit/icons/navit_svg2png b/navit/icons/navit_svg2png
index 675207561..668613a61 100755
--- a/navit/icons/navit_svg2png
+++ b/navit/icons/navit_svg2png
@@ -1,5 +1,14 @@
#!/bin/sh
+exitwithhelp()
+{
+ echo "Usage: navit_svg2png <conversion_tool> <output_png_filename> [<width_px> <height_px>]"
+ echo "The input filename is the same than the output png one with svg or svgz extension"
+ echo "Possible conversion tools: ksvgtopng, ksvgtopng4, rsvg-convert, inkscape and convert"
+ echo "width_px and height_px arguments can be omitted if output png size is specified in the filename, like this: imagename_WIDTH_HEIGHT.png (ex. myPng_100_100.png)"
+ exit
+}
+
svgtopng()
{
case $svgtopng in
@@ -15,6 +24,10 @@ svgtopng()
*convert)
$svgtopng -alpha on -background none $3 -resize $1x$2 $4
;;
+ *)
+ echo "Error: unknown conversion tool"
+ exitwithhelp # unknown conversion tool
+ ;;
esac
}
@@ -26,8 +39,27 @@ svgtopng=$1
png=$2
w=$3
h=$4
+
+# if -h or --help arg is passed, print help and exit
+case "$1" in
+ '-h'|'--help'|'')
+ exitwithhelp
+ ;;
+esac
+
+# args num must be == 2 or == 4
+if [ "$#" -ne 2 ] && [ "$#" -ne 4 ];
+then
+ echo "Error: wrong number of arguments"
+ exitwithhelp
+fi
+
case "$png" in
*_[1-9]*_[1-9]*.png)
+ if [ "$#" -ne 2 ]; then
+ echo "Error: output png size is specified by filename and by arguments, plese use only one"
+ exitwithhelp # png size musn't be specifed, only in filename
+ fi
svg=${png%_*_*.png};
h=${png##*_}
w=${png%_$h}
@@ -35,6 +67,10 @@ case "$png" in
w=${w##*_}
;;
*)
+ if [ "$#" -ne 4 ]; then
+ echo "Error: please, specify output png size"
+ exitwithhelp # filename doesn't specify png size, must be done with args 3 and 4
+ fi
svg=${png%.png}
;;
esac
View Lorry Controller Status