From ce66892808069169748d6450f1adc87c77a977f3 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 18 Jan 2017 16:20:57 +0100 Subject: [PATCH] Replace tabs with spaces for merge_highways --- layers/transportation_name/merge_highways.sql | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql index eea4941b..5ee5d801 100644 --- a/layers/transportation_name/merge_highways.sql +++ b/layers/transportation_name/merge_highways.sql @@ -13,31 +13,31 @@ DROP MATERIALIZED VIEW IF EXISTS osm_transportation_name_linestring_gen3 CASCADE -- etldoc: osm_highway_linestring -> osm_transportation_name_linestring CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( - SELECT - (ST_Dump(geometry)).geom AS geometry, + 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[0] AS osm_id, - member_osm_ids, - name, - name_en, + member_osm_ids[0] AS osm_id, + member_osm_ids, + name, + name_en, ref, - highway, - z_order - FROM ( - SELECT - ST_LineMerge(ST_Collect(geometry)) AS geometry, - name, + highway, + z_order + FROM ( + SELECT + ST_LineMerge(ST_Collect(geometry)) AS geometry, + name, COALESCE(NULLIF(name_en, ''), name) AS name_en, ref, - highway, - min(z_order) AS z_order, - array_agg(DISTINCT osm_id) AS member_osm_ids - FROM osm_highway_linestring + highway, + min(z_order) AS z_order, + array_agg(DISTINCT osm_id) AS member_osm_ids + FROM osm_highway_linestring -- We only care about highways (not railways) for labeling - WHERE (name <> '' OR ref <> '') AND NULLIF(highway, '') IS NOT NULL - GROUP BY name, name_en, highway, ref - ) AS highway_union + WHERE (name <> '' OR ref <> '') AND NULLIF(highway, '') IS NOT NULL + GROUP BY name, name_en, highway, ref + ) AS highway_union ); CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_geometry_idx ON osm_transportation_name_linestring USING gist(geometry);