Ticket #19382: josm_route_aerial_update_v3.patch

File josm_route_aerial_update_v3.patch, 15.0 KB (added by skyper, 4 years ago)

patch without indent adjustment

  • 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" />
    … …  
    502519    <text key="network" text="Network" />
    503520    <text key="description" text="Description" />
    504521    <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" />
    505     <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" />
    506     <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" />
     522    <reference ref="oh_duration_interval_fee_" />
     523    <text key="website" text="Website" />
    507524  </chunk>
    508525  <chunk id="climbing_styles">
    509526    <label text="Climbing styles:" />
    … …  
    533550      <reference ref="POI_access" />
    534551    </optional>
    535552  </chunk>
     553    <chunk id="aerialway_capacity">
     554        <text key="aerialway:capacity" text="Number of people per hour" />
     555    </chunk>
     556    <chunk id="aerialway_duration">
     557        <text key="aerialway:duration" text="Typical journey time in minutes" />
     558    </chunk>
     559    <chunk id="aerialway_capacity_duration">
     560        <optional>
     561            <reference ref="aerialway_capacity" />
     562            <reference ref="aerialway_duration" />
     563            <reference ref="oh_fee" />
     564        </optional>
     565    </chunk>
     566    <chunk id="aerialway_optionals">
     567        <reference ref="aerialway_capacity" />
     568        <text key="aerialway:occupancy" text="Number of people per car" />
     569        <reference ref="aerialway_duration" />
     570        <check key="aerialway:heating" text="Has heating?" />
     571    </chunk>
     572    <chunk id="aerialway_optionals_bubble">
     573        <optional>
     574            <reference ref="aerialway_optionals" />
     575            <check key="aerialway:bubble" text="Has bubble?" />
     576            <reference ref="oh_fee" />
     577        </optional>
     578    </chunk>
    536579  <!--  Groups -->
    537580  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    538581    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
    … …  
    18621905            <key key="route" value="ferry" />
    18631906            <optional>
    18641907                <reference ref="name_ref_operator" />
    1865                 <reference ref="oh_wheelchair" />
     1908                <reference ref="wheelchair" />
    18661909                <space />
    1867                 <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" />
    1868                 <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" />
    1869                 <reference ref="fee" />
     1910                <reference ref="oh_duration_interval_fee_" />
    18701911                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
    18711912                <check key="ferry:cable" text="Reaction ferry" />
    18721913            </optional>
    … …  
    21102151            <link wiki="Tag:aerialway=cable_car" />
    21112152            <space />
    21122153            <key key="aerialway" value="cable_car" />
    2113             <reference ref="name_ref" />
    2114             <optional>
    2115                 <text key="aerialway:capacity" text="Number of people per hour" />
    2116                 <text key="aerialway:occupancy" text="Number of people per car" />
    2117                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2118                 <check key="aerialway:heating" text="Has heating?" />
     2154            <reference ref="name_ref_operator" />
     2155            <optional>
     2156                <reference ref="aerialway_optionals" />
     2157                <reference ref="oh_fee" />
    21192158            </optional>
    21202159        </item> <!-- Cable Car -->
    21212160        <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true">
    21222161            <link wiki="Tag:aerialway=chair_lift" />
    21232162            <space />
    21242163            <key key="aerialway" value="chair_lift" />
    2125             <reference ref="name_ref" />
    2126             <optional>
    2127                 <text key="aerialway:capacity" text="Number of people per hour" />
    2128                 <text key="aerialway:occupancy" text="Number of people per chair" />
    2129                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2130                 <check key="aerialway:bubble" text="Has bubble?" />
    2131                 <check key="aerialway:heating" text="Has heating?" />
    2132             </optional>
     2164            <reference ref="name_ref_operator" />
     2165            <reference ref="aerialway_optionals_bubble" />
    21332166        </item> <!-- Chair Lift -->
    21342167        <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true">
    21352168            <link wiki="Tag:aerialway=gondola" />
    21362169            <space />
    21372170            <key key="aerialway" value="gondola" />
    2138             <reference ref="name_ref" />
     2171            <reference ref="name_ref_operator" />
    21392172            <optional>
    2140                 <text key="aerialway:capacity" text="Number of people per hour" />
    2141                 <text key="aerialway:occupancy" text="Number of people per gondola" />
    2142                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2143                 <check key="aerialway:heating" text="Has heating?" />
     2173                <reference ref="aerialway_optionals" />
     2174                <reference ref="oh_fee" />
    21442175            </optional>
    21452176        </item> <!-- Gondola -->
    21462177        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
    21472178            <link wiki="Tag:aerialway=mixed_lift" />
    21482179            <space />
    21492180            <key key="aerialway" value="mixed_lift" />
    2150             <reference ref="name_ref" />
    2151             <optional>
    2152                 <text key="aerialway:capacity" text="Number of people per hour" />
    2153                 <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
    2154                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2155                 <check key="aerialway:bubble" text="Has bubble?" />
    2156                 <check key="aerialway:heating" text="Has heating?" />
    2157             </optional>
     2181            <reference ref="name_ref_operator" />
     2182            <reference ref="aerialway_optionals_bubble" />
    21582183        </item> <!-- Mixed Lift -->
    21592184        <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true">
    21602185            <link wiki="Tag:aerialway=drag_lift" />
    21612186            <space />
    21622187            <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" />
    2163             <reference ref="name_ref" />
    2164             <optional>
    2165                 <text key="aerialway:capacity" text="Number of people per hour" />
    2166                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2167             </optional>
     2188            <reference ref="name_ref_operator" />
     2189            <reference ref="aerialway_capacity_duration" />
    21682190        </item> <!-- Drag Lift -->
    21692191        <item name="Magic Carpet" icon="presets/transport/aerialway/magic_carpet.svg" type="way" preset_name_label="true">
    21702192            <link wiki="Tag:aerialway=magic_carpet" />
    21712193            <space />
    21722194            <key key="aerialway" value="magic_carpet" />
    2173             <reference ref="name_ref" />
    2174             <optional>
    2175                 <text key="aerialway:capacity" text="Number of people per hour" />
    2176                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2177             </optional>
     2195            <reference ref="name_ref_operator" />
     2196            <reference ref="aerialway_capacity_duration" />
    21782197        </item> <!-- Magic Carpet -->
    21792198        <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true">
    21802199            <link wiki="Tag:aerialway=goods" />
    21812200            <space />
    21822201            <key key="aerialway" value="goods" />
    2183             <reference ref="name_ref" />
    2184             <optional>
    2185                 <text key="aerialway:duration" text="Typical journey time in minutes" />
     2202            <reference ref="name_ref_operator" />
     2203            <optional>
     2204                <reference ref="aerialway_duration" />   
     2205                <reference ref="fee" />
    21862206            </optional>
    21872207        </item> <!-- Goods -->
    21882208        <item name="Zip line" icon="presets/transport/aerialway/zip_line.svg" type="way" preset_name_label="true">
    21892209            <link wiki="Tag:aerialway=zip_line" />
    21902210            <space />
    21912211            <key key="aerialway" value="zip_line" />
     2212            <reference ref="name_ref_operator" />
    21922213            <optional>
    2193                 <reference ref="name_ref_operator" />
    2194                 <reference ref="oh" />
    2195                 <reference ref="fee" />
    21962214                <reference ref="min_age" />
    21972215                <text key="maxweight" text="Max. weight (tonnes)" />
     2216                <reference ref="oh_fee" />
    21982217            </optional>
    21992218        </item> <!-- Zip line -->
    22002219        <separator/>
    … …  
    22022221            <link wiki="Tag:aerialway=station" />
    22032222            <space />
    22042223            <key key="aerialway" value="station" />
    2205             <text key="name" text="Name" />
     2224            <reference ref="name_ref_operator" />
    22062225        </item> <!-- Station -->
    22072226        <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
    22082227            <link wiki="Tag:aerialway=pylon" />
    … …  
    25512570                <text key="operator" text="Operator" />
    25522571                <text key="network" text="Network" />
    25532572                <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" />
     2573                <text key="website" text="Website" />
    25542574            </optional>
    25552575            <roles>
    25562576                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- fixme: at least 2 members are required -->
    … …  
    25912611                <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
    25922612            </optional>
    25932613            <space />
    2594             <check key="bus" text="Bus" icon="presets/transport/bus.svg" />
    2595             <check key="tram" text="Tram" icon="presets/transport/railway/tram.svg" />
    2596             <check key="train" text="Train" icon="presets/transport/train.svg" />
    2597             <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
    2598             <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
    2599             <check key="subway" text="Subway" icon="presets/transport/railway/subway.svg" />
    2600             <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
    2601             <check key="monorail" text="Monorail" icon="presets/transport/railway/monorail.svg" />
    2602             <check key="funicular" text="Funicular" icon="presets/transport/railway/funicular.svg" />
    2603             <check key="aerialway" text="Aerialway" icon="presets/transport/aerialway/station.svg" />
    2604             <check key="ferry" text="Ferry" icon="presets/nautical/ferry.svg" />
     2614            <checkgroup columns="3">
     2615                <check key="bus"        text="Bus             " icon="presets/transport/bus.svg" />
     2616                <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
     2617                <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
     2618            </checkgroup>
     2619            <checkgroup columns="4">
     2620                <check key="train"      text="Train           " icon="presets/transport/train.svg" />
     2621                <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
     2622                <check key="subway"     text="Subway" icon="presets/transport/railway/subway.svg" />
     2623                <check key="tram"       text="Tram" icon="presets/transport/railway/tram.svg" />
     2624            </checkgroup>
     2625            <checkgroup columns="2">
     2626                <check key="monorail"   text="Monorail    " icon="presets/transport/railway/monorail.svg" />
     2627                <check key="funicular"  text="Funicular" icon="presets/transport/railway/funicular.svg" />
     2628                <check key="aerialway"  text="Aerialway  " icon="presets/transport/aerialway/station.svg" />
     2629                <check key="ferry"      text="Ferry" icon="presets/nautical/ferry.svg" />
     2630            </checkgroup>
    26052631        </item> <!-- Stop Position -->
    26062632        <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
    26072633            <link wiki="Tag:public_transport=platform" />
    … …  
    26612687                <text key="network" text="Network" />
    26622688                <text key="description" text="Description" />
    26632689                <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" />
     2690                <reference ref="oh_fee" />
     2691                <text key="website" text="Website" />
    26642692            </optional>
    26652693            <roles>
    26662694                <role key="" text="route segment" requisite="optional" type="way,closedway" />