Changeset 16714 in josm


Ignore:
Timestamp:
2020-06-25T19:57:23+02:00 (2 weeks ago)
Author:
Klumbumbus
Message:

fix #18265 - Add shop=lighting, shop=security, shop=wholesale and shop=trade (icons from https://publicdomainvectors.org/en/free-clipart/Yellow-lamp-shade/61718.html, https://publicdomainvectors.org/en/free-clipart/Alarm-system/75822.html, https://wiki.openstreetmap.org/wiki/File:Trade-14.svg and https://openclipart.org/detail/312240/forklift, all except wholesale modified, all PD and CC0 licensed), thanks to francians, deprecate shop=lamps

Location:
trunk/resources
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r16712 r16714  
    62596259            <reference ref="name_oh_wheelchair" />
    62606260            <reference ref="link_contact_address_payment" />
    6261         </item> <!-- Computer -->
     6261        </item> <!-- Electronics -->
    62626262        <item name="Mobile Phone" icon="presets/shop/mobile_phone.svg" type="node,closedway,multipolygon" preset_name_label="true">
    62636263            <link wiki="Tag:shop=mobile_phone" />
     
    64226422            <reference ref="link_contact_address_payment" />
    64236423        </item> <!-- Interior Decoration -->
     6424        <item name="Lighting" icon="presets/shop/lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6425            <link wiki="Tag:shop=lighting" />
     6426            <space />
     6427            <key key="shop" value="lighting" />
     6428            <reference ref="name_oh_wheelchair" />
     6429            <reference ref="link_contact_address_payment" />
     6430        </item> <!-- Lighting -->
    64246431        <item name="Antiques" icon="presets/shop/antique.svg" type="node,closedway,multipolygon" preset_name_label="true">
    64256432            <link wiki="Tag:shop=antiques" />
     
    66426649            <reference ref="link_contact_address_payment" />
    66436650        </item> <!-- Gas -->
     6651        <item name="Wholesale" icon="presets/shop/wholesale.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6652            <link wiki="Tag:shop=wholesale" />
     6653            <space />
     6654            <key key="shop" value="wholesale" />
     6655            <text key="name" text="Name" />
     6656            <combo key="wholesale" text="Type" values="clothes,electro,florist,food,general,paper,pharmacy,sanitary,seafood,supermarket" values_context="wholesale" />
     6657            <text key="operator" text="Operator" />
     6658            <reference ref="oh_wheelchair" />
     6659            <reference ref="link_contact_address_payment" />
     6660        </item> <!-- Wholesale -->
     6661        <item name="Trade" icon="presets/shop/trade.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6662            <link wiki="Tag:shop=trade" />
     6663            <space />
     6664            <key key="shop" value="trade" />
     6665            <text key="name" text="Name" />
     6666            <combo key="trade" text="Type" values="agricultural_supplies,building_supplies,catering_supplies,plumbing,tiles,timber,windows,wood" values_context="trade" />
     6667            <text key="operator" text="Operator" />
     6668            <reference ref="oh_wheelchair" />
     6669            <reference ref="link_contact_address_payment" />
     6670        </item> <!-- Trade -->
    66446671        <separator/>
    66456672        <item name="Travel Agency" icon="presets/shop/travel_agency.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    67546781            <reference ref="link_contact_address_payment" />
    67556782        </item> <!-- Photo -->
     6783        <item name="Security" icon="presets/shop/security.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6784            <link wiki="Tag:shop=security" />
     6785            <space />
     6786            <key key="shop" value="security" />
     6787            <reference ref="name_oh_wheelchair" />
     6788            <reference ref="link_contact_address_payment" />
     6789        </item> <!-- Security -->
    67566790        <item name="Weapons" icon="presets/shop/weapons.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67576791            <link wiki="Tag:shop=weapons" />
  • trunk/resources/data/validator/deprecated.mapcss

    r16656 r16714  
    19901990  group: tr("deprecated tagging");
    19911991}
     1992
     1993*[shop=lamps] {
     1994  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1995  suggestAlternative: "shop=lighting";
     1996  group: tr("deprecated tagging");
     1997  fixAdd: "shop=lighting";
     1998}
  • trunk/resources/styles/standard/elemstyles.mapcss

    r16706 r16714  
    21432143area[shop=tattoo],
    21442144area[shop=art],
     2145area[shop=lighting],
     2146area[shop=security],
     2147area[shop=wholesale],
     2148area[shop=trade],
    21452149area[shop=bag] {
    21462150    fill-color: shop#00005f;
     
    25332537node[shop=art] {
    25342538    icon-image: "presets/shop/art.svg";
     2539    set icon_z17;
     2540}
     2541node[shop=lighting] {
     2542    icon-image: "presets/shop/lighting.svg";
     2543    set icon_z17;
     2544}
     2545node[shop=security] {
     2546    icon-image: "presets/shop/security.svg";
     2547    set icon_z17;
     2548}
     2549node[shop=wholesale] {
     2550    icon-image: "presets/shop/wholesale.svg";
     2551    set icon_z17;
     2552}
     2553node[shop=trade] {
     2554    icon-image: "presets/shop/trade.svg";
    25352555    set icon_z17;
    25362556}
Note: See TracChangeset for help on using the changeset viewer.