You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/05/25 11:24:43 UTC
[incubator-baremaps] branch main updated: Simplify landuse and natural layers at low zoom levels (#666)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new a7cb5103 Simplify landuse and natural layers at low zoom levels (#666)
a7cb5103 is described below
commit a7cb5103fcb9db022a76904aae96b216cc33ff7a
Author: Leonard <73...@users.noreply.github.com>
AuthorDate: Thu May 25 13:24:39 2023 +0200
Simplify landuse and natural layers at low zoom levels (#666)
---
basemap/layers/landuse/clean.sql | 38 ++++++----
basemap/layers/landuse/prepare.sql | 138 +++++++++++++++++++++++++++++-------
basemap/layers/landuse/simplify.sql | 34 ++++-----
basemap/layers/landuse/tileset.js | 2 +-
basemap/layers/natural/clean.sql | 31 ++++----
basemap/layers/natural/prepare.sql | 131 +++++++++++++++++++++++-----------
basemap/layers/natural/simplify.sql | 22 +++---
7 files changed, 278 insertions(+), 118 deletions(-)
diff --git a/basemap/layers/landuse/clean.sql b/basemap/layers/landuse/clean.sql
index 22c4e035..8902fef8 100644
--- a/basemap/layers/landuse/clean.sql
+++ b/basemap/layers/landuse/clean.sql
@@ -14,19 +14,33 @@ DROP MATERIALIZED VIEW IF EXISTS osm_landuse_buffered CASCADE;
DROP MATERIALIZED VIEW IF EXISTS osm_landuse_exploded CASCADE;
DROP MATERIALIZED VIEW IF EXISTS osm_landuse CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium_filtered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium_clustered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium_grouped CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium_buffered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium_exploded CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_medium CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_xl CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small_filtered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small_clustered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small_grouped CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small_buffered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small_exploded CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_landuse_small CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_l CASCADE;
+
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_m CASCADE;
+
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_landuse_s CASCADE;
DROP VIEW IF EXISTS osm_landuse_z20 CASCADE;
DROP VIEW IF EXISTS osm_landuse_z19 CASCADE;
diff --git a/basemap/layers/landuse/prepare.sql b/basemap/layers/landuse/prepare.sql
index 563d1d4f..afc441e3 100644
--- a/basemap/layers/landuse/prepare.sql
+++ b/basemap/layers/landuse/prepare.sql
@@ -54,7 +54,8 @@ SELECT
geom
FROM osm_landuse_exploded;
-CREATE MATERIALIZED VIEW osm_landuse_medium_filtered AS
+-- XTRA LARGE
+CREATE MATERIALIZED VIEW osm_landuse_xl_filtered AS
SELECT
id,
tags -> 'landuse' as landuse,
@@ -62,78 +63,165 @@ SELECT
FROM osm_landuse
WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 8), 2);
-CREATE MATERIALIZED VIEW osm_landuse_medium_clustered AS
+CREATE MATERIALIZED VIEW osm_landuse_xl_clustered AS
SELECT
landuse,
geom,
st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY landuse) AS cluster
-FROM osm_landuse_medium_filtered;
+FROM osm_landuse_xl_filtered;
-CREATE MATERIALIZED VIEW osm_landuse_medium_grouped AS
+CREATE MATERIALIZED VIEW osm_landuse_xl_grouped AS
SELECT
landuse,
cluster,
st_collect(geom) AS geom
-FROM osm_landuse_medium_clustered
+FROM osm_landuse_xl_clustered
GROUP BY landuse, cluster;
-CREATE MATERIALIZED VIEW osm_landuse_medium_buffered AS
+CREATE MATERIALIZED VIEW osm_landuse_xl_buffered AS
SELECT
landuse,
st_buffer(geom, -78270 / power(2, 8), 'join=mitre') AS geom
-FROM osm_landuse_medium_grouped;
+FROM osm_landuse_xl_grouped;
-CREATE MATERIALIZED VIEW osm_landuse_medium_exploded AS
+CREATE MATERIALIZED VIEW osm_landuse_xl_exploded AS
SELECT
landuse,
(st_dump(geom)).geom AS geom
-FROM osm_landuse_medium_buffered;
+FROM osm_landuse_xl_buffered;
-CREATE MATERIALIZED VIEW osm_landuse_medium AS
+CREATE MATERIALIZED VIEW osm_landuse_xl AS
SELECT
row_number() OVER () AS id,
jsonb_build_object('landuse', landuse) AS tags,
geom AS geom
-FROM osm_landuse_medium_buffered;
+FROM osm_landuse_xl_buffered;
-CREATE MATERIALIZED VIEW osm_landuse_small_filtered AS
+-- LARGE
+CREATE MATERIALIZED VIEW osm_landuse_l_filtered AS
SELECT
id,
tags -> 'landuse' as landuse,
- st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 4)), 78270 / power(2, 4), 'join=mitre') AS geom
+ st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 6)), 78270 / power(2, 7), 'join=mitre') AS geom
FROM osm_landuse
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 4), 2);
+WHERE st_area(st_envelope(geom)) > 5 * power(78270 / power(2, 7), 2);
-CREATE MATERIALIZED VIEW osm_landuse_small_clustered AS
+CREATE MATERIALIZED VIEW osm_landuse_l_clustered AS
SELECT
landuse,
geom,
st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY landuse) AS cluster
-FROM osm_landuse_small_filtered;
+FROM osm_landuse_l_filtered;
-CREATE MATERIALIZED VIEW osm_landuse_small_grouped AS
+CREATE MATERIALIZED VIEW osm_landuse_l_grouped AS
SELECT
landuse,
cluster,
st_collect(geom) AS geom
-FROM osm_landuse_small_clustered
+FROM osm_landuse_l_clustered
GROUP BY landuse, cluster;
-CREATE MATERIALIZED VIEW osm_landuse_small_buffered AS
+CREATE MATERIALIZED VIEW osm_landuse_l_buffered AS
SELECT
landuse,
- st_buffer(geom, -78270 / power(2, 4), 'join=mitre') AS geom
-FROM osm_landuse_small_grouped;
+ st_buffer(geom, 0.5 * -78270 / power(2, 7), 'join=mitre') AS geom
+FROM osm_landuse_l_grouped;
-CREATE MATERIALIZED VIEW osm_landuse_small_exploded AS
+CREATE MATERIALIZED VIEW osm_landuse_l_exploded AS
SELECT
landuse,
(st_dump(geom)).geom AS geom
-FROM osm_landuse_small_buffered;
+FROM osm_landuse_l_buffered;
-CREATE MATERIALIZED VIEW osm_landuse_small AS
+CREATE MATERIALIZED VIEW osm_landuse_l AS
SELECT
row_number() OVER () AS id,
jsonb_build_object('landuse', landuse) AS tags,
geom AS geom
-FROM osm_landuse_small_buffered;
+FROM osm_landuse_l_buffered;
+
+-- MEDIUM
+CREATE MATERIALIZED VIEW osm_landuse_m_filtered AS
+SELECT
+ id,
+ tags -> 'landuse' as landuse,
+ st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 5)), 78270 / power(2, 6), 'join=mitre') AS geom
+FROM osm_landuse
+WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 6), 2);
+
+CREATE MATERIALIZED VIEW osm_landuse_m_clustered AS
+SELECT
+ landuse,
+ geom,
+ st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY landuse) AS cluster
+FROM osm_landuse_m_filtered;
+
+CREATE MATERIALIZED VIEW osm_landuse_m_grouped AS
+SELECT
+ landuse,
+ cluster,
+ st_collect(geom) AS geom
+FROM osm_landuse_m_clustered
+GROUP BY landuse, cluster;
+
+CREATE MATERIALIZED VIEW osm_landuse_m_buffered AS
+SELECT
+ landuse,
+ st_buffer(geom, 0.1 * -78270 / power(2, 6), 'join=mitre') AS geom
+FROM osm_landuse_m_grouped;
+
+CREATE MATERIALIZED VIEW osm_landuse_m_exploded AS
+SELECT
+ landuse,
+ (st_dump(geom)).geom AS geom
+FROM osm_landuse_m_buffered;
+
+CREATE MATERIALIZED VIEW osm_landuse_m AS
+SELECT
+ row_number() OVER () AS id,
+ jsonb_build_object('landuse', landuse) AS tags,
+ geom AS geom
+FROM osm_landuse_m_buffered;
+
+-- SMALL
+CREATE MATERIALIZED VIEW osm_landuse_s_filtered AS
+SELECT
+ id,
+ tags -> 'landuse' as landuse,
+ st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 4)), 78270 / power(2, 5), 'join=mitre') AS geom
+FROM osm_landuse
+WHERE st_area(st_envelope(geom)) > 15 * power(78270 / power(2, 5), 2);
+
+CREATE MATERIALIZED VIEW osm_landuse_s_clustered AS
+SELECT
+ landuse,
+ geom,
+ st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY landuse) AS cluster
+FROM osm_landuse_s_filtered;
+
+CREATE MATERIALIZED VIEW osm_landuse_s_grouped AS
+SELECT
+ landuse,
+ cluster,
+ st_collect(geom) AS geom
+FROM osm_landuse_s_clustered
+GROUP BY landuse, cluster;
+
+CREATE MATERIALIZED VIEW osm_landuse_s_buffered AS
+SELECT
+ landuse,
+ st_buffer(geom, 0, 'join=mitre') AS geom
+FROM osm_landuse_s_grouped;
+
+CREATE MATERIALIZED VIEW osm_landuse_s_exploded AS
+SELECT
+ landuse,
+ (st_dump(geom)).geom AS geom
+FROM osm_landuse_s_buffered;
+
+CREATE MATERIALIZED VIEW osm_landuse_s AS
+SELECT
+ row_number() OVER () AS id,
+ jsonb_build_object('landuse', landuse) AS tags,
+ geom AS geom
+FROM osm_landuse_s_buffered;
diff --git a/basemap/layers/landuse/simplify.sql b/basemap/layers/landuse/simplify.sql
index bf911761..0667a997 100644
--- a/basemap/layers/landuse/simplify.sql
+++ b/basemap/layers/landuse/simplify.sql
@@ -69,7 +69,7 @@ SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 8)) AS geom
-FROM osm_landuse_medium
+FROM osm_landuse_xl
WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 8), 2);
CREATE MATERIALIZED VIEW osm_landuse_z7 AS
@@ -77,53 +77,53 @@ SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 7)) AS geom
-FROM osm_landuse_medium
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 7), 2);
+FROM osm_landuse_l
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 7), 2);
CREATE MATERIALIZED VIEW osm_landuse_z6 AS
SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 6)) AS geom
-FROM osm_landuse_medium
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 6), 2);
+FROM osm_landuse_m
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 6), 2);
CREATE MATERIALIZED VIEW osm_landuse_z5 AS
SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 5)) AS geom
-FROM osm_landuse_medium
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 5), 2);
+FROM osm_landuse_s
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 5), 2);
CREATE MATERIALIZED VIEW osm_landuse_z4 AS
SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 4)) AS geom
-FROM osm_landuse_small
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 4), 2);
+FROM osm_landuse_s
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 4), 2);
CREATE MATERIALIZED VIEW osm_landuse_z3 AS
SELECT
id,
tags,
st_simplifypreservetopology(geom, 78270 / power(2, 3)) AS geom
-FROM osm_landuse_small
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 3), 2);
+FROM osm_landuse_s
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 3), 2);
CREATE MATERIALIZED VIEW osm_landuse_z2 AS
SELECT
id,
tags,
- st_simplifypreservetopology(geom, 78270 / power(2, 3)) AS geom
-FROM osm_landuse_small
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 2), 2);
+ st_simplifypreservetopology(geom, 78270 / power(2, 2)) AS geom
+FROM osm_landuse_s
+WHERE st_area(st_envelope(geom)) > 150 * power(78270 / power(2, 2), 2);
CREATE MATERIALIZED VIEW osm_landuse_z1 AS
SELECT
id,
tags,
- st_simplifypreservetopology(geom, 78270 / power(2, 3)) AS geom
-FROM osm_landuse_small
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 1), 2);
+ st_simplifypreservetopology(geom, 78270 / power(2, 1)) AS geom
+FROM osm_landuse_s
+WHERE st_area(st_envelope(geom)) > 250 * power(78270 / power(2, 1), 2);
diff --git a/basemap/layers/landuse/tileset.js b/basemap/layers/landuse/tileset.js
index fe5d088c..dbe37e8a 100644
--- a/basemap/layers/landuse/tileset.js
+++ b/basemap/layers/landuse/tileset.js
@@ -13,7 +13,7 @@ export default {
id: 'landuse',
queries: [
{
- minzoom: 3,
+ minzoom: 1,
maxzoom: 8,
sql:
"SELECT id, tags, geom FROM osm_landuse_z$zoom WHERE tags ->> 'landuse' IN ('farmland', 'forest', 'meadow')",
diff --git a/basemap/layers/natural/clean.sql b/basemap/layers/natural/clean.sql
index 52e8ae76..a6d651df 100644
--- a/basemap/layers/natural/clean.sql
+++ b/basemap/layers/natural/clean.sql
@@ -15,19 +15,26 @@ DROP MATERIALIZED VIEW IF EXISTS osm_natural_buffered CASCADE;
DROP MATERIALIZED VIEW IF EXISTS osm_natural_exploded CASCADE;
DROP MATERIALIZED VIEW IF EXISTS osm_natural CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium_filtered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium_clustered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium_grouped CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium_buffered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium_exploded CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_medium CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_xl CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small_filtered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small_clustered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small_grouped CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small_buffered CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small_exploded CASCADE;
-DROP MATERIALIZED VIEW IF EXISTS osm_natural_small CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_m CASCADE;
+
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s_filtered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s_clustered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s_grouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s_buffered CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s_exploded CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS osm_natural_s CASCADE;
DROP VIEW IF EXISTS osm_natural_z20 CASCADE;
DROP VIEW IF EXISTS osm_natural_z19 CASCADE;
diff --git a/basemap/layers/natural/prepare.sql b/basemap/layers/natural/prepare.sql
index 911c6af6..a85b6347 100644
--- a/basemap/layers/natural/prepare.sql
+++ b/basemap/layers/natural/prepare.sql
@@ -59,98 +59,149 @@ FROM osm_natural_exploded;
CREATE INDEX IF NOT EXISTS osm_natural_geom_idx ON osm_natural_filtered USING GIST (geom);
CREATE INDEX IF NOT EXISTS osm_natural_tags_idx ON osm_natural_filtered USING GIN (natural_value);
-CREATE MATERIALIZED VIEW osm_natural_medium_filtered AS
+-- XTRA LARGE
+CREATE MATERIALIZED VIEW osm_natural_xl_filtered AS
SELECT
id,
tags -> 'natural' as natural_value,
st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 8)), 78270 / power(2, 8), 'join=mitre') AS geom
FROM osm_natural
WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 8), 2);
-CREATE INDEX IF NOT EXISTS osm_natural_medium_filtered_geom_idx ON osm_natural_medium_filtered USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_medium_filtered_tags_idx ON osm_natural_medium_filtered (natural_value);
+CREATE INDEX IF NOT EXISTS osm_natural_xl_filtered_geom_idx ON osm_natural_xl_filtered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_xl_filtered_tags_idx ON osm_natural_xl_filtered (natural_value);
-CREATE MATERIALIZED VIEW osm_natural_medium_clustered AS
+CREATE MATERIALIZED VIEW osm_natural_xl_clustered AS
SELECT
natural_value,
geom,
st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY natural_value) AS cluster
-FROM osm_natural_medium_filtered;
-CREATE INDEX IF NOT EXISTS osm_natural_medium_clustered_geom_idx ON osm_natural_medium_clustered USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_medium_clustered_tags_idx ON osm_natural_medium_clustered (natural_value);
+FROM osm_natural_xl_filtered;
+CREATE INDEX IF NOT EXISTS osm_natural_xl_clustered_geom_idx ON osm_natural_xl_clustered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_xl_clustered_tags_idx ON osm_natural_xl_clustered (natural_value);
-CREATE MATERIALIZED VIEW osm_natural_medium_grouped AS
+CREATE MATERIALIZED VIEW osm_natural_xl_grouped AS
SELECT
natural_value,
cluster,
st_collect(geom) AS geom
-FROM osm_natural_medium_clustered
+FROM osm_natural_xl_clustered
GROUP BY natural_value, cluster;
-CREATE MATERIALIZED VIEW osm_natural_medium_buffered AS
+CREATE MATERIALIZED VIEW osm_natural_xl_buffered AS
SELECT
natural_value,
st_buffer(geom, -78270 / power(2, 8), 'join=mitre') AS geom
-FROM osm_natural_medium_grouped;
+FROM osm_natural_xl_grouped;
-CREATE MATERIALIZED VIEW osm_natural_medium_exploded AS
+CREATE MATERIALIZED VIEW osm_natural_xl_exploded AS
SELECT
natural_value,
(st_dump(geom)).geom AS geom
-FROM osm_natural_medium_buffered;
+FROM osm_natural_xl_buffered;
-CREATE MATERIALIZED VIEW osm_natural_medium AS
+CREATE MATERIALIZED VIEW osm_natural_xl AS
SELECT
row_number() OVER () AS id,
jsonb_build_object('natural', natural_value) AS tags,
geom AS geom
-FROM osm_natural_medium_buffered;
-CREATE INDEX IF NOT EXISTS osm_natural_medium_geom_idx ON osm_natural_medium USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_medium_tags_idx ON osm_natural_medium USING GIN (tags);
+FROM osm_natural_xl_buffered;
+CREATE INDEX IF NOT EXISTS osm_natural_xl_geom_idx ON osm_natural_xl USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_xl_tags_idx ON osm_natural_xl USING GIN (tags);
-CREATE MATERIALIZED VIEW osm_natural_small_filtered AS
+-- MEDIUM
+CREATE MATERIALIZED VIEW osm_natural_m_filtered AS
SELECT
id,
tags -> 'natural' as natural_value,
- st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 4)), 78270 / power(2, 4), 'join=mitre') AS geom
+ st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 5)), 78270 / power(2, 6), 'join=mitre') AS geom
FROM osm_natural
-WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 4), 2);
-CREATE INDEX IF NOT EXISTS osm_natural_small_filtered_geom_idx ON osm_natural_small_filtered USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_small_filtered_tags_idx ON osm_natural_small_filtered (natural_value);
+WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 6), 2);
+CREATE INDEX IF NOT EXISTS osm_natural_m_filtered_geom_idx ON osm_natural_m_filtered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_m_filtered_tags_idx ON osm_natural_m_filtered (natural_value);
-CREATE MATERIALIZED VIEW osm_natural_small_clustered AS
+CREATE MATERIALIZED VIEW osm_natural_m_clustered AS
SELECT
natural_value,
geom,
st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY natural_value) AS cluster
-FROM osm_natural_small_filtered;
-CREATE INDEX IF NOT EXISTS osm_natural_small_clustered_geom_idx ON osm_natural_small_clustered USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_small_clustered_tags_idx ON osm_natural_small_clustered (natural_value);
+FROM osm_natural_m_filtered;
+CREATE INDEX IF NOT EXISTS osm_natural_m_clustered_geom_idx ON osm_natural_m_clustered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_m_clustered_tags_idx ON osm_natural_m_clustered (natural_value);
-CREATE MATERIALIZED VIEW osm_natural_small_grouped AS
+CREATE MATERIALIZED VIEW osm_natural_m_grouped AS
SELECT
natural_value,
cluster,
st_collect(geom) AS geom
-FROM osm_natural_small_clustered
+FROM osm_natural_m_clustered
GROUP BY natural_value, cluster;
-CREATE MATERIALIZED VIEW osm_natural_small_buffered AS
+CREATE MATERIALIZED VIEW osm_natural_m_buffered AS
SELECT
natural_value,
- st_buffer(geom, -78270 / power(2, 4), 'join=mitre') AS geom
-FROM osm_natural_small_grouped;
+ st_buffer(geom, 0.5 * -78270 / power(2, 6), 'join=mitre') AS geom
+FROM osm_natural_m_grouped;
-CREATE MATERIALIZED VIEW osm_natural_small_exploded AS
+CREATE MATERIALIZED VIEW osm_natural_m_exploded AS
SELECT
natural_value,
(st_dump(geom)).geom AS geom
-FROM osm_natural_small_buffered;
+FROM osm_natural_m_buffered;
-CREATE MATERIALIZED VIEW osm_natural_small AS
+CREATE MATERIALIZED VIEW osm_natural_m AS
SELECT
- row_number() OVER () AS id,
- jsonb_build_object('natural', natural_value) AS tags,
- geom AS geom
-FROM osm_natural_small_buffered;
-CREATE INDEX IF NOT EXISTS osm_natural_small_geom_idx ON osm_natural_small USING GIST (geom);
-CREATE INDEX IF NOT EXISTS osm_natural_small_tags_idx ON osm_natural_small USING GIN (tags);
+ row_number() OVER () AS id,
+ jsonb_build_object('natural', natural_value) AS tags,
+ geom AS geom
+FROM osm_natural_m_buffered;
+CREATE INDEX IF NOT EXISTS osm_natural_m_geom_idx ON osm_natural_m USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_m_tags_idx ON osm_natural_m USING GIN (tags);
+
+-- SMALL
+CREATE MATERIALIZED VIEW osm_natural_s_filtered AS
+SELECT
+ id,
+ tags -> 'natural' as natural_value,
+ st_buffer(st_simplifypreservetopology(geom, 78270 / power(2, 5)), 78270 / power(2, 6), 'join=mitre') AS geom
+FROM osm_natural
+WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 6), 2);
+CREATE INDEX IF NOT EXISTS osm_natural_s_filtered_geom_idx ON osm_natural_s_filtered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_s_filtered_tags_idx ON osm_natural_s_filtered (natural_value);
+
+CREATE MATERIALIZED VIEW osm_natural_s_clustered AS
+SELECT
+ natural_value,
+ geom,
+ st_clusterdbscan(geom, 0, 0) OVER(PARTITION BY natural_value) AS cluster
+FROM osm_natural_s_filtered;
+CREATE INDEX IF NOT EXISTS osm_natural_s_clustered_geom_idx ON osm_natural_s_clustered USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_s_clustered_tags_idx ON osm_natural_s_clustered (natural_value);
+
+CREATE MATERIALIZED VIEW osm_natural_s_grouped AS
+SELECT
+ natural_value,
+ cluster,
+ st_collect(geom) AS geom
+FROM osm_natural_s_clustered
+GROUP BY natural_value, cluster;
+
+CREATE MATERIALIZED VIEW osm_natural_s_buffered AS
+SELECT
+ natural_value,
+ st_buffer(geom, 0.1 * -78270 / power(2, 6), 'join=mitre') AS geom
+FROM osm_natural_s_grouped;
+
+CREATE MATERIALIZED VIEW osm_natural_s_exploded AS
+SELECT
+ natural_value,
+ (st_dump(geom)).geom AS geom
+FROM osm_natural_s_buffered;
+
+CREATE MATERIALIZED VIEW osm_natural_s AS
+SELECT
+ row_number() OVER () AS id,
+ jsonb_build_object('natural', natural_value) AS tags,
+ geom AS geom
+FROM osm_natural_s_buffered;
+CREATE INDEX IF NOT EXISTS osm_natural_s_geom_idx ON osm_natural_s USING GIST (geom);
+CREATE INDEX IF NOT EXISTS osm_natural_s_tags_idx ON osm_natural_s USING GIN (tags);
diff --git a/basemap/layers/natural/simplify.sql b/basemap/layers/natural/simplify.sql
index b66fc3fb..683a584a 100644
--- a/basemap/layers/natural/simplify.sql
+++ b/basemap/layers/natural/simplify.sql
@@ -53,40 +53,40 @@ WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 9), 2);
CREATE MATERIALIZED VIEW osm_natural_z8 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 8)) AS geom
-FROM osm_natural_medium
+FROM osm_natural_xl
WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 8), 2);
CREATE MATERIALIZED VIEW osm_natural_z7 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 7)) AS geom
-FROM osm_natural_medium
+FROM osm_natural_xl
WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 7), 2);
CREATE MATERIALIZED VIEW osm_natural_z6 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 6)) AS geom
-FROM osm_natural_medium
+FROM osm_natural_m
WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 6), 2);
CREATE MATERIALIZED VIEW osm_natural_z5 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 5)) AS geom
-FROM osm_natural_medium
+FROM osm_natural_s
WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 5), 2);
CREATE MATERIALIZED VIEW osm_natural_z4 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 4)) AS geom
-FROM osm_natural_small
+FROM osm_natural_s
WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 4), 2);
CREATE MATERIALIZED VIEW osm_natural_z3 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 3)) AS geom
-FROM osm_natural_small
-WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 3), 2);
+FROM osm_natural_s
+WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 3), 2);
CREATE MATERIALIZED VIEW osm_natural_z2 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 2)) AS geom
-FROM osm_natural_small
-WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 2), 2);
+FROM osm_natural_s
+WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 2), 2);
CREATE MATERIALIZED VIEW osm_natural_z1 AS
SELECT id, tags, st_simplifypreservetopology(geom, 78270 / power(2, 1)) AS geom
-FROM osm_natural_small
-WHERE st_area(st_envelope(geom)) > 10 * power(78270 / power(2, 1), 2);
+FROM osm_natural_s
+WHERE st_area(st_envelope(geom)) > 25 * power(78270 / power(2, 1), 2);