[styles] Next draw order (from downmost to upmost):

- ocean
- land, island
- forest, grass, farm
- water, lake, basin

data/mapcss-mapping.csv

@@ -17,7 +17,7 @@ highway|path;[highway=path];;name;int_name;16;
 highway|bus_stop;[highway=bus_stop];;name;int_name;17;
 natural|tree;[natural=tree];;name;int_name;18;
 place|locality;[place=locality];;name;int_name;19;
-natural|coastline;[natural=ocean];;name;int_name;20;
+natural|coastline;[natural=coastline];;name;int_name;20;
 place|village;[place=village];;name;int_name;21;
 highway|residential|oneway;[highway=residential][oneway?];x;name;int_name;22;highway|residential
 waterway|river;[waterway=river];;name;int_name;23;

data/styles/include/base_landuse.mapcss

@@ -1,23 +1,33 @@
-area[natural=coastline]
-{
-  fill-color: #f1eee8;
-}
-area|z6-11[natural=land]
-{
-  fill-color: #f1eee8;
-}
-area|z12-[natural=land]
-{
-  fill-color: #f8f8f8;
-}
-
 area[landuse],
 area[natural],
-area[leisure]
+area[leisure],
+area[place=island],
+area[place=islet]
 {
   fill-position: background;
 }
 
+area[natural=coastline]
+{
+  fill-color: #B9D4D4;
+  z-index: -10;
+}
+
+area|z6-11[natural=land],
+area|z6-11[place=island],
+area|z6-11[place=islet]
+{
+  fill-color: #f1eee8;
+  z-index: -9;
+}
+area|z12-[natural=land],
+area|z12-[place=island],
+area|z12-[place=islet]
+{
+  fill-color: #f8f8f8;
+  z-index: -9;
+}
+
 area|z12-[landuse=farm],
 area|z12-[landuse=farmland]
 {

data/styles/include/base_water.mapcss

@@ -35,7 +35,6 @@ area|z16-[amenity=fountain],
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
-area[natural=ocean],
 area|z10-[natural=lake],
 area|z10-[natural=pond],
 area|z10-[natural=water],

data/styles/ink.mapcss

@@ -3869,16 +3869,24 @@ line[boundary=administrative][admin_level!=2][admin_level!=3][admin_level!=4]
 }
 
 area|z6-[natural=land]
+area|z6-[place=island]
+area|z6-[place=islet]
 {
   fill-color: #ffffff;
+  z-index: -5;
+  fill-position: foreground;
+}
+
+area[natural=coastline]
+{
+  fill-color: #6b6b6b;
+  z-index: -10;
 }
 
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
 area|z13-[leisure=water_park],
-area[natural=ocean],
-area[natural=coastline],
 area|z10-[natural=lake],
 area|z10-[natural=pond],
 area|z10-[natural=water],
@@ -3892,6 +3900,7 @@ area|z10-[waterway=riverbank]
   text-color: white;
   text-halo-radius: 2;
   text-halo-color: #6b6b6b;
+  z-index: 10;
 }
 
 line|z14-[natural=spring],

generator/generator_tests/classificator_tests.cpp

@@ -121,3 +121,88 @@ UNIT_TEST(Classificator_DrawingRules)
   CheckLineStyles(c, "waterway");
   //CheckLineStyles(c, "railway");
 }
+
+namespace
+{
+
+pair<int, int> GetMinMax(int level, vector<uint32_t> const & types)
+{
+  pair<int, int> res(numeric_limits<int>::max(), numeric_limits<int>::min());
+
+  drule::KeysT keys;
+  feature::GetDrawRule(types, level, feature::FEATURE_TYPE_AREA, keys);
+
+  for (size_t i = 0; i < keys.size(); ++i)
+  {
+    if (keys[i].m_type != drule::area)
+      continue;
+
+    if (keys[i].m_priority < res.first)
+      res.first = keys[i].m_priority;
+    if (keys[i].m_priority > res.second)
+      res.second = keys[i].m_priority;
+  }
+
+  return res;
+}
+
+}
+
+// Check area drawing priority according to the types order below (from downmost to upmost).
+// If someone is desagree with this order, please, refer to VNG :)
+// natural-coastline
+// place-island = natural-land
+// natural-wood,scrub,heath,grassland = landuse-grass,farm,farmland,forest
+// natural-water,lake = landuse-basin
+
+UNIT_TEST(Classificator_AreaPriority)
+{
+  classificator::Load();
+  Classificator const & c = classif();
+
+  vector<vector<uint32_t> > types;
+
+  char const * arrT[][2] =
+  {
+    // 0
+    {"natural", "coastline"},
+    // 1
+    //{"waterway", "riverbank"}, - it's not a good idea to place it here
+    // 2
+    {"place", "island"}, {"natural", "land"},
+    // 3
+    {"natural", "wood"}, {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
+    {"landuse", "grass"}, {"landuse", "farm"}, {"landuse", "farmland"}, {"landuse", "forest"},
+    // 4
+    //{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
+    // 5
+    {"natural", "water"}, {"natural", "lake"}, {"landuse", "basin"}
+  };
+  size_t arrI[] = { 1, 2, 8, 3 };
+
+  size_t ind = 0;
+  for (size_t i = 0; i < ARRAY_SIZE(arrI); ++i)
+  {
+    types.push_back(vector<uint32_t>());
+    types.back().reserve(arrI[i]);
+
+    for (size_t j = 0; j < arrI[i]; ++j)
+    {
+      types.back().push_back(c.GetTypeByPath(vector<string>(arrT[ind], arrT[ind] + 2)));
+      ++ind;
+    }
+  }
+
+  TEST_EQUAL(ind, ARRAY_SIZE(arrT), ());
+
+  for (int level = scales::GetUpperWorldScale() + 1; level <= scales::GetUpperStyleScale(); ++level)
+  {
+    pair<int, int> minmax = GetMinMax(level, types[0]);
+    for (size_t i = 1; i < types.size(); ++i)
+    {
+      pair<int, int> const mm = GetMinMax(level, types[i]);
+      TEST_LESS(minmax.second, mm.first, (i));
+      minmax = mm;
+    }
+  }
+}