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

Add missing transportation_name features

Browse Source 
Fix #372
This commit is contained in:
jirik 2017-11-25 11:10:01 +01:00
parent c11a4cd998
commit 63f6915fab
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
layers/transportation_name/layer.sql
View File

@ -72,15 +72,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
highway, highway,
network, network,
z_order, z_order,
CASE WHEN highway IN ('footway', 'steps') THEN layer layer,
ELSE NULL::int "level",
END AS layer, indoor
CASE WHEN highway IN ('footway', 'steps') THEN "level"
ELSE NULL::int
END AS "level",
CASE WHEN highway IN ('footway', 'steps') THEN indoor
ELSE NULL::boolean
END AS indoor
FROM osm_transportation_name_linestring FROM osm_transportation_name_linestring
WHERE zoom_level = 12 WHERE zoom_level = 12
AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry) AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
@ -100,15 +94,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
highway, highway,
network, network,
z_order, z_order,
CASE WHEN highway IN ('footway', 'steps') THEN layer layer,
ELSE NULL::int "level",
END AS layer, indoor
CASE WHEN highway IN ('footway', 'steps') THEN "level"
ELSE NULL::int
END AS "level",
CASE WHEN highway IN ('footway', 'steps') THEN indoor
ELSE NULL::boolean
END AS indoor
FROM osm_transportation_name_linestring FROM osm_transportation_name_linestring
WHERE zoom_level = 13 WHERE zoom_level = 13
AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry) AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
@ -127,15 +115,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
highway, highway,
network, network,
z_order, z_order,
CASE WHEN highway IN ('footway', 'steps') THEN layer layer,
ELSE NULL::int "level",
END AS layer, indoor
CASE WHEN highway IN ('footway', 'steps') THEN "level"
ELSE NULL::int
END AS "level",
CASE WHEN highway IN ('footway', 'steps') THEN indoor
ELSE NULL::boolean
END AS indoor
FROM osm_transportation_name_linestring FROM osm_transportation_name_linestring
WHERE zoom_level >= 14 WHERE zoom_level >= 14

12
layers/transportation_name/update_transportation_name.sql
View File

@ -23,9 +23,15 @@ CREATE MATERIALIZED VIEW osm_transportation_name_network AS (
else hl.ref else hl.ref
end as ref, end as ref,
hl.highway, hl.highway,
hl.level, CASE WHEN highway IN ('footway', 'steps') THEN layer
hl.layer, ELSE NULL::int
hl.indoor, END AS layer,
CASE WHEN highway IN ('footway', 'steps') THEN "level"
ELSE NULL::int
END AS "level",
CASE WHEN highway IN ('footway', 'steps') THEN indoor
ELSE NULL::boolean
END AS indoor,
ROW_NUMBER() OVER(PARTITION BY hl.osm_id 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 hl.z_order