Changeset 16710 in josm


Ignore:
Timestamp:
2020-06-23T21:44:26+02:00 (7 weeks ago)
Author:
Klumbumbus
Message:

fix #19382 - Add website, operator, fee, opening_hours and reservation to route relations and/or aerialways, sort checkboxes in public_transport=stop_position preset better, based on patch by skyper

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r16707 r16710  
    265265        <text key="symbol" text="Symbol description"/>
    266266        <text key="description" text="Description"/>
     267        <text key="website" text="Website" />
    267268    </chunk>
    268269    <chunk id="genus_species_taxon">
     
    503504    <text key="description" text="Description" />
    504505    <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" />
     506    <reference ref="oh" />
     507    <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" />
     508    <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" />
     509    <reference ref="fee" />
     510    <text key="website" text="Website" />
    507511  </chunk>
    508512  <chunk id="climbing_styles">
     
    18631867            <optional>
    18641868                <reference ref="name_ref_operator" />
    1865                 <reference ref="oh_wheelchair" />
     1869                <reference ref="wheelchair" />
    18661870                <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" />
     1871                <reference ref="oh" />
     1872                <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" />
     1873                <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" />
    18691874                <reference ref="fee" />
    18701875                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
     
    21172122                <text key="aerialway:duration" text="Typical journey time in minutes" />
    21182123                <check key="aerialway:heating" text="Has heating?" />
     2124                <space />
     2125                <text key="operator" text="Operator" />
     2126                <reference ref="oh" />
     2127                <reference ref="fee" />
    21192128            </optional>
    21202129        </item> <!-- Cable Car -->
     
    21302139                <check key="aerialway:bubble" text="Has bubble?" />
    21312140                <check key="aerialway:heating" text="Has heating?" />
     2141                <space />
     2142                <text key="operator" text="Operator" />
     2143                <reference ref="oh" />
     2144                <reference ref="fee" />
    21322145            </optional>
    21332146        </item> <!-- Chair Lift -->
     
    21422155                <text key="aerialway:duration" text="Typical journey time in minutes" />
    21432156                <check key="aerialway:heating" text="Has heating?" />
     2157                <space />
     2158                <text key="operator" text="Operator" />
     2159                <reference ref="oh" />
     2160                <reference ref="fee" />
    21442161            </optional>
    21452162        </item> <!-- Gondola -->
     
    21552172                <check key="aerialway:bubble" text="Has bubble?" />
    21562173                <check key="aerialway:heating" text="Has heating?" />
     2174                <space />
     2175                <text key="operator" text="Operator" />
     2176                <reference ref="oh" />
     2177                <reference ref="fee" />
    21572178            </optional>
    21582179        </item> <!-- Mixed Lift -->
     
    21652186                <text key="aerialway:capacity" text="Number of people per hour" />
    21662187                <text key="aerialway:duration" text="Typical journey time in minutes" />
     2188                <space />
     2189                <text key="operator" text="Operator" />
     2190                <reference ref="oh" />
     2191                <reference ref="fee" />
    21672192            </optional>
    21682193        </item> <!-- Drag Lift -->
     
    21752200                <text key="aerialway:capacity" text="Number of people per hour" />
    21762201                <text key="aerialway:duration" text="Typical journey time in minutes" />
     2202                <space />
     2203                <text key="operator" text="Operator" />
     2204                <reference ref="oh" />
     2205                <reference ref="fee" />
    21772206            </optional>
    21782207        </item> <!-- Magic Carpet -->
     
    21812210            <space />
    21822211            <key key="aerialway" value="goods" />
    2183             <reference ref="name_ref" />
    2184             <optional>
     2212            <optional>
     2213                <reference ref="name_ref_operator" />
    21852214                <text key="aerialway:duration" text="Typical journey time in minutes" />
    21862215            </optional>
     
    22032232            <space />
    22042233            <key key="aerialway" value="station" />
    2205             <text key="name" text="Name" />
     2234            <reference ref="name_ref_operator" />
    22062235        </item> <!-- Station -->
    22072236        <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
     
    22092238            <space />
    22102239            <key key="aerialway" value="pylon" />
    2211             <text key="name" text="Name" />
     2240            <reference ref="name_ref" />
    22122241        </item> <!-- Pylon -->
    22132242    </group> <!-- Aerialway -->
     
    25302559            <optional>
    25312560                <reference ref="public_transport_route_optionals" />
     2561                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
    25322562            </optional>
    25332563            <roles>
     
    25522582                <text key="network" text="Network" />
    25532583                <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" />
     2584                <text key="website" text="Website" />
    25542585            </optional>
    25552586            <roles>
     
    25922623            </optional>
    25932624            <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" />
     2625            <checkgroup columns="3">
     2626                <check key="bus"        text="Bus" icon="presets/transport/bus.svg" />
     2627                <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
     2628                <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
     2629                <check key="train"      text="Train" icon="presets/transport/train.svg" />
     2630                <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
     2631                <check key="subway"     text="Subway" icon="presets/transport/railway/subway.svg" />
     2632                <check key="tram"       text="Tram" icon="presets/transport/railway/tram.svg" />
     2633                <check key="monorail"   text="Monorail" icon="presets/transport/railway/monorail.svg" />
     2634                <check key="funicular"  text="Funicular" icon="presets/transport/railway/funicular.svg" />
     2635                <check key="aerialway"  text="Aerialway" icon="presets/transport/aerialway/station.svg" />
     2636                <check key="ferry"      text="Ferry" icon="presets/nautical/ferry.svg" />
     2637            </checkgroup>
    26052638        </item> <!-- Stop Position -->
    26062639        <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
     
    26622695                <text key="description" text="Description" />
    26632696                <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" />
     2697                <reference ref="oh" />
     2698                <reference ref="fee" />
     2699                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
     2700                <text key="website" text="Website" />
    26642701            </optional>
    26652702            <roles>
Note: See TracChangeset for help on using the changeset viewer.