Changeset 10798 in josm for trunk/data


Ignore:
Timestamp:
2016-08-15T00:40:04+02:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #13316 - add landuse=aquaculture to preset and mappaint style, icon self created (CC0 and PD licensed); deprecate type=palm; remove old validator rule for deprecated amenity=swimming_pool

Location:
trunk/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10771 r10798  
    93469346            <text key="species" text="Species" />
    93479347        </item> <!-- Plant Nursery -->
     9348        <item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
     9349            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=aquaculture" />
     9350            <space />
     9351            <key key="landuse" value="aquaculture" />
     9352            <text key="name" text="Name" />
     9353            <text key="operator" text="Operator" />
     9354            <combo key="aquaculture" text="Aquaculture" values="shrimp,fish,mussels" />
     9355        </item> <!-- Aquaculture -->
    93489356        <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
    93499357            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
  • trunk/data/validator/combinations.mapcss

    r10538 r10798  
    293293
    294294/* #6932 */
    295 *[natural=water][leisure=swimming_pool],
    296 *[natural=water][amenity=swimming_pool] {
     295*[natural=water][leisure=swimming_pool] {
    297296  throwWarning: tr("natural water used for swimming pool");
    298297  fixRemove: "natural";
  • trunk/data/validator/deprecated.mapcss

    r10538 r10798  
    319319  fixRemove: "type";
    320320  fixAdd: "leaf_cycle=deciduous";
     321}
     322
     323node[type=palm],
     324way[type=palm] {
     325  throwWarning: tr("{0} is deprecated", "{0.tag}");
     326  suggestAlternative: "leaf_type";
     327  suggestAlternative: "trees";
     328  suggestAlternative: "species";
    321329}
    322330
Note: See TracChangeset for help on using the changeset viewer.