Changeset 5197 in josm for trunk


Ignore:
Timestamp:
2012-04-16T22:58:56+02:00 (13 years ago)
Author:
simon04
Message:

fix #7576 - tagging presets: make use of new matching functionality (in road restrictions, buildings, addresses, contact information)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r5193 r5197  
    546546            <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
    547547            <label text="Transport mode restrictions" />
    548             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    549             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
    550             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
     548            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     549            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
     550            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    551551            <label text="Vehicles per type" />
    552             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    553             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" />
    554             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    555             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    556             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    557             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    558             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
     552            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     553            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
     554            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     555            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     556            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     557            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
     558            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    559559            <label text="Vehicles per use" />
    560             <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" />
    561             <combo key="emergency" text="Emergency vehicles"  values="yes,official,designated,destination,permissive,private,no" />
    562             <combo key="hov" text="High-occupancy vehicles (hov)"  values="yes,official,designated,destination,permissive,private,no" />
    563             <combo key="psv" text="Public Service Vehicles (psv)"   values="yes,official,designated,destination,permissive,private,no" />
     560            <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
     561            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="key" />
     562            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
     563            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    564564            <text key="maxspeed" text="Max. speed (km/h)" />
    565             <text key="minspeed" text="Min. speed (km/h)" />
    566             <text key="maxweight" text="Max. weight (tonnes)" />
    567             <text key="maxaxleload" text="Max. axleload (tonnes)" />
    568             <text key="maxheight" text="Max. height (meters)" />
    569             <text key="maxwidth" text="Max. width (meters)" />
    570             <text key="maxlength" text="Max. length (meters)" />
    571             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" />
     565            <text key="minspeed" text="Min. speed (km/h)" match="key" />
     566            <text key="maxweight" text="Max. weight (tonnes)" match="key" />
     567            <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
     568            <text key="maxheight" text="Max. height (meters)" match="key" />
     569            <text key="maxwidth" text="Max. width (meters)" match="key" />
     570            <text key="maxlength" text="Max. length (meters)" match="key" />
     571            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
    572572        </item>
    573573        <separator/>
    … …  
    38363836                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
    38373837            <label text="Edit Building" />
    3838             <combo key="building" text="Building" values="yes,roof,garage,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" />
     3838            <combo key="building" text="Building" values="yes,roof,garage,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" match="keyvalue" />
    38393839            <text key="name" text="Name" />
    38403840        </item>
    … …  
    38503850                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
    38513851            <label text="Edit Residential Building" />
    3852             <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" />
     3852            <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" />
    38533853            <text key="name" text="Name" />
    38543854        </item>
    … …  
    52335233            <label text="Edit Address Information" />
    52345234            <space />
    5235             <text key="addr:housenumber" text="House number" />
    5236             <optional>
    5237                 <text key="addr:housename" text="House name" />
    5238                 <text key="addr:street" text="Street name" use_last_as_default="force" />
    5239                 <text key="addr:city" text="City name" use_last_as_default="force" />
    5240                 <text key="addr:postcode" text="Post code" use_last_as_default="force" />
    5241                 <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" />
     5235            <text key="addr:housenumber" text="House number" match="key" />
     5236            <optional>
     5237                <text key="addr:housename" text="House name" match="key" />
     5238                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" />
     5239                <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
     5240                <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
     5241                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" match="key" />
    52425242            </optional>
    52435243        </item>
    … …  
    52475247            <label text="Edit Address Interpolation" />
    52485248            <space />
    5249             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" />
     5249            <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
    52505250        </item>
    52515251        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation">
    52525252            <label text="Edit Contact information" />
    52535253            <space />
    5254             <text key="phone" text="Phone Number" />
    5255             <text key="fax" text="Fax Number" />
    5256             <space />
    5257             <text key="website" text="Website" />
    5258             <text key="email" text="Email Address" />
     5254            <text key="phone" text="Phone Number" match="key" />
     5255            <text key="fax" text="Fax Number" match="key" />
     5256            <space />
     5257            <text key="website" text="Website" match="key" />
     5258            <text key="email" text="Email Address" match="key" />
    52595259            <space />
    52605260            <text key="wikipedia" text="Wikipedia" />
    … …  
    52645264            <label text="Edit Contact information (new schema)" />
    52655265            <space />
    5266             <text key="contact:phone" text="Phone Number" />
    5267             <text key="contact:fax" text="Fax Number" />
    5268             <space />
    5269             <text key="contact:website" text="Website" />
    5270             <text key="contact:email" text="Email Address" />
     5266            <text key="contact:phone" text="Phone Number" match="key" />
     5267            <text key="contact:fax" text="Fax Number" match="key" />
     5268            <space />
     5269            <text key="contact:website" text="Website" match="key" />
     5270            <text key="contact:email" text="Email Address" match="key" />
    52715271            <space />
    52725272            <text key="wikipedia" text="Wikipedia" />
Note: See TracChangeset for help on using the changeset viewer.