Ticket #19382: josm_route_aerial_update.patch

File josm_route_aerial_update.patch, 28.2 KB (added by skyper, 4 years ago)

patch

  • src/org/openstreetmap/josm/resources/data/defaultpresets.xml

     
    217217    <chunk id="fee_interval">
    218218        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_no_i18n="true" values_sort="false" />
    219219    </chunk>
     220    <chunk id="oh_fee">
     221        <reference ref="oh" />
     222        <reference ref="fee" />
     223    </chunk>
     224    <chunk id="duration">
     225        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     226    </chunk>
     227    <chunk id="interval">
     228        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     229    </chunk>
     230    <chunk id="oh_duration_interval_fee_">
     231        <reference ref="oh" />
     232        <reference ref="duration" />
     233        <reference ref="interval" />
     234        <reference ref="fee" />
     235    </chunk>
    220236    <chunk id="parking_name_type_ref">
    221237        <text key="name" text="Name" />
    222238        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
    … …  
    264280        <check key="roundtrip" text="Roundtrip"/>
    265281        <text key="symbol" text="Symbol description"/>
    266282        <text key="description" text="Description"/>
     283        <text key="website" text="Website" />
    267284    </chunk>
    268285    <chunk id="genus_species_taxon">
    269286        <text key="genus" text="Genus" />
    … …  
    290307        </combo>
    291308    </chunk>
    292309    <!-- start of religions and denominations -->
    293         <chunk id="religious"> <!-- all religions and denominations -->
    294             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
    295             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
    296         </chunk>
    297         <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
    298             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
    299             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    300         </chunk>
    301         <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    302             <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    303         </chunk>
    304         <chunk id="christian_denominations"> <!-- christian denominations -->
    305             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    306         </chunk>
    307         <chunk id="muslim_denominations"> <!-- muslim denominations -->
    308             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    309         </chunk>
    310         <chunk id="jewish_denominations"> <!-- jewish denominations -->
    311             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
    312         </chunk>
    313         <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
    314             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    315         </chunk>
    316         <chunk id="hindu_denominations"> <!-- hindu denominations -->
    317             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    318         </chunk>
    319         <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     310    <chunk id="religious"> <!-- all religions and denominations -->
     311        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
     312        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
     313    </chunk>
     314    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     315        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
     316        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     317    </chunk>
     318    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     319        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     320    </chunk>
     321    <chunk id="christian_denominations"> <!-- christian denominations -->
     322        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
     323    </chunk>
     324    <chunk id="muslim_denominations"> <!-- muslim denominations -->
     325        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     326    </chunk>
     327    <chunk id="jewish_denominations"> <!-- jewish denominations -->
     328        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     329    </chunk>
     330    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     331        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     332    </chunk>
     333    <chunk id="hindu_denominations"> <!-- hindu denominations -->
     334        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     335    </chunk>
     336    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    320337    <!-- end of religions and denominations -->
    321338    <chunk id="voltage">
    322339        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
    … …  
    457474    </chunk>
    458475    <chunk id="car_brands">
    459476    <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
    460   </chunk>
    461   <chunk id="motorcycle_brands">
    462     <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
    463   </chunk>
    464   <chunk id="walking_routes_roles">
    465      <roles>
    466          <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    467          <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    468          <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    469          <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    470      </roles>
    471   </chunk>
    472   <chunk id="route_segment_roles">
    473      <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    474      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    475      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    476      <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    477   </chunk>
    478   <chunk id="route_start_stop_roles">
    479      <role key="start" text="start endpoint" requisite="optional" type="node" />
    480      <role key="stop" text="stop endpoint" requisite="optional" type="node" />
    481      <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    482   </chunk>
    483   <!-- Link chunks -->
    484   <chunk id="link_contact_address">
    485     <preset_link preset_name="Contact (Common Schema)" />
    486     <preset_link preset_name="Address" />
    487   </chunk>
    488   <chunk id="link_contact_address_payment">
    489     <preset_link preset_name="Contact (Common Schema)" />
    490     <preset_link preset_name="Address" />
     477    </chunk>
     478    <chunk id="motorcycle_brands">
     479        <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
     480    </chunk>
     481    <chunk id="walking_routes_roles">
     482        <roles>
     483            <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
     484            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     485            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
     486            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     487        </roles>
     488    </chunk>
     489    <chunk id="route_segment_roles">
     490        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     491        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     492        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     493        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     494    </chunk>
     495    <chunk id="route_start_stop_roles">
     496        <role key="start" text="start endpoint" requisite="optional" type="node" />
     497        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     498        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
     499    </chunk>
     500    <!-- Link chunks -->
     501    <chunk id="link_contact_address">
     502        <preset_link preset_name="Contact (Common Schema)" />
     503        <preset_link preset_name="Address" />
     504    </chunk>
     505    <chunk id="link_contact_address_payment">
     506        <preset_link preset_name="Contact (Common Schema)" />
     507        <preset_link preset_name="Address" />
    491508    <preset_link preset_name="Payment Methods" />
    492   </chunk>
    493   <chunk id="public_transport_route_optionals">
    494     <text key="from" text="From (initial stop)" />
    495     <text key="to" text="To (terminal stop)" />
    496     <text key="via" text="Via (intermediate stops)" />
    497     <text key="operator" text="Operator" />
    498     <text key="network" text="Network" />
    499     <text key="description" text="Description" />
    500     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    501     <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    502     <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    503   </chunk>
    504   <chunk id="climbing_styles">
    505     <label text="Climbing styles:" />
    506     <checkgroup columns="2">
    507       <check key="climbing:boulder" text="Boulders" />
    508       <check key="climbing:sport" text="Sport climbing" />
    509          <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
    510          <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
    511       <check key="climbing:multipitch" text="Multi-pitch climbing" />
    512       <check key="climbing:ice" text="Ice climbing" />
    513       <check key="climbing:mixed" text="Mixed climbing" />
    514       <check key="climbing:deepwater" text="Deep Water Soloing" />
    515     </checkgroup>
    516   </chunk>
    517   <chunk id="climbing_optional_attributes">
    518     <optional>
    519       <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
    520       <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
    521       <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
    522       <check key="climbing:summit_log" text="Summit/route log/register" />
    523       <check key="indoor" text="Climbing routes indoor" />
    524       <check key="outdoor" text="Climbing routes outdoor" />           
    525       <text key="website" text="Official web site (e.g. operator)" />
    526       <text key="url" text="Unofficial web site" />
    527       <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" values_sort="false" />
    528       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
    529       <reference ref="POI_access" />
    530     </optional>
    531   </chunk>
     509    </chunk>
     510    <chunk id="public_transport_route_optionals">
     511        <text key="from" text="From (initial stop)" />
     512        <text key="to" text="To (terminal stop)" />
     513        <text key="via" text="Via (intermediate stops)" />
     514        <text key="operator" text="Operator" />
     515        <text key="network" text="Network" />
     516        <text key="description" text="Description" />
     517        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     518        <reference ref="oh_duration_interval_fee_" />
     519        <text key="website" text="Website" />
     520    </chunk>
     521    <chunk id="climbing_styles">
     522        <label text="Climbing styles:" />
     523        <checkgroup columns="2">
     524            <check key="climbing:boulder" text="Boulders" />
     525            <check key="climbing:sport" text="Sport climbing" />
     526            <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
     527            <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
     528            <check key="climbing:multipitch" text="Multi-pitch climbing" />
     529            <check key="climbing:ice" text="Ice climbing" />
     530            <check key="climbing:mixed" text="Mixed climbing" />
     531            <check key="climbing:deepwater" text="Deep Water Soloing" />
     532        </checkgroup>
     533    </chunk>
     534    <chunk id="climbing_optional_attributes">
     535        <optional>
     536            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
     537            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
     538            <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
     539            <check key="climbing:summit_log" text="Summit/route log/register" />
     540            <check key="indoor" text="Climbing routes indoor" />
     541            <check key="outdoor" text="Climbing routes outdoor" />           
     542            <text key="website" text="Official web site (e.g. operator)" />
     543            <text key="url" text="Unofficial web site" />
     544            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" values_sort="false" />
     545            <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
     546            <reference ref="POI_access" />
     547        </optional>
     548    </chunk>
     549    <chunk id="aerialway_capacity">
     550        <text key="aerialway:capacity" text="Number of people per hour" />
     551    </chunk>
     552    <chunk id="aerialway_duration">
     553        <text key="aerialway:duration" text="Typical journey time in minutes" />
     554    </chunk>
     555    <chunk id="aerialway_capacity_duration">
     556        <optional>
     557            <reference ref="aerialway_capacity" />
     558            <reference ref="aerialway_duration" />
     559            <reference ref="oh_fee" />
     560        </optional>
     561    </chunk>
     562    <chunk id="aerialway_optionals">
     563        <reference ref="aerialway_capacity" />
     564        <text key="aerialway:occupancy" text="Number of people per car" />
     565        <reference ref="aerialway_duration" />
     566        <check key="aerialway:heating" text="Has heating?" />
     567    </chunk>
     568    <chunk id="aerialway_optionals_bubble">
     569        <optional>
     570            <reference ref="aerialway_optionals" />
     571            <check key="aerialway:bubble" text="Has bubble?" />
     572            <reference ref="oh_fee" />
     573        </optional>
     574    </chunk>
    532575  <!--  Groups -->
    533576  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    534577    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
    … …  
    18581901            <key key="route" value="ferry" />
    18591902            <optional>
    18601903                <reference ref="name_ref_operator" />
    1861                 <reference ref="oh_wheelchair" />
     1904                <reference ref="wheelchair" />
    18621905                <space />
    1863                 <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    1864                 <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    1865                 <reference ref="fee" />
     1906                <reference ref="oh_duration_interval_fee_" />
    18661907                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
    18671908                <check key="ferry:cable" text="Reaction ferry" />
    18681909            </optional>
    … …  
    21062147            <link wiki="Tag:aerialway=cable_car" />
    21072148            <space />
    21082149            <key key="aerialway" value="cable_car" />
    2109             <reference ref="name_ref" />
     2150            <reference ref="name_ref_operator" />
    21102151            <optional>
    2111                 <text key="aerialway:capacity" text="Number of people per hour" />
    2112                 <text key="aerialway:occupancy" text="Number of people per car" />
    2113                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2114                 <check key="aerialway:heating" text="Has heating?" />
     2152                <reference ref="aerialway_optionals" />
     2153                <reference ref="oh_fee" />
    21152154            </optional>
    21162155        </item> <!-- Cable Car -->
    21172156        <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true">
    21182157            <link wiki="Tag:aerialway=chair_lift" />
    21192158            <space />
    21202159            <key key="aerialway" value="chair_lift" />
    2121             <reference ref="name_ref" />
    2122             <optional>
    2123                 <text key="aerialway:capacity" text="Number of people per hour" />
    2124                 <text key="aerialway:occupancy" text="Number of people per chair" />
    2125                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2126                 <check key="aerialway:bubble" text="Has bubble?" />
    2127                 <check key="aerialway:heating" text="Has heating?" />
    2128             </optional>
     2160            <reference ref="name_ref_operator" />
     2161            <reference ref="aerialway_optionals_bubble" />
    21292162        </item> <!-- Chair Lift -->
    21302163        <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true">
    21312164            <link wiki="Tag:aerialway=gondola" />
    21322165            <space />
    21332166            <key key="aerialway" value="gondola" />
    2134             <reference ref="name_ref" />
     2167            <reference ref="name_ref_operator" />
    21352168            <optional>
    2136                 <text key="aerialway:capacity" text="Number of people per hour" />
    2137                 <text key="aerialway:occupancy" text="Number of people per gondola" />
    2138                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2139                 <check key="aerialway:heating" text="Has heating?" />
     2169                <reference ref="aerialway_optionals" />
     2170                <reference ref="oh_fee" />
    21402171            </optional>
    21412172        </item> <!-- Gondola -->
    21422173        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
    21432174            <link wiki="Tag:aerialway=mixed_lift" />
    21442175            <space />
    21452176            <key key="aerialway" value="mixed_lift" />
    2146             <reference ref="name_ref" />
    2147             <optional>
    2148                 <text key="aerialway:capacity" text="Number of people per hour" />
    2149                 <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
    2150                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2151                 <check key="aerialway:bubble" text="Has bubble?" />
    2152                 <check key="aerialway:heating" text="Has heating?" />
    2153             </optional>
     2177            <reference ref="name_ref_operator" />
     2178            <reference ref="aerialway_optionals_bubble" />
    21542179        </item> <!-- Mixed Lift -->
    21552180        <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true">
    21562181            <link wiki="Tag:aerialway=drag_lift" />
    21572182            <space />
    21582183            <combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
    2159             <reference ref="name_ref" />
    2160             <optional>
    2161                 <text key="aerialway:capacity" text="Number of people per hour" />
    2162                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2163             </optional>
     2184            <reference ref="name_ref_operator" />
     2185            <reference ref="aerialway_capacity_duration" />
    21642186        </item> <!-- Drag Lift -->
    21652187        <item name="Magic Carpet" icon="presets/transport/aerialway/magic_carpet.svg" type="way" preset_name_label="true">
    21662188            <link wiki="Tag:aerialway=magic_carpet" />
    21672189            <space />
    21682190            <key key="aerialway" value="magic_carpet" />
    2169             <reference ref="name_ref" />
    2170             <optional>
    2171                 <text key="aerialway:capacity" text="Number of people per hour" />
    2172                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2173             </optional>
     2191            <reference ref="name_ref_operator" />
     2192            <reference ref="aerialway_capacity_duration" />
    21742193        </item> <!-- Magic Carpet -->
    21752194        <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true">
    21762195            <link wiki="Tag:aerialway=goods" />
    21772196            <space />
    21782197            <key key="aerialway" value="goods" />
    2179             <reference ref="name_ref" />
     2198            <reference ref="name_ref_operator" />
     2199            <reference ref="fee" />
    21802200            <optional>
    2181                 <text key="aerialway:duration" text="Typical journey time in minutes" />
     2201                <reference ref="aerialway_duration" />
    21822202            </optional>
    21832203        </item> <!-- Goods -->
    21842204        <item name="Zip line" icon="presets/transport/aerialway/zip_line.svg" type="way" preset_name_label="true">
    … …  
    21872207            <key key="aerialway" value="zip_line" />
    21882208            <optional>
    21892209                <reference ref="name_ref_operator" />
    2190                 <reference ref="oh" />
    2191                 <reference ref="fee" />
     2210                <reference ref="oh_fee" />
    21922211                <reference ref="min_age" />
    21932212                <text key="maxweight" text="Max. weight (tonnes)" />
    21942213            </optional>
    … …  
    25472566                <text key="operator" text="Operator" />
    25482567                <text key="network" text="Network" />
    25492568                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     2569                <text key="website" text="Website" />
    25502570            </optional>
    25512571            <roles>
    25522572                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- fixme: at least 2 members are required -->
    … …  
    26572677                <text key="network" text="Network" />
    26582678                <text key="description" text="Description" />
    26592679                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     2680                <reference ref="oh_fee" />
     2681                <text key="website" text="Website" />
    26602682            </optional>
    26612683            <roles>
    26622684                <role key="" text="route segment" requisite="optional" type="way,closedway" />