From 7352b6bb94c27b0ad0e21ce3cdd2551d74ab68bd Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 7 Jun 2022 12:48:26 +0300
Subject: [PATCH] [classifier] Added cemetery=grave.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/mapcss-mapping.csv                       |  2 +-
 data/strings/types_strings.txt                | 37 +++++++++++++++++++
 .../styles/clear/include/Basemap_label.mapcss | 14 +++----
 data/styles/clear/include/Icons.mapcss        |  2 +-
 data/styles/vehicle/include/Icons.mapcss      |  2 +-
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 5158fd89f8..535510446e 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -465,7 +465,7 @@ deprecated|deprecated;464;x
 deprecated|deprecated;465;x
 piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
 landuse|salt_pond;467;
-deprecated|deprecated;468;x
+cemetery|grave;468;
 railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469;
 area:highway|steps;470;
 deprecated|deprecated;471;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 804c99fc46..5c4a2a701b 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4762,6 +4762,43 @@
     uk = Склад
     zh-Hans = 仓库
 
+  [type.cemetery.grave]
+    en = Grave
+    ar = ﺮﻴﻄﺧ
+    be = Магіла
+    bg = Гроб
+    cs = Hrob
+    da = Grav
+    de = Grab
+    el = Τάφος
+    es = Tumba
+    eu = Hilobia
+    fa = ﺮﺒﻗ
+    fi = Hauta
+    fr = La tombe
+    he = רבק
+    hu = Sír
+    id = Kuburan
+    it = La tomba
+    ja = 墓
+    ko = 무덤
+    nb = Grav
+    nl = Graf
+    pl = Mogiła
+    pt = Túmulo
+    pt-BR = Túmulo
+    ro = Mormânt
+    ru = Могила
+    sk = Hrob
+    sv = Grav
+    sw = Kaburi
+    th = หลุมฝังศพ
+    tr = Mezar
+    uk = Могила
+    vi = Phần mộ
+    zh-Hans = 墓穴
+    zh-Hant = 墓穴
+
   [type.craft]
     en = Craft
     fr = Artisanat
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 72a6273726..53870e98f9 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -47,6 +47,8 @@ area[landuse=cemetery],
 node[landuse=cemetery],
 area[amenity=grave_yard],
 node[amenity=grave_yard],
+node[cemetery=grave],
+area[cemetery=grave],
 {z-index: 800;}
 
 line[isoline],
@@ -626,18 +628,12 @@ node|z15-[landuse=quarry],
 /* 	7.4 Cemetry */
 
 area|z15-[landuse=cemetery],
-node|z15-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
-node|z17-[amenity=grave_yard],
-{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
-
-area|z15-16[landuse=cemetery]
-{icon-image: cemetery-m.svg;}
-area|z17-[landuse=cemetery],
 node|z17-[landuse=cemetery],
 area|z17-[amenity=grave_yard],
 node|z17-[amenity=grave_yard],
-{icon-image: cemetery-m.svg;}
+node|z17-[cemetery=grave],
+area|z17-[cemetery=grave],
+{icon-image: cemetery-m.svg; text: name; text-offset: 1; font-size: 10; text-color: @poi_label;}
 
 /* 	7.5 Pedestrian areas */
 
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 1586a24f35..1085ce173d 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -988,7 +988,7 @@ area|z17-[historic=wayside_shrine],
 node|z17-[historic=archaeological_site],
 area|z17-[historic=archaeological_site],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre]
+area|z17-[amenity=arts_centre],
 {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-optional: true;}
 
 node|z12-14[historic=fort],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index afb06f7bbb..11167a013f 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -482,7 +482,7 @@ area|z15[historic=memorial]
 node|z16-[historic=monument],
 area|z16-[historic=monument],
 node|z16-[historic=memorial],
-area|z16-[historic=memorial]
+area|z16-[historic=memorial],
 {icon-image: monument-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15-[historic=memorial][memorial=plaque],