cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused osm_id column (#1147)

Browse Source 
Fixes #1146

This PR removes the always-null osm_id column from the `transportation_name_linestring` table and the series of generalized tables that derive from it.

Demonstration of `transportation_name` objects behaving normally after the column has been removed:

![image](https://user-images.githubusercontent.com/3254090/124684944-4512ef80-de9e-11eb-998c-b66bc23be09e.png)
This commit is contained in:
Brian Sperlongano 2021-07-13 07:39:28 -04:00 committed by GitHub
parent a851f2c9e9
commit 197ea39ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layers/transportation_name/transportation_name.sql
View File

@ -4,7 +4,6 @@
CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer) CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer)
RETURNS TABLE RETURNS TABLE
( (
osm_id bigint,
geometry geometry, geometry geometry,
name text, name text,
name_en text, name_en text,
@ -22,8 +21,7 @@ CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level i
) )
AS AS
$$ $$
SELECT osm_id, SELECT geometry,
geometry,
name, name,
COALESCE(name_en, name) AS name_en, COALESCE(name_en, name) AS name_en,
COALESCE(name_de, name, name_en) AS name_de, COALESCE(name_de, name, name_en) AS name_de,
@ -89,7 +87,6 @@ FROM (
-- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z12 -- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z12
SELECT geometry, SELECT geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -112,7 +109,6 @@ FROM (
-- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z13 -- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z13
SELECT geometry, SELECT geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -134,7 +130,6 @@ FROM (
-- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z14_ -- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z14_
SELECT geometry, SELECT geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -155,7 +150,6 @@ FROM (
-- etldoc: osm_highway_point -> layer_transportation_name:z10 -- etldoc: osm_highway_point -> layer_transportation_name:z10
SELECT SELECT
p.geometry, p.geometry,
p.osm_id,
p.name, p.name,
p.name_en, p.name_en,
p.name_de, p.name_de,

5
layers/transportation_name/update_transportation_name.sql
View File

@ -56,7 +56,6 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_network_geometry_idx ON osm_t
-- etldoc: osm_transportation_name_network -> osm_transportation_name_linestring -- etldoc: osm_transportation_name_network -> osm_transportation_name_linestring
CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS
SELECT (ST_Dump(geometry)).geom AS geometry, SELECT (ST_Dump(geometry)).geom AS geometry,
NULL::bigint AS osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -100,7 +99,6 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_highway_partial_id
-- etldoc: osm_transportation_name_linestring -> osm_transportation_name_linestring_gen1 -- etldoc: osm_transportation_name_linestring -> osm_transportation_name_linestring_gen1
CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen1_view AS CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen1_view AS
SELECT ST_Simplify(geometry, 50) AS geometry, SELECT ST_Simplify(geometry, 50) AS geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -128,7 +126,6 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen1_highway_parti
-- etldoc: osm_transportation_name_linestring_gen1 -> osm_transportation_name_linestring_gen2 -- etldoc: osm_transportation_name_linestring_gen1 -> osm_transportation_name_linestring_gen2
CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen2_view AS CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen2_view AS
SELECT ST_Simplify(geometry, 120) AS geometry, SELECT ST_Simplify(geometry, 120) AS geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -156,7 +153,6 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen2_highway_parti
-- etldoc: osm_transportation_name_linestring_gen2 -> osm_transportation_name_linestring_gen3 -- etldoc: osm_transportation_name_linestring_gen2 -> osm_transportation_name_linestring_gen3
CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen3_view AS CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen3_view AS
SELECT ST_Simplify(geometry, 200) AS geometry, SELECT ST_Simplify(geometry, 200) AS geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,
@ -184,7 +180,6 @@ CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen3_highway_parti
-- etldoc: osm_transportation_name_linestring_gen3 -> osm_transportation_name_linestring_gen4 -- etldoc: osm_transportation_name_linestring_gen3 -> osm_transportation_name_linestring_gen4
CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen4_view AS CREATE OR REPLACE VIEW osm_transportation_name_linestring_gen4_view AS
SELECT ST_Simplify(geometry, 500) AS geometry, SELECT ST_Simplify(geometry, 500) AS geometry,
osm_id,
name, name,
name_en, name_en,
name_de, name_de,