Switch place class back to place value

layers/place/layer.sql

@@ -8,22 +8,22 @@
 -- etldoc: layer_city          -> layer_place
 
 CREATE OR REPLACE FUNCTION layer_place(bbox geometry, zoom_level int, pixel_width numeric)
-RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, subclass text, "rank" int, capital INT) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, "rank" int, capital INT) AS $$
     SELECT
         osm_id, geometry, name, name_en,
-        'continent' AS class, 'continent' AS subclass, 1 AS "rank", NULL::int AS capital
+        'continent' AS class, 1 AS "rank", NULL::int AS capital
     FROM osm_continent_point
     WHERE geometry && bbox AND zoom_level < 4
     UNION ALL
     SELECT
         osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
-        'country' AS class, 'country' AS subclass,"rank", NULL::int AS capital
+        'country' AS class,"rank", NULL::int AS capital
     FROM osm_country_point
     WHERE geometry && bbox AND "rank" <= zoom_level AND name <> ''
     UNION ALL
     SELECT
         osm_id, geometry, name, COALESCE(NULLIF(name_en, ''), name) AS name_en,
-        'state' AS class, 'state' AS subclass, "rank", NULL::int AS capital
+        'state' AS class, "rank", NULL::int AS capital
     FROM osm_state_point
     WHERE geometry && bbox AND
           name <> '' AND
@@ -34,7 +34,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t
     UNION ALL
     SELECT
         osm_id, geometry, name, name_en,
-        place_class(place::text) AS class, place::text AS subclass, "rank", capital
+        place::text AS class, "rank", capital
     FROM layer_city(bbox, zoom_level, pixel_width)
     ORDER BY "rank" ASC
 $$ LANGUAGE SQL IMMUTABLE;