Changeset 9434 in josm


Ignore:
Timestamp:
2016-01-13T19:48:25+01:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #11507, see #12297 - deprecate power=cable_distribution_cabinet in favor of man_made=street_cabinet + street_cabinet=power

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r9433 r9434  
    64476447        </item> <!-- Power Compensator -->
    64486448        <separator/>
    6449         <item name="Cable Distribution Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
    6450             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
    6451                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
    6452                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet" />
    6453             <space />
    6454             <key key="power" value="cable_distribution_cabinet" />
     6449        <item name="Power Street Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
     6450            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=street_cabinet" />
     6451            <space />
     6452            <key key="man_made" value="street_cabinet" />
     6453            <key key="street_cabinet" value="power" />
    64556454            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
    64566455            <reference ref="ref_operator_branch" />
    6457         </item> <!-- Cable Distribution Cabinet -->
     6456        </item> <!-- Power Street Cabinet -->
    64586457        <separator/>
    64596458        <item name="Transformer Tower" icon="styles/standard/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">
  • trunk/data/validator/deprecated.mapcss

    r9363 r9434  
    642642  fixChangeKey: "type => studio";
    643643}
     644
     645/* #11507, #12297 */
     646*[power=cable_distribution_cabinet] {
     647  throwWarning: tr("{0} is deprecated", "{0.tag}");
     648  suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
     649  fixAdd: "man_made=street_cabinet";
     650  fixAdd: "street_cabinet=power";
     651  fixRemove: "power";
     652}
  • trunk/styles/standard/elemstyles.mapcss

    r9433 r9434  
    11871187    fill-color: power#eeeeee;
    11881188}
    1189 node[power=cable_distribution_cabinet] {
     1189node[man_made=street_cabinet][street_cabinet=power] {
    11901190    icon-image: "power/cable_distribution_cabinet.svg";
    11911191    set icon_z17;
Note: See TracChangeset for help on using the changeset viewer.