Changeset 6176 in josm


Ignore:
Timestamp:
2013-08-22T17:17:43+02:00 (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r6161 r6176  
    14011401
    14021402        <!-- *** access *** -->
    1403         <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
     1403        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
    14041404            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
    14051405                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
    14061406                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
    1407             <label text="Edit Entrance" />
     1407            <label text="Edit Entrance (barrier opening)" />
    14081408            <space />
    14091409            <key key="barrier" value="entrance" />
     
    46794679            <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" />
    46804680            <text key="name" text="Name" />
     4681        </item>
     4682        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node">
     4683            <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
     4684                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
     4685                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:entrance"
     4686                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:entrance"
     4687                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
     4688                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
     4689            <label text="Edit Entrance" />
     4690            <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" default="yes" match="key" />
     4691            <combo key="access" text="Access" values="yes,delivery,private,no" />
     4692            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    46814693        </item>
    46824694        <item name="Tower" icon="presets/tower.png" type="node,closedway">
  • trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java

    r6157 r6176  
    119119                alternative("barrier", "chain").
    120120                alternative("fence_type", "chain_link"));
     121        // http://wiki.openstreetmap.org/wiki/Key:fence_type
     122        // see #8962
     123        checks.add(new DeprecationCheck(2123).
     124                test("building", "entrance").
     125                alternative("entrance"));
    121126    }
    122127
Note: See TracChangeset for help on using the changeset viewer.