Skip to content

Commit c5e5fec

Browse files
simonpoolesimonpoole
committed
Create two versions of all traffic sign presets
This adds separate versions of the traffic sign presets for separate nodes and for way nodes with match_expressions. The later is supported in Vespucci 20.2. Fixes #467
1 parent afb6580 commit c5e5fec

File tree

1 file changed

+68
-25
lines changed

1 file changed

+68
-25
lines changed

‎master_preset.xml

Lines changed: 68 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -904,9 +904,25 @@
904904
<check key="embankment" text="Embankment" disable_off="true"/>
905905
</optional>
906906
</chunk>
907-
<chunk id="traffic_signals_direction">
908-
<combo key="direction" text="For traffic direction" values="forward,backward,N,E,S,W,0,90,180,270"
909-
display_values="Forward,Backward,North,East,South,West,0°,90°,180°,270°" values_sort="false" value_type="cardinal_direction" />
907+
<chunk id="traffic_sign_direction">
908+
<combo key="direction" text="For traffic direction" values="forward,backward"
909+
display_values="Forward,Backward" values_sort="false" match="key" />
910+
</chunk>
911+
<chunk id="traffic_sign_direction_standalone">
912+
<combo key="direction" text="Facing" values="N,E,S,W,0,90,180,270"
913+
display_values="North,East,South,West,0°,90°,180°,270°" values_sort="false" match="key" value_type="cardinal_direction" />
914+
</chunk>
915+
<chunk id="city_limit_base">
916+
<link wiki="Tag:traffic_sign=city_limit"/>
917+
<space/>
918+
<key key="traffic_sign" value="city_limit"/>
919+
<text key="name" text="Name"/>
920+
<text key="alt_name" text="Alternate name" alternative_autocomplete_keys="name" />
921+
<combo key="city_limit" values="begin,end,both" display_values="Begin,End,Both" values_sort="false" />
922+
<combo key="colour:back" text="Background colour" values_context="colour" >
923+
<reference ref="colour_values"/>
924+
</combo>
925+
<preset_link preset_name="Name"/>
910926
</chunk>
911927
<chunk id="min_age">
912928
<text key="min_age" text="Minimum age"/>
@@ -3747,17 +3763,28 @@
37473763
<text key="name" text="Name"/>
37483764
</optional>
37493765
</item> <!-- Traffic Signal -->
3750-
<item name="Stop" icon="${highway_stop}" type="node" preset_name_label="true">
3766+
<item name="Stop" icon="${highway_stop}" type="node" preset_name_label="true" match_expression="child highway=*">
37513767
<link wiki="Tag:highway=stop"/>
37523768
<key key="highway" value="stop"/>
37533769
<combo key="stop" text="Type" values="all,minor" display_values="All,Minor"/>
3754-
<reference ref="traffic_signals_direction" />
3770+
<reference ref="traffic_sign_direction" />
37553771
</item> <!-- Stop -->
3756-
<item name="Give Way" icon="${highway_give_way}" type="node" preset_name_label="true">
3772+
<item name="Stop (separate)" icon="${highway_stop}" type="node" preset_name_label="true" match_expression="-child highway=*">
3773+
<link wiki="Tag:highway=stop"/>
3774+
<key key="highway" value="stop"/>
3775+
<combo key="stop" text="Type" values="all,minor" display_values="All,Minor"/>
3776+
<reference ref="traffic_sign_direction_standalone" />
3777+
</item> <!-- Stop (separate)-->
3778+
<item name="Give Way" icon="${highway_give_way}" type="node" preset_name_label="true" match_expression="child highway=*">
37573779
<link wiki="Tag:highway=give_way"/>
37583780
<key key="highway" value="give_way"/>
3759-
<reference ref="traffic_signals_direction" />
3781+
<reference ref="traffic_sign_direction" />
37603782
</item> <!-- Give Way -->
3783+
<item name="Give Way (separate)" icon="${highway_give_way}" type="node" preset_name_label="true" match_expression="-child highway=*">
3784+
<link wiki="Tag:highway=give_way"/>
3785+
<key key="highway" value="give_way"/>
3786+
<reference ref="traffic_sign_direction_standalone" />
3787+
</item> <!-- Give Way (separate) -->
37613788
<item name="Advanced stop line" icon="${highway_cycleway_asl}" type="node" preset_name_label="true">
37623789
<link wiki="Tag:cycleway=asl" />
37633790
<key key="cycleway" value="asl" object="true" />
@@ -3883,40 +3910,56 @@
38833910
<link wiki="Tag:highway=turning_loop"/>
38843911
<key key="highway" value="turning_loop"/>
38853912
</item> <!-- Turning Loop -->
3886-
<item name="City Limit" icon="${traffic_sign_city_limit}" type="node" preset_name_label="true">
3887-
<link wiki="Tag:traffic_sign=city_limit"/>
3888-
<space/>
3889-
<key key="traffic_sign" value="city_limit"/>
3890-
<text key="name" text="Name"/>
3891-
<text key="alt_name" text="Alternate name" alternative_autocomplete_keys="name" />
3892-
<combo key="city_limit" values="begin,end,both" display_values="Begin,End,Both" values_sort="false" />
3893-
<reference ref="traffic_signals_direction" />
3894-
<combo key="colour:back" text="Background colour" values_context="colour" >
3895-
<reference ref="colour_values"/>
3896-
</combo>
3897-
<preset_link preset_name="Name"/>
3913+
<item name="City limit" icon="${traffic_sign_city_limit}" type="node" preset_name_label="true" match_expression="child highway=*">
3914+
<reference ref="city_limit_base" />
3915+
<reference ref="traffic_sign_direction" />
38983916
</item> <!-- City Limit -->
3899-
<item name="Speed Limit Sign" icon="${traffic_sign_speed_limit}" type="node" preset_name_label="true">
3917+
<item name="City limit (separate)" icon="${traffic_sign_city_limit}" type="node" preset_name_label="true" match_expression="-child highway=*">
3918+
<reference ref="city_limit_base" />
3919+
<reference ref="traffic_sign_direction_standalone" />
3920+
</item> <!-- City Limit (separate)-->
3921+
<item name="Speed limit sign" icon="${traffic_sign_speed_limit}" type="node" preset_name_label="true" match_expression="child highway=*">
39003922
<link wiki="Key:traffic_sign"/>
39013923
<space/>
39023924
<key key="traffic_sign" value="maxspeed"/>
39033925
<reference ref="maxspeed"/>
3904-
<reference ref="traffic_signals_direction" />
3926+
<reference ref="traffic_sign_direction" />
39053927
</item> <!-- Speed Limit Sign -->
3906-
<item name="Stop sign" icon="${traffic_sign_stop}" type="node" preset_name_label="true">
3928+
<item name="Speed limit sign (separate)" icon="${traffic_sign_speed_limit}" type="node" preset_name_label="true" match_expression="-child highway=*">
3929+
<link wiki="Key:traffic_sign"/>
3930+
<space/>
3931+
<key key="traffic_sign" value="maxspeed"/>
3932+
<reference ref="maxspeed"/>
3933+
<reference ref="traffic_sign_direction_standalone" />
3934+
</item> <!-- Speed Limit Sign (separate)-->
3935+
<item name="Stop sign" icon="${traffic_sign_stop}" type="node" preset_name_label="true" match_expression="child highway=*">
39073936
<link wiki="Key:traffic_sign"/>
39083937
<space/>
39093938
<key key="traffic_sign" value="stop"/>
3910-
<reference ref="traffic_signals_direction" />
3939+
<reference ref="traffic_sign_direction" />
39113940
</item> <!-- Stop sign -->
3912-
<item name="Traffic sign" icon="${traffic_sign}" type="node" preset_name_label="true">
3941+
<item name="Stop sign (separate)" icon="${traffic_sign_stop}" type="node" preset_name_label="true" match_expression="-child highway=*">
3942+
<link wiki="Key:traffic_sign"/>
3943+
<space/>
3944+
<key key="traffic_sign" value="stop"/>
3945+
<reference ref="traffic_sign_direction_standalone" />
3946+
</item> <!-- Stop sign (separate)-->
3947+
<item name="Traffic sign" icon="${traffic_sign}" type="node" preset_name_label="true" match_expression="child highway=*">
39133948
<link wiki="Key:traffic_sign"/>
39143949
<space/>
39153950
<combo key="traffic_sign" text="Traffic sign" match="key" editable="true">
39163951
<reference ref="traffic_sign_values"/>
39173952
</combo>
3918-
<reference ref="traffic_signals_direction" />
3953+
<reference ref="traffic_sign_direction" />
39193954
</item> <!-- Traffic sign -->
3955+
<item name="Traffic sign (separate)" icon="${traffic_sign}" type="node" preset_name_label="true" match_expression="-child highway=*">
3956+
<link wiki="Key:traffic_sign"/>
3957+
<space/>
3958+
<combo key="traffic_sign" text="Traffic sign" match="key" editable="true">
3959+
<reference ref="traffic_sign_values"/>
3960+
</combo>
3961+
<reference ref="traffic_sign_direction_standalone" />
3962+
</item> <!-- Traffic sign (separate)-->
39203963
<item name="Traffic Sign Forward" text="Traffic sign forward" icon="${traffic_sign_forward}" type="node" preset_name_label="true">
39213964
<link wiki="Key:traffic_sign"/>
39223965
<space/>

0 commit comments

Comments
 (0)