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

Add layer, level, and indoor tags for footways and steps

Browse Source
This commit is contained in:
jirik
2017-11-09 09:36:09 +01:00
committed by Jiri Kozel
parent 0b94704436
commit e95f2d476b
6 changed files with 191 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
layers/transportation/layer.sql
View File

@@ -7,7 +7,8 @@ $$ LANGUAGE SQL IMMUTABLE STRICT;
-- etldoc: label="<sql> layer_transportation |<z4> z4 |<z5> z5 |<z6> z6 |<z7> z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_transportation(bbox geometry, zoom_level int)
RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text,
ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
ramp int, oneway int, brunnel TEXT, service TEXT, layer INT, level INT,
indoor INT) AS $$
SELECT
osm_id, geometry,
CASE
@@ -28,7 +29,10 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
THEN 1 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(service, '') AS service,
NULLIF(layer, 0) AS layer,
"level",
CASE WHEN indoor=TRUE THEN 1 ELSE NULL END as indoor
FROM (
-- etldoc: osm_transportation_merge_linestring_gen7 -> layer_transportation:z4
SELECT
@@ -38,6 +42,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_transportation_merge_linestring_gen7
WHERE zoom_level = 4
@@ -51,6 +56,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_transportation_merge_linestring_gen6
WHERE zoom_level = 5
@@ -64,6 +70,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_transportation_merge_linestring_gen5
WHERE zoom_level = 6
@@ -77,6 +84,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_transportation_merge_linestring_gen4
WHERE zoom_level = 7
@@ -90,6 +98,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_transportation_merge_linestring_gen3
WHERE zoom_level = 8
@@ -104,6 +113,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_highway_linestring_gen2
WHERE zoom_level BETWEEN 9 AND 10
@@ -118,6 +128,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_highway_linestring_gen1
WHERE zoom_level = 11
@@ -131,7 +142,17 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
CASE WHEN highway IN ('footway', 'steps') THEN layer
ELSE NULL::int
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,
z_order
FROM osm_highway_linestring
WHERE NOT is_area AND (
zoom_level = 12 AND (
@@ -152,6 +173,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring_gen5
WHERE zoom_level = 8
@@ -166,6 +188,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring_gen4
WHERE zoom_level = 9
@@ -177,7 +200,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, railway, 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, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring_gen3
WHERE zoom_level = 10
AND railway IN ('rail', 'narrow_gauge') AND service = ''
@@ -188,7 +213,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, railway, 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, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring_gen2
WHERE zoom_level = 11
AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
@@ -199,7 +226,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, railway, 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, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring_gen1
WHERE zoom_level = 12
AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
@@ -211,7 +240,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, railway, 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, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_railway_linestring
WHERE zoom_level = 13
AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
@@ -223,7 +254,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
NULL AS public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_aerialway_linestring_gen1
WHERE zoom_level = 12
UNION ALL
@@ -234,7 +267,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
NULL AS public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_aerialway_linestring
WHERE zoom_level >= 13
UNION ALL
@@ -244,7 +279,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
NULL AS public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_shipway_linestring_gen2
WHERE zoom_level = 11
UNION ALL
@@ -254,7 +291,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
NULL AS public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_shipway_linestring_gen1
WHERE zoom_level = 12
UNION ALL
@@ -265,7 +304,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
NULL AS public_transport, service_value(service) AS service,
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_shipway_linestring
WHERE zoom_level >= 13
UNION ALL
@@ -281,7 +322,9 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
public_transport, NULL AS service,
FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford,
FALSE AS is_ramp, FALSE AS is_oneway, z_order
FALSE AS is_ramp, FALSE AS is_oneway,
NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
z_order
FROM osm_highway_polygon
-- We do not want underground pedestrian areas for now
WHERE zoom_level >= 13 AND is_area AND COALESCE(layer, 0) >= 0