Update default preset and taginfo project files

MarcusWolschon · Dec 31, 2024 · 666783a · 666783a
1 parent 466920f
commit 666783a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/assets/preset.xml b/src/main/assets/preset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.66.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,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,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,">
+<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.68.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,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,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,">
 <!--
     Icons have been derived from mainly from
 
@@ -5194,6 +5194,10 @@
                         <check key="fuel:biogas" text="Biogas" disable_off="true"/>
                         <check key="fuel:1_25" text="1/25 mix (mofa/moped)" disable_off="true"/>
                         <check key="fuel:1_50" text="1/50 mix (mofa/moped)" disable_off="true"/>
+                        <check key="fuel:LH2" text="Liquid hydrogen" disable_off="true"/>
+                        <check key="fuel:h35" text="Hydrogen gas (350 bar)" disable_off="true"/>
+                        <check key="fuel:h50" text="Hydrogen gas (500 bar)" disable_off="true"/>
+                        <check key="fuel:h70" text="Hydrogen gas (700 bar)" disable_off="true"/>
                     </checkgroup>
                     <space/>
                     <label text="Additives:"/>
@@ -7930,6 +7934,7 @@
                 <reference ref="school_common"/>
             </optional>
             <reference ref="link_contact_address"/>
+            <preset_link preset_name="Driver training" text="Similar but different tags:" alternative="true"/>
         </item> <!-- Driving School -->
         <item name="Driver training" icon="icons/png/education_motorsport_track.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=driver_training"/>
@@ -7939,6 +7944,7 @@
             <reference ref="optional_oh"/>
             <reference ref="licence_classes"/>
             <reference ref="link_contact_address"/>
+            <preset_link preset_name="Driving School" text="Similar but different tags:" alternative="true"/>
         </item> <!-- Driver training -->
         <item name="Music School" icon="icons/png/education_musical_instrument_29107.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=music_school"/>
@@ -13571,7 +13577,7 @@
             <reference ref="name_wikipedia"/>
             <text key="ele" text="Elevation (meters)" length="10"/>
             <optional>
-            <combo key="volcano:status" text="Current Status">
+            <combo key="volcano:status" text="Current Status" values_context="volcano">
                 <list_entry value="active" display_value="Active"/>
                 <list_entry value="dormant" display_value="Dormant" short_description="Was active in historical times"/>
                 <list_entry value="extinct" display_value="Extinct" short_description="Not erupted in recorded history"/>

diff --git a/taginfo-style.json b/taginfo-style.json
@@ -96,7 +96,7 @@
 {"description":"Data rendering","key": "railway","object_types": ["way"]},
 {"description":"Data rendering","key": "railway","value": "funicular","object_types": ["way"]},
 {"description":"Data rendering","key": "railway","value": "light_rail","object_types": ["way"]},
-{"description":"Data rendering","key": "railway","value": "minature","object_types": ["way"]},
+{"description":"Data rendering","key": "railway","value": "miniature","object_types": ["way"]},
 {"description":"Data rendering","key": "railway","value": "monorail","object_types": ["way"]},
 {"description":"Data rendering","key": "railway","value": "narrow_gauge","object_types": ["way"]},
 {"description":"Data rendering","key": "railway","value": "platform","object_types": ["area"]},

diff --git a/taginfo.json b/taginfo.json
@@ -10473,6 +10473,10 @@
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:biogas","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:1_25","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:1_50","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:LH2","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:h35","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:h50","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:h70","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:adblue","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "payment:dkv","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "payment:routex","object_types": ["node","area"]},