Ticket #19382: josm_route_aerial_update_v4.patch
File josm_route_aerial_update_v4.patch, 15.5 KB (added by , 4 years ago) |
---|
-
resources/data/defaultpresets.xml
217 217 <chunk id="fee_interval"> 218 218 <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" /> 219 219 </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> 220 236 <chunk id="parking_name_type_ref"> 221 237 <text key="name" text="Name" /> 222 238 <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" /> … … 264 280 <check key="roundtrip" text="Roundtrip"/> 265 281 <text key="symbol" text="Symbol description"/> 266 282 <text key="description" text="Description"/> 283 <text key="website" text="Website" /> 267 284 </chunk> 268 285 <chunk id="genus_species_taxon"> 269 286 <text key="genus" text="Genus" /> … … 502 519 <text key="network" text="Network" /> 503 520 <text key="description" text="Description" /> 504 521 <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" /> 507 524 </chunk> 508 525 <chunk id="climbing_styles"> 509 526 <label text="Climbing styles:" /> … … 533 550 <reference ref="POI_access" /> 534 551 </optional> 535 552 </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> 536 579 <!-- Groups --> 537 580 <group name="Highways" icon="presets/transport/way/way_secondary.svg"> 538 581 <group name="Streets" icon="presets/transport/way/way_secondary.svg"> … … 1862 1905 <key key="route" value="ferry" /> 1863 1906 <optional> 1864 1907 <reference ref="name_ref_operator" /> 1865 <reference ref=" oh_wheelchair" />1908 <reference ref="wheelchair" /> 1866 1909 <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_" /> 1870 1911 <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" /> 1871 1912 <check key="ferry:cable" text="Reaction ferry" /> 1872 1913 </optional> … … 2110 2151 <link wiki="Tag:aerialway=cable_car" /> 2111 2152 <space /> 2112 2153 <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" /> 2119 2158 </optional> 2120 2159 </item> <!-- Cable Car --> 2121 2160 <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true"> 2122 2161 <link wiki="Tag:aerialway=chair_lift" /> 2123 2162 <space /> 2124 2163 <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" /> 2133 2166 </item> <!-- Chair Lift --> 2134 2167 <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true"> 2135 2168 <link wiki="Tag:aerialway=gondola" /> 2136 2169 <space /> 2137 2170 <key key="aerialway" value="gondola" /> 2138 <reference ref="name_ref " />2171 <reference ref="name_ref_operator" /> 2139 2172 <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" /> 2144 2175 </optional> 2145 2176 </item> <!-- Gondola --> 2146 2177 <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true"> 2147 2178 <link wiki="Tag:aerialway=mixed_lift" /> 2148 2179 <space /> 2149 2180 <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" /> 2158 2183 </item> <!-- Mixed Lift --> 2159 2184 <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true"> 2160 2185 <link wiki="Tag:aerialway=drag_lift" /> 2161 2186 <space /> 2162 2187 <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" /> 2168 2190 </item> <!-- Drag Lift --> 2169 2191 <item name="Magic Carpet" icon="presets/transport/aerialway/magic_carpet.svg" type="way" preset_name_label="true"> 2170 2192 <link wiki="Tag:aerialway=magic_carpet" /> 2171 2193 <space /> 2172 2194 <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" /> 2178 2197 </item> <!-- Magic Carpet --> 2179 2198 <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true"> 2180 2199 <link wiki="Tag:aerialway=goods" /> 2181 2200 <space /> 2182 2201 <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" /> 2186 2206 </optional> 2187 2207 </item> <!-- Goods --> 2188 2208 <item name="Zip line" icon="presets/transport/aerialway/zip_line.svg" type="way" preset_name_label="true"> 2189 2209 <link wiki="Tag:aerialway=zip_line" /> 2190 2210 <space /> 2191 2211 <key key="aerialway" value="zip_line" /> 2212 <reference ref="name_ref_operator" /> 2192 2213 <optional> 2193 <reference ref="name_ref_operator" />2194 <reference ref="oh" />2195 <reference ref="fee" />2196 2214 <reference ref="min_age" /> 2197 2215 <text key="maxweight" text="Max. weight (tonnes)" /> 2216 <reference ref="oh_fee" /> 2198 2217 </optional> 2199 2218 </item> <!-- Zip line --> 2200 2219 <separator/> … … 2202 2221 <link wiki="Tag:aerialway=station" /> 2203 2222 <space /> 2204 2223 <key key="aerialway" value="station" /> 2205 < text key="name" text="Name" />2224 <reference ref="name_ref_operator" /> 2206 2225 </item> <!-- Station --> 2207 2226 <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true"> 2208 2227 <link wiki="Tag:aerialway=pylon" /> … … 2529 2548 <reference ref="name_ref" /> 2530 2549 <optional> 2531 2550 <reference ref="public_transport_route_optionals" /> 2551 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" /> 2532 2552 </optional> 2533 2553 <roles> 2534 2554 <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" /> … … 2551 2571 <text key="operator" text="Operator" /> 2552 2572 <text key="network" text="Network" /> 2553 2573 <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" /> 2574 <text key="website" text="Website" /> 2554 2575 </optional> 2555 2576 <roles> 2556 2577 <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- fixme: at least 2 members are required --> … … 2591 2612 <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" /> 2592 2613 </optional> 2593 2614 <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" /> 2615 <checkgroup columns="3"> 2616 <check key="bus" text="Bus " icon="presets/transport/bus.svg" /> 2617 <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" /> 2618 <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" /> 2619 </checkgroup> 2620 <checkgroup columns="4"> 2621 <check key="train" text="Train " icon="presets/transport/train.svg" /> 2622 <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" /> 2623 <check key="subway" text="Subway" icon="presets/transport/railway/subway.svg" /> 2624 <check key="tram" text="Tram" icon="presets/transport/railway/tram.svg" /> 2625 </checkgroup> 2626 <checkgroup columns="2"> 2627 <check key="monorail" text="Monorail " icon="presets/transport/railway/monorail.svg" /> 2628 <check key="funicular" text="Funicular" icon="presets/transport/railway/funicular.svg" /> 2629 <check key="aerialway" text="Aerialway " icon="presets/transport/aerialway/station.svg" /> 2630 <check key="ferry" text="Ferry" icon="presets/nautical/ferry.svg" /> 2631 </checkgroup> 2605 2632 </item> <!-- Stop Position --> 2606 2633 <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true"> 2607 2634 <link wiki="Tag:public_transport=platform" /> … … 2661 2688 <text key="network" text="Network" /> 2662 2689 <text key="description" text="Description" /> 2663 2690 <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" /> 2691 <reference ref="oh_fee" /> 2692 <combo key="reservation" text="Reservation" values="yes,no,required,recommended" /> 2693 <text key="website" text="Website" /> 2664 2694 </optional> 2665 2695 <roles> 2666 2696 <role key="" text="route segment" requisite="optional" type="way,closedway" />