Changeset 5080 in josm

Timestamp:

2012-03-14T13:10:09+01:00 (13 years ago)

Author:

simon04

Message:

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

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -4312 +4312 @@
             <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" />
         </item>
-        <item name="Organic" icon="presets/fruits.png" type="node,closedway">
-            <label text="Edit Organic Shop" />
-            <key key="shop" value="organic" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <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" />
+        <separator/>
+        <item name="Organic" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
+            <label text="Edit Organic/Bio" />
+            <combo text="Organic/Bio" key="organic" values="no,yes,only" />
+        </item>
+        <item name="Fair Trade" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
+            <label text="Edit Fair Trade" />
+            <combo text="Fair Trade" key="fair_trade" values="no,yes,only" />
         </item>
         <separator/>

trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java

@@ -72 +72 @@
                 test("power_rating").
                 alternative("generator:output"));
+        // from http://wiki.openstreetmap.org/wiki/Tag:shop%3Dorganic
+        checks.add(new DeprecationCheck(2114).
+                testAndRemove("shop", "organic").
+                add("shop", "supermarket").
+                add("organic", "only"));
     }
 

trunk/styles/standard/elemstyles.xml

@@ -2426 +2426 @@
 
         <rule>
-                <condition k="shop" v="organic"/>
-                <icon annotate="true" src="shop/groceries/fruits.png"/>
-                <area colour="shop#00005f"/>
-        </rule>
-
-        <rule>
                 <condition k="shop" v="optician"/>
                 <icon annotate="true" src="shop/optician.png"/>