Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove alignment of AS in SQL and few others #932

Merged
merged 3 commits into from
Jul 22, 2020
Merged

Remove alignment of AS in SQL and few others #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84c649
Remove alignment of AS in SQL
frodrigo Jul 22, 2020
6000f5e
Remove alignment of CREATE TABLE in SQL
frodrigo Jul 22, 2020
660d7b4
Merge branch 'master' into unalign_sql
TomPohys Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions layers/aerodrome_label/layer.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion layers/aerodrome_label/update_aerodrome_label_point.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
74 changes: 37 additions & 37 deletions layers/boundary/boundary.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
36 changes: 18 additions & 18 deletions layers/building/building.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion layers/building/update_building.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);

Expand Down
2 changes: 1 addition & 1 deletion layers/housenumber/housenumber_centroid.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions layers/landuse/landuse.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
-- 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
);

-- 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
);

Expand Down
8 changes: 4 additions & 4 deletions layers/mountain_peak/layer.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading