Changeset 7222 in josm for trunk/data


Ignore:
Timestamp:
2014-06-08T16:13:54+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #10107, fix #10108 - use of new leaf_type and leaf_cycle keys in presets, deprecate old wood and type values in validator

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7210 r7222  
    355355        <text key="description" text="Description"/>
    356356    </chunk>
     357    <chunk id="leaf">
     358        <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
     359        <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
     360    </chunk>
    357361  <!-- Link chunks -->
    358362  <chunk id="link_contact">
     
    62836287                <text key="species" text="Species" />
    62846288                <text key="taxon" text="Taxon" />
     6289                <reference ref="leaf" />
    62856290            </optional>
    62866291        </item>
     
    62946299                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
    62956300            <key key="natural" value="tree_row" />
     6301            <optional>
     6302                <reference ref="leaf" />
     6303            </optional>
    62966304        </item>
    62976305        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     
    63056313            <key key="natural" value="wood" />
    63066314            <text key="name" text="Name" />
    6307             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
     6315            <reference ref="leaf" />
    63086316        </item>
    63096317        <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     
    63186326            <key key="landuse" value="forest" />
    63196327            <text key="name" text="Name" />
    6320             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
     6328            <reference ref="leaf" />
    63216329        </item>
    63226330        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
  • trunk/data/validator/deprecated.mapcss

    r7197 r7222  
    217217}
    218218
     219/* see #10107, #10108 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
     220*[wood=deciduous],
     221*[type=broad_leaved],
     222*[type=broad_leafed] {
     223  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     224  fixRemove: "{0.key}";
     225  fixAdd: "leaf_type=broadleaved";
     226}
     227
     228*[wood=coniferous] {
     229  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     230  fixRemove: "wood";
     231  fixAdd: "leaf_type=needleleaved";
     232}
     233
     234*[wood=mixed] {
     235  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     236  fixRemove: "wood";
     237  fixAdd: "leaf_type=mixed";
     238}
     239
     240*[wood=evergreen],
     241*[type=evergreen] {
     242  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     243  fixRemove: "{0.key}";
     244  fixAdd: "leaf_cycle=evergreen";
     245}
     246
     247*[type=deciduous],
     248*[type=deciduos] {
     249  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
     250  fixRemove: "type";
     251  fixAdd: "leaf_cycle=deciduous";
     252}
Note: See TracChangeset for help on using the changeset viewer.