Changeset 5742 in josm


Ignore:
Timestamp:
2013-02-25T20:33:40+01:00 (12 years ago)
Author:
Don-vip
Message:

fix #8459 - deprecate amenity=emergency_phone in favor of emergency=phone

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r5708 r5742  
    10081008        </item>
    10091009        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
    1010             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/emergency_phone" />
    1011             <key key="amenity" value="emergency_phone" />
     1010            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
     1011                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
     1012                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
     1013                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
     1014            <key key="emergency" value="phone" />
    10121015        </item>
    10131016        <separator/>

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

    r5107 r5742  
    8181                testAndRemove("bicycle_parking", "sheffield").
    8282                add("bicycle_parking", "stands"));
     83        // http://wiki.openstreetmap.org/wiki/Tag:emergency=phone
     84        checks.add(new DeprecationCheck(2116).
     85                testAndRemove("amenity", "emergency_phone").
     86                add("emergency", "phone"));
    8387    }
    8488

  • trunk/styles/standard/elemstyles.xml

    r5690 r5742  
    17911791
    17921792        <rule>
    1793                 <condition k="amenity" v="emergency_phone"/>
     1793                <condition k="emergency" v="phone"/>
    17941794                <icon annotate="true" src="vehicle/emergency_phone.png"/>
    17951795                <area colour="amenity_light#f7efb7"/>
    … …  
    38263826        <!-- amenity=park_bench -> amenity=bench -->
    38273827        <!-- amenity=signpost -> information=guidepost -->
     3828    <!-- amenity=emergency_phone -> emergency=phone -->
    38283829        <!-- highway minor - classification now more detailed -->
    38293830        <!-- highway=stile -> barrier=stile -->
Note: See TracChangeset for help on using the changeset viewer.