Remove unnecessary fields from boundary

layers/boundary/boundary.sql

@@ -1,114 +1,85 @@
-CREATE OR REPLACE FUNCTION boundary_class(featureclass VARCHAR) RETURNS VARCHAR
-AS $$
-BEGIN
-    RETURN CASE
-        WHEN featureclass ILIKE 'line of control%' THEN 'control'
-        WHEN featureclass ILIKE 'disputed%' THEN 'dispute'
-        WHEN featureclass ILIKE 'lease%' THEN 'lease'
-        WHEN featureclass ILIKE 'overlay%' THEN 'overlay'
-        ELSE 'boundary'
-    END;
-END;
-$$ LANGUAGE plpgsql IMMUTABLE;
-
 CREATE OR REPLACE VIEW boundary_z0 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_110m_admin_0_boundary_lines_land
 );
 
 CREATE OR REPLACE VIEW boundary_z1 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 4 AS admin_level
     FROM ne_50m_admin_1_states_provinces_lines
     WHERE scalerank <= 2
 );
 
 CREATE OR REPLACE VIEW boundary_z3 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 4 AS admin_level
     FROM ne_50m_admin_1_states_provinces_lines
 );
 
 CREATE OR REPLACE VIEW boundary_z4 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE scalerank <= 3 AND featurecla = 'Adm-1 boundary'
 );
 
 CREATE OR REPLACE VIEW boundary_z5 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE scalerank <= 7 AND featurecla = 'Adm-1 boundary'
 );
 
 CREATE OR REPLACE VIEW boundary_z7 AS (
-    SELECT geom, 2 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 2 AS admin_level
     FROM ne_10m_admin_0_boundary_lines_land
     UNION ALL
-    SELECT geom, 4 AS admin_level, scalerank,
-           boundary_class(featurecla) AS class
+    SELECT geom, 4 AS admin_level
     FROM ne_10m_admin_1_states_provinces_lines_shp
     WHERE featurecla = 'Adm-1 boundary'
 
 );
 
 CREATE OR REPLACE VIEW boundary_z8 AS (
-    SELECT geometry AS geom, admin_level,
-           NULL AS scalerank, NULL AS class
+    SELECT geometry AS geom, admin_level
     FROM osm_boundary_linestring_gen5
     WHERE admin_level <= 4 AND ST_Length(geometry) > 1000
 );
 
 CREATE OR REPLACE VIEW boundary_z9 AS (
-    SELECT geometry AS geom, admin_level,
-           NULL AS scalerank, NULL AS class
+    SELECT geometry AS geom, admin_level
     FROM osm_boundary_linestring_gen4
     WHERE admin_level <= 6
 );
 
 CREATE OR REPLACE VIEW boundary_z10 AS (
-    SELECT geometry AS geom, admin_level,
-           NULL AS scalerank, NULL AS class
+    SELECT geometry AS geom, admin_level
     FROM osm_boundary_linestring_gen3
     WHERE admin_level <= 6
 );
 
 CREATE OR REPLACE VIEW boundary_z11 AS (
-    SELECT geometry AS geom, admin_level,
-           NULL AS scalerank, NULL AS class
+    SELECT geometry AS geom, admin_level
     FROM osm_boundary_linestring_gen2
     WHERE admin_level <= 8
 );
 
 CREATE OR REPLACE VIEW boundary_z12 AS (
-    SELECT geometry AS geom, admin_level,
-           NULL AS scalerank, NULL AS class
+    SELECT geometry AS geom, admin_level
     FROM osm_boundary_linestring_gen1
 );
 
 CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int)
-RETURNS TABLE(geom geometry, admin_level int, scalerank int, class text) AS $$
-    SELECT geom, admin_level, scalerank::int, class FROM (
+RETURNS TABLE(geometry geometry, admin_level int) AS $$
+    SELECT geom, admin_level FROM (
         SELECT * FROM boundary_z0 WHERE geom && bbox AND zoom_level = 0
         UNION ALL
         SELECT * FROM boundary_z1 WHERE geom && bbox AND zoom_level BETWEEN 1 AND 2