Changeset 5080 in josm for trunk


Ignore:
Timestamp:
2012-03-14T13:10:09+01:00 (8 years ago)
Author:
simon04
Message:

Incorporate accepted keys organic, fair_trade; deprecate previously used shop=organic

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r4981 r5080  
    43124312            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
    43134313        </item>
    4314         <item name="Organic" icon="presets/fruits.png" type="node,closedway">
    4315             <label text="Edit Organic Shop" />
    4316             <key key="shop" value="organic" />
    4317             <text key="name" text="Name" default="" delete_if_empty="true" />
    4318             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
     4314        <separator/>
     4315        <item name="Organic" type="node,closedway">
     4316            <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
     4317            <label text="Edit Organic/Bio" />
     4318            <combo text="Organic/Bio" key="organic" values="no,yes,only" />
     4319        </item>
     4320        <item name="Fair Trade" type="node,closedway">
     4321            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
     4322            <label text="Edit Fair Trade" />
     4323            <combo text="Fair Trade" key="fair_trade" values="no,yes,only" />
    43194324        </item>
    43204325        <separator/>
  • trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java

    r4887 r5080  
    7272                test("power_rating").
    7373                alternative("generator:output"));
     74        // from http://wiki.openstreetmap.org/wiki/Tag:shop%3Dorganic
     75        checks.add(new DeprecationCheck(2114).
     76                testAndRemove("shop", "organic").
     77                add("shop", "supermarket").
     78                add("organic", "only"));
    7479    }
    7580
  • trunk/styles/standard/elemstyles.xml

    r4981 r5080  
    24262426
    24272427        <rule>
    2428                 <condition k="shop" v="organic"/>
    2429                 <icon annotate="true" src="shop/groceries/fruits.png"/>
    2430                 <area colour="shop#00005f"/>
    2431         </rule>
    2432 
    2433         <rule>
    24342428                <condition k="shop" v="optician"/>
    24352429                <icon annotate="true" src="shop/optician.png"/>
Note: See TracChangeset for help on using the changeset viewer.