Ticket #8206: pt.patch

File pt.patch, 20.1 KB (added by simon04, 13 years ago)

  • data/defaultpresets.xml 

    diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index f81b011..b252ce7 100755
    a b Note that for a match, at least one positive and no negative is required.  
    23112311        </item>
    23122312    </group> <!-- Bicycle -->
    23132313    <group name="Public Transport" icon="presets/bus.png">
     2314        <item name="Route" icon="presets/path.png" type="relation">
     2315            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route"/>
     2316            <label text="Edit Route"/>
     2317            <key key="type" value="route"/>
     2318            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
     2319            <text key="name" text="Name"/>
     2320            <text key="ref" text="Reference"/>
     2321            <optional>
     2322                <text key="from" text="From (initial stop)"/>
     2323                <text key="to" text="To (terminal stop)"/>
     2324                <text key="via" text="Via (intermediate stops)"/>
     2325                <text key="operator" text="Operator"/>
     2326                <text key="network" text="Network"/>
     2327                <text key="description" text="Description"/>
     2328                <text key="color" text="Color (hex)"/>
     2329            </optional>
     2330            <roles>
     2331                <role key="" text="route segment" requisite="required" type="way" />
     2332                <role key="stop" text="stop position" requisite="optional" type="node" />
     2333                <role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" />
     2334                <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" />
     2335                <role key="platform" text="platform" requisite="optional" type="node,way,closedway" />
     2336                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" />
     2337                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" />
     2338            </roles>
     2339        </item>
     2340        <item name="Route master" icon="presets/path.png" type="relation">
     2341            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/>
     2342            <label text="Edit Route master"/>
     2343            <key key="type" value="route_master"/>
     2344            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
     2345            <text key="name" text="Name"/>
     2346            <text key="ref" text="Reference"/>
     2347            <optional>
     2348                <text key="operator" text="Operator"/>
     2349                <text key="network" text="Network"/>
     2350                <text key="color" text="Color (hex)"/>
     2351            </optional>
     2352            <roles>
     2353                <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation"/> <!-- FIXME: at least 2 members are required -->
     2354            </roles>
     2355        </item>
     2356        <item name="Stop Area" type="relation" icon="presets/interpolation.png">
     2357            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
     2358            <label text="Edit Stop Area"/>
     2359            <key key="type" value="public_transport"/>
     2360            <key key="public_transport" value="stop_area"/>
     2361            <text key="name" text="Name"/>
     2362            <optional>
     2363                <text key="ref" text="Reference"/>
     2364                <text key="uic_ref" text="UIC reference"/>
     2365                <text key="uic_name" text="UIC name"/>
     2366                <text key="operator" text="Operator"/>
     2367                <text key="network" text="Network"/>
     2368            </optional>
     2369            <roles>
     2370                <role key="stop" text="Stop Position" requisite="optional" type="node"/>
     2371                <role key="platform" text="Platform" requisite="optional" type="node,way,closedway"/>
     2372                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway"/>
     2373            </roles>
     2374        </item>
     2375        <separator/>
     2376        <item name="Stop Position" type="node" icon="presets/barrier.png">
     2377            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
     2378            <key key="public_transport" value="stop_position"/>
     2379            <text key="name" text="Name"/>
     2380            <optional>
     2381                <text key="ref" text="Reference"/>
     2382                <text key="uic_ref" text="UIC reference"/>
     2383                <text key="uic_name" text="UIC name"/>
     2384                <text key="operator" text="Operator"/>
     2385                <text key="network" text="Network"/>
     2386            </optional>
     2387            <space/>
     2388            <check key="bus" text="Bus"/>
     2389            <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)"/>
     2390            <check key="tram" text="Tram"/>
     2391            <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)"/>
     2392            <check key="train" text="Train"/>
     2393            <check key="railway" value_on="station" value_off="" text="Railway station (legacy)"/>
     2394            <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)"/>
     2395            <check key="trolleybus" text="Trolleybus"/>
     2396            <check key="share_taxi" text="Share taxi"/>
     2397            <check key="subway" text="Subway"/>
     2398            <check key="monorail" text="Monorail"/>
     2399            <check key="funicular" text="Funicular"/>
     2400            <check key="aerialway" text="Aerialway"/>
     2401            <check key="ferry" text="Ferry"/>
     2402        </item>
     2403        <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png">
     2404            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform"/>
     2405            <key key="public_transport" value="platform"/>
     2406            <text key="name" text="Name"/>
     2407            <check key="bench" text="Bench"/>
     2408            <check key="shelter" text="Shelter"/>
     2409            <check key="covered" text="Covered"/>
     2410            <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only"/>
     2411            <optional>
     2412                <text key="ref" text="Reference"/>
     2413                <text key="uic_ref" text="UIC reference"/>
     2414                <text key="uic_name" text="UIC name"/>
     2415                <text key="operator" text="Operator"/>
     2416                <text key="network" text="Network"/>
     2417                <space/>
     2418                <check key="bus" text="Bus"/>
     2419                <check key="highway" value_on="platform" text="Highway platform (legacy)"/>
     2420                <check key="tram" text="Tram"/>
     2421                <check key="train" text="Train"/>
     2422                <check key="railway" value_on="platform" text="Railway platform (legacy)"/>
     2423                <check key="trolleybus" text="Trolleybus"/>
     2424                <check key="share_taxi" text="Share taxi"/>
     2425                <check key="subway" text="Subway"/>
     2426                <check key="monorail" text="Monorail"/>
     2427                <check key="funicular" text="funicular"/>
     2428                <check key="aerialway" text="aerialway"/>
     2429                <check key="ferry" text="ferry"/>
     2430            </optional>
     2431        </item>
     2432        <item name="Station" type="node,closedway" icon="styles/standard/transport/railway_station.png">
     2433            <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"/>
     2434            <key key="public_transport" value="station"/>
     2435            <text key="name" text="Name"/>
     2436            <check key="area" text="Area"/>
     2437            <check key="building" text="Building"/>
     2438            <text key="operator" text="Operator"/>
     2439            <text key="network" text="Network"/>
     2440        </item>
     2441        <separator/>
     2442        <item name="Subway Entrance" icon="presets/underground.png" type="node">
     2443            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
     2444                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
     2445                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
     2446                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
     2447            <label text="Edit Subway Entrance" />
     2448            <space />
     2449            <key key="railway" value="subway_entrance" />
     2450            <optional>
     2451                <text key="name" text="Name" />
     2452                <check key="wheelchair" text="Wheelchair" default="off" />
     2453                <check key="bicycle" text="Bicycle" default="off" />
     2454            </optional>
     2455        </item>
     2456        <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
     2457            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
     2458                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
     2459                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
     2460                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
     2461                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
     2462            <key key="amenity" value="vending_machine"/>
     2463            <key key="vending" value="public_transport_tickets"/>
     2464            <text key="name" text="Name"/>
     2465            <text key="operator" text="Operator"/>
     2466            <text key="ref" text="Reference Number"/>
     2467            <check key="payment:coins" text="Coins" default="off" />
     2468            <check key="payment:notes" text="Notes" default="off" />
     2469            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
     2470            <check key="payment:debit_cards" text="Debit cards" default="off" />
     2471            <check key="payment:credit_cards" text="Credit cards" default="off" />
     2472            <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     2473        </item>
     2474    </group>
     2475    <group name="Public Transport (legacy)" icon="presets/bus.png">
    23142476        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway">
    23152477            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
    23162478                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
    … … Note that for a match, at least one positive and no negative is required.  
    23602522            <text key="width" text="Width (meters)" />
    23612523            <check key="area" text="Area" default="off" />
    23622524        </item>
    2363         <item name="Subway Entrance" icon="presets/underground.png" type="node">
    2364             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
    2365                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
    2366                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
    2367                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
    2368             <label text="Edit Subway Entrance" />
    2369             <space />
    2370             <key key="railway" value="subway_entrance" />
    2371             <optional>
    2372                 <text key="name" text="Name" />
    2373                 <check key="wheelchair" text="Wheelchair" default="off" />
    2374                 <check key="bicycle" text="Bicycle" default="off" />
    2375             </optional>
    2376         </item>
    23772525        <separator/>
    23782526        <item name="Bus Station" icon="presets/bus.png" type="node,closedway">
    23792527            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
    … … Note that for a match, at least one positive and no negative is required.  
    24052553
    24062554            </optional>
    24072555        </item>
    2408         <item name="Bus Platform" icon="presets/platform_bus.png" type="node,closedway">
     2556        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
    24092557            <label text="Edit Bus Platform" />
    24102558            <key key="highway" value="platform" />
    24112559            <space />
    … … Note that for a match, at least one positive and no negative is required.  
    24132561            <text key="width" text="Width (meters)" />
    24142562            <check key="area" text="Area" default="off" />
    24152563        </item>
    2416         <separator/>
    2417         <item name="Stop Area" type="relation">
    2418             <label text="Edit Stop Area" />
    2419             <key key="type" value="public_transport" />
    2420             <key key="public_transport" value="stop_area" />
    2421             <optional>
    2422                 <text key="name" text="Name" />
    2423                 <text key="ref" text="Reference" />
    2424                 <text key="uic_ref" text="UIC reference" />
    2425                 <text key="uic_name" text="UIC name" />
    2426                 <text key="operator" text="Operator" />
    2427                 <text key="network" text="Network" />
    2428             </optional>
    2429         </item>
    2430         <separator/>
    2431         <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
    2432             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
    2433                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
    2434                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
    2435                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
    2436                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
    2437             <key key="amenity" value="vending_machine"/>
    2438             <key key="vending" value="public_transport_tickets"/>
    2439             <text key="name" text="Name"/>
    2440             <text key="operator" text="Operator"/>
    2441             <text key="ref" text="Reference Number"/>
    2442             <check key="payment:coins" text="Coins" default="off" />
    2443             <check key="payment:notes" text="Notes" default="off" />
    2444             <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    2445             <check key="payment:debit_cards" text="Debit cards" default="off" />
    2446             <check key="payment:credit_cards" text="Credit cards" default="off" />
    2447             <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
    2448         </item>
    24492564    </group> <!-- Public Transport -->
    24502565    <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
    24512566        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
    … … Note that for a match, at least one positive and no negative is required.  
    56375752            </roles>
    56385753        </item>
    56395754        <separator/>
    5640         <item name="Route" icon="presets/path.png" type="relation">
    5641             <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
    5642                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
    5643                   es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
    5644                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
    5645                   it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
    5646                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
    5647                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
    5648             <label text="Edit Route" />
    5649             <key key="type" value="route" />
    5650             <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
    5651             <text key="name" text="Name" />
    5652             <text key="ref" text="Reference" />
    5653             <text key="symbol" text="Symbol description" />
    5654             <text key="description" text="Description" />
    5655             <optional>
    5656                 <text key="from" text="From (initial stop)" />
    5657                 <text key="to" text="To (terminal stop)" />
    5658                 <text key="network" text="Network" />
    5659                 <text key="operator" text="Operator" />
    5660                 <combo key="state" text="Route state" values="proposed,alternate,temporary,connection" />
    5661                 <text key="color" text="Color (hex)" />
    5662             </optional>
    5663             <roles>
    5664                 <role key="" text="route segment" requisite="optional" type="way" />
    5665                 <role key="forward" text="forward segment" requisite="optional" type="way" />
    5666                 <role key="backward" text="backward segment" requisite="optional" type="way" />
    5667                 <role key="stop" text="halt point" requisite="optional" type="node" />
    5668                 <role key="forward_stop" text="forward halt point" requisite="optional" type="node" />
    5669                 <role key="backward_stop" text="backward halt point" requisite="optional" type="node" />
    5670                 <role key="platform" text="platform belonging to route" requisite="optional" type="node,way,closedway" />
    5671             </roles>
    5672         </item>
    5673         <item name="Route master" icon="presets/path.png" type="relation">
    5674             <link href="http://wiki.openstreetmap.org/wiki/Relation:route_master"
    5675                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Relation:route_master"/>
    5676             <label text="Edit Route master" />
    5677             <key key="type" value="route_master" />
    5678             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
    5679             <text key="name" text="Name" />
    5680             <text key="ref" text="Reference" />
    5681             <optional>
    5682                 <text key="network" text="Network" />
    5683                 <text key="operator" text="Operator" />
    5684                 <text key="color" text="Color (hex)" />
    5685             </optional>
    5686             <roles>
    5687               <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" /><!-- FIXME: at least 2 members are required -->
    5688             </roles>
    5689         </item>
    5690         <item name="Directional Route (North America)" icon="presets/path.png" type="relation">
     5755        <item name="Route (legacy)" icon="presets/path.png" type="relation">
    56915756            <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
    56925757                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
    56935758                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
    … … Note that for a match, at least one positive and no negative is required.  
    56955760                  it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
    56965761                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
    56975762                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
    5698             <label text="Edit Directional Route (used in North America)" />
     5763            <label text="Edit Route (legacy)" />
    56995764            <key key="type" value="route" />
    57005765            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
    57015766            <text key="name" text="Name" />
    … … Note that for a match, at least one positive and no negative is required.  
    57105775            </optional>
    57115776            <roles>
    57125777                <role key="" text="route segment" requisite="optional" type="way" />
    5713                 <role key="east" text="east segment" requisite="optional" type="way" />
    5714                 <role key="north" text="north segment" requisite="optional" type="way" />
    5715                 <role key="west" text="west segment" requisite="optional" type="way" />
    5716                 <role key="south" text="south segment" requisite="optional" type="way" />
     5778                <role key="east" text="east segment (North America)" requisite="optional" type="way" />
     5779                <role key="north" text="north segment (North America)" requisite="optional" type="way" />
     5780                <role key="west" text="west segment (North America)" requisite="optional" type="way" />
     5781                <role key="south" text="south segment (North America)" requisite="optional" type="way" />
    57175782                <role key="stop" text="halt point" requisite="optional" type="node" />
    57185783                <role key="forward_stop" text="forward halt point" requisite="optional" type="node" />
    57195784                <role key="backward_stop" text="backward halt point" requisite="optional" type="node" />