Changeset 6176 in josm

Timestamp:

2013-08-22T17:17:43+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9000 - add entrance to presets + deprecate building=entrance in favor of it. Icons and map style already ok.

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -1401 +1401 @@
 
         <!-- *** access *** -->
-        <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
+        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
-            <label text="Edit Entrance" />
+            <label text="Edit Entrance (barrier opening)" />
             <space />
             <key key="barrier" value="entrance" />
@@ -4679 +4679 @@
             <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" />
             <text key="name" text="Name" />
+        </item>
+        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:entrance"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:entrance"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
+            <label text="Edit Entrance" />
+            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" default="yes" match="key" />
+            <combo key="access" text="Access" values="yes,delivery,private,no" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
         </item>
         <item name="Tower" icon="presets/tower.png" type="node,closedway">

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

@@ -119 +119 @@
                 alternative("barrier", "chain").
                 alternative("fence_type", "chain_link"));
+        // http://wiki.openstreetmap.org/wiki/Key:fence_type
+        // see #8962
+        checks.add(new DeprecationCheck(2123).
+                test("building", "entrance").
+                alternative("entrance"));
     }