Changeset 12908 in josm


Ignore:
Timestamp:
2017-09-29T23:58:31+02:00 (18 months ago)
Author:
Don-vip
Message:

fix #15143 - name on landuse should be optional

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r12771 r12908  
    180180            <text key="maxheight" text="Max. height (meters)" length="7" />
    181181            <text key="maxwidth" text="Max. width (meters)" length="7" />
     182        </optional>
     183    </chunk>
     184    <chunk id="optional_name">
     185        <optional>
     186            <text key="name" text="Name" />
     187        </optional>
     188    </chunk>
     189    <chunk id="optional_name_operator">
     190        <optional>
     191            <text key="name" text="Name" />
     192            <text key="operator" text="Operator" />
    182193        </optional>
    183194    </chunk>
     
    22932304            <space />
    22942305            <key key="landuse" value="basin" />
    2295             <text key="name" text="Name" />
    22962306            <combo key="basin" text="Type" values="retention,infiltration,detention" />
     2307            <reference ref="optional_name" />
    22972308        </item> <!-- Basin -->
    22982309        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    23062317            <space />
    23072318            <key key="landuse" value="reservoir" />
    2308             <text key="name" text="Name" />
    23092319            <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
     2320            <reference ref="optional_name" />
    23102321        </item> <!-- Reservoir -->
    23112322        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    23202331            <space />
    23212332            <key key="man_made" value="reservoir_covered" />
    2322             <text key="name" text="Name" />
     2333            <reference ref="optional_name" />
    23232334        </item> <!-- Covered Reservoir -->
    23242335        <separator/>
     
    1027410285            <space />
    1027510286            <key key="landuse" value="forest" />
    10276             <text key="name" text="Name" />
    1027710287            <reference ref="leaf" />
     10288            <reference ref="optional_name" />
    1027810289        </item> <!-- Forest -->
    1027910290        <item name="Cutline" icon="presets/landmark/cutline.svg" type="way" preset_name_label="true">
     
    1047510486            <space />
    1047610487            <key key="landuse" value="farmyard" />
    10477             <text key="name" text="Name" />
     10488            <reference ref="optional_name" />
    1047810489        </item> <!-- Farmyard -->
    1047910490        <item name="Farmland" icon="presets/landuse/farmland.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1048810499            <space />
    1048910500            <key key="landuse" value="farmland" />
    10490             <text key="name" text="Name" />
    1049110501            <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
     10502            <reference ref="optional_name" />
    1049210503        </item> <!-- Farmland -->
    1049310504        <item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1050210513            <space />
    1050310514            <key key="landuse" value="meadow" />
    10504             <text key="name" text="Name" />
     10515            <reference ref="optional_name" />
    1050510516        </item> <!-- Meadow -->
    1050610517        <item name="Orchard" icon="presets/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1051510526            <space />
    1051610527            <key key="landuse" value="orchard" />
    10517             <text key="name" text="Name" />
    1051810528            <combo key="trees" text="Trees" values="olive_trees,apple_trees,oil_palms,orange_trees,almond_trees,banana_plants,coconut_palms,hazel_plants,cherry_trees,persimmon_trees,walnut_trees,plum_trees,peach_trees,tea_plants" />
     10529            <reference ref="optional_name" />
    1051910530        </item> <!-- Orchard -->
    1052010531        <item name="Vineyard" icon="presets/landuse/vineyard.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1052710538            <space />
    1052810539            <key key="landuse" value="vineyard" />
    10529             <text key="name" text="Name" />
     10540            <reference ref="optional_name" />
    1053010541        </item> <!-- Vineyard -->
    1053110542        <item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1054210553            <space />
    1054310554            <key key="landuse" value="greenhouse_horticulture" />
    10544             <text key="name" text="Name" />
    10545             <text key="operator" text="Operator" />
     10555            <reference ref="optional_name_operator" />
    1054610556        </item> <!-- Greenhouse Horticulture -->
    1054710557        <item name="Plant Nursery" icon="presets/landuse/plant_nursery.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1055510565            <space />
    1055610566            <key key="landuse" value="plant_nursery" />
    10557             <text key="name" text="Name" />
    10558             <text key="operator" text="Operator" />
    1055910567            <reference ref="genus_species_taxon" />
     10568            <reference ref="optional_name_operator" />
    1056010569        </item> <!-- Plant Nursery -->
    1056110570        <item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1056610575            <space />
    1056710576            <key key="landuse" value="aquaculture" />
    10568             <text key="name" text="Name" />
    10569             <text key="operator" text="Operator" />
    1057010577            <combo key="aquaculture" text="Aquaculture" values="shrimp,fish,mussels" />
     10578            <reference ref="optional_name_operator" />
    1057110579        </item> <!-- Aquaculture -->
    1057210580        <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1058210590            <space />
    1058310591            <key key="landuse" value="allotments" />
    10584             <text key="name" text="Name" />
     10592            <reference ref="optional_name" />
    1058510593        </item> <!-- Allotments -->
    1058610594        <separator/>
     
    1059510603            <space />
    1059610604            <key key="leisure" value="garden" />
    10597             <text key="name" text="Name" />
     10605            <reference ref="optional_name" />
    1059810606        </item> <!-- Garden -->
    1059910607        <item name="Grass" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1061010618            <space />
    1061110619            <key key="landuse" value="grass" />
    10612             <text key="name" text="Name" />
     10620            <reference ref="optional_name" />
    1061310621        </item> <!-- Grass -->
    1061410622        <item name="Village Green" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1062510633            <space />
    1062610634            <key key="landuse" value="village_green" />
    10627             <text key="name" text="Name" />
     10635            <reference ref="optional_name" />
    1062810636        </item> <!-- Village Green -->
    1062910637        <item name="Common" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1063910647            <space />
    1064010648            <key key="leisure" value="common" />
    10641             <text key="name" text="Name" />
     10649            <reference ref="optional_name" />
    1064210650        </item> <!-- Common -->
    1064310651        <item name="Park" icon="presets/leisure/park.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1065310661            <space />
    1065410662            <key key="leisure" value="park" />
    10655             <text key="name" text="Name" />
     10663            <reference ref="optional_name" />
    1065610664        </item> <!-- Park -->
    1065710665        <item name="Recreation Ground" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1066610674            <space />
    1066710675            <key key="landuse" value="recreation_ground" />
    10668             <text key="name" text="Name" />
     10676            <reference ref="optional_name" />
    1066910677        </item> <!-- Recreation Ground -->
    1067010678        <separator/>
     
    1068110689            <space />
    1068210690            <key key="landuse" value="residential" />
    10683             <text key="name" text="Name" />
     10691            <reference ref="optional_name" />
    1068410692        </item> <!-- Residential Area -->
    1068510693        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    1073510743            <space />
    1073610744            <key key="landuse" value="retail" />
    10737             <text key="name" text="Name" />
     10745            <reference ref="optional_name" />
    1073810746        </item> <!-- Retail -->
    1073910747        <item name="Commercial" icon="presets/landuse/commercial.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1074810756            <space />
    1074910757            <key key="landuse" value="commercial" />
    10750             <text key="name" text="Name" />
     10758            <reference ref="optional_name" />
    1075110759        </item> <!-- Commercial -->
    1075210760        <item name="Industrial" icon="presets/landmark/works.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1076210770            <space />
    1076310771            <key key="landuse" value="industrial" />
    10764             <text key="name" text="Name" />
    1076510772            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse" values_context="industrial" />
     10773            <reference ref="optional_name" />
    1076610774        </item> <!-- Industrial -->
    1076710775        <item name="Garages" icon="presets/landuse/garages.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1077610784            <space />
    1077710785            <key key="landuse" value="garages" />
    10778             <text key="name" text="Name" />
    10779             <text key="operator" text="Operator" />
     10786            <reference ref="optional_name_operator" />
    1078010787        </item> <!-- Garages -->
    1078110788        <item name="Railway Land" icon="presets/landuse/railway.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1078910796            <space />
    1079010797            <key key="landuse" value="railway" />
    10791             <text key="name" text="Name" />
     10798            <reference ref="optional_name" />
    1079210799        </item> <!-- Railway Land -->
    1079310800        <item name="Military" icon="presets/landuse/military.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1080010807            <space />
    1080110808            <key key="landuse" value="military" />
    10802             <text key="name" text="Name" />
     10809            <reference ref="optional_name" />
    1080310810        </item> <!-- Military -->
    1080410811        <separator/>
     
    1081510822            <space />
    1081610823            <key key="landuse" value="construction" />
    10817             <text key="name" text="Name" />
     10824            <reference ref="optional_name" />
    1081810825        </item> <!-- Construction Area -->
    1081910826        <item name="Brownfield" icon="presets/landuse/brownfield.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1082810835            <space />
    1082910836            <key key="landuse" value="brownfield" />
    10830             <text key="name" text="Name" />
     10837            <reference ref="optional_name" />
    1083110838        </item> <!-- Brownfield -->
    1083210839        <item name="Greenfield" icon="presets/landuse/greenfield.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1084010847            <space />
    1084110848            <key key="landuse" value="greenfield" />
    10842             <text key="name" text="Name" />
     10849            <reference ref="optional_name" />
    1084310850        </item> <!-- Greenfield -->
    1084410851        <item name="Landfill" icon="presets/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
     
    1085310860            <space />
    1085410861            <key key="landuse" value="landfill" />
    10855             <text key="name" text="Name" />
     10862            <reference ref="optional_name" />
    1085610863        </item> <!-- Landfill -->
    1085710864        <item name="Quarry" icon="presets/landmark/mine.svg" type="closedway,multipolygon" preset_name_label="true">
Note: See TracChangeset for help on using the changeset viewer.