From c6eed77e42e6ff482eb05124e66417519ab6018a Mon Sep 17 00:00:00 2001 From: jirik Date: Wed, 29 Mar 2017 10:17:34 +0200 Subject: [PATCH] Remove memeber_osm_ids attribute from transportation and transportation_name Too big DB during import-sql step --- layers/transportation/merge_highways.sql | 12 ++++-------- layers/transportation_name/merge_highways.sql | 16 ++++++---------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/layers/transportation/merge_highways.sql b/layers/transportation/merge_highways.sql index 1bfe9957..52dde407 100644 --- a/layers/transportation/merge_highways.sql +++ b/layers/transportation/merge_highways.sql @@ -26,18 +26,14 @@ CREATE INDEX IF NOT EXISTS osm_highway_linestring_highway_partial_idx CREATE MATERIALIZED VIEW osm_transportation_merge_linestring AS ( SELECT (ST_Dump(geometry)).geom AS geometry, - -- NOTE: The osm_id is no longer the original one which can make it difficult - -- to lookup road names by OSM ID - member_osm_ids[1] AS osm_id, - member_osm_ids, + NULL::bigint AS osm_id, highway, z_order FROM ( SELECT ST_LineMerge(ST_Collect(geometry)) AS geometry, highway, - min(z_order) AS z_order, - array_agg(DISTINCT osm_id) AS member_osm_ids + min(z_order) AS z_order FROM osm_highway_linestring WHERE highway IN ('motorway','trunk') group by highway @@ -51,7 +47,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_merge_linestring_highway_partial_i -- etldoc: osm_transportation_merge_linestring -> osm_transportation_merge_linestring_gen5 CREATE MATERIALIZED VIEW osm_transportation_merge_linestring_gen5 AS ( - SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, member_osm_ids, highway, z_order + SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, highway, z_order FROM osm_transportation_merge_linestring WHERE highway IN ('motorway','trunk') AND ST_Length(geometry) > 20000 ); @@ -63,7 +59,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_merge_linestring_gen5_highway_part -- etldoc: osm_transportation_merge_linestring_gen5 -> osm_transportation_merge_linestring_gen6 CREATE MATERIALIZED VIEW osm_transportation_merge_linestring_gen6 AS ( - SELECT ST_Simplify(geometry, 2000) AS geometry, osm_id, member_osm_ids, highway, z_order + SELECT ST_Simplify(geometry, 2000) AS geometry, osm_id, highway, z_order FROM osm_transportation_merge_linestring_gen5 WHERE highway IN ('motorway') AND ST_Length(geometry) > 20000 ); diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql index 76684ac2..09b9ed11 100644 --- a/layers/transportation_name/merge_highways.sql +++ b/layers/transportation_name/merge_highways.sql @@ -36,10 +36,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_network_geometry_idx ON osm_t CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( SELECT (ST_Dump(geometry)).geom AS geometry, - -- NOTE: The osm_id is no longer the original one which can make it difficult - -- to lookup road names by OSM ID - member_osm_ids[1] AS osm_id, - member_osm_ids, + NULL::bigint AS osm_id, name, name_en, name_de, @@ -56,8 +53,7 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( ref, highway, network_type, - min(z_order) AS z_order, - array_agg(DISTINCT osm_id) AS member_osm_ids + min(z_order) AS z_order FROM osm_transportation_name_network WHERE ("rank"=1 OR "rank" is null) AND (name <> '' OR ref <> '') @@ -73,7 +69,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_highway_partial_id -- etldoc: osm_transportation_name_linestring -> osm_transportation_name_linestring_gen1 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen1 AS ( - SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring WHERE highway IN ('motorway','trunk') AND ST_Length(geometry) > 8000 ); @@ -85,7 +81,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen1_highway_parti -- etldoc: osm_transportation_name_linestring_gen1 -> osm_transportation_name_linestring_gen2 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen2 AS ( - SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen1 WHERE highway IN ('motorway','trunk') AND ST_Length(geometry) > 14000 ); @@ -97,7 +93,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen2_highway_parti -- etldoc: osm_transportation_name_linestring_gen2 -> osm_transportation_name_linestring_gen3 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen3 AS ( - SELECT ST_Simplify(geometry, 200) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 200) AS geometry, osm_id, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen2 WHERE highway = 'motorway' AND ST_Length(geometry) > 20000 ); @@ -109,7 +105,7 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen3_highway_parti -- etldoc: osm_transportation_name_linestring_gen3 -> osm_transportation_name_linestring_gen4 CREATE MATERIALIZED VIEW osm_transportation_name_linestring_gen4 AS ( - SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, member_osm_ids, name, name_en, name_de, ref, highway, network, z_order + SELECT ST_Simplify(geometry, 500) AS geometry, osm_id, name, name_en, name_de, ref, highway, network, z_order FROM osm_transportation_name_linestring_gen3 WHERE highway = 'motorway' AND ST_Length(geometry) > 20000 );