Changeset 3608 in josm


Ignore:
Timestamp:
2010-10-15T21:49:44+02:00 (9 years ago)
Author:
ulfl
Message:
  • slight redesign of car and public transport (e.g. adding a ticket machine) presets
  • lower mappaint prio of public_transport (empty icons)
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r3606 r3608  
    13851385    <separator/>
    13861386    <group name="Car" icon="presets/car.png">
     1387        <item name="Parking" icon="presets/parking.png" type="node,closedway">
     1388            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
     1389                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
     1390            <label text="Edit Parking" />
     1391            <key key="amenity" value="parking" />
     1392            <text key="name" text="Name" default="" delete_if_empty="true" />
     1393            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1394            <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" delete_if_empty="true" />
     1395            <combo key="park_ride" text="Park and Ride" values="yes,no" default="" delete_if_empty="true" />
     1396            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
     1397            <space />
     1398            <text key="capacity" text="Capacity (overall)" default="" delete_if_empty="true" />
     1399            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
     1400            <combo key="capacity:women" text="Spaces for Women" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
     1401            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
     1402            <label text="See the Wiki for other capacity:[types]=*." />
     1403        </item>
     1404        <separator/>
    13871405        <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
    13881406            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
     
    14221440            <text key="amperage" text="Amperage" default="" delete_if_empty="true" />
    14231441        </item>           
    1424         <item name="Parking" icon="presets/parking.png" type="node,closedway">
    1425             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
    1426                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
    1427             <label text="Edit Parking" />
    1428             <key key="amenity" value="parking" />
    1429             <text key="name" text="Name" default="" delete_if_empty="true" />
    1430             <text key="ref" text="Reference number" default="" delete_if_empty="true" />
    1431             <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" delete_if_empty="true" />
    1432             <combo key="park_ride" text="Park and Ride" values="yes,no" default="" delete_if_empty="true" />
    1433             <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
    1434             <space />
    1435             <text key="capacity" text="Capacity (overall)" default="" delete_if_empty="true" />
    1436             <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
    1437             <combo key="capacity:women" text="Spaces for Women" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
    1438             <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,unknown,1,2,3" default="" delete_if_empty="true" />
    1439             <label text="See the Wiki for other capacity:[types]=*." />
    1440         </item>
    14411442        <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
    14421443            <label text="Edit Car Wash" />
     
    14471448            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    14481449        </item>
     1450        <separator/>
    14491451        <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
    14501452            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
     
    14751477                <text key="email" text="Email Address" default="" delete_if_empty="true" />
    14761478         </item>
     1479        <separator/>
    14771480        <item name="Rental" icon="presets/car_rental.png" type="node,closedway">
    14781481            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
     
    16361639        </item>
    16371640        <separator/>
    1638         <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
    1639             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
    1640             <label text="Edit Taxi station" />
    1641             <key key="amenity" value="taxi" />
    1642             <text key="name" text="Name" default="" delete_if_empty="true" />
     1641        <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
     1642            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dvending_machine" de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity%3Dvending_machine"/>
     1643            <key key="amenity" value="vending_machine"/>
     1644            <key key="vending" value="public_transport_tickets"/>
     1645            <text key="name" text="Name" default="" delete_if_empty="true"/>
     1646            <text key="operator" text="Operator" default="" delete_if_empty="true"/>
     1647            <text key="ref" text="Reference Number" default="" delete_if_empty="true"/>
     1648            <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
     1649            <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
     1650            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
     1651            <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
     1652            <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
     1653            <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
    16431654        </item>
    16441655    </group> <!-- Public Transport -->
     1656    <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
     1657        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
     1658        <label text="Edit Taxi station" />
     1659        <key key="amenity" value="taxi" />
     1660        <text key="name" text="Name" default="" delete_if_empty="true" />
     1661    </item>
    16451662    <separator/>
    16461663    <group name="Airport" icon="presets/plane.png">
  • trunk/styles/standard/elemstyles.xml

    r3607 r3608  
    45664566        <rule>
    45674567                <condition k="public_transport" v="stop_position"/>
    4568                 <icon annotate="true" src="misc/no_icon.png"/>
     4568                <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
    45694569                <scale_min>1</scale_min>
    45704570                <scale_max>50000</scale_max>
     
    45734573        <rule>
    45744574                <condition k="public_transport" v="platform"/>
    4575                 <icon annotate="true" src="misc/no_icon.png"/>
     4575                <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
    45764576                <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
    45774577                <scale_min>1</scale_min>
Note: See TracChangeset for help on using the changeset viewer.