diff --git a/data.yml b/data.yml index 285e76f..437d30a 100644 --- a/data.yml +++ b/data.yml @@ -74,7 +74,9 @@ Layer: UNION ALL SELECT * FROM boundary_z1 WHERE z(!scale_denominator!) BETWEEN 1 AND 2 UNION ALL - SELECT * FROM boundary_z3 WHERE z(!scale_denominator!) BETWEEN 3 AND 4 + SELECT * FROM boundary_z3 WHERE z(!scale_denominator!) = 3 + UNION ALL + SELECT * FROM boundary_z4 WHERE z(!scale_denominator!) = 4 UNION ALL SELECT * FROM boundary_z5 WHERE z(!scale_denominator!) BETWEEN 5 AND 6 UNION ALL diff --git a/schema/layers/boundary.sql b/schema/layers/boundary.sql index 4201c18..afaf5ab 100644 --- a/schema/layers/boundary.sql +++ b/schema/layers/boundary.sql @@ -38,6 +38,17 @@ CREATE OR REPLACE VIEW boundary_z3 AS ( FROM ne_50m_admin_1_states_provinces_lines ); +CREATE OR REPLACE VIEW boundary_z4 AS ( + SELECT geom, 0 AS admin_level, scalerank, + boundary_class(featurecla) AS class + FROM ne_10m_admin_0_boundary_lines_land + UNION ALL + SELECT geom, 1 AS admin_level, scalerank, + boundary_class(featurecla) AS class + 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, 0 AS admin_level, scalerank, boundary_class(featurecla) AS class