From c030eaa7bed80d2c478f8885d8c09451539985f0 Mon Sep 17 00:00:00 2001
From: Miel Truyen <miel.truyen@gmail.com>
Date: Sun, 9 Aug 2020 13:41:37 +0200
Subject: [PATCH] Refinements

---
 layers/poi/class.sql    | 47 +++++++++++++++++++++++++++++++++++------
 layers/poi/mapping.yaml | 13 ++++++++++++
 layers/poi/poi.yaml     | 12 +++++++++++
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/layers/poi/class.sql b/layers/poi/class.sql
index a36fbdf..136df3b 100644
--- a/layers/poi/class.sql
+++ b/layers/poi/class.sql
@@ -3,10 +3,15 @@ CREATE OR REPLACE FUNCTION poi_class_rank(class text)
 $$
 SELECT CASE class
            WHEN 'hospital' THEN 20
+           WHEN 'airport' THEN 30
            WHEN 'railway' THEN 40
-           WHEN 'bus' THEN 50
-           WHEN 'attraction' THEN 70
-           WHEN 'harbor' THEN 75
+           WHEN 'aerialway' THEN 40
+           WHEN 'heliport' THEN 45
+           WHEN 'taxi' THEN 50
+           WHEN 'harbor' THEN 55
+           WHEN 'library' THEN 60
+           WHEN 'bus' THEN 70
+           WHEN 'attraction' THEN 75
            WHEN 'college' THEN 80
            WHEN 'school' THEN 85
            WHEN 'stadium' THEN 90
@@ -19,11 +24,39 @@ SELECT CASE class
            WHEN 'police' THEN 135
            WHEN 'post' THEN 140
            WHEN 'golf' THEN 150
-           WHEN 'shop' THEN 400
-           WHEN 'grocery' THEN 500
-           WHEN 'fast_food' THEN 600
+           WHEN 'entrance' THEN 250
+           WHEN 'parking' THEN 300
+           WHEN 'car_parking' THEN 300
+           WHEN 'charging_station' THEN 350
+           WHEN 'fuel' THEN 350
+           WHEN 'bicycle_parking' THEN 390
+           WHEN 'motorcycle_parking' THEN 390
+           WHEN 'fast_food' THEN 400
+           WHEN 'ice_cream' THEN 400
+           WHEN 'bar' THEN 450
+           WHEN 'cafe' THEN 450
+           WHEN 'grocery' THEN 450
+           WHEN 'shop' THEN 500
+           WHEN 'optician' THEN 500
+           WHEN 'furniture' THEN 500
+           WHEN 'jewelry' THEN 500
+           WHEN 'toys' THEN 500
+           WHEN 'newsagent' THEN 500
+           WHEN 'paint' THEN 500
+           WHEN 'electronics' THEN 500
+           WHEN 'garden_centre' THEN 500
+           WHEN 'community_centre' THEN 600
+           WHEN 'mobile_phone' THEN 700
+           WHEN 'shoes' THEN 700
            WHEN 'clothing_store' THEN 700
-           WHEN 'bar' THEN 800
+           WHEN 'florist' THEN 750
+           WHEN 'dog_park' THEN 800
+           WHEN 'pitch' THEN 800
+           when 'power_tower' then 900
+           when 'wind_mill' then 900
+           when 'water_tower' then 900
+           when 'communications_tower' then 900
+           when 'wind_turbine' then 900
            ELSE 1000
            END;
 $$ LANGUAGE SQL IMMUTABLE
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 32abea0..f99769a 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -21,6 +21,7 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - clinic
   - college
   - community_centre
+  - social_facility
   - courthouse
   - dentist
   - doctors
@@ -84,6 +85,7 @@ def_poi_mapping_building: &poi_mapping_building
 # highway values , see http://taginfo.openstreetmap.org/keys/highway#values
 def_poi_mapping_highway: &poi_mapping_highway
   - bus_stop
+  - speed_camera
 
 # historic values , see http://taginfo.openstreetmap.org/keys/historic#values
 def_poi_mapping_historic: &poi_mapping_historic
@@ -328,6 +330,15 @@ def_poi_mapping_aeroway: &poi_mapping_aeroway
 # aeroway values , see http://taginfo.openstreetmap.org/keys/aeroway#values
 def_poi_mapping_power: &poi_mapping_power
   - generator
+  - tower
+
+def_poi_mapping_man_made: &poi_mapping_man_made
+  - communications_tower
+  - water_tower
+  - wind_mill
+
+def_poi_mapping_emergency: &poi_mapping_emergency
+  - defibrillator
 
 def_poi_fields: &poi_fields
   - name: osm_id
@@ -399,6 +410,8 @@ def_poi_mapping: &poi_mapping
   waterway: *poi_mapping_waterway
   aeroway: *poi_mapping_aeroway
   power: *poi_mapping_power
+  man_made: *poi_mapping_man_made
+  emergency: *poi_mapping_emergency
 
 tables:
   # etldoc: imposm3 -> osm_poi_point
diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml
index 7b092c2..3bb7d41 100644
--- a/layers/poi/poi.yaml
+++ b/layers/poi/poi.yaml
@@ -51,6 +51,8 @@ layer:
           subclass: ['florist']
         town_hall:
           subclass: ['townhall', 'public_building', 'courthouse', 'community_centre']
+        community_centre:
+          subclass: ['community_centre', 'social_facility']
         golf:
           subclass: ['golf', 'golf_course', 'miniature_golf']
         fast_food:
@@ -128,6 +130,16 @@ layer:
           subclass: ['aerodrome']
         heliport:
           subclass: ['helipad']
+        wind_turbine:
+          subclass: ['wind_turbine']
+        communications_tower:
+          subclass: ['communications_tower']
+        water_tower:
+          subclass: ['water_tower']
+        wind_mill:
+          subclass: ['wind_mill']
+        power_tower:
+          subclasss: ['tower']
     subclass:
       description: |
           Original value of either the