Changeset 15466 in josm

Timestamp:

2019-10-19T21:14:00+02:00 (5 years ago)

Author:

Klumbumbus

Message:

• fix #18238 - add shop=e-cigarette (icon derived from ​https://publicdomainvectors.org/en/free-clipart/Vector-drawing-of-green-smoking-area-sign/27742.html, modified, CC0 and PD licensed)
• see #18233 - clean up barrier=cable_barrier icon

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/barrier/cable_barrier.svg (modified) (4 diffs)
• images/presets/shop/e-cigarette.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -6112 +6112 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tobacco -->
+        <item name="E-cigarette" icon="presets/shop/e-cigarette.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=e-cigarette" />
+            <space />
+            <key key="shop" value="e-cigarette" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- E-cigarette -->
         <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=hairdresser" />

trunk/images/presets/barrier/cable_barrier.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="cable_barrier3.svg">
+   sodipodi:docname="cable_barrier.svg">
   <defs
      id="defs4" />
@@ -27 +27 @@
      inkscape:pageshadow="2"
      inkscape:zoom="24.296875"
-     inkscape:cx="5.4318085"
-     inkscape:cy="8.3709857"
+     inkscape:cx="6.0697506"
+     inkscape:cy="5.5722719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -55 +55 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
@@ -93 +93 @@
     <path
        style="fill:none;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -4,1035.8623 c 2.2324577,0.8386 4.39518274,0.4723 6.5517685,0 2.9006649,0.8773 6.0089953,1.5163 11.0302255,0 1.720411,0.8318 3.562515,0.481 5.418006,0"
-       id="path820"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:none;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -4,1038.8623 c 2.1367973,0.827 4.39815715,0.4871 6.6752412,0 4.8649488,1.3225 7.8505658,0.6456 10.8244368,0 1.356101,0.4734 2.822122,0.8378 5.500322,0"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:none;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m -2,1045.8622 c 20,0 20,0 20,0"
        id="path844"

trunk/styles/standard/elemstyles.mapcss

@@ -1986 +1986 @@
 area[shop=chemist],
 area[shop=tobacco],
+area[shop=e-cigarette],
 area[shop=clothes],
 area[shop=computer],
@@ -2137 +2138 @@
     set icon_z17;
 }
+node[shop=e-cigarette] {
+    icon-image: "presets/shop/e-cigarette.svg";
+    set icon_z17;
+}
 node[shop=clothes] {
     icon-image: "presets/shop/clothes.svg";