Changeset 2989 in josm


Ignore:
Timestamp:
2010-02-15T00:41:05+01:00 (15 years ago)
Author:
bastiK
Message:

fixed #4527 - add access=official, delivery, forestry to the preset, fixed #4526 - duplicate tag in preset

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r2903 r2989  
    349349        <separator/>
    350350        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way">
     351            <link href="http://wiki.openstreetmap.org/wiki/Key:access"
     352                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
    351353            <label text="Edit Road Restrictions" />
    352354            <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    353355            <check key="toll" text="Toll" default="off" delete_if_empty="true"  />
    354356            <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
    355             <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    356             <combo key="agricultural" text="Agricultural" values="yes,designated,destination,permissive,no" default="" delete_if_empty="true" />
    357             <combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
    358             <combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    359             <combo key="goods" text="Goods" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    360             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    361             <combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    362             <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    363             <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    364             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
     357            <combo key="access" text="Access" values="yes,private,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     358            <combo key="agricultural" text="Agricultural" values="yes,designated,destination,permissive,delivery,unknown,no" default="" delete_if_empty="true" />
     359            <combo key="bicycle" text="Bicycle" values="yes,private,designated,official,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
     360            <combo key="foot" text="Foot" values="yes,private,designated,official,destination,permissive,unknown,no" default="" delete_if_empty="true" />
     361            <combo key="goods" text="Goods" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     362            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     363            <combo key="horse" text="Horse" values="yes,private,designated,official,permissive,unknown,no" default="" delete_if_empty="true" />
     364            <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,official,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     365            <combo key="motorcar" text="Motorcar" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     366            <combo key="psv" text="Public Service Vehicles (psv)"   values="yes,private,designated,official,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    365367            <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
    366368            <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
    … …  
    370372            <text key="maxlength" text="Max. Length (meters)" default="" delete_if_empty="true" />
    371373        </item>
     374        <separator/>
    372375        <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
    373376            <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
    … …  
    461464                <!-- <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" /> -->
    462465                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    463                 <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    464                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    465                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     466                <combo key="access" text="Access" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     467                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
     468                <combo key="motorcar" text="Motorcar" values="yes,private,designated,official,destination,permissive,agricultural,forestry,delivery,unknown,no" default="" delete_if_empty="true" />
    466469                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
    467470            </optional>
    … …  
    484487                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" />
    485488                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" default="" delete_if_empty="true" />
    486                 <combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" />
    487                 <combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" />
    488                 <combo key="horse" text="Horse" values="yes,designated,no" default="" delete_if_empty="true" />
     489                <combo key="foot" text="Foot" values="yes,designated,official,no" default="" delete_if_empty="true" />
     490                <combo key="bicycle" text="Bicycle" values="yes,designated,official,no" default="" delete_if_empty="true" />
     491                <combo key="horse" text="Horse" values="yes,designated,official,no" default="" delete_if_empty="true" />
    489492                <combo key="wheelchair" text="Wheelchairs" values="unknown,yes,no" default="" delete_if_empty="true" />
    490                 <combo key="ski" text="Ski" values="yes,designated,no" default="" delete_if_empty="true" />
    491                 <combo key="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" />
     493                <combo key="ski" text="Ski" values="yes,designated,official,no" default="" delete_if_empty="true" />
     494                <combo key="snowmobile" text="Snowmobile" values="yes,designated,official,no" default="" delete_if_empty="true" />
    492495                <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" delete_if_empty="true" /> -->
    493496                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    … …  
    575578                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
    576579                <check key="passing_places" text="Passing Places" default="off" delete_if_empty="true" />
    577                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    578580                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
    579581                <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" default="" delete_if_empty="true" />

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r2946 r2989  
    364364            combo = new JComboBox(lhm.values().toArray());
    365365            combo.setEditable(editable);
     366            combo.setMaximumRowCount(13);
    366367            AutoCompletingTextField tf = new AutoCompletingTextField();
    367368            initAutoCompletionField(tf, key);
Note: See TracChangeset for help on using the changeset viewer.