From 1f8be579bd2a7f2c929988a9197ac3bb5a242a5a Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Fri, 22 Oct 2021 10:54:06 +0100
Subject: [PATCH] [styles] Draw natural=bare_rock like filled area, but not
 like peak icon.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/styles/clear/include/Basemap.mapcss | 5 +++++
 data/styles/clear/include/Icons.mapcss   | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 4bc61570f5..b4f2186605 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -78,6 +78,7 @@ area[leisure=garden]
 area[landuse=farmland],
 area[landuse=allotments],
 area[natural=scrub],
+area[natural=bare_rock],
 area[landuse=orchard],
 area[landuse=vineyard],
 area[landuse=meadow],
@@ -249,6 +250,7 @@ area|z12-[leisure=golf_course],
 area|z12-[natural=heath],
 area|z12-[landuse=allotments],
 area|z12-[natural=scrub],
+area|z12-[natural=bare_rock],
 area|z12-[landuse=orchard],
 area|z12-[landuse=vineyard],
 area|z12-[landuse=meadow],
@@ -318,6 +320,9 @@ area|z16-[leisure=park],
 area|z16-[leisure=garden]
 {fill-color: @forest;}
 
+area|z12-[natural=bare_rock],
+{fill-color: #EDE5DC;}
+
 /* 5.BEACH & GLACIER */
 
 area|z0-[natural=glacier],
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 73898794cc..e33e633286 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -654,7 +654,8 @@ area|z14-[natural=hot_spring],
 node|z14-[natural=geyser],
 area|z14-[natural=geyser],
 node|z16-[natural=beach],
-area|z16-[natural=beach]
+area|z16-[natural=beach],
+area|z14-[natural=bare_rock],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;text-optional: true;}
 
 node|z12-[boundary=national_park],
@@ -709,10 +710,8 @@ node|z12[natural=peak][name],
 area|z12[natural=peak][name]
 {icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 1;text: name;text-color: @poi_label;text-position: center;text-optional: true;}
 node|z12-14[natural=peak][!name],
-node|z12-14[natural=bare_rock][!name],
 node|z12-14[natural=rock][!name],
 area|z12-14[natural=peak][!name],
-area|z12-14[natural=bare_rock][!name],
 area|z12-14[natural=rock][!name]
 {font-size: 0;}
 node|z13[natural=peak][name],
@@ -722,10 +721,8 @@ node|z14[natural=peak][name],
 area|z14[natural=peak][name]
 {icon-image: peakt-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[natural=peak],
-node|z15-[natural=bare_rock],
 node|z15-[natural=rock],
 area|z15-[natural=peak],
-area|z15-[natural=bare_rock],
 area|z15-[natural=rock]
 {icon-image: peakt-m.svg;text-offset: 1;font-size: 10;text-optional: true;}