From 4d71aa4f3dda98e5500559cca5c9b87c6259fc2f Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 7 Jun 2022 19:52:43 +0300
Subject: [PATCH] [classifier] Added linear cliff, earth_bank, embankment.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/mapcss-mapping.csv                     |  4 ++--
 data/styles/clear/include/Basemap.mapcss    | 15 +++++++++++++++
 data/styles/vehicle/include/Basemap.mapcss  | 16 ++++++++++++++++
 generator/generator_tests/osm_type_test.cpp |  8 +++++---
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index ef3aee3c24..0d49ee05d1 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -947,8 +947,8 @@ office|government;947;
 office|estate_agent;[office=estate_agent],[shop=estate_agent];;name;int_name;948;
 office|lawyer;949;
 office;[office];;name;int_name;950;
-deprecated|deprecated;951;x
-deprecated|deprecated;952;x
+natural|earth_bank;951;
+man_made|embankment;952;
 amenity|ferry_terminal;953;
 amenity;[amenity];;name;int_name;954;
 shop|furniture;955;
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index e9a4464772..984b97d300 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -703,6 +703,21 @@ line|z18-[barrier=wall],
 line|z18-[historic=citywalls],
 {width: 2.0; dashes: 2.4,2.4; opacity: 1;}
 
+/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */
+line|z16-[natural=cliff],
+line|z16-[natural=earth_bank],
+line|z16-[man_made=embankment],
+{color: @fence; width: 1.0; opacity: 0.5;}
+
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+line|z17[man_made=embankment],
+{width: 2.0; opacity: 0.7;}
+
+line|z18-[natural=cliff],
+line|z18-[natural=earth_bank],
+line|z18-[man_made=embankment],
+{width: 3.0; opacity: 1;}
 
 /* 9. ISOLINES */
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index e46c2bc826..bf575738fd 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -610,3 +610,19 @@ line|z18-[barrier=retaining_wall],
 line|z18-[barrier=wall],
 line|z18-[historic=citywalls],
 {width: 2.0; dashes: 2.4,2.4; opacity: 1;}
+
+/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */
+line|z16-[natural=cliff],
+line|z16-[natural=earth_bank],
+line|z16-[man_made=embankment],
+{color: @fence; width: 1.0; opacity: 0.5;}
+
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+line|z17[man_made=embankment],
+{width: 2.0; opacity: 0.7;}
+
+line|z18-[natural=cliff],
+line|z18-[natural=earth_bank],
+line|z18-[man_made=embankment],
+{width: 3.0; opacity: 1;}
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 64b2661591..240e70af19 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1414,9 +1414,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cliff)
 
     auto const params = GetFeatureBuilderParams(tags);
 
-    /// @todo natural=cliff is not drawable now ..
-    TEST_EQUAL(params.m_types.size(), 0, (params));
-    //TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params));
+    TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params));
   }
 }
 
@@ -1664,6 +1662,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"boundary", "national_park"},
     {"building", "has_parts"},
     {"building", "train_station"},
+    {"cemetery", "grave"},
     {"craft", "brewery"},
     {"craft", "carpenter"},
     {"craft", "electrician"},
@@ -1867,6 +1866,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"man_made", "breakwater"},
     {"man_made", "chimney"},
     {"man_made", "cutline"},
+    {"man_made", "embankment"},
     {"man_made", "lighthouse"},
     {"man_made", "survey_point"},
     {"man_made", "pier"},
@@ -1880,7 +1880,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"natural", "beach"},
     {"natural", "cape"},
     {"natural", "cave_entrance"},
+    {"natural", "cliff"},
     {"natural", "coastline"},
+    {"natural", "earth_bank"},
     {"natural", "geyser"},
     {"natural", "glacier"},
     {"natural", "grassland"},