From ab80b2212eacbccb3eb984e16e2f2ad44280585d Mon Sep 17 00:00:00 2001
From: lukasmartinelli <me@lukasmartinelli.ch>
Date: Fri, 28 Oct 2016 13:21:08 +0200
Subject: [PATCH] Use custom enum type

---
 layers/place/city.sql  | 4 ++--
 layers/place/types.sql | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/layers/place/city.sql b/layers/place/city.sql
index 62aa5db0..f606c90e 100644
--- a/layers/place/city.sql
+++ b/layers/place/city.sql
@@ -1,13 +1,13 @@
 CREATE OR REPLACE FUNCTION layer_city(bbox geometry, zoom_level int, pixel_width numeric)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, place text, scalerank int) AS $$
-    SELECT osm_id, geometry, name, name_en, place, scalerank
+    SELECT osm_id, geometry, name, name_en, place::text, scalerank
     FROM osm_place_point
     WHERE geometry && bbox
       AND ((zoom_level = 2 AND scalerank = 0)
         OR (zoom_level BETWEEN 3 AND 7 AND scalerank < zoom_level)
       )
     UNION ALL
-    SELECT osm_id, geometry, name, name_en, place, scalerank FROM (
+    SELECT osm_id, geometry, name, name_en, place::text, scalerank FROM (
         SELECT osm_id, geometry, name, name_en, place, scalerank,
 			row_number() OVER (
 				PARTITION BY LabelGrid(geometry, 150 * pixel_width)
diff --git a/layers/place/types.sql b/layers/place/types.sql
index 317c46c2..846a30af 100644
--- a/layers/place/types.sql
+++ b/layers/place/types.sql
@@ -5,3 +5,5 @@ BEGIN
     END IF;
 END
 $$;
+
+ALTER TABLE osm_place_point ALTER COLUMN place TYPE place_subclass USING place::place_subclass;