From 9bb17792a6f1c4b2da9b34c7c3fb73e6a3e6c342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Wed, 22 Jul 2020 13:48:25 +0200 Subject: [PATCH] Remove alignment of AS in SQL and few others (#932) * Remove alignment of AS in SQL * Remove alignment of CREATE TABLE in SQL --- layers/aerodrome_label/layer.sql | 12 +- .../update_aerodrome_label_point.sql | 2 +- layers/boundary/boundary.sql | 74 +-- layers/building/building.sql | 36 +- layers/building/update_building.sql | 2 +- layers/housenumber/housenumber_centroid.sql | 2 +- layers/landuse/landuse.sql | 24 +- layers/mountain_peak/layer.sql | 8 +- layers/park/layer.sql | 6 +- layers/place/city.sql | 12 +- layers/place/layer.sql | 58 +- layers/place/update_city_point.sql | 2 +- layers/place/update_continent_point.sql | 2 +- layers/place/update_country_point.sql | 2 +- layers/place/update_island_point.sql | 2 +- layers/place/update_island_polygon.sql | 2 +- layers/place/update_state_point.sql | 2 +- layers/poi/layer.sql | 20 +- layers/poi/poi_stop_agg.sql | 2 +- layers/poi/update_poi_point.sql | 2 +- layers/poi/update_poi_polygon.sql | 2 +- layers/transportation/layer.sql | 552 +++++++++--------- .../update_transportation_merge.sql | 6 +- layers/transportation_name/layer.sql | 32 +- .../update_transportation_name.sql | 25 +- layers/water/water.sql | 36 +- layers/water_name/layer.sql | 24 +- layers/water_name/update_marine_point.sql | 2 +- layers/water_name/update_water_lakeline.sql | 4 +- layers/water_name/update_water_point.sql | 4 +- layers/waterway/update_important_waterway.sql | 14 +- layers/waterway/waterway.sql | 32 +- 32 files changed, 502 insertions(+), 503 deletions(-) diff --git a/layers/aerodrome_label/layer.sql b/layers/aerodrome_label/layer.sql index 19b8b2a2..7c2c41fa 100644 --- a/layers/aerodrome_label/layer.sql +++ b/layers/aerodrome_label/layer.sql @@ -24,16 +24,16 @@ SELECT osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, - COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, CASE %%FIELD_MAPPING: class %% ELSE 'other' - END AS class, - NULLIF(iata, '') AS iata, - NULLIF(icao, '') AS icao, - substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele, + END AS class, + NULLIF(iata, '') AS iata, + NULLIF(icao, '') AS icao, + substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele, round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft FROM osm_aerodrome_label_point WHERE geometry && bbox diff --git a/layers/aerodrome_label/update_aerodrome_label_point.sql b/layers/aerodrome_label/update_aerodrome_label_point.sql index e730b519..f349af9f 100644 --- a/layers/aerodrome_label/update_aerodrome_label_point.sql +++ b/layers/aerodrome_label/update_aerodrome_label_point.sql @@ -24,7 +24,7 @@ CREATE SCHEMA IF NOT EXISTS aerodrome_label; CREATE TABLE IF NOT EXISTS aerodrome_label.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION aerodrome_label.flag() RETURNS trigger AS diff --git a/layers/boundary/boundary.sql b/layers/boundary/boundary.sql index 11007593..1661ad30 100644 --- a/layers/boundary/boundary.sql +++ b/layers/boundary/boundary.sql @@ -216,11 +216,11 @@ $$ LANGUAGE SQL IMMUTABLE CREATE OR REPLACE VIEW boundary_z0 AS ( SELECT geometry, - 2 AS admin_level, + 2 AS admin_level, (CASE WHEN featurecla LIKE 'Disputed%' THEN TRUE ELSE FALSE END) AS disputed, - NULL::text AS disputed_name, - NULL::text AS claimed_by, - FALSE AS maritime + NULL::text AS disputed_name, + NULL::text AS claimed_by, + FALSE AS maritime FROM ne_110m_admin_0_boundary_lines_land ); @@ -230,24 +230,24 @@ FROM ne_110m_admin_0_boundary_lines_land CREATE OR REPLACE VIEW boundary_z1 AS ( SELECT geometry, - 2 AS admin_level, + 2 AS admin_level, (CASE WHEN featurecla LIKE 'Disputed%' THEN TRUE ELSE FALSE END) AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, - FALSE AS maritime + NULL AS disputed_name, + NULL AS claimed_by, + FALSE AS maritime FROM ne_50m_admin_0_boundary_lines_land UNION ALL SELECT geometry, - 4 AS admin_level, + 4 AS admin_level, FALSE AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, + NULL AS disputed_name, + NULL AS claimed_by, FALSE AS maritime FROM ne_50m_admin_1_states_provinces_lines UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -261,24 +261,24 @@ FROM osm_border_disp_linestring_gen11 CREATE OR REPLACE VIEW boundary_z3 AS ( SELECT geometry, - 2 AS admin_level, + 2 AS admin_level, (CASE WHEN featurecla LIKE 'Disputed%' THEN TRUE ELSE FALSE END) AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, - FALSE AS maritime + NULL AS disputed_name, + NULL AS claimed_by, + FALSE AS maritime FROM ne_50m_admin_0_boundary_lines_land UNION ALL SELECT geometry, - 4 AS admin_level, + 4 AS admin_level, FALSE AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, + NULL AS disputed_name, + NULL AS claimed_by, FALSE AS maritime FROM ne_50m_admin_1_states_provinces_lines UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -293,19 +293,19 @@ FROM osm_border_disp_linestring_gen11 CREATE OR REPLACE VIEW boundary_z4 AS ( SELECT geometry, - 2 AS admin_level, + 2 AS admin_level, (CASE WHEN featurecla LIKE 'Disputed%' THEN TRUE ELSE FALSE END) AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, - FALSE AS maritime + NULL AS disputed_name, + NULL AS claimed_by, + FALSE AS maritime FROM ne_10m_admin_0_boundary_lines_land WHERE featurecla <> 'Lease limit' UNION ALL SELECT geometry, - 4 AS admin_level, + 4 AS admin_level, FALSE AS disputed, - NULL AS disputed_name, - NULL AS claimed_by, + NULL AS disputed_name, + NULL AS claimed_by, FALSE AS maritime FROM ne_10m_admin_1_states_provinces_lines WHERE min_zoom <= 5 @@ -322,7 +322,7 @@ WHERE maritime = TRUE UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -345,7 +345,7 @@ WHERE admin_level <= 4 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -368,7 +368,7 @@ WHERE admin_level <= 4 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -391,7 +391,7 @@ WHERE admin_level <= 6 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -414,7 +414,7 @@ WHERE admin_level <= 6 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -437,7 +437,7 @@ WHERE admin_level <= 6 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -460,7 +460,7 @@ WHERE admin_level <= 6 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -483,7 +483,7 @@ WHERE admin_level <= 8 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -505,7 +505,7 @@ WHERE osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen2 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime @@ -527,7 +527,7 @@ WHERE osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen1 UNION ALL SELECT geometry, admin_level, - TRUE AS disputed, + TRUE AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime diff --git a/layers/building/building.sql b/layers/building/building.sql index 47b2c51e..0f550986 100644 --- a/layers/building/building.sql +++ b/layers/building/building.sql @@ -9,15 +9,15 @@ CREATE OR REPLACE VIEW osm_all_buildings AS SELECT -- etldoc: osm_building_relation -> layer_building:z14_ -- Buildings built from relations - member AS osm_id, + member AS osm_id, geometry, - COALESCE(CleanNumeric(height), CleanNumeric(buildingheight)) AS height, + COALESCE(CleanNumeric(height), CleanNumeric(buildingheight)) AS height, COALESCE(CleanNumeric(min_height), CleanNumeric(buildingmin_height)) AS min_height, - COALESCE(CleanNumeric(levels), CleanNumeric(buildinglevels)) AS levels, - COALESCE(CleanNumeric(min_level), CleanNumeric(buildingmin_level)) AS min_level, - nullif(material, '') AS material, - nullif(colour, '') AS colour, - FALSE AS hide_3d + COALESCE(CleanNumeric(levels), CleanNumeric(buildinglevels)) AS levels, + COALESCE(CleanNumeric(min_level), CleanNumeric(buildingmin_level)) AS min_level, + nullif(material, '') AS material, + nullif(colour, '') AS colour, + FALSE AS hide_3d FROM osm_building_relation WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon' @@ -28,13 +28,13 @@ SELECT -- Standalone buildings obp.osm_id, obp.geometry, - COALESCE(CleanNumeric(obp.height), CleanNumeric(obp.buildingheight)) AS height, + COALESCE(CleanNumeric(obp.height), CleanNumeric(obp.buildingheight)) AS height, COALESCE(CleanNumeric(obp.min_height), CleanNumeric(obp.buildingmin_height)) AS min_height, - COALESCE(CleanNumeric(obp.levels), CleanNumeric(obp.buildinglevels)) AS levels, - COALESCE(CleanNumeric(obp.min_level), CleanNumeric(obp.buildingmin_level)) AS min_level, - nullif(obp.material, '') AS material, - nullif(obp.colour, '') AS colour, - obr.role IS NOT NULL AS hide_3d + COALESCE(CleanNumeric(obp.levels), CleanNumeric(obp.buildinglevels)) AS levels, + COALESCE(CleanNumeric(obp.min_level), CleanNumeric(obp.buildingmin_level)) AS min_level, + nullif(obp.material, '') AS material, + nullif(obp.colour, '') AS colour, + obr.role IS NOT NULL AS hide_3d FROM osm_building_polygon obp LEFT JOIN osm_building_relation obr ON obp.osm_id >= 0 AND @@ -78,18 +78,18 @@ SELECT geometry, WHEN 'timber_framing' THEN '#b3b0a9' WHEN 'sandstone' THEN '#b4a995' -- same as stone WHEN 'clay' THEN '#9d8b75' -- same as mud - END) AS colour, + END) AS colour, CASE WHEN hide_3d THEN TRUE END AS hide_3d FROM ( SELECT -- etldoc: osm_building_block_gen1 -> layer_building:z13 osm_id, geometry, - NULL::int AS render_height, - NULL::int AS render_min_height, + NULL::int AS render_height, + NULL::int AS render_min_height, NULL::text AS material, NULL::text AS colour, - FALSE AS hide_3d + FALSE AS hide_3d FROM osm_building_block_gen1 WHERE zoom_level = 13 AND geometry && bbox @@ -98,7 +98,7 @@ FROM ( -- etldoc: osm_building_polygon -> layer_building:z14_ DISTINCT ON (osm_id) osm_id, geometry, - ceil(COALESCE(height, levels * 3.66, 5))::int AS render_height, + ceil(COALESCE(height, levels * 3.66, 5))::int AS render_height, floor(COALESCE(min_height, min_level * 3.66, 0))::int AS render_min_height, material, colour, diff --git a/layers/building/update_building.sql b/layers/building/update_building.sql index 5c15ae8a..99292ca8 100644 --- a/layers/building/update_building.sql +++ b/layers/building/update_building.sql @@ -88,7 +88,7 @@ CREATE SCHEMA IF NOT EXISTS buildings; CREATE TABLE IF NOT EXISTS buildings.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); diff --git a/layers/housenumber/housenumber_centroid.sql b/layers/housenumber/housenumber_centroid.sql index fad1f3dd..8e429458 100644 --- a/layers/housenumber/housenumber_centroid.sql +++ b/layers/housenumber/housenumber_centroid.sql @@ -25,7 +25,7 @@ CREATE SCHEMA IF NOT EXISTS housenumber; CREATE TABLE IF NOT EXISTS housenumber.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION housenumber.flag() RETURNS trigger AS diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index a1cae13c..7feaa854 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -1,14 +1,14 @@ -- etldoc: ne_50m_urban_areas -> landuse_z4 CREATE OR REPLACE VIEW landuse_z4 AS ( -SELECT NULL::bigint AS osm_id, +SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, - NULL::text AS amenity, - NULL::text AS leisure, - NULL::text AS tourism, - NULL::text AS place, - NULL::text AS waterway + NULL::text AS amenity, + NULL::text AS leisure, + NULL::text AS tourism, + NULL::text AS place, + NULL::text AS waterway FROM ne_50m_urban_areas WHERE scalerank <= 2 ); @@ -16,14 +16,14 @@ WHERE scalerank <= 2 -- etldoc: ne_50m_urban_areas -> landuse_z5 CREATE OR REPLACE VIEW landuse_z5 AS ( -SELECT NULL::bigint AS osm_id, +SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, - NULL::text AS amenity, - NULL::text AS leisure, - NULL::text AS tourism, - NULL::text AS place, - NULL::text AS waterway + NULL::text AS amenity, + NULL::text AS leisure, + NULL::text AS tourism, + NULL::text AS place, + NULL::text AS waterway FROM ne_50m_urban_areas ); diff --git a/layers/mountain_peak/layer.sql b/layers/mountain_peak/layer.sql index 9a9385ac..b6f6752b 100644 --- a/layers/mountain_peak/layer.sql +++ b/layers/mountain_peak/layer.sql @@ -35,10 +35,10 @@ FROM ( SELECT osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, - COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, + COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele, + substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele, round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft, row_number() OVER ( PARTITION BY LabelGrid(geometry, 100 * pixel_width) @@ -47,7 +47,7 @@ FROM ( (CASE WHEN NULLIF(wikipedia, '') IS NOT NULL THEN 10000 ELSE 0 END) + (CASE WHEN NULLIF(name, '') IS NOT NULL THEN 10000 ELSE 0 END) ) DESC - )::int AS "rank" + )::int AS "rank" FROM osm_peak_point WHERE geometry && bbox AND ele IS NOT NULL diff --git a/layers/park/layer.sql b/layers/park/layer.sql index e6547c85..f5572f8c 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -30,7 +30,7 @@ FROM ( LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')), NULLIF(boundary, ''), NULLIF(leisure, '') - ) AS class, + ) AS class, name, name_en, name_de, @@ -171,7 +171,7 @@ FROM ( LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')), NULLIF(boundary, ''), NULLIF(leisure, '') - ) AS class, + ) AS class, name, name_en, name_de, @@ -182,7 +182,7 @@ FROM ( (CASE WHEN boundary = 'national_park' THEN TRUE ELSE FALSE END) DESC, (COALESCE(NULLIF(tags->'wikipedia', ''), NULLIF(tags->'wikidata', '')) IS NOT NULL) DESC, area DESC - )::int AS "rank" + )::int AS "rank" FROM ( -- etldoc: osm_park_polygon_gen8 -> layer_park:z6 SELECT osm_id, diff --git a/layers/place/city.sql b/layers/place/city.sql index 9c44e4f1..41438d5c 100644 --- a/layers/place/city.sql +++ b/layers/place/city.sql @@ -22,12 +22,12 @@ FROM ( SELECT osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, place, "rank", - normalize_capital_level(capital) AS capital + normalize_capital_level(capital) AS capital FROM osm_city_point WHERE geometry && bbox AND ((zoom_level = 2 AND "rank" = 1) @@ -37,17 +37,17 @@ FROM ( SELECT osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, place, COALESCE("rank", gridrank + 10), - normalize_capital_level(capital) AS capital + normalize_capital_level(capital) AS capital FROM ( SELECT osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, place, @@ -59,7 +59,7 @@ FROM ( place ASC NULLS LAST, population DESC NULLS LAST, length(name) ASC - )::int AS gridrank + )::int AS gridrank FROM osm_city_point WHERE geometry && bbox AND ((zoom_level = 7 AND place <= 'town'::city_place diff --git a/layers/place/layer.sql b/layers/place/layer.sql index f4eae732..e9bb7b8c 100644 --- a/layers/place/layer.sql +++ b/layers/place/layer.sql @@ -21,16 +21,16 @@ SELECT * FROM ( SELECT -- etldoc: osm_continent_point -> layer_place:z0_3 - osm_id * 10 AS osm_id, + osm_id * 10 AS osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'continent' AS class, - 1 AS "rank", - NULL::int AS capital, - NULL::text AS iso_a2 + 'continent' AS class, + 1 AS "rank", + NULL::int AS capital, + NULL::text AS iso_a2 FROM osm_continent_point WHERE geometry && bbox AND zoom_level < 4 @@ -42,16 +42,16 @@ FROM ( -- etldoc: osm_country_point -> layer_place:z4_7 -- etldoc: osm_country_point -> layer_place:z8_11 -- etldoc: osm_country_point -> layer_place:z12_14 - osm_id * 10 AS osm_id, + osm_id * 10 AS osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'country' AS class, + 'country' AS class, "rank", - NULL::int AS capital, - iso3166_1_alpha_2 AS iso_a2 + NULL::int AS capital, + iso3166_1_alpha_2 AS iso_a2 FROM osm_country_point WHERE geometry && bbox AND "rank" <= zoom_level + 1 @@ -64,16 +64,16 @@ FROM ( -- etldoc: osm_state_point -> layer_place:z4_7 -- etldoc: osm_state_point -> layer_place:z8_11 -- etldoc: osm_state_point -> layer_place:z12_14 - osm_id * 10 AS osm_id, + osm_id * 10 AS osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'state' AS class, + 'state' AS class, "rank", - NULL::int AS capital, - NULL::text AS iso_a2 + NULL::int AS capital, + NULL::text AS iso_a2 FROM osm_state_point WHERE geometry && bbox AND name <> '' @@ -87,16 +87,16 @@ FROM ( SELECT -- etldoc: osm_island_point -> layer_place:z12_14 - osm_id * 10 AS osm_id, + osm_id * 10 AS osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'island' AS class, - 7 AS "rank", - NULL::int AS capital, - NULL::text AS iso_a2 + 'island' AS class, + 7 AS "rank", + NULL::int AS capital, + NULL::text AS iso_a2 FROM osm_island_point WHERE zoom_level >= 12 AND geometry && bbox @@ -106,16 +106,16 @@ FROM ( SELECT -- etldoc: osm_island_polygon -> layer_place:z8_11 -- etldoc: osm_island_polygon -> layer_place:z12_14 - osm_id * 10 AS osm_id, + osm_id * 10 AS osm_id, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'island' AS class, - island_rank(area) AS "rank", - NULL::int AS capital, - NULL::text AS iso_a2 + 'island' AS class, + island_rank(area) AS "rank", + NULL::int AS capital, + NULL::text AS iso_a2 FROM osm_island_polygon WHERE geometry && bbox AND ((zoom_level = 8 AND island_rank(area) <= 3) @@ -138,7 +138,7 @@ FROM ( place::text AS class, "rank", capital, - NULL::text AS iso_a2 + NULL::text AS iso_a2 FROM layer_city(bbox, zoom_level, pixel_width) ORDER BY "rank" ASC ) AS place_all diff --git a/layers/place/update_city_point.sql b/layers/place/update_city_point.sql index 7766491c..6795e267 100644 --- a/layers/place/update_city_point.sql +++ b/layers/place/update_city_point.sql @@ -60,7 +60,7 @@ CREATE SCHEMA IF NOT EXISTS place_city; CREATE TABLE IF NOT EXISTS place_city.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_city.flag() RETURNS trigger AS diff --git a/layers/place/update_continent_point.sql b/layers/place/update_continent_point.sql index 6502299a..18f607c6 100644 --- a/layers/place/update_continent_point.sql +++ b/layers/place/update_continent_point.sql @@ -21,7 +21,7 @@ CREATE SCHEMA IF NOT EXISTS place_continent_point; CREATE TABLE IF NOT EXISTS place_continent_point.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_continent_point.flag() RETURNS trigger AS diff --git a/layers/place/update_country_point.sql b/layers/place/update_country_point.sql index a49e3b67..715e9d52 100644 --- a/layers/place/update_country_point.sql +++ b/layers/place/update_country_point.sql @@ -96,7 +96,7 @@ CREATE SCHEMA IF NOT EXISTS place_country; CREATE TABLE IF NOT EXISTS place_country.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_country.flag() RETURNS trigger AS diff --git a/layers/place/update_island_point.sql b/layers/place/update_island_point.sql index b1c79f7f..e9f16b5b 100644 --- a/layers/place/update_island_point.sql +++ b/layers/place/update_island_point.sql @@ -21,7 +21,7 @@ CREATE SCHEMA IF NOT EXISTS place_island_point; CREATE TABLE IF NOT EXISTS place_island_point.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_island_point.flag() RETURNS trigger AS diff --git a/layers/place/update_island_polygon.sql b/layers/place/update_island_polygon.sql index 9938373f..a081f31f 100644 --- a/layers/place/update_island_polygon.sql +++ b/layers/place/update_island_polygon.sql @@ -24,7 +24,7 @@ CREATE SCHEMA IF NOT EXISTS place_island_polygon; CREATE TABLE IF NOT EXISTS place_island_polygon.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_island_polygon.flag() RETURNS trigger AS diff --git a/layers/place/update_state_point.sql b/layers/place/update_state_point.sql index 4693d3c6..b77dd316 100644 --- a/layers/place/update_state_point.sql +++ b/layers/place/update_state_point.sql @@ -61,7 +61,7 @@ CREATE SCHEMA IF NOT EXISTS place_state; CREATE TABLE IF NOT EXISTS place_state.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION place_state.flag() RETURNS trigger AS diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index a268bc6b..aecd23fc 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -20,13 +20,13 @@ CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_wi ) AS $$ -SELECT osm_id_hash AS osm_id, +SELECT osm_id_hash AS osm_id, geometry, - NULLIF(name, '') AS name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + NULLIF(name, '') AS name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - poi_class(subclass, mapping_key) AS class, + poi_class(subclass, mapping_key) AS class, CASE WHEN subclass = 'information' THEN NULLIF(information, '') @@ -35,15 +35,15 @@ SELECT osm_id_hash AS osm_id, WHEN subclass = 'pitch' THEN NULLIF(sport, '') ELSE subclass - END AS subclass, + END AS subclass, agg_stop, - NULLIF(layer, 0) AS layer, + NULLIF(layer, 0) AS layer, "level", - CASE WHEN indoor = TRUE THEN 1 END AS indoor, + CASE WHEN indoor = TRUE THEN 1 END AS indoor, row_number() OVER ( PARTITION BY LabelGrid(geometry, 100 * pixel_width) ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass, mapping_key)) END ASC - )::int AS "rank" + )::int AS "rank" FROM ( -- etldoc: osm_poi_point -> layer_poi:z12 -- etldoc: osm_poi_point -> layer_poi:z13 @@ -73,7 +73,7 @@ FROM ( CASE WHEN osm_id < 0 THEN -osm_id * 10 + 4 ELSE osm_id * 10 + 1 - END AS osm_id_hash + END AS osm_id_hash FROM osm_poi_polygon WHERE geometry && bbox AND zoom_level BETWEEN 12 AND 13 @@ -88,7 +88,7 @@ FROM ( CASE WHEN osm_id < 0 THEN -osm_id * 10 + 4 ELSE osm_id * 10 + 1 - END AS osm_id_hash + END AS osm_id_hash FROM osm_poi_polygon WHERE geometry && bbox AND zoom_level >= 14 diff --git a/layers/poi/poi_stop_agg.sql b/layers/poi/poi_stop_agg.sql index 3b1e9053..5d629b04 100644 --- a/layers/poi/poi_stop_agg.sql +++ b/layers/poi/poi_stop_agg.sql @@ -2,7 +2,7 @@ DROP MATERIALIZED VIEW IF EXISTS osm_poi_stop_centroid CASCADE; CREATE MATERIALIZED VIEW osm_poi_stop_centroid AS ( SELECT uic_ref, - count(*) AS count, + count(*) AS count, CASE WHEN count(*) > 2 THEN ST_Centroid(ST_UNION(geometry)) END AS centroid FROM osm_poi_point WHERE nullif(uic_ref, '') IS NOT NULL diff --git a/layers/poi/update_poi_point.sql b/layers/poi/update_poi_point.sql index d058b581..f2660805 100644 --- a/layers/poi/update_poi_point.sql +++ b/layers/poi/update_poi_point.sql @@ -57,7 +57,7 @@ CREATE SCHEMA IF NOT EXISTS poi_point; CREATE TABLE IF NOT EXISTS poi_point.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION poi_point.flag() RETURNS trigger AS diff --git a/layers/poi/update_poi_polygon.sql b/layers/poi/update_poi_polygon.sql index d1b042fa..f84f394e 100644 --- a/layers/poi/update_poi_polygon.sql +++ b/layers/poi/update_poi_polygon.sql @@ -42,7 +42,7 @@ CREATE SCHEMA IF NOT EXISTS poi_polygon; CREATE TABLE IF NOT EXISTS poi_polygon.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION poi_polygon.flag() RETURNS trigger AS diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql index 31966b39..16431dd9 100644 --- a/layers/transportation/layer.sql +++ b/layers/transportation/layer.sql @@ -39,54 +39,54 @@ SELECT osm_id, WHEN NULLIF(aerialway, '') IS NOT NULL THEN aerialway WHEN NULLIF(shipway, '') IS NOT NULL THEN shipway WHEN NULLIF(man_made, '') IS NOT NULL THEN man_made - END AS class, + END AS class, CASE WHEN railway IS NOT NULL THEN railway WHEN (highway IS NOT NULL OR public_transport IS NOT NULL) AND highway_class(highway, public_transport, construction) = 'path' THEN COALESCE(NULLIF(public_transport, ''), highway) - END AS subclass, + END AS subclass, -- All links are considered as ramps as well CASE WHEN highway_is_link(highway) OR highway = 'steps' THEN 1 - ELSE is_ramp::int END AS ramp, - is_oneway::int AS oneway, + ELSE is_ramp::int END AS ramp, + is_oneway::int AS oneway, brunnel(is_bridge, is_tunnel, is_ford) AS brunnel, - NULLIF(service, '') AS service, - NULLIF(layer, 0) AS layer, + NULLIF(service, '') AS service, + NULLIF(layer, 0) AS layer, "level", - CASE WHEN indoor = TRUE THEN 1 END AS indoor, - NULLIF(bicycle, '') AS bicycle, - NULLIF(foot, '') AS foot, - NULLIF(horse, '') AS horse, - NULLIF(mtb_scale, '') AS mtb_scale, - NULLIF(surface, '') AS surface + CASE WHEN indoor = TRUE THEN 1 END AS indoor, + NULLIF(bicycle, '') AS bicycle, + NULLIF(foot, '') AS foot, + NULLIF(horse, '') AS horse, + NULLIF(mtb_scale, '') AS mtb_scale, + NULLIF(surface, '') AS surface FROM ( -- etldoc: osm_transportation_merge_linestring_gen7 -> layer_transportation:z4 SELECT osm_id, geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_transportation_merge_linestring_gen7 WHERE zoom_level = 4 @@ -97,25 +97,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_transportation_merge_linestring_gen6 WHERE zoom_level = 5 @@ -126,25 +126,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_transportation_merge_linestring_gen5 WHERE zoom_level = 6 @@ -155,25 +155,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_transportation_merge_linestring_gen4 WHERE zoom_level = 7 @@ -184,25 +184,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_transportation_merge_linestring_gen3 WHERE zoom_level = 8 @@ -214,25 +214,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, + NULL::int AS is_oneway, + NULL AS man_made, layer, - NULL::int AS level, + NULL::int AS level, NULL::boolean AS indoor, bicycle, foot, horse, mtb_scale, - NULL AS surface, + NULL AS surface, z_order FROM osm_highway_linestring_gen2 WHERE zoom_level BETWEEN 9 AND 10 @@ -244,25 +244,25 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, - NULL AS service, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, + NULL AS service, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_ford, NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, + NULL::int AS is_oneway, + NULL AS man_made, layer, - NULL::int AS level, + NULL::int AS level, NULL::boolean AS indoor, bicycle, foot, horse, mtb_scale, - NULL AS surface, + NULL AS surface, z_order FROM osm_highway_linestring_gen1 WHERE zoom_level = 11 @@ -276,11 +276,11 @@ FROM ( geometry, highway, construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, public_transport, - service_value(service) AS service, + service_value(service) AS service, is_bridge, is_tunnel, is_ford, @@ -289,12 +289,12 @@ FROM ( man_made, layer, CASE WHEN highway IN ('footway', 'steps') THEN "level" END AS "level", - CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor, + CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor, bicycle, foot, horse, mtb_scale, - surface_value(surface) AS "surface", + surface_value(surface) AS "surface", z_order FROM osm_highway_linestring WHERE NOT is_area @@ -322,27 +322,27 @@ FROM ( -- etldoc: osm_railway_linestring_gen5 -> layer_transportation:z8 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel, - NULL::boolean AS is_ford, - NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, - NULL::int AS layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel, + NULL::boolean AS is_ford, + NULL::boolean AS is_ramp, + NULL::int AS is_oneway, + NULL AS man_made, + NULL::int AS layer, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring_gen5 WHERE zoom_level = 8 @@ -354,27 +354,27 @@ FROM ( -- etldoc: osm_railway_linestring_gen4 -> layer_transportation:z9 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel, - NULL::boolean AS is_ford, - NULL::boolean AS is_ramp, - NULL::int AS is_oneway, - NULL AS man_made, + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel, + NULL::boolean AS is_ford, + NULL::boolean AS is_ramp, + NULL::int AS is_oneway, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring_gen4 WHERE zoom_level = 9 @@ -386,27 +386,27 @@ FROM ( -- etldoc: osm_railway_linestring_gen3 -> layer_transportation:z10 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring_gen3 WHERE zoom_level = 10 @@ -417,27 +417,27 @@ FROM ( -- etldoc: osm_railway_linestring_gen2 -> layer_transportation:z11 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring_gen2 WHERE zoom_level = 11 @@ -448,27 +448,27 @@ FROM ( -- etldoc: osm_railway_linestring_gen1 -> layer_transportation:z12 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring_gen1 WHERE zoom_level = 12 @@ -480,27 +480,27 @@ FROM ( -- etldoc: osm_railway_linestring -> layer_transportation:z14_ SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, + NULL AS highway, + NULL AS construction, railway, - NULL AS aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS aerialway, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_railway_linestring WHERE zoom_level = 13 @@ -511,27 +511,27 @@ FROM ( -- etldoc: osm_aerialway_linestring_gen1 -> layer_transportation:z12 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, - NULL AS railway, + NULL AS highway, + NULL AS construction, + NULL AS railway, aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_aerialway_linestring_gen1 WHERE zoom_level = 12 @@ -541,27 +541,27 @@ FROM ( -- etldoc: osm_aerialway_linestring -> layer_transportation:z14_ SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, - NULL AS railway, + NULL AS highway, + NULL AS construction, + NULL AS railway, aerialway, - NULL AS shipway, - NULL AS public_transport, + NULL AS shipway, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_aerialway_linestring WHERE zoom_level >= 13 @@ -570,27 +570,27 @@ FROM ( -- etldoc: osm_shipway_linestring_gen2 -> layer_transportation:z11 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, - NULL AS railway, - NULL AS aerialway, + NULL AS highway, + NULL AS construction, + NULL AS railway, + NULL AS aerialway, shipway, - NULL AS public_transport, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_shipway_linestring_gen2 WHERE zoom_level = 11 @@ -599,27 +599,27 @@ FROM ( -- etldoc: osm_shipway_linestring_gen1 -> layer_transportation:z12 SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, - NULL AS railway, - NULL AS aerialway, + NULL AS highway, + NULL AS construction, + NULL AS railway, + NULL AS aerialway, shipway, - NULL AS public_transport, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_shipway_linestring_gen1 WHERE zoom_level = 12 @@ -629,27 +629,27 @@ FROM ( -- etldoc: osm_shipway_linestring -> layer_transportation:z14_ SELECT osm_id, geometry, - NULL AS highway, - NULL AS construction, - NULL AS railway, - NULL AS aerialway, + NULL AS highway, + NULL AS construction, + NULL AS railway, + NULL AS aerialway, shipway, - NULL AS public_transport, + NULL AS public_transport, service_value(service) AS service, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, - NULL AS man_made, + NULL AS man_made, layer, - NULL::int AS level, - NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL::int AS level, + NULL::boolean AS indoor, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_shipway_linestring WHERE zoom_level >= 13 @@ -664,29 +664,29 @@ FROM ( SELECT osm_id, geometry, highway, - NULL AS construction, - NULL AS railway, - NULL AS aerialway, - NULL AS shipway, + NULL AS construction, + NULL AS railway, + NULL AS aerialway, + NULL AS shipway, public_transport, - NULL AS service, + NULL AS service, CASE WHEN man_made IN ('bridge') THEN TRUE ELSE FALSE - END AS is_bridge, - FALSE AS is_tunnel, - FALSE AS is_ford, - FALSE AS is_ramp, - FALSE::int AS is_oneway, + END AS is_bridge, + FALSE AS is_tunnel, + FALSE AS is_ford, + FALSE AS is_ramp, + FALSE::int AS is_oneway, man_made, layer, - NULL::int AS level, + NULL::int AS level, NULL::boolean AS indoor, - NULL AS bicycle, - NULL AS foot, - NULL AS horse, - NULL AS mtb_scale, - NULL AS surface, + NULL AS bicycle, + NULL AS foot, + NULL AS horse, + NULL AS mtb_scale, + NULL AS surface, z_order FROM osm_highway_polygon -- We do not want underground pedestrian areas for now diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 962b1b58..f6179440 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -28,7 +28,7 @@ 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, - NULL::bigint AS osm_id, + NULL::bigint AS osm_id, highway, construction, z_order @@ -36,7 +36,7 @@ FROM ( SELECT ST_LineMerge(ST_Collect(geometry)) AS geometry, highway, construction, - min(z_order) AS z_order + min(z_order) AS z_order FROM osm_highway_linestring WHERE (highway IN ('motorway', 'trunk', 'primary') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary')) @@ -126,7 +126,7 @@ CREATE SCHEMA IF NOT EXISTS transportation; CREATE TABLE IF NOT EXISTS transportation.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION transportation.flag() RETURNS trigger AS diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql index 1d148f4d..9242160f 100644 --- a/layers/transportation_name/layer.sql +++ b/layers/transportation_name/layer.sql @@ -23,33 +23,33 @@ AS $$ SELECT osm_id, geometry, - NULLIF(name, '') AS name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + NULLIF(name, '') AS name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, NULLIF(ref, ''), - NULLIF(LENGTH(ref), 0) AS ref_length, + NULLIF(LENGTH(ref), 0) AS ref_length, --TODO: The road network of the road is not yet implemented CASE WHEN network IS NOT NULL THEN network::text WHEN length(coalesce(ref, '')) > 0 THEN 'road' - END AS network, - highway_class(highway, '', construction) AS class, + END AS network, + highway_class(highway, '', construction) AS class, CASE WHEN highway IS NOT NULL AND highway_class(highway, '', construction) = 'path' THEN highway - END AS subclass, - NULLIF(layer, 0) AS layer, + END AS subclass, + NULLIF(layer, 0) AS layer, "level", - CASE WHEN indoor = TRUE THEN 1 END AS indoor + CASE WHEN indoor = TRUE THEN 1 END AS indoor FROM ( -- etldoc: osm_transportation_name_linestring_gen4 -> layer_transportation_name:z6 SELECT *, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor FROM osm_transportation_name_linestring_gen4 WHERE zoom_level = 6 @@ -57,8 +57,8 @@ FROM ( -- etldoc: osm_transportation_name_linestring_gen3 -> layer_transportation_name:z7 SELECT *, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor FROM osm_transportation_name_linestring_gen3 WHERE zoom_level = 7 @@ -66,8 +66,8 @@ FROM ( -- etldoc: osm_transportation_name_linestring_gen2 -> layer_transportation_name:z8 SELECT *, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor FROM osm_transportation_name_linestring_gen2 WHERE zoom_level = 8 @@ -77,8 +77,8 @@ FROM ( -- etldoc: osm_transportation_name_linestring_gen1 -> layer_transportation_name:z10 -- etldoc: osm_transportation_name_linestring_gen1 -> layer_transportation_name:z11 SELECT *, - NULL::int AS layer, - NULL::int AS level, + NULL::int AS layer, + NULL::int AS level, NULL::boolean AS indoor FROM osm_transportation_name_linestring_gen1 WHERE zoom_level BETWEEN 9 AND 11 diff --git a/layers/transportation_name/update_transportation_name.sql b/layers/transportation_name/update_transportation_name.sql index ae4503a1..8a473fef 100644 --- a/layers/transportation_name/update_transportation_name.sql +++ b/layers/transportation_name/update_transportation_name.sql @@ -13,7 +13,7 @@ CREATE MATERIALIZED VIEW osm_transportation_name_network AS ( SELECT hl.geometry, hl.osm_id, - CASE WHEN length(hl.name) > 15 THEN osml10n_street_abbrev_all(hl.name) ELSE hl.name END AS "name", + CASE WHEN length(hl.name) > 15 THEN osml10n_street_abbrev_all(hl.name) ELSE hl.name END AS "name", CASE WHEN length(hl.name_en) > 15 THEN osml10n_street_abbrev_en(hl.name_en) ELSE hl.name_en END AS "name_en", CASE WHEN length(hl.name_de) > 15 THEN osml10n_street_abbrev_de(hl.name_de) ELSE hl.name_de END AS "name_de", hl.tags, @@ -22,14 +22,14 @@ SELECT hl.geometry, WHEN (rm.network_type IS NOT NULL AND nullif(rm.ref::text, '') IS NOT NULL) THEN rm.ref::text ELSE hl.ref - END AS ref, + END AS ref, hl.highway, hl.construction, - CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer, - CASE WHEN highway IN ('footway', 'steps') THEN "level" END AS "level", - CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor, + CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer, + CASE WHEN highway IN ('footway', 'steps') THEN "level" END AS "level", + CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor, ROW_NUMBER() OVER (PARTITION BY hl.osm_id - ORDER BY rm.network_type) AS "rank", + ORDER BY rm.network_type) AS "rank", hl.z_order FROM osm_highway_linestring hl LEFT JOIN osm_route_member rm ON (rm.member = hl.osm_id) @@ -40,8 +40,8 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_network_geometry_idx ON osm_t -- etldoc: osm_transportation_name_network -> osm_transportation_name_linestring CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS ( -SELECT (ST_Dump(geometry)).geom AS geometry, - NULL::bigint AS osm_id, +SELECT (ST_Dump(geometry)).geom AS geometry, + NULL::bigint AS osm_id, name, name_en, name_de, @@ -52,7 +52,7 @@ SELECT (ST_Dump(geometry)).geom AS geometry, "level", layer, indoor, - network_type AS network, + network_type AS network, z_order FROM ( SELECT ST_LineMerge(ST_Collect(geometry)) AS geometry, @@ -61,8 +61,7 @@ FROM ( name_de, hstore(string_agg(nullif(slice_language_tags(tags || hstore(ARRAY ['name', name, 'name:en', name_en, 'name:de', name_de]))::text, - ''), ',')) - AS "tags", + ''), ',')) AS "tags", ref, highway, construction, @@ -70,7 +69,7 @@ FROM ( layer, indoor, network_type, - min(z_order) AS z_order + min(z_order) AS z_order FROM osm_transportation_name_network WHERE ("rank" = 1 OR "rank" IS NULL) AND (name <> '' OR ref <> '') @@ -183,7 +182,7 @@ CREATE SCHEMA IF NOT EXISTS transportation_name; CREATE TABLE IF NOT EXISTS transportation_name.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION transportation_name.flag() RETURNS trigger AS diff --git a/layers/water/water.sql b/layers/water/water.sql index f218dd91..b5f9166b 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -32,7 +32,7 @@ FROM ne_110m_ocean UNION ALL -- etldoc: ne_110m_lakes -> water_z0 SELECT geometry, - 'lake'::text AS class, + 'lake'::text AS class, NULL::boolean AS is_intermittent, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel @@ -51,7 +51,7 @@ FROM ne_110m_ocean UNION ALL -- etldoc: ne_110m_lakes -> water_z1 SELECT geometry, - 'lake'::text AS class, + 'lake'::text AS class, NULL::boolean AS is_intermittent, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel @@ -70,7 +70,7 @@ FROM ne_50m_ocean UNION ALL -- etldoc: ne_50m_lakes -> water_z2 SELECT geometry, - 'lake'::text AS class, + 'lake'::text AS class, NULL::boolean AS is_intermittent, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel @@ -89,7 +89,7 @@ FROM ne_50m_ocean UNION ALL -- etldoc: ne_10m_lakes -> water_z4 SELECT geometry, - 'lake'::text AS class, + 'lake'::text AS class, NULL::boolean AS is_intermittent, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel @@ -108,7 +108,7 @@ FROM ne_10m_ocean UNION ALL -- etldoc: ne_10m_lakes -> water_z5 SELECT geometry, - 'lake'::text AS class, + 'lake'::text AS class, NULL::boolean AS is_intermittent, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel @@ -129,8 +129,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen6 WHERE "natural" != 'bay' ); @@ -149,8 +149,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen5 WHERE "natural" != 'bay' ); @@ -169,8 +169,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen4 WHERE "natural" != 'bay' ); @@ -189,8 +189,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen3 WHERE "natural" != 'bay' ); @@ -209,8 +209,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen2 WHERE "natural" != 'bay' ); @@ -229,8 +229,8 @@ UNION ALL SELECT geometry, water_class(waterway) AS class, is_intermittent, - NULL::boolean AS is_bridge, - NULL::boolean AS is_tunnel + NULL::boolean AS is_bridge, + NULL::boolean AS is_tunnel FROM osm_water_polygon_gen1 WHERE "natural" != 'bay' ); @@ -311,7 +311,7 @@ $$ SELECT geometry, class::text, waterway_brunnel(is_bridge, is_tunnel) AS brunnel, - is_intermittent::int AS intermittent + is_intermittent::int AS intermittent FROM ( -- etldoc: water_z0 -> layer_water:z0 SELECT * diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql index 2327a05f..41ed5435 100644 --- a/layers/water_name/layer.sql +++ b/layers/water_name/layer.sql @@ -21,14 +21,14 @@ SELECT CASE WHEN osm_id < 0 THEN -osm_id * 10 + 4 ELSE osm_id * 10 + 1 - END AS osm_id_hash, + END AS osm_id_hash, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'lake'::text AS class, - is_intermittent::int AS intermittent + 'lake'::text AS class, + is_intermittent::int AS intermittent FROM osm_water_lakeline WHERE geometry && bbox AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry)) @@ -40,14 +40,14 @@ SELECT CASE WHEN osm_id < 0 THEN -osm_id * 10 + 4 ELSE osm_id * 10 + 1 - END AS osm_id_hash, + END AS osm_id_hash, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - 'lake'::text AS class, - is_intermittent::int AS intermittent + 'lake'::text AS class, + is_intermittent::int AS intermittent FROM osm_water_point WHERE geometry && bbox AND ( @@ -59,14 +59,14 @@ SELECT -- etldoc: osm_marine_point -> layer_water_name:z0_8 -- etldoc: osm_marine_point -> layer_water_name:z9_13 -- etldoc: osm_marine_point -> layer_water_name:z14_ - osm_id * 10 AS osm_id_hash, + osm_id * 10 AS osm_id_hash, geometry, name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, tags, - place::text AS class, - is_intermittent::int AS intermittent + place::text AS class, + is_intermittent::int AS intermittent FROM osm_marine_point WHERE geometry && bbox AND ( diff --git a/layers/water_name/update_marine_point.sql b/layers/water_name/update_marine_point.sql index 8fec8d0a..f04cf19d 100644 --- a/layers/water_name/update_marine_point.sql +++ b/layers/water_name/update_marine_point.sql @@ -43,7 +43,7 @@ CREATE SCHEMA IF NOT EXISTS water_name_marine; CREATE TABLE IF NOT EXISTS water_name_marine.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION water_name_marine.flag() RETURNS trigger AS diff --git a/layers/water_name/update_water_lakeline.sql b/layers/water_name/update_water_lakeline.sql index 190b5d90..fccc317e 100644 --- a/layers/water_name/update_water_lakeline.sql +++ b/layers/water_name/update_water_lakeline.sql @@ -4,12 +4,12 @@ DROP TRIGGER IF EXISTS trigger_insert_line ON osm_water_polygon; CREATE OR REPLACE VIEW osm_water_lakeline_view AS SELECT wp.osm_id, - ll.wkb_geometry AS geometry, + ll.wkb_geometry AS geometry, name, name_en, name_de, update_tags(tags, ll.wkb_geometry) AS tags, - ST_Area(wp.geometry) AS area, + ST_Area(wp.geometry) AS area, is_intermittent FROM osm_water_polygon AS wp INNER JOIN lake_centerline ll ON wp.osm_id = ll.osm_id diff --git a/layers/water_name/update_water_point.sql b/layers/water_name/update_water_point.sql index cfa48614..7ef72a5e 100644 --- a/layers/water_name/update_water_point.sql +++ b/layers/water_name/update_water_point.sql @@ -4,12 +4,12 @@ DROP TRIGGER IF EXISTS trigger_insert_point ON osm_water_polygon; CREATE OR REPLACE VIEW osm_water_point_view AS SELECT wp.osm_id, - ST_PointOnSurface(wp.geometry) AS geometry, + ST_PointOnSurface(wp.geometry) AS geometry, wp.name, wp.name_en, wp.name_de, update_tags(wp.tags, ST_PointOnSurface(wp.geometry)) AS tags, - ST_Area(wp.geometry) AS area, + ST_Area(wp.geometry) AS area, wp.is_intermittent FROM osm_water_polygon AS wp LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id diff --git a/layers/waterway/update_important_waterway.sql b/layers/waterway/update_important_waterway.sql index 51cace40..e70f7df1 100644 --- a/layers/waterway/update_important_waterway.sql +++ b/layers/waterway/update_important_waterway.sql @@ -26,7 +26,7 @@ FROM ( name, name_en, name_de, - slice_language_tags(tags) AS tags + slice_language_tags(tags) AS tags FROM osm_waterway_linestring WHERE name <> '' AND waterway = 'river' @@ -78,12 +78,12 @@ CREATE SCHEMA IF NOT EXISTS waterway_important; CREATE TABLE IF NOT EXISTS waterway_important.changes ( - id serial PRIMARY KEY, - is_old boolean, - name character varying, + id serial PRIMARY KEY, + is_old boolean, + name character varying, name_en character varying, name_de character varying, - tags hstore, + tags hstore, UNIQUE (is_old, name, name_en, name_de, tags) ); CREATE OR REPLACE FUNCTION waterway_important.store() RETURNS trigger AS @@ -106,7 +106,7 @@ $$ LANGUAGE plpgsql; CREATE TABLE IF NOT EXISTS waterway_important.updates ( id serial PRIMARY KEY, - t text, + t text, UNIQUE (t) ); CREATE OR REPLACE FUNCTION waterway_important.flag() RETURNS trigger AS @@ -143,7 +143,7 @@ BEGIN w.name, w.name_en, w.name_de, - slice_language_tags(w.tags) AS tags + slice_language_tags(w.tags) AS tags FROM osm_waterway_linestring AS w JOIN waterway_important.changes AS c ON w.name = c.name AND w.name_en IS NOT DISTINCT FROM c.name_en AND diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 36e5ca26..a917bae9 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -13,10 +13,10 @@ CREATE OR REPLACE VIEW waterway_z3 AS ( SELECT geometry, 'river'::text AS class, - NULL::text AS name, - NULL::text AS name_en, - NULL::text AS name_de, - NULL::hstore AS tags, + NULL::text AS name, + NULL::text AS name_en, + NULL::text AS name_de, + NULL::hstore AS tags, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_intermittent @@ -29,10 +29,10 @@ CREATE OR REPLACE VIEW waterway_z4 AS ( SELECT geometry, 'river'::text AS class, - NULL::text AS name, - NULL::text AS name_en, - NULL::text AS name_de, - NULL::hstore AS tags, + NULL::text AS name, + NULL::text AS name_en, + NULL::text AS name_de, + NULL::hstore AS tags, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_intermittent @@ -45,10 +45,10 @@ CREATE OR REPLACE VIEW waterway_z6 AS ( SELECT geometry, 'river'::text AS class, - NULL::text AS name, - NULL::text AS name_en, - NULL::text AS name_de, - NULL::hstore AS tags, + NULL::text AS name, + NULL::text AS name_en, + NULL::text AS name_de, + NULL::hstore AS tags, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_intermittent @@ -167,11 +167,11 @@ AS $$ SELECT geometry, class, - NULLIF(name, '') AS name, - COALESCE(NULLIF(name_en, ''), name) AS name_en, + NULLIF(name, '') AS name, + COALESCE(NULLIF(name_en, ''), name) AS name_en, COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de, - waterway_brunnel(is_bridge, is_tunnel) AS brunnel, - is_intermittent::int AS intermittent, + waterway_brunnel(is_bridge, is_tunnel) AS brunnel, + is_intermittent::int AS intermittent, tags FROM ( -- etldoc: waterway_z3 -> layer_waterway:z3