From 3fc403dfc44ebeb7772f5ef9a9013a371daa3433 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Sat, 6 Jun 2020 03:29:23 -0400 Subject: [PATCH] NOOP water - Move updating sql into separate file Use `update_water.sql` for all queries that update db to be consistent with the other layers. --- layers/water/update_water.sql | 42 ++++++++++++++++++++++++++++++++ layers/water/water.sql | 45 ----------------------------------- layers/water/water.yaml | 1 + 3 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 layers/water/update_water.sql diff --git a/layers/water/update_water.sql b/layers/water/update_water.sql new file mode 100644 index 000000000..bca37e15f --- /dev/null +++ b/layers/water/update_water.sql @@ -0,0 +1,42 @@ +-- This statement can be deleted after the water importer image stops creating this object as a table +DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen1 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; +-- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen1 +DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen1 CASCADE; +CREATE MATERIALIZED VIEW osm_ocean_polygon_gen1 AS ( + SELECT ST_Simplify(geometry, 20) AS geometry + FROM osm_ocean_polygon +) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; +CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen1_idx ON osm_ocean_polygon_gen1 USING gist (geometry); + + +-- This statement can be deleted after the water importer image stops creating this object as a table +DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen2 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; +-- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen2 +DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen2 CASCADE; +CREATE MATERIALIZED VIEW osm_ocean_polygon_gen2 AS ( + SELECT ST_Simplify(geometry, 40) AS geometry + FROM osm_ocean_polygon +) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; +CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen2_idx ON osm_ocean_polygon_gen2 USING gist (geometry); + + +-- This statement can be deleted after the water importer image stops creating this object as a table +DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen3 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; +-- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen3 +DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen3 CASCADE; +CREATE MATERIALIZED VIEW osm_ocean_polygon_gen3 AS ( + SELECT ST_Simplify(geometry, 80) AS geometry + FROM osm_ocean_polygon +) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; +CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen3_idx ON osm_ocean_polygon_gen3 USING gist (geometry); + + +-- This statement can be deleted after the water importer image stops creating this object as a table +DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen4 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; +-- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen4 +DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen4 CASCADE; +CREATE MATERIALIZED VIEW osm_ocean_polygon_gen4 AS ( + SELECT ST_Simplify(geometry, 160) AS geometry + FROM osm_ocean_polygon +) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; +CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen4_idx ON osm_ocean_polygon_gen4 USING gist (geometry); diff --git a/layers/water/water.sql b/layers/water/water.sql index a4784280e..f59d1f1c5 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -1,48 +1,3 @@ --- This statement can be deleted after the water importer image stops creating this object as a table -DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen1 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; --- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen1 -DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen1 CASCADE; -CREATE MATERIALIZED VIEW osm_ocean_polygon_gen1 AS ( - SELECT ST_Simplify(geometry, 20) AS geometry - FROM osm_ocean_polygon -) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; -CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen1_idx ON osm_ocean_polygon_gen1 USING gist (geometry); - - --- This statement can be deleted after the water importer image stops creating this object as a table -DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen2 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; --- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen2 -DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen2 CASCADE; -CREATE MATERIALIZED VIEW osm_ocean_polygon_gen2 AS ( - SELECT ST_Simplify(geometry, 40) AS geometry - FROM osm_ocean_polygon -) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; -CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen2_idx ON osm_ocean_polygon_gen2 USING gist (geometry); - - --- This statement can be deleted after the water importer image stops creating this object as a table -DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen3 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; --- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen3 -DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen3 CASCADE; -CREATE MATERIALIZED VIEW osm_ocean_polygon_gen3 AS ( - SELECT ST_Simplify(geometry, 80) AS geometry - FROM osm_ocean_polygon -) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; -CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen3_idx ON osm_ocean_polygon_gen3 USING gist (geometry); - - --- This statement can be deleted after the water importer image stops creating this object as a table -DO $$ BEGIN DROP TABLE IF EXISTS osm_ocean_polygon_gen4 CASCADE; EXCEPTION WHEN wrong_object_type THEN END; $$ language 'plpgsql'; --- etldoc: osm_ocean_polygon -> osm_ocean_polygon_gen4 -DROP MATERIALIZED VIEW IF EXISTS osm_ocean_polygon_gen4 CASCADE; -CREATE MATERIALIZED VIEW osm_ocean_polygon_gen4 AS ( - SELECT ST_Simplify(geometry, 160) AS geometry - FROM osm_ocean_polygon -) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; -CREATE INDEX IF NOT EXISTS osm_ocean_polygon_gen4_idx ON osm_ocean_polygon_gen4 USING gist (geometry); - - - CREATE OR REPLACE FUNCTION water_class(waterway TEXT) RETURNS TEXT AS $$ SELECT CASE %%FIELD_MAPPING: class %% diff --git a/layers/water/water.yaml b/layers/water/water.yaml index 24ecabe54..cbd0a0793 100644 --- a/layers/water/water.yaml +++ b/layers/water/water.yaml @@ -34,6 +34,7 @@ layer: datasource: query: (SELECT geometry, class, intermittent, brunnel FROM layer_water(!bbox!, z(!scale_denominator!))) AS t schema: + - ./update_water.sql - ./water.sql datasources: - type: imposm3