diff --git a/data.yml b/data.yml index 9877390..057dd8f 100644 --- a/data.yml +++ b/data.yml @@ -122,7 +122,6 @@ Layer: user: osm description: Buildings fields: - featureclass: String scalerank: Number type: String properties: @@ -151,7 +150,7 @@ Layer: WHERE z(!scale_denominator!) BETWEEN 2 AND 4 UNION ALL SELECT * FROM ice_z5 - WHERE z(!scale_denominator!) BETWEEN 5 AND 7 + WHERE z(!scale_denominator!) BETWEEN 5 AND 8 ) AS ice WHERE geom && !bbox! ) AS t diff --git a/schema/layers/road.sql b/schema/layers/road.sql index 28931b1..49efe91 100644 --- a/schema/layers/road.sql +++ b/schema/layers/road.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE VIEW ne_10m_global_roads AS ( - SELECT geom, scalerank, featurecla as featureclass, type - FROM ne_10m_roads WHERE continent <> 'North America' + SELECT geom, scalerank, type + FROM ne_10m_roads WHERE continent <> 'North America' AND featurecla = 'Road' UNION ALL - SELECT geom, scalerank, class as featureclass, type + SELECT geom, scalerank, type FROM ne_10m_roads_north_america );