1 files changed, 89 insertions, 213 deletions
diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg
index d81e92082..d4cf5a0c4 100644
--- a/navit/icons/drinking_water.svg
+++ b/navit/icons/drinking_water.svg
@@ -7,19 +7,31 @@
    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: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"
-   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="drinking_water.svg"
    sodipodi:version="0.32"
    version="1.0"
-   width="22">
+   width="200"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\drinking_water.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="">
@@ -27,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
@@ -50,212 +52,86 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="50.806915"
-     inkscape:cy="45.424044"
-     inkscape:pageopacity="0"
+     inkscape:cx="24.94017"
+     inkscape:cy="6.5543801"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:window-height="820"
-     inkscape:window-width="1238"
-     inkscape:window-x="194"
-     inkscape:window-y="51"
-     inkscape:zoom="3.6867084"
+     inkscape:window-height="705"
+     inkscape:window-width="1366"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="1.2239456"
      objecttolerance="10.0"
-     pagecolor="#ff00ff"
+     pagecolor="#ffffff"
      showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4196">
-      <stop
-         style="stop-color:#000080;stop-opacity:1;"
-         offset="0"
-         id="stop4198" />
-      <stop
-         style="stop-color:#000080;stop-opacity:0;"
-         offset="1"
-         id="stop4200" />
-    </linearGradient>
-    <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="perspective2562"
-       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="perspective12"
-       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" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4196"
-       id="linearGradient4206"
-       x1="29.023178"
-       y1="70.434334"
-       x2="44.755371"
-       y2="101.62747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21881295,0,0,0.21881295,0.47435352,6.2430753e-6)" />
-  </defs>
+     inkscape:window-maximized="1"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:lockguides="true" />
   <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="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="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 12.436868,0.57706224 c -1.756054,-0.0072 -1.452409,2.99148696 0.252488,2.67358796 1.004234,0.02611 2.749381,-1.106231 1.602985,-2.101222 -0.57279,-0.27373596 -1.209385,-0.56173696 -1.855473,-0.57236596 z"
-     id="path3340-5"
-     inkscape:connector-curvature="0" />
-  <path
-     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 14.679609,0.57526524 c -0.967634,0.02427 -2.791986,0.83385096 -1.815038,2.00822396 0.936966,1.010616 3.464595,0.889184 3.186202,-0.922345 -0.111341,-0.633164 -0.72702,-1.12771896 -1.371164,-1.08587896 z"
-     id="path3345-3"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 13.593731,0.58335224 C 12.387334,1.1419522 12.828196,2.8169302 12.690704,3.9034352 c -0.09796,1.220051 0.240233,2.45467 1.030619,3.404995 1.232351,-1.82182 0.995002,-4.215759 0.538222,-6.19674 C 14.150204,0.83878924 13.923686,0.54027724 13.593731,0.58335224 Z"
-     id="path3347-5"
-     inkscape:connector-curvature="0" />
-  <path
-     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 13.531732,2.5506922 c -2.289178,0.593914 -2.305734,4.533935 -0.181504,5.311685 1.894657,0.169104 2.446142,-2.359225 1.920168,-3.786423 -0.201715,-0.799139 -0.840261,-1.581215 -1.738664,-1.525262 z"
-     id="path3349-6"
-     inkscape:connector-curvature="0" />
+     style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:10.13824272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 62.783034,3.5735704 V 17.236455 h 14.94995 v 11.38778 H 18.27971 L 3.8247918,16.892039 V 72.335481 L 17.735175,61.048734 h 49.948669 c 0,0 2.33359,13.446294 16.48455,12.722288 11.60169,-0.593114 12.7718,-12.722288 12.7718,-12.722288 0,0 11.035676,-0.184073 19.553746,0 3.42,0.08181 4.25383,2.558569 4.20776,4.900756 -0.26158,13.293515 0,19.108279 0,19.108279 0,0 16.20905,-0.184073 26.13764,0 0.094,-15.012933 0.28634,-26.772332 0,-39.949066 -0.24583,-11.342378 -17.94482,-16.249267 -29.15731,-16.484468 -11.21251,-0.235201 -29.305866,0 -29.305866,0 l 8e-5,-11.38778 H 105.20721 V 3.5735704 Z"
+     id="path1679"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccscccccccccccc" />
   <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.93358684;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 15.122587,4.4650192 c -1.850678,0.206295 -3.768037,-0.221731 -5.5825924,0.192287 -1.630915,0.596785 -2.336053,2.429814 -1.874245,4.060378 2.6853604,-2.060836 9.0608744,-1.566868 9.5112554,-2.023261 1.426801,0.354491 1.511935,0.03612 1.618189,-1.214391 -0.09716,-1.36257 -1.743679,-1.069923 -3.672607,-1.015013 z"
-     id="path3351-2"
+     style="fill:none;stroke:#0089cd;stroke-width:4.09043884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 82.021684,96.425097 105.97417,196.52835 h 58.7514 L 187.7742,96.425097"
+     id="path1681"
      inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccc" />
+     sodipodi:nodetypes="cccc" />
   <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.23002474"
-     d="m 7.6774306,9.0732492 c -1.522412,-0.0067 -3.044753,0.105091 -4.548829,0.341892 0.533135,4.0678518 1.067027,8.1356058 1.600289,12.2034418 2.451669,0.29844 4.95269,0.41349 7.3967324,-0.0153 0.936237,-1.818906 0.557294,-3.973665 1.055444,-5.913623 0.275065,-2.090408 0.54868,-4.181007 0.823839,-6.2714018 -2.089757,-0.359069 -4.2138774,-0.361168 -6.3274754,-0.345038 z"
-     id="path3582"
-     inkscape:connector-curvature="0" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-6-0-0-4"
+     sodipodi:type="arc"
+     sodipodi:cx="104.94855"
+     sodipodi:cy="121.39098"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 119.97788,121.39098 a 15.029328,11.755445 0 0 1 -7.51467,10.18052 15.029328,11.755445 0 0 1 -15.029327,0 15.029328,11.755445 0 0 1 -7.514664,-10.18052" />
   <path
-     d="m 4.6291306,10.672236 7.5366344,0.06102 -1.220507,9.650504 -5.1566454,0.06102 -1.159482,-9.772555 z"
-     id="path2381"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.1;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-     inkscape:connector-curvature="0" />
-  <g
-     id="g3353"
-     transform="matrix(0.03867173,0,0,0.03867173,-1.8751227,0.43801824)">
-    <path
-       d="m 391.67731,24.490931 c -11.66352,4.361614 -27.64526,10.849786 -33.63434,10.849786 -5.98908,0 -10.84979,-4.860704 -10.84979,-10.849786 0,-5.989083 4.86071,-10.849787 10.84979,-10.849787 5.70837,0.219191 22.30594,6.964662 33.63434,10.849787 z"
-       id="path3340"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       transform="translate(15.189701,15.189701)"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 396.38288,39.680632 c 11.66352,4.361614 27.64526,10.849786 33.63434,10.849786 5.98908,0 10.84979,-4.860704 10.84979,-10.849786 0,-5.989083 -4.86071,-10.849787 -10.84979,-10.849787 -5.70837,0.219191 -22.30594,6.964662 -33.63434,10.849787 z"
-       id="path3345"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 401.4421,39.138141 0,66.183699 0.81374,25.76824"
-       id="path3347"
-       style="fill:none;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       id="path3349"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       cx="401.44211"
-       cy="125.39394"
-       rx="22.784552"
-       ry="45.569103" />
-    <path
-       d="m 522.95971,130.81884 -177.93695,-1.00529 -14.10427,-0.0797 c -69.43863,-1.08498 -65.09872,64.01374 -65.09872,64.01374"
-       id="path3351"
-       sodipodi:nodetypes="cccc"
-       style="fill:none;stroke:#c02727;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-  </g>
-  <rect
-     style="opacity:0.44029852;fill:url(#linearGradient4206);fill-opacity:1;stroke:none;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none"
-     id="rect4179"
-     width="5.9945359"
-     height="6.0538883"
-     x="5.459908"
-     y="14.40297" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-8-2-8-2"
+     sodipodi:type="arc"
+     sodipodi:cx="135.36032"
+     sodipodi:cy="121.39098"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="0"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 150.38965,121.39098 a 15.029328,11.755445 0 0 1 -7.51466,10.18052 15.029328,11.755445 0 0 1 -15.02933,0 15.029328,11.755445 0 0 1 -7.51467,-10.18052" />
   <path
-     d="m 12.866673,10.209018 -0.0061,0 c 0.007,-0.006 0.01081,-0.01211 0.01081,-0.01823 0,-0.144298 -1.970328,-0.2612768 -4.4008944,-0.2612768 -2.430542,0 -4.400895,0.1169788 -4.400895,0.2612768 0,0.0061 0.0038,0.01221 0.01084,0.01823 l -0.01084,0 1.37352,10.473678 0.0062,0 c -0.01215,0.0065 -0.01859,0.01323 -0.01859,0.01995 0,0.0997 1.360979,0.180464 3.039818,0.180464 1.6788634,0 3.0398184,-0.08076 3.0398184,-0.180464 0,-0.0067 -0.0064,-0.01341 -0.01859,-0.01995 l 1.374931,-10.473678 z m -2.256784,9.707939 c -0.07036,0.06511 -4.2436584,0.0346 -4.3140214,-0.03052 l -1.304742,-9.043255 c 2.226935,0.0074 3.830658,0.11811 6.8578754,-0.06102 l -1.239112,9.134795 z"
-     id="path2209"
-     sodipodi:nodetypes="ccsssccccsssccccccc"
-     style="fill:#c02727"
-     inkscape:connector-curvature="0" />
+     style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path830-0-3-4-9-1-1"
+     sodipodi:type="arc"
+     sodipodi:cx="165.61842"
+     sodipodi:cy="121.5046"
+     sodipodi:rx="15.029328"
+     sodipodi:ry="11.755445"
+     sodipodi:start="6.2639059"
+     sodipodi:end="3.1415927"
+     sodipodi:open="true"
+     d="m 180.64496,121.27798 a 15.029328,11.755445 0 0 1 -7.34521,10.33075 15.029328,11.755445 0 0 1 -15.11219,0.11395 15.029328,11.755445 0 0 1 -7.59846,-10.21808" />
 </svg>