Changeset 10724 in josm

Timestamp:

2016-08-03T22:15:13+02:00 (8 years ago)

Author:

Klumbumbus

Message:

see #13217, see #13204 - fix icons

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/food/food_court.png (modified) ( previous)
• images/presets/misc/no_icon.svg (modified) (5 diffs)
• images/presets/service/telephone.svg (modified) (4 diffs)
• images/presets/sport/athletics.png (modified) ( previous)
• images/presets/sport/beachvolleyball.png (modified) ( previous)
• images/presets/sport/ice_hockey.png (modified) ( previous)
• images/presets/sport/karting.png (modified) ( previous)
• images/presets/sport/pelota.png (modified) ( previous)
• images/presets/sport/skating.png (modified) ( previous)
• images/presets/transport/airport/gate.svg (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -9009 +9009 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Islet -->
-        <item name="Reef" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Reef" icon="presets/landmark/reef.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=reef"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=reef" />

trunk/images/presets/misc/no_icon.svg

@@ -1 +1 @@
 <?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/"
@@ -9 +10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="252.14287"
-   height="252.14287"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docbase="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\share\map-icons\svg\misc"
    sodipodi:docname="no_icon.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
@@ -35 +35 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="350"
-     inkscape:cy="163.55228"
+     inkscape:zoom="15.839192"
+     inkscape:cx="2.2843151"
+     inkscape:cy="10.356284"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:window-width="797"
-     inkscape:window-height="667"
-     inkscape:window-x="176"
-     inkscape:window-y="232"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
      showguides="true"
      inkscape:guide-bbox="true"
-     showgrid="false" />
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -57 +62 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -73 +79 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-216.07142,-141.29077)">
+     transform="translate(-334.14286,-259.36219)">
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#0d0000;stroke-width:13.75324631;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1;stroke:#0d0000;stroke-width:0.87272722;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4123"
-       width="238.38962"
-       height="238.38962"
-       x="222.94804"
-       y="148.16739"
-       ry="31.069748" />
+       width="15.127273"
+       height="15.127273"
+       x="334.57922"
+       y="259.79855"
+       ry="1.9715647" />
   </g>
 </svg>

trunk/images/presets/service/telephone.svg

@@ -11 +11 @@
    id="svg1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="telephone4.svg"
+   sodipodi:docname="telephone3.svg"
    sodipodi:version="0.32"
    width="12.08762"
@@ -71 +71 @@
      id="base"
      inkscape:current-layer="svg1"
-     inkscape:cx="4.7193656"
-     inkscape:cy="11.78842"
+     inkscape:cx="-3.9822662"
+     inkscape:cy="9.6184726"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
@@ -79 +79 @@
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:zoom="10.209232"
+     inkscape:zoom="20.418464"
      pagecolor="#ffffff"
      showgrid="false"
@@ -118 +118 @@
     </marker>
   </defs>
-  <g
-     id="g10"
-     style="fill:#000000;stroke:#ffffff;stroke-width:6.19752598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     transform="matrix(0.12920748,0,0,0.13031517,-4.8612553,-2.566014)">
-    <path
-       d="m 66.1172,22.8873 c 0,0 -25.7258,0.3341 -25.3918,23.3871 0.3342,23.053 5.0116,43.4332 12.696,54.7926 7.6843,11.36 27.3962,41.095 49.7816,38.088 0,0 11.025,-2.339 19.377,-7.685 L 95.5181,110.422 c 0,0 -8.0184,5.011 -13.0299,-1.671 -5.0115,-6.682 -20.7143,-37.7531 -20.7143,-37.7531 0,0 -4.3433,-10.0231 5.3456,-14.3663 L 66.1172,22.8873 Z"
-       id="path11"
-       style="fill:#000000;stroke:#ffffff;stroke-width:6.19752598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 69.1241,22.8873 c 0,0 2.0047,-0.6683 5.6798,1.3364 3.6751,2.0046 3.6751,3.6751 3.6751,3.6751 l 0.3341,23.0531 c 0,0 -1.0023,1.3364 -2.3387,2.6727 -1.3364,1.3365 -5.6798,3.341 -6.348,2.0047 -0.6681,-1.3365 -1.0023,-32.742 -1.0023,-32.742 z"
-       id="path12"
-       style="fill:#000000;stroke:#ffffff;stroke-width:6.19752598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 97.769099,107.95908 105.207,104.074 c 0,0 1.671,-0.334 4.343,1.336 2.673,1.671 16.705,12.696 16.705,12.696 0,0 2.339,2.005 1.671,4.344 -0.668,2.338 -2.339,7.35 -2.339,7.35 L 97.769099,107.95908 Z"
-       id="path13"
-       sodipodi:nodetypes="ccccccc"
-       style="fill:#000000;stroke:#ffffff;stroke-width:6.19752598;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke:#ffffff;stroke-width:0.80419183;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:"
+     id="path11"
+     d="m 3.6815815,0.41654839 c 0,0 -3.32396579,0.0435383 -3.28081049,3.04769391 0.0431811,3.0041556 0.64753619,5.6600048 1.64041819,7.1403067 0.992869,1.480381 3.5397939,5.355302 6.4321551,4.963444 0,0 1.4245124,-0.304807 2.5036537,-1.001472 L 7.4803977,11.823648 c 0,0 -1.0360373,0.653009 -1.6835605,-0.217757 C 5.1493139,10.735125 3.1203946,6.6860894 3.1203946,6.6860894 c 0,0 -0.5611868,-1.306162 0.6906916,-1.8721468 L 3.6815815,0.41654839 Z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke:#ffffff;stroke-width:0.304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path12"
+     d="m 4.0700955,0.41654839 c 0,0 0.2590222,-0.0870896 0.7338726,0.17415319 0.4748504,0.26122979 0.4748504,0.47892132 0.4748504,0.47892132 l 0.043168,3.0041686 c 0,0 -0.1295046,0.1741532 -0.3021775,0.3482934 C 4.8471363,4.5962511 4.2859366,4.8574678 4.1996001,4.6833277 4.1132766,4.5091615 4.0700955,0.41654839 4.0700955,0.41654839 Z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke:#ffffff;stroke-width:0.304;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="ccccccc"
+     id="path13"
+     d="M 7.7712436,11.502692 8.732276,10.996407 c 0,0 0.2159057,-0.04352 0.5611481,0.174101 0.3453716,0.217757 2.1584109,1.654481 2.1584109,1.654481 0,0 0.302216,0.261282 0.215906,0.56609 -0.08631,0.304676 -0.302217,0.957816 -0.302217,0.957816 L 7.7712436,11.502692 Z" />
 </svg>

trunk/images/presets/transport/airport/gate.svg

@@ -10 +10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15.999996"
-   height="15.999999"
-   viewBox="0 0 15.999996 15.999999"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
    id="svg4146"
    version="1.1"
@@ -72 +72 @@
        sodipodi:open="true" />
     <g
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.1543808px;font-family:'Lucida Handwriting';-inkscape-font-specification:'Lucida Handwriting';fill:#000000;fill-opacity:1;stroke:none"
        id="text3738">
       <path
          d="m 709.88966,382.88859 -2.05452,0 -0.28269,0.96355 -1.8435,0 2.19388,-5.83707 1.96693,0 2.19388,5.83707 -1.8873,0 -0.28668,-0.96355 z m -0.37825,-1.26218 -0.64502,-2.09832 -0.64105,2.09832 1.28607,0 z"
-         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black Heavy'"
          id="path4137" />
       <path
          d="m 713.94695,379.70328 -1.53293,-0.27473 q 0.19112,-0.73262 0.73262,-1.12282 0.54548,-0.3902 1.54089,-0.3902 1.14273,0 1.65238,0.42603 0.50965,0.42604 0.50965,1.07106 0,0.37826 -0.20705,0.68484 -0.20704,0.30659 -0.62511,0.53752 0.33843,0.0836 0.51761,0.1951 0.29066,0.17918 0.44992,0.47382 0.16325,0.29066 0.16325,0.69678 0,0.50965 -0.26677,0.97949 -0.26677,0.46585 -0.76846,0.72067 -0.50168,0.25084 -1.31792,0.25084 -0.79632,0 -1.25819,-0.18713 -0.45789,-0.18714 -0.75651,-0.54549 -0.29464,-0.36233 -0.45391,-0.90781 l 1.62053,-0.21501 q 0.0956,0.48974 0.29464,0.68086 0.20306,0.18714 0.51363,0.18714 0.32649,0 0.5415,-0.2389 0.21899,-0.2389 0.21899,-0.63706 0,-0.40613 -0.21103,-0.6291 -0.20704,-0.22297 -0.56539,-0.22297 -0.19112,0 -0.52557,0.0956 l 0.0836,-1.15865 q 0.13538,0.0199 0.21103,0.0199 0.31853,0 0.52955,-0.20306 0.21501,-0.20306 0.21501,-0.48178 0,-0.26677 -0.15926,-0.42603 -0.15927,-0.15927 -0.43798,-0.15927 -0.28668,0 -0.46585,0.17519 -0.17918,0.17121 -0.24288,0.60521 z"
-         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black Heavy'"
          id="path4139" />
     </g>