[styles] Replace obsolete "natural-grass,greenfield,greenhouse" with widely used "natural-grassland".

data/classificator.txt

@@ -426,9 +426,7 @@ world  +
         cliff  -
         coastline  -
         glacier  -
-        grass  -
-        greenfield  -
-        greenhouse_horticulture  -
+        grassland  -
         heath  -
         lake  -
         land  -

data/mapcss-mapping.csv

@@ -471,7 +471,7 @@ highway|steps|area;[highway=steps][area?];x;name;int_name;470;area:highway|steps
 railway|proposed;[railway=proposed];x;name;int_name;471;
 highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472;
 landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473;highway|construction
-natural|grass;[natural=grass];;name;int_name;474;natural|wood
+natural|grass;[natural=grass];x;name;int_name;474;natural|grassland
 highway|road|area;[highway=road][area?];x;name;int_name;475;
 highway|tertiary|area;[highway=tertiary][area?];x;name;int_name;476;
 piste:lift|platter;[piste:lift=platter];;name;int_name;477;
@@ -856,8 +856,8 @@ man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=ov
 mapswithme|grid;[mapswithme=grid];;name;int_name;856;
 natural|farmyard;[natural=farmyard];x;name;int_name;857;
 natural|garages;[natural=garages];x;name;int_name;858;
-natural|greenfield;[natural=greenfield];;name;int_name;859;
-natural|greenhouse_horticulture;[natural=greenhouse_horticulture];;name;int_name;860;
+natural|greenfield;[natural=greenfield];x;name;int_name;859;
+natural|greenhouse_horticulture;[natural=greenhouse_horticulture];x;name;int_name;860;landuse|greenhouse_horticulture
 natural|salt_pond;[natural=salt_pond];;name;int_name;861;
 natural|street;[natural=street];x;name;int_name;862;
 railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863;
@@ -953,3 +953,4 @@ landuse|residential|urban;[landuse=residential][residential=urban];;name;int_nam
 amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953;
 amenity;[amenity];;name;int_name;954;
 shop|furniture;[shop=furniture];;name;int_name;955;
+natural|grassland;[natural=grassland];;name;int_name;956;

data/styles/include/base_landuse.mapcss

@@ -31,7 +31,8 @@ area|z12-[landuse=grass],
 area|z12-[landuse=meadow],
 area|z12-[landuse=recreation_ground],
 area|z12-[landuse=village_green],
-area|z12-[natural=scrub]
+area|z12-[natural=scrub],
+area|z12-[natural=grassland]
 {
   fill-color: #d0e8c4;
 }
@@ -141,9 +142,7 @@ area|z15[landuse=salt_pond],
 area|z15[landuse=village_green],
 area|z15[landuse=vineyard],
 area|z14-15[natural=bay],
-area|z15[natural=grass],
-area|z15[natural=greenfield],
-area|z15[natural=greenhouse_horticulture],
+area|z15[natural=grassland],
 area|z15[natural=meadow],
 area|z15[natural=orchard],
 area|z15[natural=salt_pond],
@@ -203,9 +202,7 @@ area|z16-[landuse=salt_pond],
 area|z16-[landuse=village_green],
 area|z16-[landuse=vineyard],
 area|z16-[natural=bay],
-area|z16-[natural=grass],
-area|z16-[natural=greenfield],
-area|z16-[natural=greenhouse_horticulture],
+area|z16-[natural=grassland],
 area|z16-[natural=meadow],
 area|z16-[natural=orchard],
 area|z16-[natural=salt_pond],
@@ -237,9 +234,7 @@ node|z16-[landuse=salt_pond],
 node|z16-[landuse=village_green],
 node|z16-[landuse=vineyard],
 node|z16-[natural=bay],
-node|z16-[natural=grass],
-node|z16-[natural=greenfield],
-node|z16-[natural=greenhouse_horticulture],
+node|z16-[natural=grassland],
 node|z16-[natural=meadow],
 node|z16-[natural=orchard],
 node|z16-[natural=salt_pond],

data/types.txt

@@ -471,7 +471,7 @@ area:highway|steps
 mapswithme
 mapswithme
 highway|construction
-natural|grass
+natural|grassland
 mapswithme
 mapswithme
 piste:lift|platter
@@ -856,8 +856,8 @@ man_made|pipeline
 mapswithme|grid
 mapswithme
 mapswithme
-natural|greenfield
-natural|greenhouse_horticulture
+mapswithme
+landuse|greenhouse_horticulture
 natural|salt_pond
 mapswithme
 railway|incline|bridge
@@ -953,3 +953,4 @@ landuse|residential|urban
 amenity|ferry_terminal
 amenity
 shop|furniture
+natural|grassland