From 029d755ea158c096309d23f8165ab21ac721ecfa Mon Sep 17 00:00:00 2001
From: Miel Truyen <miel.truyen@gmail.com>
Date: Fri, 7 Aug 2020 15:38:32 +0200
Subject: [PATCH] Added landuse for bicycle and motorcycle parkings, split up
 some POIs and added some (to be aligned with the iconset!)

---
 layers/landuse/landuse.yaml |  5 +++++
 layers/landuse/mapping.yaml |  6 ++++++
 layers/poi/poi.yaml         | 41 ++++++++++++++++++++++++++++---------
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml
index f9bb253..2759c32 100644
--- a/layers/landuse/landuse.yaml
+++ b/layers/landuse/landuse.yaml
@@ -41,7 +41,12 @@ layer:
       - dam
       - sports_centre
       - parking
+      - motorcycle_parking
+      - bicycle_parking
       - religious
+      - prison
+      - wastewater_plant
+      - water_works
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml
index c4ff9fe..6f72b43 100644
--- a/layers/landuse/mapping.yaml
+++ b/layers/landuse/mapping.yaml
@@ -84,6 +84,9 @@ tables:
       - library
       - hospital
       - parking
+      - prison
+      - motorcycle_parking
+      - bicycle_parking
       - animal_training
       leisure:
       - stadium
@@ -100,3 +103,6 @@ tables:
       - neighbourhood
       waterway:
       - dam
+      man_made:
+      - wastewater_plant
+      - water_works
diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml
index 38c2984..607306a 100644
--- a/layers/poi/poi.yaml
+++ b/layers/poi/poi.yaml
@@ -18,13 +18,30 @@ layer:
       values:
         shop:
           subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
-                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'garden_centre', 'doityourself',
-                     'erotic', 'electronics', 'fabric', 'florist', 'frozen_food', 'furniture', 'video_games', 'video',
-                     'general', 'gift', 'hardware', 'hearing_aids', 'hifi', 'ice_cream', 'interior_decoration',
-                     'jewelry', 'kiosk', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone', 'newsagent',
-                     'optician', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'shoes', 'sports',
-                     'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency', 'watches',
-                     'weapons', 'wholesale']
+                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'doityourself',
+                     'erotic', 'fabric', 'frozen_food', 'video_games', 'video', 'general', 'gift',
+                     'hearing_aids', 'hifi', 'interior_decoration', 'kiosk', 'lamps', 'mall', 'massage', 'motorcycle',
+                     'newsagent', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo',
+                     'second_hand', 'sports', 'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys',
+                     'travel_agency', 'watches', 'weapons', 'wholesale']
+        optician:
+            subclass: ['optician']
+        jewelry:
+          subclass: ['jewelry']
+        furniture:
+          subclass: ['furniture']
+        electronics:
+          subclass: ['electronics']
+        garden_centre:
+          subclass: ['garden_centre']
+        mobile_phone:
+          subclass: ['mobile_phone']
+        shoes:
+          subclass: ['shoes']
+        hardware:
+          subclass: ['hardware']
+        florist:
+          subclass: ['florist']
         town_hall:
           subclass: ['townhall', 'public_building', 'courthouse', 'community_centre']
         golf:
@@ -59,7 +76,7 @@ layer:
         lodging:
           subclass: ['hotel', 'motel', 'bed_and_breakfast', 'guest_house', 'hostel', 'chalet', 'alpine_hut', 'dormitory']
         ice_cream:
-          subclass: ['chocolate', 'confectionery']
+          subclass: ['chocolate', 'confectionery', 'ice_cream']
         post:
           subclass: ['post_box', 'post_office']
         cafe:
@@ -72,8 +89,12 @@ layer:
           subclass: ['bar', 'nightclub']
         harbor:
           subclass: ['marina', 'dock']
-        car:
-          subclass: ['car', 'car_repair', 'car_parts', 'taxi']
+        taxi:
+          subclass: ['taxi']
+        car_dealer:
+          subclass: ['car', 'car_parts']
+        car_repair:
+          subclass: ['car_repair']
         hospital:
           subclass: ['hospital', 'nursing_home', 'clinic']
         cemetery: