From 3b25d7f36ea4aab324c5f7ccf0b110c90d344abd Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Tue, 15 Feb 2022 19:56:43 +0100
Subject: [PATCH] Special colors for hotels/garden buildings

part of #724
---
 app/map_styles/polygon.xml      | 10 +++++++++-
 app/src/tiles/dataDefinition.ts |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 2a3fa09d..fbe123e8 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -534,9 +534,17 @@
             <PolygonSymbolizer fill="#cccccc" />
         </Rule>
         <Rule>
-            <Filter>[current_landuse_order] = "Residential"</Filter>
+            <Filter>[current_landuse_order] = "Residential" and not ([current_landuse_group] = "Garden buildings") and not ([current_landuse_group] = "Hotels, boarding and guest houses") </Filter>
             <PolygonSymbolizer fill="#252aa6" />
         </Rule>
+        <Rule>
+            <Filter>[current_landuse_order] = "Residential" and [current_landuse_group] = "Hotels, boarding and guest houses"</Filter>
+            <PolygonSymbolizer fill="#3c4194" />
+        </Rule>
+        <Rule>
+            <Filter>[current_landuse_order] = "Residential" and [current_landuse_group] = "Garden buildings" </Filter>
+            <PolygonSymbolizer fill="#5b5fbc" />
+        </Rule>
         <Rule>
             <Filter>[current_landuse_order] = "Community Services"</Filter>
             <PolygonSymbolizer fill="#73ccd1" />
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 137bae96..eb30fbde 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -149,7 +149,8 @@ const LAYER_QUERIES = {
     landuse: `
         SELECT
             geometry_id,
-            current_landuse_order
+            current_landuse_order,
+            current_landuse_group[1] as current_landuse_group
         FROM
             buildings
         WHERE