Skip to content

Commit

Permalink
Add embedded_rails support
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonpoole
simonpoole committed Sep 26, 2023
1 parent eba1cc7 commit 0d3674a
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ repositories {
}

ext {
version = '5.15.0'
version = '5.16.0'
preset_file = 'master_preset.xml'
mapped_josm_preset_file = 'mapped_josm_preset.xml'
mapped_vespucci_preset_file = 'mapped_vespucci_preset.xml'
Expand Down
47 changes: 39 additions & 8 deletions master_preset.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<presets version="5.15.0" xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM"
<presets version="5.16.0" xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM"
description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version"
object_keys="advertising,attraction,building:part,cemetery,club,disused:amenity,disused:leisure,disused:man_made,golf,hazard,noexit,disused:shop,ford,indoor,playground,police,public_transport,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,telecom,mountain_pass,marker">
<!--
Expand Down Expand Up @@ -478,6 +478,18 @@
<list_entry value="XIb"/>
<list_entry value="XIc"/>
</chunk>
<chunk id="embedded_rails_values">
<list_entry value="abandoned" display_value="Abandoned"/>
<list_entry value="construction" display_value="Construction"/>
<list_entry value="disused" display_value="Disused"/>
<list_entry value="funicular" display_value="Funicular"/>
<list_entry value="light_rail" display_value="Light rail"/>
<list_entry value="miniature" display_value="Miniature"/>
<list_entry value="narrow_gauge" display_value="Narroe guage"/>
<list_entry value="rail" display_value="Rail"/>
<list_entry value="tram" display_value="Tram"/>
<list_entry value="yes" display_value="Yes"/>
</chunk>
<!-- Item chunks -->
<chunk id="incline">
<combo key="incline" text="Incline" values="10%,-10%,10&#xB0;,-10&#xB0;,up,down" display_values="10%,-10%,10&#xB0;,-10&#xB0;,Up,Down" values_sort="false"/>
Expand Down Expand Up @@ -698,6 +710,12 @@
<check key="noref" text="No reference" disable_off="true" />
</optional>
</chunk>
<chunk id="highway_public_transport">
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<combo key="embedded_rails" text="Embedded rails">
<reference ref="embedded_rails_values"/>
</combo>
</chunk>
<chunk id="crossing_type">
<multiselect key="crossing" text="Crossing type" values_context="pedestrian" text_context="pedestrian">
<list_entry value="uncontrolled" short_description="Not controlled" icon="${crossing}"/>
Expand Down Expand Up @@ -2321,7 +2339,7 @@
<check key="motorroad" text="Motorroad" disable_off="true"/>
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2343,6 +2361,7 @@
<check key="motorroad" text="Motorroad" disable_off="true"/>
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2362,7 +2381,7 @@
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport"/>
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2382,6 +2401,7 @@
<text key="destination" text="Destination" />
<text key="destination:ref" text="Destination reference" />
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2401,7 +2421,7 @@
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2419,6 +2439,7 @@
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand All @@ -2437,7 +2458,7 @@
<reference ref="highway_ref"/>
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk_winter"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<check key="passing_places" text="Passing Places" disable_off="true"/>
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
Expand All @@ -2458,7 +2479,7 @@
<reference ref="highway_ref"/>
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="shoulder"/>
</optional>
Expand Down Expand Up @@ -2504,7 +2525,7 @@
<reference ref="surface_smoothness"/>
<check key="dual_carriageway" text="Divided highway" disable_off="true" />
<reference ref="highway_additional_oneway_lit_width"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<reference ref="parking_lane"/>
<reference ref="bus_bay"/>
</optional>
Expand All @@ -2522,6 +2543,7 @@
<reference ref="surface_smoothness"/>
<check key="area" text="Area" disable_off="true"/>
<reference ref="highway_additional"/>
<reference ref="highway_public_transport" />
<check key="lit" text="Lit" disable_off="true"/>
<text key="width" text="Width (meters)" value_type="dimension_horizontal"/>
</optional>
Expand Down Expand Up @@ -2616,7 +2638,7 @@
<text key="name" text="Name"/>
<reference ref="highway_base"/>
<reference ref="highway_additional_oneway_lit_width_sidewalk"/>
<check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
<reference ref="highway_public_transport" />
<combo key="junction" text="Junction" values="roundabout,jughandle,yes"/>
</optional>
<reference ref="road_access_restrictions"/>
Expand Down Expand Up @@ -2686,6 +2708,9 @@
<multiselect key="hgv:lanes" text="HGV lane access" delimiter="|" match="key" editable="true">
<reference ref="lane_access_values"/>
</multiselect>
<multiselect key="embedded_rails:lanes" text="Lanes with rails" delimiter="|" match="key" editable="true">
<reference ref="embedded_rails_values"/>
</multiselect>
</optional>
</item> <!-- Single direction roads -->
<item name="Bi-directional roads" icon="${lane_bi_directional}" type="way,closedway" preset_name_label="true">
Expand Down Expand Up @@ -2716,6 +2741,9 @@
<multiselect key="hgv:lanes:forward" text="HGV lane access in way direction" delimiter="|" match="key" editable="true">
<reference ref="lane_access_values"/>
</multiselect>
<multiselect key="embedded_rails:lanes:forward" text="Lanes with rails" delimiter="|" match="key" editable="true">
<reference ref="embedded_rails_values"/>
</multiselect>
</optional>
<!-- backwards -->
<multiselect key="turn:lanes:backward" text="Turning lanes opposite to way direction" delimiter="|" match="key" editable="true" >
Expand All @@ -2740,6 +2768,9 @@
<multiselect key="hgv:lanes:backward" text="HGV lane access opposite to way direction" delimiter="|" match="key" editable="true">
<reference ref="lane_access_values"/>
</multiselect>
<multiselect key="embedded_rails:lanes:backwards" text="Lanes with rails" delimiter="|" match="key" editable="true">
<reference ref="embedded_rails_values"/>
</multiselect>
</optional>
</item> <!-- Bi-directional roads -->
<item name="Public transport lanes" icon="${lane_public_transport}" type="way,closedway" preset_name_label="true">
Expand Down

0 comments on commit 0d3674a

Please sign in to comment.