Ticket #20270: 20270.4.patch

resources/data/defaultpresets.xml

@@ -411 +411 @@
             <reference ref="voltage_frequency" />
         </optional>
     </chunk>
-    <chunk id="power_pole">
+    <chunk id="utilities">
+        <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true"/>
+    </chunk>
+    <chunk id="pole">
         <text key="height" text="Height (meters)" length="7" />
         <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+        <reference ref="ref_operator" />
+    </chunk>
+    <chunk id="power_pole">
         <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
         <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
         <check key="location:transition" text="Location transition" disable_off="true" />
-        <reference ref="ref_operator" />
+        <reference ref="pole" />
     </chunk>
     <chunk id="rating_phases">
         <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
@@ -5783 +5789 @@
             <key key="man_made" value="embankment" />
         </item> <!-- Embankment -->
         <separator/>
+        <item name="Utility Pole" icon="presets/tower/pole.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:man_made=utility_pole" />
+            <space />
+            <key key="man_made" value="utility_pole" />
+            <reference ref="pole" />
+            <reference ref="utilities" />
+            <preset_link preset_name="Pole" />
+        </item> <!-- Utility Pole -->
         <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=street_lamp" />
             <space />
@@ -6044 +6058 @@
             <link wiki="Key:marker" />
             <space />
             <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
-            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
+            <reference ref="utilities" />
             <optional>
                 <reference ref="ref_operator" />
                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
@@ -6499 +6513 @@
             <space />
             <key key="power" value="pole" />
             <reference ref="power_pole" />
+            <preset_link preset_name="Utility Pole" />
         </item> <!-- Pole -->
         <item name="Pole with Switch" icon="presets/power/pole_switch.svg" type="node" preset_name_label="true">
             <link wiki="Tag:power=pole" />

resources/data/validator/ignoretags.cfg

@@ -224 +224 @@
 K:attraction=summer_toboggan
 K:water=pool
 K:golf=path
-K:man_made=utility_pole
 K:site=geodesic
 K:site=stop_area
 K:site=parking

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

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <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"/>
+ <path transform="translate(0 -1036.4)" d="m6 1037.4v15" fill="none" stroke="#8b4513" stroke-width="2"/>
+ <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"/>
+</svg>

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

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="13" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <path id="a" d="M1.89 2H.42v4h1.47v10h4.13V6h5.09V2H6.02V.09H1.89V2z"/>
+  <path id="b" d="m3.97 1v15"/>
+  <path id="c" d="M1.55 5.12h7.5V6h1.19V3.12H1.55v2z"/>
+  <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"/>
+  <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"/>
+ </defs>
+ <use fill="#fc0" xlink:href="#a"/>
+ <g fill-opacity="0">
+  <use stroke="#000" stroke-opacity="0" stroke-width="1.94" xlink:href="#a"/>
+  <use xlink:href="#b"/>
+  <use stroke="#8b4513" stroke-width="2" xlink:href="#b"/>
+ </g>
+ <use xlink:href="#c"/>
+ <use fill-opacity="0" stroke="#000" stroke-opacity="0" stroke-width="2" xlink:href="#c"/>
+ <use fill="#fc0" xlink:href="#d"/>
+ <use fill="#f38c0a" xlink:href="#e"/>
+</svg>

resources/styles/standard/elemstyles.mapcss

@@ -1783 +1783 @@
     icon-image: "presets/tower/communications_tower.svg";
     set icon_z17;
 }
+node|z17-[man_made=utility_pole][utility!=power][utility!=street_lighting]::utility_casing {
+    symbol-fill-color: #fdfdf8;
+    symbol-fill-opacity: 0.5;
+    symbol-shape: circle;
+    symbol-size: 20;
+}
+node|z17-[man_made=utility_pole][utility=~/^(telecom|television|;)$/]::utility_casing {
+    symbol-fill-color: #33ff33;
+    symbol-fill-opacity: 0.5;
+    symbol-shape: circle;
+    symbol-size: 20;
+}
+node|z17-[man_made=utility_pole][utility=water]::utility_casing {
+    symbol-fill-color: #2090cf;
+    symbol-fill-opacity: 0.5;
+    symbol-shape: circle;
+    symbol-size: 20;
+}
+node|z17-[man_made=utility_pole][utility=gas]::utility_casing {
+    symbol-fill-color: #ffff4c;
+    symbol-fill-opacity: 0.5;
+    symbol-shape: circle;
+    symbol-size: 20;
+}
+node|z17-[man_made=utility_pole][utility=waste]::utility_casing {
+    symbol-fill-color: #ee82ee;
+    symbol-fill-opacity: 0.5;
+    symbol-shape: circle;
+    symbol-size: 20;
+}
+node[man_made=utility_pole] {
+    icon-image: "presets/tower/pole.svg";
+    set icon_z17;
+}
+node[man_made=utility_pole][utility~=power] {
+    icon-image: "presets/power/pole.svg";
+    set icon_z17;
+}
+node[man_made=utility_pole][utility~=street_lighting] {
+    icon-image: "presets/tower/pole_street_light.svg";
+    set icon_z17;
+}
 
 /****************/
 /* telecom tags */