Changeset 15541 in josm

Timestamp:

2019-11-24T21:23:35+01:00 (5 years ago)

Author:

Klumbumbus

Message:

fix #18356 - add tourism=camp_pitch (icon derived from internal camp_site icon, CC0 and PD licensed), camp_site icon adjusted

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/accommodation/camp_pitch.svg (added)
• images/presets/accommodation/camping.svg (modified) (5 diffs)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -2912 +2912 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Campsite -->
+        <item name="Camp pitch" icon="presets/accommodation/camp_pitch.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:tourism=camp_pitch" />
+            <space />
+            <key key="tourism" value="camp_pitch" />
+            <text key="ref" text="Reference" />
+            <text key="addr:unit" text="Unit number" />
+            <text key="capacity" text="Number of places" />
+            <reference ref="surface" />
+            <checkgroup columns="2">
+                <check key="tents" text="Tents allowed" />
+                <check key="caravans" text="Caravans allowed" />
+                <check key="drinking_water" text="Drinking Water" />
+                <check key="power_supply" text="Power supply" />
+                <check key="permanent_camping" text="Permanent camping only" />
+            </checkgroup>
+        </item> <!-- Camp pitch -->
     </group> <!-- Accommodation -->
     <group name="Food+Drinks" icon="presets/food/restaurant.svg">

trunk/images/presets/accommodation/camping.svg

@@ -10 +10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
+   width="13"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    version="1.0"
-   sodipodi:docname="camping.svg"
+   sodipodi:docname="camping3.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -31 +31 @@
      inkscape:pageshadow="2"
      inkscape:zoom="31.678384"
-     inkscape:cx="-0.61499654"
-     inkscape:cy="6.7034407"
+     inkscape:cx="5.9352113"
+     inkscape:cy="6.746294"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -38 +38 @@
      height="32px"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -61 +61 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Tent</dc:title>
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
@@ -97 +97 @@
      transform="translate(-7.9680758,-7.562273)">
     <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99152654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
        id="rect4136"
-       width="16"
+       width="13"
        height="16"
        x="7.9680758"
        y="7.562273" />
     <path
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.62349802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 16.269851,13.283306 0,-5.283382 4.210621,1.4574848 -4.210621,1.4271202"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.66032374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.493521,13.283306 V 7.999924 l 4.722694,1.4574848 -4.722694,1.4271202"
        id="path2163"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:#8effff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.62695503;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 12.094586,22.207608 4.176201,-8.489045 4.118596,8.489045 -8.294797,0 z"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.72304797;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.8104809,22.207608 4.6840901,-8.489045 4.619477,8.489045 z"
        id="path2161"
        sodipodi:nodetypes="cccc"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:#5abd3f;fill-opacity:1;fill-rule:evenodd;stroke:#00b000;stroke-width:0.6551975px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99431817"
-       d="m 9.9680757,23.234674 12.5150003,0"
+       style="opacity:1;fill:#5abd3f;fill-opacity:1;fill-rule:evenodd;stroke:#00b000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99431817"
+       d="M 7.9680758,23.062273 H 20.968076"
        id="path2165"
        inkscape:connector-curvature="0" />

trunk/styles/standard/elemstyles.mapcss

@@ -3254 +3254 @@
 area[tourism=wilderness_hut],
 area[tourism=camp_site],
+area[tourism=camp_pitch],
 area[tourism=caravan_site] {
     fill-color: hotel#feced0;
@@ -3291 +3292 @@
 node[tourism=camp_site] {
     icon-image: "presets/accommodation/camping.svg";
+    set icon_z17;
+}
+node[tourism=camp_pitch] {
+    icon-image: "presets/accommodation/camp_pitch.svg";
     set icon_z17;
 }