Changeset 18092 in josm

Timestamp:

2021-07-26T22:53:12+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #20835 - Add attraction=water_slide, use icon from leisure=water_park, for leisure=water_park use a new icon instead: ​https://wiki.openstreetmap.org/wiki/File:Swimming-16.svg (PD and CC0 licensed)

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/attraction/water_slide.svg (added)
• images/presets/leisure/water_park.svg (modified) (2 diffs)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -3725 +3725 @@
             <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
         </item> <!-- Water Park -->
+        <item name="Water Slide" icon="presets/attraction/water_slide.svg" type="node,way" preset_name_label="true">
+            <link wiki="Tag:attraction=water_slide" />
+            <space />
+            <key key="attraction" value="water_slide" />
+            <reference ref="name_operator_oh_wheelchair" />
+        </item> <!-- Water Slide -->
         <item name="Public bath" icon="presets/leisure/public_bath.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=public_bath" />

trunk/resources/images/presets/leisure/water_park.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/"
+   id="svg2"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   version="1.1"
+   sodipodi:docname="water_park2.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    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"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="water_park1001.svg">
-  <defs
-     id="defs4" />
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <sodipodi:namedview
-     id="base"
+     id="namedview7"
      pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="1.1076822"
-     inkscape:cy="8.1984568"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
      showgrid="true"
-     units="px"
+     inkscape:zoom="26.892857"
+     inkscape:cx="2.9933599"
+     inkscape:cy="5.4475432"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
-       id="grid4136" />
+       id="grid824" />
   </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
@@ -50 +45 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.17200001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4153"
-       width="16"
-       height="16"
-       x="0"
-       y="1036.3622" />
-    <path
-       style="fill:#1288ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 0,1052.3622 8,0 0,-4 c -5.8018596,3.0166 -4.6497361,-2.9157 -8,0 z"
-       id="path4134"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.17200001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4136"
-       width="8.0000019"
-       height="4.9999652"
-       x="8"
-       y="1047.3622" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#1a1a1a;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 8.4821428,1043.8801 1.2500005,3.8616"
-       id="path4149"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#1a1a1a;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 15.398884,1047.5306 -2.839309,-8.522 -0.0397,8.7556"
-       id="path4151"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#0b0bff;stroke-width:1.9653343;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 12.98648,1039.1706 c -1.59965,-0.054 -2.607206,0.3947 -3.9036588,2.5254 -0.7197243,1.3265 -1.5538296,2.7911 -2.4370261,4.0362 -1.0519243,0.8991 -2.2566332,0.7485 -2.9585231,0.4961"
-       id="path4138"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+  <defs
+     id="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="1"
+     x="1"
+     height="14"
+     width="14" />
+  <path
+     style="fill:#0e8517;stroke-width:1.33333"
+     id="swimming"
+     d="m 9.7083337,1.5417802 c -0.1252548,0.00996 -0.2461931,0.050632 -0.375,0.124999 L 5.2916666,3.8334275 C 4.77896,4.0760921 4.5785334,4.8362857 4.9166666,5.2917486 L 6,7.0000675 1.3333334,9.6667117 1.375,10.500038 c 0,0 0.6238766,-0.499996 1.2916666,-0.499996 0.6317149,0 1.8976382,0.999992 2.6666668,0.999992 0.6711521,0 1.9949321,-0.999992 2.6666666,-0.999992 0.6991169,0 1.9675497,0.999992 2.666666,0.999992 H 11.125 L 7.3333334,5.0000843 10.125,3.5417633 C 10.722322,3.1969018 10.915373,2.5975422 10.666666,2.166775 10.437251,1.7694195 10.084096,1.5118961 9.7083337,1.5417802 Z M 12,5.0000843 c -1.104574,0 -2,0.8954591 -2,1.9999832 0,1.104524 0.895426,1.9999831 2,1.9999831 1.104574,0 2,-0.8954591 2,-1.9999831 C 14,5.8955434 13.104574,5.0000843 12,5.0000843 Z M 2.6666666,12.000025 c -0.4285893,0 -1.0623391,0.362481 -1.6465901,0.650968 L 1.0038613,14.67779 C 1.6169029,14.385497 2.2737936,14.000008 2.6666666,14.000008 3.3389826,14.000008 4.6214694,15 5.3333334,15 5.967336,15 7.3230466,14.000008 8,14.000008 8.672316,14.000008 10.028974,15 10.666666,15 c 0.672317,0 2.0339,-0.999992 2.666668,-0.999992 0.396039,0 1.077576,0.391727 1.696931,0.68483 l 0.04637,-2.023556 c -0.602924,-0.299517 -1.304223,-0.685649 -1.743298,-0.661257 -0.637694,0 -1.953704,0.999992 -2.666668,0.999992 -0.593219,0 -1.99435,-0.999992 -2.666666,-0.999992 -0.672316,0 -2.0721294,0.999992 -2.6666666,0.999992 -0.6340028,0 -1.9548028,-0.999992 -2.6666668,-0.999992 z" />
 </svg>

trunk/resources/styles/standard/elemstyles.mapcss

@@ -3659 +3659 @@
     set icon_z17;
 }
+way[attraction=water_slide] {
+    width: 2;
+    color: attraction#ffbfd3;
+}
+node[attraction=water_slide] {
+    icon-image: "presets/attraction/water_slide.svg";
+    set icon_z17;
+}
 
 /********************/