Skip to content

Commit 8bb961d

Browse files
simonpoolesimonpoole
committed
Update default preset and taginfo project file
1 parent 0119fa2 commit 8bb961d

File tree

2 files changed

+216
-30
lines changed

2 files changed

+216
-30
lines changed

‎src/main/assets/preset.xml‎

Lines changed: 78 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.95.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,area:highway,building:part,cemetery,club,departures_board,disc_golf,golf,ford,harbour,hazard,noexit,indoor,indoormark,playground,pipeline,piste:type,police,public_transport,seamark:type,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom,roller_coaster,climbing,road_marking,disused:amenity,disused:building,disused:highway,disused:leisure,disused:man_made,disused:military,disused:railway,disused:shop,abandoned:amenity,abandoned:building,abandoned:highway,abandoned:leisure,abandoned:man_made,abandoned:military,abandoned:railway,abandoned:shop">
2+
<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.96.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,area:highway,building:part,cemetery,club,departures_board,disc_golf,golf,ford,harbour,hazard,noexit,indoor,indoormark,playground,pipeline,piste:type,police,public_transport,seamark:type,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom,roller_coaster,climbing,road_marking,disused:amenity,disused:building,disused:highway,disused:leisure,disused:man_made,disused:military,disused:railway,disused:shop,abandoned:amenity,abandoned:building,abandoned:highway,abandoned:leisure,abandoned:man_made,abandoned:military,abandoned:railway,abandoned:shop">
33
<!--
44
Icons have been derived from mainly from
55

@@ -824,7 +824,7 @@
824824
<combo key="fast_food" text="Fast food service" values="cafeteria,yes" display_values="Cafeteria,Yes"/>
825825
</chunk>
826826
<chunk id="cuisine">
827-
<multiselect key="cuisine" text="Cuisine" values_searchable="true" match="key">
827+
<multiselect key="cuisine" text="Cuisine" values_searchable="true" match="key" values_context="cuisine">
828828
<list_entry value="african" display_value="African"/>
829829
<list_entry value="american" display_value="American"/>
830830
<list_entry value="arab" display_value="Arab"/>
@@ -1501,6 +1501,10 @@
15011501
<chunk id="maxweight">
15021502
<text key="maxweight" text="Max. weight (tonnes)" match="key"/>
15031503
</chunk>
1504+
<chunk id="vehicle_maxweight">
1505+
<text key="maxweight" text="Max. actual vehical weight (tonnes)" match="key" exclude_regions="true" regions="FR"/>
1506+
<text key="maxweightrating" text="Max. rated vehical weight (tonnes)" match="key"/>
1507+
</chunk>
15041508
<chunk id="enforcement_roles">
15051509
<roles>
15061510
<role key="device" text="location of enforcement device" requisite="required" type="node,way,closedway"/>
@@ -1516,7 +1520,7 @@
15161520
<space/>
15171521
<reference ref="maxspeed"/>
15181522
<space/>
1519-
<reference ref="maxweight"/>
1523+
<reference ref="vehicle_maxweight"/>
15201524
<reference ref="incline"/>
15211525
<text key="width" text="Width (meters)" value_type="dimension_horizontal"/>
15221526
<check key="toll" text="Toll" disable_off="true"/>
@@ -3406,6 +3410,9 @@
34063410
<item name="Advanced stop line" icon="icons/png/asl.png" type="node" preset_name_label="true">
34073411
<link wiki="Tag:cycleway=asl"/>
34083412
<key key="cycleway" value="asl" object="true"/>
3413+
<optional>
3414+
<combo key="direction" text="Direction" values="forward,backward" display_values="Forward,Backward" values_sort="false"/>
3415+
</optional>
34093416
</item> <!-- Advanced stop line -->
34103417
<item name="Mini-Roundabout" icon="icons/png/transport_miniroundabout_clockwise.png" type="node" preset_name_label="true">
34113418
<link wiki="Tag:highway=mini_roundabout"/>
@@ -4276,7 +4283,7 @@
42764283
<item name="Physical restrictions" icon="icons/png/maximum_width.png" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
42774284
<link wiki="Key:access"/>
42784285
<space/>
4279-
<reference ref="maxweight"/>
4286+
<reference ref="vehicle_maxweight"/>
42804287
<text key="maxaxleload" text="Max. axle load (tonnes)" match="key"/>
42814288
<text key="maxheight" text="Max. height (meters)" match="key" value_type="dimension_vertical"/>
42824289
<text key="maxwidth" text="Max. width (meters)" match="key" value_type="dimension_horizontal"/>
@@ -11571,7 +11578,7 @@
1157111578
<multiselect key="observatory:type" text="Obervatory type" values_searchable="true">
1157211579
<list_entry value="astronomical" short_description="Astronomical"/>
1157311580
<list_entry value="meteorological" short_description="Meteorological"/>
11574-
<list_entry value="gravitational" short_description="gravitational"/>
11581+
<list_entry value="gravitational" short_description="Gravitational"/>
1157511582
</multiselect>
1157611583
<reference ref="name_wikipedia"/>
1157711584
</item> <!-- Observatory -->
@@ -13883,7 +13890,7 @@
1388313890
<check key="payment:bankaxept" text="BankAxept" match="keyvalue" disable_off="true"/>
1388413891
<check key="payment:girocard" text="Girocard" match="keyvalue" disable_off="true"/>
1388513892
<check key="payment:gpn_debit" text="GPN" match="keyvalue" disable_off="true"/>
13886-
<check key="payment:laser" text="Laser" match="keyvalue" disable_off="true"/>
13893+
<check key="payment:laser" text="Laser" match="keyvalue" disable_off="true" deprecated="true"/>
1388713894
<check key="payment:maestro" text="Maestro" match="keyvalue" disable_off="true"/>
1388813895
<check key="payment:postfinance_card" text="PostFinance Card (ch)" match="keyvalue" disable_off="true" regions="CH"/>
1388913896
<check key="payment:v_pay" text="V Pay" match="keyvalue" disable_off="true"/>
@@ -13908,16 +13915,16 @@
1390813915
<space/>
1390913916
<check key="payment:electronic_purses" text="Electronic purses" match="keyvalue"/>
1391013917
<checkgroup text="Electronic purses type" columns="4">
13911-
<check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" disable_off="true" regions="FI"/>
13918+
<check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" disable_off="true" regions="FI" deprecated="true"/>
1391213919
<check key="payment:ep_beep" text="Beep" match="keyvalue" disable_off="true"/>
1391313920
<check key="payment:ep_brizzi" text="BRIZZI" match="keyvalue" disable_off="true"/>
1391413921
<check key="payment:ep_bsbcash" text="BSB Cash" match="keyvalue" disable_off="true"/>
1391513922
<check key="payment:ep_flazz" text="Flazz" match="keyvalue" disable_off="true"/>
13916-
<check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" disable_off="true" regions="DE"/>
13923+
<check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" disable_off="true" regions="DE" deprecated="true"/>
1391713924
<check key="payment:ep_mandiri_emoney" text="Mandiri e-money" match="keyvalue" disable_off="true"/>
1391813925
<check key="payment:ep_megacash" text="MEGACASH" match="keyvalue" disable_off="true"/>
1391913926
<check key="payment:ep_mep" text="Mep (pt)" match="keyvalue" disable_off="true" regions="PT"/>
13920-
<check key="payment:ep_minicash" text="Minicash (lu)" match="keyvalue" disable_off="true" regions="LU"/>
13927+
<check key="payment:ep_minicash" text="Minicash (lu)" match="keyvalue" disable_off="true" regions="LU" deprecated="true"/>
1392113928
<check key="payment:ep_minipay" text="Minipay (it)" match="keyvalue" disable_off="true" regions="IT"/>
1392213929
<check key="payment:ep_monedero" text="Mondero (ar)" match="keyvalue" disable_off="true" deprecated="true"/>
1392313930
<check key="payment:ep_monedero4b" text="Mondero 4b (es)" match="keyvalue" disable_off="true" regions="ES"/>
@@ -15497,17 +15504,52 @@
1549715504
<role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
1549815505
</roles>
1549915506
</item> <!-- Detour Route -->
15500-
<item name="Power Route" icon="icons/png/osm_route_sp.png" type="relation" preset_name_label="true">
15501-
<link wiki="Tag:route=power"/>
15502-
<space/>
15503-
<key key="type" value="route"/>
15504-
<key key="route" value="power"/>
15505-
<reference ref="name_ref_operator"/>
15506-
<roles>
15507-
<role key="line" text="route segment" requisite="required" type="way" member_expression="power=line|power=cable"/>
15508-
<role key="substation" text="Power Substation" requisite="optional" type="way,closedway,multipolygon" member_expression="power"/>
15509-
</roles>
15510-
</item> <!-- Power Route -->
15507+
<group name="Power" icon="icons/png/power_station_coal.png">
15508+
<item name="Power Route" icon="icons/png/osm_route_sp.png" type="relation" preset_name_label="true" deprecated="true">
15509+
<link wiki="Tag:route=power"/>
15510+
<space/>
15511+
<key key="type" value="route"/>
15512+
<key key="route" value="power"/>
15513+
<reference ref="name_ref_operator"/>
15514+
<roles>
15515+
<role key="line" text="route segment" requisite="required" type="way" member_expression="power=line|power=cable"/>
15516+
<role key="substation" text="Power Substation" requisite="optional" type="way,closedway,multipolygon" member_expression="power"/>
15517+
</roles>
15518+
</item> <!-- Power Route -->
15519+
<item name="Power circuit" icon="icons/png/power_tower_high2.png" type="relation" preset_name_label="true">
15520+
<link wiki="Tag:power=circuit"/>
15521+
<space/>
15522+
<key key="type" value="power"/>
15523+
<key key="power" value="circuit"/>
15524+
<space/>
15525+
<reference ref="cables"/>
15526+
<reference ref="voltage_frequency"/>
15527+
<combo key="topology" text="Circuit topology" values="linear,branched" display_values="Linear,Branched"/>
15528+
<optional>
15529+
<reference ref="name_ref_operator"/>
15530+
</optional>
15531+
<roles>
15532+
<role key="substation" text="Power Substation" requisite="required" type="way,closedway,multipolygon" member_expression="power|substation"/>
15533+
<role key="section" text="Circuit section" requisite="required" type="way,relation" member_expression="power=line|power=cable|power=minor_line|power=line_section"/>
15534+
<role key="tap" text="Tap point" requisite="optional" type="node" member_expression="power=pole|power=tower|power=connection"/>
15535+
</roles>
15536+
</item> <!-- Power circuit -->
15537+
<item name="Power line section" icon="icons/png/power_tower_high2.png" type="relation" preset_name_label="true">
15538+
<link wiki="Tag:power=line_section"/>
15539+
<space/>
15540+
<key key="type" value="power"/>
15541+
<key key="power" value="line_section"/>
15542+
<space/>
15543+
<reference ref="cables"/>
15544+
<reference ref="voltage_frequency"/>
15545+
<optional>
15546+
<reference ref="name_ref_operator"/>
15547+
</optional>
15548+
<roles>
15549+
<role key="line" text="Section segment" requisite="required" type="way" member_expression="power=line|power=cable|power=minor_line"/>
15550+
</roles>
15551+
</item> <!-- Power circuit -->
15552+
</group>
1551115553
<item name="Pipeline route" icon="icons/png/osm_route_sp.png" type="relation" preset_name_label="true">
1551215554
<link wiki="Tag:route=pipeline"/>
1551315555
<space/>
@@ -15547,7 +15589,19 @@
1554715589
<link wiki="Relation:superroute"/>
1554815590
<space/>
1554915591
<key key="type" value="superroute"/>
15550-
<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 bike route,Piste route,Power route,Railway route,Road route,Ski route"/>
15592+
<combo key="route" text="Type">
15593+
<list_entry value="bicycle" display_value="Bicycle route"/>
15594+
<list_entry value="detour" display_value="Detour route"/>
15595+
<list_entry value="foot" display_value="Walking route"/>
15596+
<list_entry value="hiking" display_value="Hiking route"/>
15597+
<list_entry value="horse" display_value="Riding route"/>
15598+
<list_entry value="mtb" display_value="Mountain bike route"/>
15599+
<list_entry value="piste" display_value="Piste route"/>
15600+
<list_entry value="power" display_value="Power route" deprecated="true"/>
15601+
<list_entry value="railway" display_value="Railway route"/>
15602+
<list_entry value="road" display_value="Road route"/>
15603+
<list_entry value="ski" display_value="Ski route"/>
15604+
</combo>
1555115605
<reference ref="name_ref_operator"/>
1555215606
<roles>
1555315607
<role key="" text="Route segment" requisite="required" type="relation" member_expression="type=route"/> <!-- fixme: at least 2 members are required -->
@@ -16665,15 +16719,15 @@
1666516719
<!-- originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
1666616720
before the PropertyEditor was started, tags are the current values, by removing the key at the
1666716721
end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
16668-
<text key="set_to_abandoned" javascript=" var objects = ['amenity','aerialway''aeroway','bridge','building','highway','leisure','man_made','military','place','railway','shop','tourism']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('abandoned:'+key,tags.get(key)); tags.remove(key); } } tags.remove('set_to_abandoned');"/>
16722+
<text key="set_to_abandoned" javascript=" var objects = ['amenity','aerialway','aeroway','bridge','building','highway','leisure','man_made','military','place','railway','shop','tourism']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('abandoned:'+key,tags.get(key)); tags.remove(key); } } tags.remove('set_to_abandoned');"/>
1666916723
</item>
1667016724
<item name="Set to abandoned (remove tags)" icon="icons/png/javascript.png" type="node,way,closedway,relation" preset_name_label="true">
1667116725
<link wiki="Key:abandoned:"/>
1667216726
<!-- This preset will only remove tags on app version 703 and higher (Vespucci 11.1.1)
1667316727
originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
1667416728
before the PropertyEditor was started, tags are the current values, by removing the key at the
1667516729
end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
16676-
<text key="set_to_abandoned_remove_tags" javascript=" var objects = ['amenity','aerialway''aeroway','bridge','building','highway','leisure','man_made','military','place','railway','shop','tourism']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('abandoned:'+key,tags.get(key)); presetItem = key2PresetItem.get(key); tags.remove(key); } if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) { if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) { tags.remove(key); } } } tags.remove('set_to_abandoned_remove_tags');"/>
16730+
<text key="set_to_abandoned_remove_tags" javascript=" var objects = ['amenity','aerialway','aeroway','bridge','building','highway','leisure','man_made','military','place','railway','shop','tourism']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('abandoned:'+key,tags.get(key)); presetItem = key2PresetItem.get(key); tags.remove(key); } if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) { if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) { tags.remove(key); } } } tags.remove('set_to_abandoned_remove_tags');"/>
1667716731
</item>
1667816732
<item name="Abandoned amenity" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
1667916733
<link wiki="Key:abandoned:"/>
@@ -16754,7 +16808,7 @@
1675416808
originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
1675516809
before the PropertyEditor was started, tags are the current values, by removing the key at the
1675616810
end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
16757-
<text key="set_to_demolished_remove_tags" javascript=" var objects = ['building', 'highway','power']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('demolished:'+key,tags.get(key)); presetItem = key2PresetItem.get(key); tags.remove(key); } if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) { if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) { tags.remove(key); } } } tags.remove('set_to_demolished_remove_tags');"/>
16811+
<text key="set_to_demolished_remove_tags" javascript=" var objects = ['building','highway','power']; function isObject(key) { var objectsLength = objects.length; for (var i = 0; i &lt; objectsLength; i++) { if (objects[i].equals(key)) { return true; } } return false; } var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) { if (isObject(key)) { tags.put('demolished:'+key,tags.get(key)); presetItem = key2PresetItem.get(key); tags.remove(key); } if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) { if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) { tags.remove(key); } } } tags.remove('set_to_demolished_remove_tags');"/>
1675816812
</item>
1675916813
<item name="Demolished building" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
1676016814
<link wiki="Key:demolished:"/>

0 commit comments

Comments
 (0)