Ticket #20270: 20270.patch

File 20270.patch, 5.3 KB (added by taylor.smock, 4 years ago)

Add man_made=utility_pole to presets

  • resources/data/defaultpresets.xml

     
    324324    </chunk>
    325325    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    326326        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    327     </chunk> 
     327    </chunk>
    328328    <chunk id="christian_denominations"> <!-- christian denominations -->
    329329        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    330330    </chunk>
    … …  
    341341        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    342342    </chunk>
    343343    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    344     <!-- end of religions and denominations --> 
     344    <!-- end of religions and denominations -->
    345345    <chunk id="voltage">
    346346        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
    347347    </chunk>
    … …  
    399399            <reference ref="voltage_frequency" />
    400400        </optional>
    401401    </chunk>
    402     <chunk id="power_pole">
     402    <chunk id="utilities">
     403        <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
     404    </chunk>
     405    <chunk id="pole">
    403406        <text key="height" text="Height (meters)" length="7" />
    404407        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     408        <reference ref="ref_operator" />
     409    </chunk>
     410    <chunk id="power_pole">
    405411        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    406412        <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    407413        <check key="location:transition" text="Location transition" disable_off="true" />
    408         <reference ref="ref_operator" />
     414        <reference ref="pole" />
    409415    </chunk>
    410416    <chunk id="rating_phases">
    411417        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    … …  
    784790                    <check key="narrow" text="Narrow" disable_off="true" />
    785791                    <check key="trolley_wire" text="Overhead trolley wires" />
    786792                    <check key="passing_places" text="Passing Places" />
    787                 </checkgroup> 
     793                </checkgroup>
    788794                <reference ref="placement" />
    789795            </optional>
    790796            <reference ref="link_road_access_restrictions" />
    … …  
    13431349            <check key="button_operated" text="Button operated" />
    13441350            <check key="traffic_signals:sound" text="Sound signals" />
    13451351        </item> <!-- Pedestrian Crossing -->
    1346         <group name="Traffic Calming" icon="presets/vehicle/choker.svg"> 
     1352        <group name="Traffic Calming" icon="presets/vehicle/choker.svg">
    13471353            <item name="Bump" icon="presets/vehicle/bump.svg" type="node,way" preset_name_label="true">
    13481354                <link wiki="Key:traffic_calming" />
    13491355                <space />
    … …  
    55355541            <key key="man_made" value="embankment" />
    55365542        </item> <!-- Embankment -->
    55375543        <separator/>
     5544        <item name="Utility Pole" icon="presets/power/pole.svg" type="node" preset_name_label="true">
     5545            <link wiki="Tag:man_made=utility_pole" />
     5546            <space />
     5547            <key key="man_made" value="utility_pole" />
     5548            <reference ref="pole" />
     5549            <reference ref="utilities" />
     5550        </item> <!-- Utility Pole -->
    55385551        <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
    55395552            <link wiki="Tag:highway=street_lamp" />
    55405553            <space />
    … …  
    57965809            <link wiki="Key:marker" />
    57975810            <space />
    57985811            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    5799             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
     5812            <reference ref="utilities" />
    58005813            <optional>
    58015814                <reference ref="ref_operator" />
    58025815                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />