Changeset 18081 in josm for trunk/resources

Timestamp:

2021-07-24T17:16:20+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20210 - add route node network relation as new preset and fix validation for network relations (patch by skyper)

File:

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

trunk/resources/data/defaultpresets.xml

@@ -8989 +8989 @@
             </item> <!-- Superroute -->
         </group> <!-- Routes -->
-        <item name="Route Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+        <item name="Route Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true" match_expression="-&quot;network:type&quot;=node_network">
             <link wiki="Relation:network" />
             <space />
             <key key="type" value="network" />
-            <text key="name" text="Name" />
-            <optional>
-                <text key="network" text="Network" />
+            <text key="network" text="Network" />
+            <optional>
+                <text key="name" text="Name" />
                 <text key="operator" text="Operator" />
             </optional>
@@ -9002 +9002 @@
             </roles>
         </item> <!-- Route Network -->
+        <item name="Route Node Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
+            <link wiki="Cycle_Node_Network_Tagging#(C)_Network_tagging" />
+            <space />
+            <key key="type" value="network" />
+            <key key="network:type" value="node_network" />
+            <combo key="network" text="Network" values="icn,ncn,rcn,lcn,iwn,nwn,rwn,lwn" display_values="international cycling,national cycling,regional cycling,local cycling,international walking,national walking,regional walking,local walking" values_context="network" values_sort="false"/>
+            <optional>
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+            </optional>
+            <roles>
+                <role key="" text="route" requisite="required" type="relation" member_expression="&quot;network:type&quot;=node_network (type=route|type=network)" />
+                <role key="" text="junction" requisite="required" type="node" member_expression="&quot;network:type&quot;=node_network" />
+                <role key="connection" text="connection route" requisite="optional" type="relation" member_expression="&quot;network:type&quot;=node_network type=route" />
+                <role key="connection" text="connection junction" requisite="optional" type="node" member_expression="&quot;network:type&quot;=node_network" />
+            </roles>
+        </item> <!-- Route Node Network -->
         <separator/>
         <item name="Associated Street" icon="presets/misc/housenumber.svg" type="relation" preset_name_label="true">