Changeset 10860 in josm


Ignore:
Timestamp:
2016-08-20T16:26:15+02:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #13194 - update water, basin and reservoir presets; fix #13391 - remove autofix for wood=deciduous

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10854 r10860  
    21742174            <key key="landuse" value="basin" />
    21752175            <text key="name" text="Name" />
     2176            <combo key="basin" text="Type" values="retention,infiltration,detention" />
    21762177        </item> <!-- Basin -->
    21772178        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    21852186            <key key="landuse" value="reservoir" />
    21862187            <text key="name" text="Name" />
     2188            <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
    21872189        </item> <!-- Reservoir -->
    21882190        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    22122214            <key key="natural" value="water" />
    22132215            <text key="name" text="Name" />
    2214             <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
     2216            <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" />
    22152217            <check key="salt" text="Salt Water" disable_off="true" />
    22162218            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
  • trunk/data/validator/deprecated.mapcss

    r10798 r10860  
    279279}
    280280
    281 /* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
    282 *[wood=deciduous],
     281/* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
    283282*[type=broad_leaved],
    284283*[type=broad_leafed] {
     
    319318  fixRemove: "type";
    320319  fixAdd: "leaf_cycle=deciduous";
     320}
     321
     322*[wood=deciduous] {
     323  throwWarning: tr("{0} is deprecated", "{0.tag}");
     324  suggestAlternative: "leaf_type + leaf_cycle";
    321325}
    322326
Note: See TracChangeset for help on using the changeset viewer.