Changeset 7600 in josm


Ignore:
Timestamp:
2014-10-05T16:46:40+02:00 (5 years ago)
Author:
Don-vip
Message:

fix #10594 - add deprecation warnings for synonymous shop values + add preset/icon for shop=antiques

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7598 r7600  
    63736373            <reference ref="link_contact" />
    63746374        </item> <!-- Interior Decoration -->
     6375        <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
     6376            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=antiques"
     6377                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=antiques"
     6378                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=antiques" />
     6379            <space />
     6380            <key key="shop" value="antiques" />
     6381            <reference ref="name_oh" />
     6382            <reference ref="link_contact" />
     6383        </item> <!-- Antiques -->
    63756384    </group> <!-- Home decoration -->
    63766385    <group name="Printed Material" icon="presets/stationery.png">
  • trunk/data/validator/deprecated.mapcss

    r7599 r7600  
    8282}
    8383 
     84*[shop=antique] {
     85  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     86  fixAdd: "shop=antiques";
     87}
     88
     89*[shop=bags] {
     90  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     91  fixAdd: "shop=bag";
     92}
     93
    8494*[shop=organic] {
    8595  /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
     
    8898  fixAdd: "organic=only";
    8999}
    90  
     100
     101*[shop=pets] {
     102  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     103  fixAdd: "shop=pet";
     104}
     105
     106*[shop=pharmacy] {
     107  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     108  fixChangeKey: "shop => amenity";
     109}
     110
    91111*[bicycle_parking=sheffield] {
    92112  /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
  • trunk/images/notes

    • Property svn:ignore set to
      Thumbs.db
  • trunk/styles/standard/elemstyles.mapcss

    r7598 r7600  
    15051505area[shop=tea],
    15061506area[shop=coffee],
     1507area[shop=antiques],
    15071508area[shop=bag] {
    15081509    fill-color: shop#00005f;
     
    18541855node[shop=coffee] {
    18551856    icon-image: "shop/groceries/coffee.svg";
     1857    set icon_z17;
     1858    text: auto;
     1859}
     1860node[shop=antiques] {
     1861    icon-image: "shop/antique.svg";
    18561862    set icon_z17;
    18571863    text: auto;
Note: See TracChangeset for help on using the changeset viewer.