From d3a5985343b6d825bc5b3b1c3c2e344a54bec1b7 Mon Sep 17 00:00:00 2001 From: jirik Date: Fri, 10 Nov 2017 16:21:25 +0100 Subject: [PATCH] Remove waterway's name.sql because of duplicity --- layers/waterway/name.sql | 7 ------- layers/waterway/update_important_waterway.sql | 1 - layers/waterway/update_waterway_linestring.sql | 1 + layers/waterway/waterway.yaml | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 layers/waterway/name.sql diff --git a/layers/waterway/name.sql b/layers/waterway/name.sql deleted file mode 100644 index 60eab1b..0000000 --- a/layers/waterway/name.sql +++ /dev/null @@ -1,7 +0,0 @@ -DO $$ -BEGIN - update osm_waterway_linestring SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry); - update osm_waterway_linestring_gen1 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry); - update osm_waterway_linestring_gen2 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry); - update osm_waterway_linestring_gen3 SET tags = delete_empty_keys(tags) || get_basic_names(tags, geometry); -END $$; diff --git a/layers/waterway/update_important_waterway.sql b/layers/waterway/update_important_waterway.sql index e190043..cebcfb9 100644 --- a/layers/waterway/update_important_waterway.sql +++ b/layers/waterway/update_important_waterway.sql @@ -1,4 +1,3 @@ -DROP TRIGGER IF EXISTS trigger_flag ON osm_waterway_linestring; DROP TRIGGER IF EXISTS trigger_refresh ON waterway_important.updates; -- We merge the waterways by name like the highways diff --git a/layers/waterway/update_waterway_linestring.sql b/layers/waterway/update_waterway_linestring.sql index 9234b97..8463e33 100644 --- a/layers/waterway/update_waterway_linestring.sql +++ b/layers/waterway/update_waterway_linestring.sql @@ -1,3 +1,4 @@ +DROP TRIGGER IF EXISTS trigger_flag ON osm_waterway_linestring; DROP TRIGGER IF EXISTS trigger_refresh ON osm_waterway_linestring; DO $$ diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml index ff0e8c9..41dede4 100644 --- a/layers/waterway/waterway.yaml +++ b/layers/waterway/waterway.yaml @@ -25,7 +25,6 @@ layer: geometry_field: geometry query: (SELECT geometry, name, name_en, name_de, {name_languages}, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t schema: - - ./name.sql - ./update_waterway_linestring.sql - ./update_important_waterway.sql - ./waterway.sql