Changeset 18270 in josm for trunk/resources

Timestamp:

2021-10-10T21:51:02+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20270 - Add man_made=utility_pole (patch by taylor.smock and francois.lacombe, reviewed by skyper)

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (4 diffs)
• data/validator/ignoretags.cfg (modified) (1 diff)
• images/presets/tower/pole.svg (added)
• images/presets/tower/pole_street_light.svg (added)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -433 +433 @@
     <chunk id="power_source_values">
     </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">
@@ -5813 +5819 @@
         </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" text="Similar preset:" />
+        </item> <!-- Utility Pole -->
         <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=street_lamp" />
@@ -6074 +6088 @@
             <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" />
@@ -6704 +6718 @@
             <key key="power" value="pole" />
             <reference ref="power_pole" />
+            <preset_link preset_name="Utility Pole" text="Similar preset:" />
         </item> <!-- Pole -->
         <item name="Pole with Switch" icon="presets/power/pole_switch.svg" type="node" preset_name_label="true">

trunk/resources/data/validator/ignoretags.cfg

@@ -239 +239 @@
 K:water=pool
 K:golf=path
-K:man_made=utility_pole
 K:site=geodesic
 K:site=stop_area

trunk/resources/styles/standard/elemstyles.mapcss

@@ -1786 +1786 @@
 node[man_made=communications_tower] {
     icon-image: "presets/tower/communications_tower.svg";
+    set icon_z17;
+}
+node|z17-[man_made=utility_pole][utility][utility!=power][utility!=street_lighting]::utility_casing {
+    utility_casing: #fdfdf8;
+}
+node|z17-[man_made=utility_pole][utility=gas]::utility_casing {
+    utility_casing: #ffff00;
+}
+node|z17-[man_made=utility_pole][utility=oil]::utility_casing {
+    utility_casing: #708090;
+}
+node|z17-[man_made=utility_pole][utility=telecom]::utility_casing,
+node|z17-[man_made=utility_pole][utility=television]::utility_casing {
+    utility_casing: #21bd00;
+}
+node|z17-[man_made=utility_pole][utility=water]::utility_casing {
+    utility_casing: #2090cf;
+}
+node|z17-[man_made=utility_pole][utility=sewerage]::utility_casing {
+    utility_casing: #1d5575;
+}
+node|z17-[man_made=utility_pole][utility=waste]::utility_casing {
+    utility_casing: #ee82ee;
+}
+node[man_made=utility_pole].utility_casing::utility_casing {
+    symbol-fill-color: prop("utility_casing");
+    symbol-shape: circle;
+    symbol-size: 12;
+}
+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;
 }