Ticket #20270: 20270.6.patch

File 20270.6.patch, 7.5 KB (added by taylor.smock, 3 years ago)

Drop opacity, add text= to preset_links

  • resources/data/defaultpresets.xml 

    diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index b5cff550a2..56464c03b3 100644
    a b  
    411411            <reference ref="voltage_frequency" />
    412412        </optional>
    413413    </chunk>
    414     <chunk id="power_pole">
     414    <chunk id="utilities">
     415        <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true"/>
     416    </chunk>
     417    <chunk id="pole">
    415418        <text key="height" text="Height (meters)" length="7" />
    416419        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     420        <reference ref="ref_operator" />
     421    </chunk>
     422    <chunk id="power_pole">
    417423        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    418424        <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    419425        <check key="location:transition" text="Location transition" disable_off="true" />
    420         <reference ref="ref_operator" />
     426        <reference ref="pole" />
    421427    </chunk>
    422428    <chunk id="rating_phases">
    423429        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    … …  
    57835789            <key key="man_made" value="embankment" />
    57845790        </item> <!-- Embankment -->
    57855791        <separator/>
     5792        <item name="Utility Pole" icon="presets/tower/pole.svg" type="node" preset_name_label="true">
     5793            <link wiki="Tag:man_made=utility_pole" />
     5794            <space />
     5795            <key key="man_made" value="utility_pole" />
     5796            <reference ref="pole" />
     5797            <reference ref="utilities" />
     5798            <preset_link preset_name="Pole" text="Similar but different tags:" />
     5799        </item> <!-- Utility Pole -->
    57865800        <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
    57875801            <link wiki="Tag:highway=street_lamp" />
    57885802            <space />
    … …  
    60446058            <link wiki="Key:marker" />
    60456059            <space />
    60466060            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    6047             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
     6061            <reference ref="utilities" />
    60486062            <optional>
    60496063                <reference ref="ref_operator" />
    60506064                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    … …  
    64996513            <space />
    65006514            <key key="power" value="pole" />
    65016515            <reference ref="power_pole" />
     6516            <preset_link preset_name="Utility Pole" text="Similar but different tags:" />
    65026517        </item> <!-- Pole -->
    65036518        <item name="Pole with Switch" icon="presets/power/pole_switch.svg" type="node" preset_name_label="true">
    65046519            <link wiki="Tag:power=pole" />

  • resources/data/validator/ignoretags.cfg 

    diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
index 6253bbcb9a..c5db631dc2 100644
    a b K:land_area=administrative  
    224224K:attraction=summer_toboggan
    225225K:water=pool
    226226K:golf=path
    227 K:man_made=utility_pole
    228227K:site=geodesic
    229228K:site=stop_area
    230229K:site=parking

  • new file resources/images/presets/tower/pole.svg 

    diff --git a/resources/images/presets/tower/pole.svg b/resources/images/presets/tower/pole.svg
new file mode 100644
index 0000000000..6dce4741c5
    - +  
     1<?xml version="1.0" encoding="UTF-8"?>
     2<svg width="12" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
     3 <path transform="translate(0 -1036.4)" d="M4 1036.362v2H0v6h3v-2h1v10h4v-10h1v2h3v-6H8v-2H4z" color-rendering="auto" fill="#fff" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" style="isolation:auto;mix-blend-mode:normal;white-space:normal"/>
     4 <path transform="translate(0 -1036.4)" d="m6 1037.4v15" fill="none" stroke="#8b4513" stroke-width="2"/>
     5 <path transform="translate(0 -1036.4)" d="m1 1039.4v4h1v-2h8v2h1v-4h-10z" color-rendering="auto" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" style="isolation:auto;mix-blend-mode:normal;white-space:normal"/>
     6</svg>

  • new file resources/images/presets/tower/pole_street_light.svg 

    diff --git a/resources/images/presets/tower/pole_street_light.svg b/resources/images/presets/tower/pole_street_light.svg
new file mode 100644
index 0000000000..1fda8a212e
    - +  
     1<?xml version="1.0" encoding="UTF-8"?>
     2<svg width="13" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     3 <defs>
     4  <path id="a" d="M1.89 2H.42v4h1.47v10h4.13V6h5.09V2H6.02V.09H1.89V2z"/>
     5  <path id="b" d="m3.97 1v15"/>
     6  <path id="c" d="M1.55 5.12h7.5V6h1.19V3.12H1.55v2z"/>
     7  <path id="d" d="M6.74 6h5.5v2.56c0 1.25-1.02 2.27-2.28 2.27H9.1c-1.31 0-2.36-1.06-2.36-2.36V6z"/>
     8  <path id="e" d="M7.86 6h3.25v2.14c0 .78-.64 1.4-1.42 1.37-.36-.02-.25-.01-.67-.03-.65-.02-1.16-.55-1.16-1.2V6z"/>
     9 </defs>
     10 <use fill="#fc0" xlink:href="#a"/>
     11 <g fill-opacity="0">
     12  <use stroke="#000" stroke-opacity="0" stroke-width="1.94" xlink:href="#a"/>
     13  <use xlink:href="#b"/>
     14  <use stroke="#8b4513" stroke-width="2" xlink:href="#b"/>
     15 </g>
     16 <use xlink:href="#c"/>
     17 <use fill-opacity="0" stroke="#000" stroke-opacity="0" stroke-width="2" xlink:href="#c"/>
     18 <use fill="#fc0" xlink:href="#d"/>
     19 <use fill="#f38c0a" xlink:href="#e"/>
     20</svg>

  • resources/styles/standard/elemstyles.mapcss 

    diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
index e09c569b59..629d8c644c 100644
    a b node[man_made=communications_tower] {  
    17831783    icon-image: "presets/tower/communications_tower.svg";
    17841784    set icon_z17;
    17851785}
     1786node|z17-[man_made=utility_pole][utility][utility!=power][utility!=street_lighting]::utility_casing {
     1787    utility_casing: #fdfdf8;
     1788}
     1789node|z17-[man_made=utility_pole][utility=gas]::utility_casing {
     1790    utility_casing: #ffff00;
     1791}
     1792node|z17-[man_made=utility_pole][utility=oil]::utility_casing {
     1793    utility_casing: #708090;
     1794}
     1795node|z17-[man_made=utility_pole][utility=~/^(telecom|television|;)$/]::utility_casing {
     1796    utility_casing: #21bd00;
     1797}
     1798node|z17-[man_made=utility_pole][utility=water]::utility_casing {
     1799    utility_casing: #2090cf;
     1800}
     1801node|z17-[man_made=utility_pole][utility=gas]::utility_casing {
     1802    utility_casing: #ffff4c;
     1803}
     1804node|z17-[man_made=utility_pole][utility=sewerage]::utility_casing,
     1805node|z17-[man_made=utility_pole][utility=waste]::utility_casing {
     1806    utility_casing: #ee82ee;
     1807
     1808}
     1809node[man_made=utility_pole].utility_casing::utility_casing {
     1810    symbol-fill-color: prop("utility_casing");
     1811    symbol-shape: circle;
     1812    symbol-size: (prop("utility_casing") == "#fdfdf8") ? 10 : 15;
     1813}
     1814node[man_made=utility_pole] {
     1815    icon-image: "presets/tower/pole.svg";
     1816    set icon_z17;
     1817}
     1818node[man_made=utility_pole][utility~=power] {
     1819    icon-image: "presets/power/pole.svg";
     1820    set icon_z17;
     1821}
     1822node[man_made=utility_pole][utility~=street_lighting] {
     1823    icon-image: "presets/tower/pole_street_light.svg";
     1824    set icon_z17;
     1825}
    17861826
    17871827/****************/
    17881828/* telecom tags */