Changeset 19467 in josm for trunk/resources/data/defaultpresets.xml

Timestamp:

2026-01-16T11:11:30+01:00 (2 months ago)

Author:

stoecker

Message:

improve Power circuits relations presets and validation, fix #24456 - patch by francois.lacombe

File:

• trunk/resources/data/defaultpresets.xml (modified) (4 diffs)

trunk/resources/data/defaultpresets.xml

@@ -499 +499 @@
             <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power_windings" />
         </optional>
+    </chunk>
+    <chunk id="power_topology">
+        <combo key="topology" text="Circuit topology" values="linear,branched" />
     </chunk>
     <chunk id="telecom_medium">
@@ -10116 +10119 @@
                 </roles>
             </item> <!-- Detour Route -->
-            <item name="Power Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
-                <link wiki="Tag:route=power" />
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="power"/>
-                <reference ref="name_ref_operator"/>
-                <roles>
-                    <role key="line" text="route segment" requisite="required" type="way" member_expression="power=line|power=cable"/>
-                    <role key="substation" text="Power Substation" requisite="optional" type="way,closedway,multipolygon" member_expression="power"/>
-                </roles>
-            </item> <!-- Power Route -->
             <item name="Railway Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
                 <link wiki="Tag:route=railway" />
@@ -10159 +10151 @@
                 <space/>
                 <key key="type" value="superroute"/>
-                <combo key="route" text="Type" values="bicycle,detour,foot,hiking,horse,mtb,piste,power,railway,road,ski" display_values="Bicycle Route,Detour Route,Walking Route,Hiking Route,Riding Route,Mountain Biking Route,Piste Route,Power Route,Railway Route,Road Route,Ski Route" />
+                <combo key="route" text="Type" values="bicycle,detour,foot,hiking,horse,mtb,piste,railway,road,ski" display_values="Bicycle Route,Detour Route,Walking Route,Hiking Route,Riding Route,Mountain Biking Route,Piste Route,Railway Route,Road Route,Ski Route" />
                 <reference ref="name_ref_operator"/>
                 <roles>
@@ -10298 +10290 @@
             </roles>
         </item> <!-- Tunnel -->
+        <group name="Power" icon="presets/power/power.svg">
+            <item name="Power circuit" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+                <link wiki="Tag:power=circuit" />
+                <space/>
+                <key key="type" value="power"/>
+                <key key="power" value="circuit"/>
+                <space/>
+                <reference ref="cables"/>
+                <reference ref="voltage"/>
+                <reference ref="frequency"/>
+                <reference ref="power_topology"/>
+                <optional>
+                    <reference ref="name_ref_operator"/>
+                </optional>
+                <roles>
+                    <role key="substation" text="Power Substation" requisite="required" type="way,closedway,multipolygon" member_expression="power|substation"/>
+                    <role key="section" text="Circuit section" requisite="required" type="way,relation" member_expression="power=line|power=cable|power=minor_line|power=line_section"/>
+                    <role key="tap" text="Tap point" requisite="optional" type="node" member_expression="power=pole|power=tower|power=connection"/>
+                </roles>
+            </item> <!-- Power circuit -->
+            <item name="Power line section" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+                <link wiki="Tag:power=line_section" />
+                <space/>
+                <key key="type" value="power"/>
+                <key key="power" value="line_section"/>
+                <space/>
+                <reference ref="cables"/>
+                <reference ref="voltage"/>
+                <optional>
+                    <reference ref="name_ref_operator"/>
+                </optional>
+                <roles>
+                    <role key="line" text="Section segment" requisite="required" type="way" member_expression="power=line|power=cable|power=minor_line"/>
+                </roles>
+            </item> <!-- Power circuit -->
+        </group>
     </group> <!-- Relations -->
 </presets>