From 48222a730f751a1fbddb1ab4f8692bbbf6e76dd5 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Tue, 15 Dec 2015 14:24:29 +0300
Subject: [PATCH] [styles] Add building:part and religion=*

---
 data/mapcss-mapping.csv                      |  8 ++++++++
 data/styles/legacy/include/base_other.mapcss |  1 +
 generator/osm2meta.hpp                       | 10 ++++++++++
 indexer/feature_meta.hpp                     |  1 +
 4 files changed, 20 insertions(+)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 8343053310..d28c9734d2 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1040,3 +1040,11 @@ barrier|border_control;[barrier=border_control];;name;int_name;1039;
 shop|laundry;[shop=laundry];;name;int_name;1040;
 amenity|vending_machine|parking_tickets;[amenity=vending_machine][vending=parking_tickets];;name;int_name;1041;
 amenity|vending_machine|public_transport_tickets;[amenity=vending_machine][vending=public_transport_tickets];;name;int_name;1042;
+building:part;[building:part];;name;int_name;1043;
+amenity|place_of_worship|christian;[amenity=place_of_worship][religion=christian];;name;int_name;1044;
+amenity|place_of_worship|muslim;[amenity=place_of_worship][religion=muslim];;name;int_name;1045;
+amenity|place_of_worship|buddhist;[amenity=place_of_worship][religion=buddhist];;name;int_name;1046;
+amenity|place_of_worship|hindu;[amenity=place_of_worship][religion=hindu];;name;int_name;1047;
+amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;name;int_name;1048;
+amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049;
+amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050;
diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss
index a432bc7fbd..6d5efc1b9b 100644
--- a/data/styles/legacy/include/base_other.mapcss
+++ b/data/styles/legacy/include/base_other.mapcss
@@ -574,6 +574,7 @@ node|z15-[leisure=nature_reserve]
 {
   icon-image: bird.svg;
 }
+area|z15-[building:part],
 area|z15-[building],
 node|z15-[building]
 {
diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index 818331ede4..9a898e3b22 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -140,6 +140,12 @@ public:
           md.Set(Metadata::FMD_HEIGHT, value);
       }
     }
+    else if (k == "denomination")
+    {
+      string const & value = ValidateAndFormat_denomination(v);
+      if (!value.empty())
+        md.Set(Metadata::FMD_DENOMINATION, value);
+    }
     return false;
   }
 
@@ -249,5 +255,9 @@ protected:
     ss << fixed << setw(2) << setprecision(1) << (val * 3 /*levels multiplied by 3 meters per level*/);
     return ss.str();
   }
+  string ValidateAndFormat_denomination(string const & v) const
+  {
+    return v;
+  }
   string ValidateAndFormat_wikipedia(string v) const;
 };
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index 27e1c850d5..6da5b0ea36 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -38,6 +38,7 @@ namespace feature
       FMD_MAXSPEED = 17,
       FMD_FLATS = 18,
       FMD_HEIGHT = 19,
+      FMD_DENOMINATION = 20,
       FMD_COUNT
     };