Ticket #25035: josm_25035.patch

File josm_25035.patch, 21.9 KB (added by skyper, 28 minutes ago)

add material=sandstone

  • trunk/resources/data/defaultpresets.xml

     
    2727    <chunk id="riding_surface">
    2828        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted,woodchips" />
    2929    </chunk>
     30    <chunk id="material">
     31        <combo key="material" text="Material" values="concrete,metal,plastic,sandstone,steel,stone,wood" />
     32    </chunk>
     33    <chunk id="material_building"
     34        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,sandstone,steel,stone,wood" />
     35    </chunk>
    3036    <chunk id="highway_base">
    3137        <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
    3238        <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
    … …  
    473479    </chunk>
    474480    <chunk id="pole">
    475481        <text key="height" text="Height (meters)" length="7" />
    476         <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     482        <reference ref="material" />
    477483        <reference ref="ref_operator" />
    478484    </chunk>
    479485    <chunk id="power_pole">
    … …  
    17621768            <link wiki="Tag:barrier=block" />
    17631769            <key key="barrier" value="block" />
    17641770            <reference ref="optional_maxwidth" />
    1765             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1771            <reference ref="material" />
    17661772            <space />
    17671773            <reference ref="highway_access_vehicle" />
    17681774            <reference ref="check_access_nomotor" />
    … …  
    17751781            <space />
    17761782            <combo key="bollard" text="Bollard type" values="rising,removable,foldable,fixed" values_searchable="true" />
    17771783            <reference ref="optional_maxwidth" />
    1778             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1784            <reference ref="material" />
    17791785            <space />
    17801786            <label text="Tags which are implied and do not need to be set are:" />
    17811787            <label text="`access=no`, `foot=yes` and `bicycle=yes`" />
    … …  
    17891795            <link wiki="Tag:barrier=cycle_barrier" />
    17901796            <key key="barrier" value="cycle_barrier" />
    17911797            <reference ref="optional_maxwidth" />
    1792             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1798            <reference ref="material" />
    17931799            <space />
    17941800            <reference ref="highway_access_vehicle" />
    17951801            <optional text="Non-motorized traffic:">
    … …  
    18081814            <link wiki="Tag:barrier=cattle_grid" />
    18091815            <key key="barrier" value="cattle_grid" />
    18101816            <reference ref="optional_maxwidth" />
    1811             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1817            <reference ref="material" />
    18121818            <space />
    18131819            <reference ref="highway_access_vehicle" />
    18141820            <reference ref="check_access_nomotor" />
    … …  
    18191825            <link wiki="Tag:barrier=bus_trap" />
    18201826            <key key="barrier" value="bus_trap" />
    18211827            <reference ref="optional_maxwidth" />
    1822             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1828            <reference ref="material" />
    18231829            <space />
    18241830            <label text="Tags which are implied and do not need to be set are:" />
    18251831            <label text="`motor_vehicle=no`, `psv=yes`, `foot=yes` and `bicycle=yes`" />
    … …  
    18321838            <link wiki="Tag:barrier=spikes" />
    18331839            <key key="barrier" value="spikes" />
    18341840            <reference ref="optional_maxwidth" />
    1835             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1841            <reference ref="material" />
    18361842            <space />
    18371843            <reference ref="highway_access_vehicle" />
    18381844            <reference ref="check_access_nomotor" />
    … …  
    18961902            <link wiki="Tag:barrier=handrail" />
    18971903            <key key="barrier" value="handrail" />
    18981904            <optional>
    1899                 <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1905                <reference ref="material" />
    19001906                <reference ref="color" />
    19011907            </optional>
    19021908        </item> <!-- Handrail -->
    … …  
    19151921            <key key="barrier" value="wall" />
    19161922            <reference ref="optional_height" />
    19171923            <combo key="wall" text="Type" values="brick,castle_wall,concrete,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
    1918             <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     1924            <reference ref="material_building" />
    19191925        </item> <!-- Wall -->
    19201926        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
    19211927            <link wiki="Tag:barrier=city_wall" />
    19221928            <key key="barrier" value="city_wall" />
    19231929            <reference ref="optional_height" />
    19241930            <check key="two_sided" text="Two-sided" disable_off="true" />
    1925             <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     1931            <reference ref="material_building" />
    19261932        </item> <!-- City Wall -->
    19271933        <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
    19281934            <link wiki="Tag:barrier=retaining_wall" />
    19291935            <key key="barrier" value="retaining_wall" />
    19301936            <reference ref="optional_height" />
    1931             <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     1937            <reference ref="material_building" />
    19321938        </item> <!-- Retaining Wall -->
    19331939        <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
    19341940            <link wiki="Tag:barrier=jersey_barrier" />
    … …  
    19631969            <link wiki="Tag:barrier=entrance" />
    19641970            <key key="barrier" value="entrance" />
    19651971            <reference ref="optional_maxheight_maxwidth" />
    1966             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1972            <reference ref="material" />
    19671973            <space />
    19681974            <reference ref="highway_access_vehicle" />
    19691975            <reference ref="check_access_nomotor" />
    … …  
    19741980            <link wiki="Tag:barrier=gate" />
    19751981            <key key="barrier" value="gate" />
    19761982            <reference ref="optional_maxheight_maxwidth" />
    1977             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1983            <reference ref="material" />
    19781984            <space />
    19791985            <reference ref="highway_access_vehicle" />
    19801986            <reference ref="check_access_nomotor" />
    … …  
    19881994            <space />
    19891995            <combo key="lift_gate:type" text="Type" values="single,double" values_context="lift_gate" values_searchable="true" />
    19901996            <reference ref="optional_maxwidth" />
    1991             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     1997            <reference ref="material" />
    19921998            <space />
    19931999            <reference ref="highway_access_vehicle" />
    19942000            <reference ref="check_access_nomotor" />
    … …  
    20022008            <space />
    20032009            <combo key="swing_gate:type" text="Type" values="single,double" values_context="swing_gate" values_searchable="true" />
    20042010            <reference ref="optional_maxwidth" />
    2005             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2011            <reference ref="material" />
    20062012            <space />
    20072013            <reference ref="highway_access_vehicle" />
    20082014            <reference ref="check_access_nomotor" />
    … …  
    20152021            <key key="barrier" value="hampshire_gate" />
    20162022            <reference ref="optional_maxwidth" />
    20172023            <text key="maxlength" text="Max. length (meters)" match="key" />
    2018             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2024            <reference ref="material" />
    20192025            <space />
    20202026            <reference ref="highway_access_vehicle" />
    20212027            <reference ref="check_access_nomotor" />
    … …  
    20282034            <key key="barrier" value="bump_gate" />
    20292035            <reference ref="optional_maxheight_maxwidth" />
    20302036            <text key="maxlength" text="Max. length (meters)" match="key" />
    2031             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2037            <reference ref="material" />
    20322038            <space />
    20332039            <reference ref="highway_access_vehicle" />
    20342040            <reference ref="check_access_nomotor" />
    … …  
    20402046            <link wiki="Tag:barrier=kissing_gate" />
    20412047            <key key="barrier" value="kissing_gate" />
    20422048            <reference ref="optional_maxwidth" />
    2043             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2049            <reference ref="material" />
    20442050            <space />
    20452051            <label text="The tag `foot=yes` is implied and does not need to be set." />
    20462052            <space />
    … …  
    20542060            <link wiki="Tag:barrier=wicket_gate" />
    20552061            <key key="barrier" value="wicket_gate" />
    20562062            <reference ref="optional_maxwidth" />
    2057             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2063            <reference ref="material" />
    20582064            <space />
    20592065            <label text="The tag `foot=yes` is implied and does not need to be set." />
    20602066            <space />
    … …  
    20672073            <link wiki="Tag:barrier=height_restrictor" />
    20682074            <key key="barrier" value="height_restrictor" />
    20692075            <reference ref="optional_maxheight_maxwidth" />
    2070             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2076            <reference ref="material" />
    20712077            <space />
    20722078            <reference ref="highway_access_vehicle" />
    20732079            <reference ref="check_access_nomotor" />
    … …  
    20782084            <link wiki="Tag:barrier=chain" />
    20792085            <key key="barrier" value="chain" />
    20802086            <reference ref="optional_maxwidth" />
    2081             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2087            <reference ref="material" />
    20822088            <space />
    20832089            <reference ref="highway_access_vehicle" />
    20842090            <reference ref="check_access_nomotor" />
    … …  
    20922098            <key key="barrier" value="stile" />
    20932099            <combo key="stile" text="Type" values="ladder,squeezer,stepover" values_searchable="true" />
    20942100            <reference ref="optional_maxwidth" />
    2095             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2101            <reference ref="material" />
    20962102            <space />
    20972103            <reference ref="highway_access_vehicle" />
    20982104            <reference ref="check_access_nomotor" />
    … …  
    21032109            <key key="barrier" value="turnstile" />
    21042110            <reference ref="optional_maxwidth" />
    21052111            <text key="maxlength" text="Max. length (meters)" match="key" />
    2106             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2112            <reference ref="material" />
    21072113            <space />
    21082114            <reference ref="highway_access_vehicle" />
    21092115            <reference ref="check_access_nomotor" />
    … …  
    21142120            <key key="barrier" value="full-height_turnstile" />
    21152121            <reference ref="optional_maxheight_maxwidth" />
    21162122            <text key="maxlength" text="Max. length (meters)" match="key" />
    2117             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2123            <reference ref="material" />
    21182124            <space />
    21192125            <reference ref="highway_access_vehicle" />
    21202126            <reference ref="check_access_nomotor" />
    … …  
    21262132            <key key="barrier" value="sally_port" />
    21272133            <text key="maxheight" text="Max. height (meters)" match="key" />
    21282134            <text key="maxwidth" text="Max. width (meters)" match="key" />
    2129             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2135            <reference ref="material" />
    21302136            <space />
    21312137            <reference ref="highway_access_vehicle" />
    21322138            <reference ref="check_access_nomotor" />
    … …  
    43464352            <combo key="playground" text="Type" values="activitypanel,aerialrotator,balancebeam,basketrotator,basketswing,climbingframe,climbingwall,cushion,exercise,hopscotch,horizontal_bar,map,playhouse,roundabout,sandpit,seesaw,sledding,slide,splash_pad,springy,structure,swing,teenshelter,trampoline,water,youth_bench,zipwire" values_searchable="true" values_context="playground" match="key!" />
    43474353            <reference ref="name_operator_oh_wheelchair" />
    43484354            <reference ref="max_age" />
    4349             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     4355            <reference ref="material" />
    43504356        </item> <!-- Playground device -->
    43514357        <item name="Picnic Site" icon="presets/leisure/picnic.svg" type="node,closedway,multipolygon" preset_name_label="true">
    43524358            <link wiki="Tag:tourism=picnic_site" />
    … …  
    45434549            <text key="name" text="Name" />
    45444550            <text key="artwork_subject" text="Subject" />
    45454551            <text key="artist_name" text="Artist Name" />
    4546             <combo key="material" text="Material" values="aluminium,brass,bronze,ceramic,concrete,copper,glass,gold,granite,iron,marble,metal,plastic,steel,stone,wood" />
     4552            <combo key="material" text="Material" values="aluminium,brass,bronze,ceramic,concrete,copper,glass,gold,granite,iron,marble,metal,plastic,sandstone,steel,stone,wood" />
    45474553            <text key="start_date" text="Start date" />
    45484554        </item> <!-- Artwork -->
    45494555        <item name="Studio" icon="presets/service/studio.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    50245030            <key key="indication:emergency" value="fire_hydrant" match="keyvalue!" />
    50255031            <optional>
    50265032                <reference ref="ref_operator" />
    5027                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     5033                <reference ref="material" />
    50285034                <reference ref="color" />
    50295035                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    50305036                <space />
    … …  
    53925398            <space />
    53935399            <key key="amenity" value="bench" />
    53945400            <check key="backrest" text="Backrest" />
    5395             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     5401            <reference ref="material" />
    53965402            <reference ref="color" />
    53975403            <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
    53985404        </item> <!-- Bench -->
    … …  
    64746480                <reference ref="name_ref_operator" />
    64756481                <text key="height" text="Height (meters)" length="7" />
    64766482                <text key="ele" text="Elevation (meters)" length="10" />
    6477                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     6483                <reference ref="material_building" />
    64786484                <reference ref="POI_access" />
    64796485            </optional>
    64806486            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    … …  
    64886494            <key key="man_made" value="survey_point" />
    64896495            <reference ref="name_ref" />
    64906496            <text key="ele" text="Elevation (meters)" length="10" />
    6491             <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
     6497            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,sandstone,steel,stone" />
    64926498        </item> <!-- Survey Point -->
    64936499        <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
    64946500            <link wiki="Tag:man_made=surveillance" />
    … …  
    65446550                <reference ref="name_ref_operator" />
    65456551                <text key="height" text="Height (meters)" length="7" />
    65466552                <text key="ele" text="Elevation (meters)" length="10" />
    6547                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     6553                <reference ref="material_building" />
    65486554                <reference ref="communication" />
    65496555            </optional>
    65506556            <preset_link preset_name="Mast" text="Similar but different tags:" />
    … …  
    65686574                <reference ref="name_ref_operator" />
    65696575                <text key="height" text="Height (meters)" length="7" />
    65706576                <text key="ele" text="Elevation (meters)" length="10" />
    6571                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     6577                <reference ref="material_building" />
    65726578                <reference ref="communication" />
    65736579            </optional>
    65746580            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    … …  
    65966602                <reference ref="name_ref_operator" />
    65976603                <text key="height" text="Height (meters)" length="7" />
    65986604                <text key="ele" text="Elevation (meters)" length="10" />
    6599                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     6605                <reference ref="material_building" />
    66006606                <reference ref="communication" />
    66016607                <space />
    66026608                <reference ref="POI_access" />
    … …  
    66216627                <reference ref="name_ref_operator" />
    66226628                <text key="height" text="Height (meters)" length="7" />
    66236629                <text key="ele" text="Elevation (meters)" length="10" />
    6624                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     6630                <reference ref="material_building" />
    66256631                <reference ref="communication" />
    66266632                <space />
    66276633                <reference ref="POI_access" />
    … …  
    66746680            <reference ref="utilities" />
    66756681            <optional>
    66766682                <reference ref="ref_operator" />
    6677                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     6683                <reference ref="material" />
    66786684                <reference ref="color" />
    66796685                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    66806686                <space />
    … …  
    72867292            <key key="power" value="portal" />
    72877293            <text key="height" text="Height (meters)" length="7" />
    72887294            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    7289             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     7295            <reference ref="material" />
    72907296            <reference ref="color" />
    72917297            <reference ref="ref_operator" />
    72927298            <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
    … …  
    72987304            <key key="power" value="tower" />
    72997305            <text key="height" text="Height (meters)" length="7" />
    73007306            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    7301             <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     7307            <reference ref="material" />
    73027308            <reference ref="color" />
    73037309            <reference ref="ref_operator" />
    73047310            <optional>
    … …  
    74167422            <key key="utility" value="power" match="keyvalue!"/>
    74177423            <optional>
    74187424                <reference ref="ref_operator" />
    7419                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     7425                <reference ref="material" />
    74207426                <reference ref="color" />
    74217427                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    74227428                <space />
    … …  
    76357641            <optional>
    76367642                <text key="inscription" text="Inscription" multiline="true" />
    76377643                <text key="artist_name" text="Artist Name" />
    7638                 <combo key="material" text="Material" values="concrete,granite,metal,plastic,steel,stone,wood" />
     7644                <combo key="material" text="Material" values="concrete,granite,metal,plastic,sandstone,steel,stone,wood" />
    76397645                <text key="start_date" text="Start date" />
    76407646                <reference ref="wikipedia_wikidata" />
    76417647            </optional>
    … …  
    90739079            <optional>
    90749080                <reference ref="name_ref" />
    90759081                <text key="inscription" text="Inscription" multiline="true" />
    9076                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     9082                <reference ref="material" />
    90779083            </optional>
    90789084            <preset_link preset_name="Boundary Stone" text="Similar but different tags:" />
    90799085        </item> <!-- Boundary Marker -->