Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 14821)
+++ trunk/data/validator/combinations.mapcss	(revision 14830)
@@ -547,2 +547,9 @@
   throwOther: tr("{0} together with {1}. Tag each hydrant separately.", "{0.tag}", "{1.tag}");
 }
+
+/* #12502 */
+node[leisure=park][natural=tree] {
+  throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
+  fixRemove: "leisure";
+}
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 14821)
+++ trunk/data/validator/geometry.mapcss	(revision 14830)
@@ -53,5 +53,5 @@
 }
 
-/* {0} on a node, should be an area; #10679 #16528 #16792 */
+/* {0} on a node, should be an area; #10679 #16528 #16792 #12502 #17402*/
 node[golf=green],
 node[golf=bunker],
@@ -74,4 +74,6 @@
 node[natural=bare_rock],
 node[natural=glacier],
+node[leisure=park][natural!=tree], /* For nodes with both tags another warning is created in combinations.mapcss */
+node[leisure=nature_reserve],
 node[waterway=riverbank],
 node[man_made=bridge],
@@ -146,14 +148,4 @@
   throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
   fixDeleteObject: this;
-}
-
-/* #12502 */
-node[leisure=park][natural=tree] {
-  throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
-  group: tr("suspicious tag combination");
-  fixRemove: "leisure";
-}
-node[leisure=park][natural!=tree] {
-  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
 }