Changeset 10798 in josm

Timestamp:

2016-08-15T00:40:04+02:00 (8 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

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• images_nodist/presets/trees_palm.png (moved) (moved from trunk/images/presets/landmark/trees_palm.png )
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -9346 +9346 @@
             <text key="species" text="Species" />
         </item> <!-- Plant Nursery -->
+        <item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=aquaculture" />
+            <space />
+            <key key="landuse" value="aquaculture" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="aquaculture" text="Aquaculture" values="shrimp,fish,mussels" />
+        </item> <!-- Aquaculture -->
         <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"

trunk/data/validator/combinations.mapcss

@@ -293 +293 @@
 
 /* #6932 */
-*[natural=water][leisure=swimming_pool],
-*[natural=water][amenity=swimming_pool] {
+*[natural=water][leisure=swimming_pool] {
   throwWarning: tr("natural water used for swimming pool");
   fixRemove: "natural";

trunk/data/validator/deprecated.mapcss

@@ -319 +319 @@
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
+}
+
+node[type=palm],
+way[type=palm] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type";
+  suggestAlternative: "trees";
+  suggestAlternative: "species";
 }
 

trunk/styles/standard/elemstyles.mapcss

@@ -3229 +3229 @@
     fill-color: green#b1e0c2;
 }
+area[landuse=aquaculture] {
+    fill-color: aquaculture#189dff;
+}
 area[landuse=grass] {
     fill-color: grass#97ca96;
@@ -4182 +4185 @@
 node[natural=tree][leaf_type=broadleaved] {
     icon-image: "presets/landmark/trees_broad_leaved.svg";
-    set icon_z17;
-}
-node[natural=tree][type=palm] {
-    icon-image: "presets/landmark/trees_palm.png";
     set icon_z17;
 }