Ticket #5792: 5792.patch

File 5792.patch, 9.8 KB (added by simon04, 14 years ago)
  • data/defaultpresets.xml

    diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
    index 5238aa2..d7f6d56 100755
    a b are supplied, then "values" will be treated as "display_values" and translated i  
    14091397            <label text="Edit Chair Lift" />
    14101398            <key key="aerialway" value="chair_lift" />
    14111399            <text key="name" text="Name" default="" delete_if_empty="true" />
     1400            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1401            <optional>
     1402                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1403                <text key="aerialway:occupancy" text="Number of people per chair" default="" delete_if_empty="true" />
     1404                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1405                <check key="aerialway:bubble" text="Has bubble?" default="" delete_if_empty="true" />
     1406                <check key="aerialway:heating" text="Has heating?" default="" delete_if_empty="true" />
     1407            </optional>
    14121408        </item>
    14131409        <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
    14141410            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
    14151411            <label text="Edit Drag Lift" />
    14161412            <key key="aerialway" value="drag_lift" />
    14171413            <text key="name" text="Name" default="" delete_if_empty="true" />
     1414            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1415            <optional>
     1416                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1417                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1418            </optional>
    14181419        </item>
    14191420        <item name="Cable Car" icon="presets/cable_car.png" type="way">
    14201421            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
    14211422            <label text="Edit Cable Car" />
    14221423            <key key="aerialway" value="cable_car" />
    14231424            <text key="name" text="Name" default="" delete_if_empty="true" />
     1425            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1426            <optional>
     1427                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1428                <text key="aerialway:occupancy" text="Number of people per car" default="" delete_if_empty="true" />
     1429                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1430                <check key="aerialway:heating" text="Has heating?" default="" delete_if_empty="true" />
     1431            </optional>
    14241432        </item>
    14251433        <item name="Gondola" icon="presets/gondola.png" type="way">
    14261434            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
    14271435            <label text="Edit Gondola" />
    14281436            <key key="aerialway" value="gondola" />
    14291437            <text key="name" text="Name" default="" delete_if_empty="true" />
     1438            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1439            <optional>
     1440                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1441                <text key="aerialway:occupancy" text="Number of people per gondola" default="" delete_if_empty="true" />
     1442                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1443                <check key="aerialway:heating" text="Has heating?" default="" delete_if_empty="true" />
     1444            </optional>
     1445        </item>
     1446        <item name="Mixed Lift" type="way">
     1447            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1448            <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
     1449            <key key="aerialway" value="mixed_lift" />
     1450            <text key="name" text="Name" default="" delete_if_empty="true" />
     1451            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1452            <optional>
     1453                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1454                <text key="aerialway:occupancy" text="Number of people per gondola/chair" default="" delete_if_empty="true" />
     1455                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1456                <check key="aerialway:bubble" text="Has bubble?" default="" delete_if_empty="true" />
     1457                <check key="aerialway:heating" text="Has heating?" default="" delete_if_empty="true" />
     1458            </optional>
     1459        </item>
     1460        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
     1461            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1462            <label text="Edit T-bar Lift" />
     1463            <key key="aerialway" value="t-bar" />
     1464            <text key="name" text="Name" default="" delete_if_empty="true" />
     1465            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1466            <optional>
     1467                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1468                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1469            </optional>
     1470        </item>
     1471        <item name="J-bar Lift" icon="presets/drag_lift.png" type="way">
     1472            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1473            <label text="Edit J-bar Lift" />
     1474            <key key="aerialway" value="j-bar" />
     1475            <text key="name" text="Name" default="" delete_if_empty="true" />
     1476            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1477            <optional>
     1478                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1479                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1480            </optional>
     1481        </item>
     1482        <item name="Platter Lift" icon="presets/drag_lift.png" type="way">
     1483            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1484            <label text="Edit Platter Lift" />
     1485            <key key="aerialway" value="platter" />
     1486            <text key="name" text="Name" default="" delete_if_empty="true" />
     1487            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1488            <optional>
     1489                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1490                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1491            </optional>
     1492        </item>
     1493        <item name="Rope Tow" type="way">
     1494            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1495            <label text="Edit Rope Tow" />
     1496            <key key="aerialway" value="rope_tow" />
     1497            <text key="name" text="Name" default="" delete_if_empty="true" />
     1498            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1499            <optional>
     1500                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1501                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1502            </optional>
     1503        </item>
     1504        <item name="Magic Carpet" type="way">
     1505            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
     1506            <label text="Edit Magic Carpet" />
     1507            <key key="aerialway" value="magic_carpet" />
     1508            <text key="name" text="Name" default="" delete_if_empty="true" />
     1509            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1510            <optional>
     1511                <text key="aerialway:capacity" text="Number of people per hour" default="" delete_if_empty="true" />
     1512                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1513            </optional>
     1514        </item>
     1515        <item name="Goods" name_context="aerialway" icon="presets/goods.png" type="way">
     1516            <label text="Edit Goods" text_context="aerialway" />
     1517            <key key="aerialway" value="goods" />
     1518            <text key="name" text="Name" default="" delete_if_empty="true" />
     1519            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
     1520            <optional>
     1521                <text key="aerialway:duration" text="Typical journey time in minutes" default="" delete_if_empty="true" />
     1522            </optional>
    14301523        </item>
    14311524        <separator/>
    14321525        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
    are supplied, then "values" will be treated as "display_values" and translated i  
    14411534            <key key="aerialway" value="pylon" />
    14421535            <text key="name" text="Name" default="" delete_if_empty="true" />
    14431536        </item>
    1444         <item name="Goods" name_context="aerialway" icon="presets/goods.png" type="way">
    1445             <label text="Edit Goods" text_context="aerialway" />
    1446             <key key="aerialway" value="goods" />
    1447             <text key="name" text="Name" default="" delete_if_empty="true" />
    1448         </item>
    14491537    </group> <!-- Aerialway -->
    14501538    <separator/>
    14511539    <group name="Car" icon="presets/car.png">