Ticket #7576: 7576.patch

File 7576.patch, 10.2 KB (added by simon04, 14 months ago)

  • data/defaultpresets.xml 

    diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 9885473..c819537 100755
    a b Note that for a match, at least one positive and no negative is required. 
    542542            <check key="toll" text="Toll" default="off"  /> 
    543543            <check key="noexit" text="No exit (cul-de-sac)" default="off"  /> 
    544544            <label text="Transport mode restrictions" /> 
    545             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    546             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" /> 
    547             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" /> 
     545            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     546            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" /> 
     547            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" /> 
    548548            <label text="Vehicles per type" /> 
    549             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    550             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" /> 
    551             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    552             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    553             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    554             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" /> 
    555             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" /> 
     549            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     550            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" /> 
     551            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     552            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     553            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     554            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
     555            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" /> 
    556556            <label text="Vehicles per use" /> 
    557             <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" /> 
    558             <combo key="emergency" text="Emergency vehicles"  values="yes,official,designated,destination,permissive,private,no" /> 
    559             <combo key="hov" text="High-occupancy vehicles (hov)"  values="yes,official,designated,destination,permissive,private,no" /> 
    560             <combo key="psv" text="Public Service Vehicles (psv)"   values="yes,official,designated,destination,permissive,private,no" /> 
    561             <text key="maxspeed" text="Max. speed (km/h)" /> 
    562             <text key="minspeed" text="Min. speed (km/h)" /> 
    563             <text key="maxweight" text="Max. weight (tonnes)" /> 
    564             <text key="maxaxleload" text="Max. axleload (tonnes)" /> 
    565             <text key="maxheight" text="Max. height (meters)" /> 
    566             <text key="maxwidth" text="Max. width (meters)" /> 
    567             <text key="maxlength" text="Max. length (meters)" /> 
     557            <combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" /> 
     558            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="key" /> 
     559            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" /> 
     560            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" /> 
     561            <text key="maxspeed" text="Max. speed (km/h)" match="key" /> 
     562            <text key="minspeed" text="Min. speed (km/h)" match="key" /> 
     563            <text key="maxweight" text="Max. weight (tonnes)" match="key" /> 
     564            <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" /> 
     565            <text key="maxheight" text="Max. height (meters)" match="key" /> 
     566            <text key="maxwidth" text="Max. width (meters)" match="key" /> 
     567            <text key="maxlength" text="Max. length (meters)" match="key" /> 
    568568        </item> 
    569569        <separator/> 
    570570        <item name="Roundabout" icon="presets/roundabout.png" type="closedway"> 
    … … Note that for a match, at least one positive and no negative is required. 
    38383838                  pl.href="http://wiki.openstreetmap.org/wiki/PL:Key:building" 
    38393839                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" /> 
    38403840            <label text="Edit Residential Building" /> 
    3841             <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" /> 
     3841            <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" /> 
    38423842            <text key="name" text="Name" /> 
    38433843        </item> 
    38443844        <item name="Tower" icon="presets/tower.png" type="node,closedway"> 
    … … Note that for a match, at least one positive and no negative is required. 
    52215221                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" /> 
    52225222            <label text="Edit Address Information" /> 
    52235223            <space /> 
    5224             <text key="addr:housenumber" text="House number" /> 
     5224            <text key="addr:housenumber" text="House number" match="key" /> 
    52255225            <optional> 
    5226                 <text key="addr:housename" text="House name" /> 
    5227                 <text key="addr:street" text="Street name" use_last_as_default="force" /> 
    5228                 <text key="addr:city" text="City name" use_last_as_default="force" /> 
    5229                 <text key="addr:postcode" text="Post code" use_last_as_default="force" /> 
    5230                 <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" /> 
     5226                <text key="addr:housename" text="House name" match="key" /> 
     5227                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" /> 
     5228                <text key="addr:city" text="City name" use_last_as_default="force" match="key" /> 
     5229                <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" /> 
     5230                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" match="key" /> 
    52315231            </optional> 
    52325232        </item> 
    52335233        <item name="Address Interpolation" icon="presets/interpolation.png" type="way"> 
    … … Note that for a match, at least one positive and no negative is required. 
    52355235                 de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" /> 
    52365236            <label text="Edit Address Interpolation" /> 
    52375237            <space /> 
    5238             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" /> 
     5238            <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" /> 
    52395239        </item> 
    52405240        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation"> 
    52415241            <label text="Edit Contact information" /> 
    52425242            <space /> 
    5243             <text key="phone" text="Phone Number" /> 
    5244             <text key="fax" text="Fax Number" /> 
     5243            <text key="phone" text="Phone Number" match="key" /> 
     5244            <text key="fax" text="Fax Number" match="key" /> 
    52455245            <space /> 
    5246             <text key="website" text="Website" /> 
    5247             <text key="email" text="Email Address" /> 
     5246            <text key="website" text="Website" match="key" /> 
     5247            <text key="email" text="Email Address" match="key" /> 
    52485248            <space /> 
    52495249            <text key="wikipedia" text="Wikipedia" /> 
    52505250            <text key="image" text="Image" /> 
    … … Note that for a match, at least one positive and no negative is required. 
    52525252        <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation"> 
    52535253            <label text="Edit Contact information (new schema)" /> 
    52545254            <space /> 
    5255             <text key="contact:phone" text="Phone Number" /> 
    5256             <text key="contact:fax" text="Fax Number" /> 
     5255            <text key="contact:phone" text="Phone Number" match="key" /> 
     5256            <text key="contact:fax" text="Fax Number" match="key" /> 
    52575257            <space /> 
    5258             <text key="contact:website" text="Website" /> 
    5259             <text key="contact:email" text="Email Address" /> 
     5258            <text key="contact:website" text="Website" match="key" /> 
     5259            <text key="contact:email" text="Email Address" match="key" /> 
    52605260            <space /> 
    52615261            <text key="wikipedia" text="Wikipedia" /> 
    52625262            <text key="image" text="Image" />