Changeset 16500 in josm

Timestamp:

2020-05-25T16:08:22+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19287 - Add playground=* and warn about playground=yes, new icon for leisure=playground (from ​https://wiki.openstreetmap.org/wiki/File:Playground-16.svg, modified, playground=* icon derived, both icons PD and CC0 licensed)

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• images/presets/leisure/playground.svg (modified) (1 diff)
• images/presets/leisure/playground_device.svg (added)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -3424 +3424 @@
             <reference ref="max_age" />
         </item> <!-- Playground -->
+        <item name="Playground device" icon="presets/leisure/playground_device.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:playground" />
+            <space />
+            <combo key="playground" text="Type" values="activitypanel,aerialrotator,balancebeam,basketrotator,basketswing,climbingframe,climbingwall,cushion,exercise,hopscotch,horizontal_bar,map,playhouse,roundabout,sandpit,seesaw,sledding,slide,splash_pad,springy,structure,swing,teenshelter,trampoline,water,youth_bench,zipwire" values_context="playground" match="key!" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="max_age" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+        </item> <!-- Playground device -->
         <item name="Picnic Site" icon="presets/leisure/picnic.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=picnic_site" />

trunk/resources/data/validator/deprecated.mapcss

@@ -472 +472 @@
 }
 
-/* see #18334, #17950, #10661, #10837, #11737, #12771 */
+/* see #19287, #18334, #17950, #10661, #10837, #11737, #12771 */
+*[playground=yes],
 *[manhole=plain],
 *[manhole=unknown],

trunk/resources/images/presets/leisure/playground.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/"
+   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"
-   version="1.0"
-   width="18"
-   height="18"
-   id="svg2">
+   version="1.1"
+   width="14"
+   height="13"
+   viewBox="0 0 14 13"
+   id="svg2"
+   sodipodi:docname="Playground-16c.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <g
-     transform="matrix(6.7201909e-2,0,0,6.7227152e-2,-14.47422,-27.17495)"
-     id="g2168">
-    <rect
-       width="250"
-       height="250"
-       ry="48.57143"
-       x="224.28572"
-       y="413.07645"
-       style="fill:#c7f1a3;fill-opacity:1;stroke:#000000;stroke-width:17.79999924;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.10000002;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3165" />
-    <path
-       d="M 247.27748,532.72088 L 451.29396,572.95821"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:14.19999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.10000002;stroke-dasharray:none;stroke-opacity:1"
-       id="path2383" />
-    <path
-       d="M 349.28571,554.13022 L 327.77308,599.29833 L 370.79835,599.29833 L 349.28571,554.13022 z "
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.83189112px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2385" />
-    <g
-       id="g3189" />
-    <g
-       transform="matrix(0.8785919,0.3718702,-0.3462376,0.9436356,143.99832,-69.706166)"
-       id="g3185">
-      <path
-         d="M 338.53918,463.22191 C 329.58668,464.8893 317.58246,511.84896 317.58246,511.84896 L 352.1962,507.06244 C 352.1962,507.06244 347.86669,522.57427 344.01118,534.07986 C 341.60652,541.25572 349.61825,543.57042 353.65106,535.609 C 361.10006,520.90345 366.70326,504.64933 366.70326,504.64933 C 366.70326,504.64933 347.9936,461.46108 338.53918,463.22191 z "
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33470964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path3181" />
-      <path
-         d="M 286.86472,449.50504 C 286.86828,454.63621 283.15421,458.79796 278.57144,458.79796 C 273.98867,458.79796 270.2746,454.63621 270.27816,449.50504 C 270.2746,444.37387 273.98867,440.21212 278.57144,440.21212 C 283.15421,440.21212 286.86828,444.37387 286.86472,449.50504 z "
-         transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:5.9000001;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path3183" />
-    </g>
-    <g
-       transform="matrix(-0.9492779,-9.5302988e-2,-0.1490016,0.9940458,828.53274,98.070173)"
-       id="g3193">
-      <path
-         d="M 338.53918,463.22191 C 329.58668,464.8893 317.58246,511.84896 317.58246,511.84896 L 352.1962,507.06244 C 352.1962,507.06244 347.86669,522.57427 344.01118,534.07986 C 341.60652,541.25572 349.61825,543.57042 353.65106,535.609 C 361.10006,520.90345 366.70326,504.64933 366.70326,504.64933 C 366.70326,504.64933 347.9936,461.46108 338.53918,463.22191 z "
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33470964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path3195" />
-      <path
-         d="M 286.86472,449.50504 C 286.86828,454.63621 283.15421,458.79796 278.57144,458.79796 C 273.98867,458.79796 270.2746,454.63621 270.27816,449.50504 C 270.2746,444.37387 273.98867,440.21212 278.57144,440.21212 C 283.15421,440.21212 286.86828,444.37387 286.86472,449.50504 z "
-         transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:5.9000001;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path3197" />
-    </g>
-  </g>
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="31.098545"
+     inkscape:cx="9.9107639"
+     inkscape:cy="7.3043439"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+  </sodipodi:namedview>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="-1"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     style="fill:#0e8517;stroke-width:1.33332765"
+     d="M 3.40625,0 C 2.65262,0.047193 1.998524,0.7448953 2,1.5 2.000287,2.2852156 2.714784,2.9994517 3.5,2.9994517 4.285216,2.9994517 4.999713,2.2852156 5,1.5 5.0016,0.6823545 4.222298,-0.0511045 3.40625,0 Z m 8,3 C 10.65262,3.0471927 9.998524,3.7448953 10,4.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 13.001599,3.6823545 12.222298,2.9488956 11.40625,3 Z M 3,3.5 C 1.52901,3.5 1.134165,5.3734067 1.03125,6.375 L 0,6 v 1.4501818 l 5.96875,2.125 L 5,13 H 9 L 8.0625,10.325182 14,12.450182 V 11 L 13.0625,10.65625 C 13.226562,9.794922 13.75,6.5 12,6.5 c -1.638462,0 -1.915209,2.244501 -1.96875,3.09375 l -5.9375,-2.125 C 4.285012,6.337531 4.614,3.5 3,3.5 Z"
+     id="playground"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccsccccsccsccccccccccsccs" />
 </svg>

trunk/resources/styles/standard/elemstyles.mapcss

@@ -1881 +1881 @@
 node[leisure=swimming_pool] {
     icon-image: "presets/sport/swimming.svg";
+    set icon_z17;
+}
+area[playground]:closed {
+    fill-color: playground#c7f1a3;
+}
+way[playground] {
+    width: 2;
+    color: playground#c7f1a3;
+}
+node[playground] {
+    icon-image: "presets/leisure/playground_device.svg";
     set icon_z17;
 }