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

Add platforms to transportation as paths

Browse Source
This commit is contained in:
jirik 2017-11-08 16:54:07 +01:00 committed by Jiri Kozel
parent 68785c1a21
commit 1cdf726384
5 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layers/transportation/class.sql
View File

@ -9,7 +9,7 @@ $$ LANGUAGE SQL IMMUTABLE STRICT;
-- The classes for highways are derived from the classes used in ClearTables -- The classes for highways are derived from the classes used in ClearTables
-- https://github.com/ClearTables/ClearTables/blob/master/transportation.lua -- https://github.com/ClearTables/ClearTables/blob/master/transportation.lua
CREATE OR REPLACE FUNCTION highway_class(highway TEXT) RETURNS TEXT AS $$ CREATE OR REPLACE FUNCTION highway_class(highway TEXT, public_transport TEXT) RETURNS TEXT AS $$
SELECT CASE SELECT CASE
WHEN highway IN ('motorway', 'motorway_link') THEN 'motorway' WHEN highway IN ('motorway', 'motorway_link') THEN 'motorway'
WHEN highway IN ('trunk', 'trunk_link') THEN 'trunk' WHEN highway IN ('trunk', 'trunk_link') THEN 'trunk'
@ -18,7 +18,7 @@ CREATE OR REPLACE FUNCTION highway_class(highway TEXT) RETURNS TEXT AS $$
WHEN highway IN ('tertiary', 'tertiary_link') THEN 'tertiary' WHEN highway IN ('tertiary', 'tertiary_link') THEN 'tertiary'
WHEN highway IN ('unclassified', 'residential', 'living_street', 'road') THEN 'minor' WHEN highway IN ('unclassified', 'residential', 'living_street', 'road') THEN 'minor'
WHEN highway IN ('service', 'track') THEN highway WHEN highway IN ('service', 'track') THEN highway
WHEN highway IN ('pedestrian', 'path', 'footway', 'cycleway', 'steps', 'bridleway', 'corridor') THEN 'path' WHEN highway IN ('pedestrian', 'path', 'footway', 'cycleway', 'steps', 'bridleway', 'corridor') OR public_transport IN ('platform') THEN 'path'
WHEN highway = 'raceway' THEN 'raceway' WHEN highway = 'raceway' THEN 'raceway'
ELSE NULL ELSE NULL
END; END;

47
layers/transportation/layer.sql
View File

@ -11,7 +11,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
CASE CASE
WHEN highway IS NOT NULL THEN highway_class(highway) WHEN highway IS NOT NULL OR public_transport IS NOT NULL THEN highway_class(highway, public_transport)
WHEN railway IS NOT NULL THEN railway_class(railway) WHEN railway IS NOT NULL THEN railway_class(railway)
WHEN aerialway IS NOT NULL THEN aerialway WHEN aerialway IS NOT NULL THEN aerialway
WHEN shipway IS NOT NULL THEN shipway WHEN shipway IS NOT NULL THEN shipway
@ -31,7 +31,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -44,7 +44,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -57,7 +57,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -70,7 +70,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -83,7 +83,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -97,7 +97,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -111,7 +111,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, NULL AS public_transport, NULL AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -127,15 +127,16 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_highway_linestring FROM osm_highway_linestring
WHERE NOT is_area AND ( WHERE NOT is_area AND (
zoom_level = 12 AND ( zoom_level = 12 AND (
highway_class(highway) NOT IN ('track', 'path', 'minor') highway_class(highway, public_transport) NOT IN ('track', 'path', 'minor')
OR highway IN ('unclassified', 'residential') OR highway IN ('unclassified', 'residential')
) )
OR zoom_level = 13 AND highway_class(highway) NOT IN ('track', 'path') OR zoom_level = 13
AND highway_class(highway, public_transport) NOT IN ('track', 'path')
OR zoom_level >= 14 OR zoom_level >= 14
) )
UNION ALL UNION ALL
@ -144,7 +145,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, NULL AS public_transport, service_value(service) AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -158,7 +159,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, NULL AS public_transport, service_value(service) AS service,
NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel, NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
NULL::boolean AS is_ford, NULL::boolean AS is_ford,
NULL::boolean AS is_ramp, NULL::boolean AS is_oneway, NULL::boolean AS is_ramp, NULL::boolean AS is_oneway,
@ -172,7 +173,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_railway_linestring_gen3 FROM osm_railway_linestring_gen3
WHERE zoom_level = 10 WHERE zoom_level = 10
@ -183,7 +184,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_railway_linestring_gen2 FROM osm_railway_linestring_gen2
WHERE zoom_level = 11 WHERE zoom_level = 11
@ -194,7 +195,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_railway_linestring_gen1 FROM osm_railway_linestring_gen1
WHERE zoom_level = 12 WHERE zoom_level = 12
@ -206,7 +207,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, railway, NULL AS aerialway, NULL AS shipway, NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_railway_linestring FROM osm_railway_linestring
WHERE zoom_level = 13 WHERE zoom_level = 13
@ -218,7 +219,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, NULL as railway, aerialway, NULL AS shipway, NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_aerialway_linestring_gen1 FROM osm_aerialway_linestring_gen1
WHERE zoom_level = 12 WHERE zoom_level = 12
@ -229,7 +230,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, NULL as railway, aerialway, NULL AS shipway, NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
service_value(service) AS service, 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, z_order
FROM osm_aerialway_linestring FROM osm_aerialway_linestring
WHERE zoom_level >= 13 WHERE zoom_level >= 13
@ -239,7 +240,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway, NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
service_value(service) AS service, 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, z_order
FROM osm_shipway_linestring_gen2 FROM osm_shipway_linestring_gen2
WHERE zoom_level = 11 WHERE zoom_level = 11
@ -249,7 +250,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway, NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
service_value(service) AS service, 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, z_order
FROM osm_shipway_linestring_gen1 FROM osm_shipway_linestring_gen1
WHERE zoom_level = 12 WHERE zoom_level = 12
@ -260,7 +261,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
NULL AS highway, NULL AS railway, NULL AS aerialway, shipway, NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
service_value(service) AS service, 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, z_order
FROM osm_shipway_linestring FROM osm_shipway_linestring
WHERE zoom_level >= 13 WHERE zoom_level >= 13
@ -275,7 +276,7 @@ ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
SELECT SELECT
osm_id, geometry, osm_id, geometry,
highway, NULL AS railway, NULL AS aerialway, NULL AS shipway, highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
NULL AS service, public_transport, NULL AS service,
FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford, 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, z_order
FROM osm_highway_polygon FROM osm_highway_polygon

10
layers/transportation/mapping.yaml
View File

@ -100,6 +100,10 @@ usage_field: &usage
key: usage key: usage
name: usage name: usage
type: string type: string
public_transport_field: &public_transport
key: public_transport
name: public_transport
type: string
ref_field: &ref ref_field: &ref
key: ref key: ref
name: ref name: ref
@ -144,6 +148,7 @@ tables:
- *area - *area
- *service - *service
- *usage - *usage
- *public_transport
mapping: mapping:
highway: highway:
- motorway - motorway
@ -170,6 +175,8 @@ tables:
- corridor - corridor
- pedestrian - pedestrian
- steps - steps
public_transport:
- platform
# etldoc: imposm3 -> osm_railway_linestring # etldoc: imposm3 -> osm_railway_linestring
railway_linestring: railway_linestring:
@ -286,9 +293,12 @@ tables:
- name: is_area - name: is_area
key: area key: area
type: bool type: bool
- *public_transport
mapping: mapping:
highway: highway:
- pedestrian - pedestrian
public_transport:
- platform
# TODO: Future table for joining networks # TODO: Future table for joining networks
# etldoc: imposm3 -> osm_route_member # etldoc: imposm3 -> osm_route_member

BIN
layers/transportation/mapping_diagram.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 89 KiB

6
layers/transportation_name/layer.sql
View File

@ -17,7 +17,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
when length(coalesce(ref, ''))>0 when length(coalesce(ref, ''))>0
then 'road' then 'road'
end as network, end as network,
highway_class(highway) AS class highway_class(highway, '') AS class
FROM ( FROM (
-- etldoc: osm_transportation_name_linestring_gen4 -> layer_transportation_name:z6 -- etldoc: osm_transportation_name_linestring_gen4 -> layer_transportation_name:z6
@ -46,7 +46,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
SELECT * FROM osm_transportation_name_linestring SELECT * 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)
AND highway_class(highway) NOT IN ('minor', 'track', 'path') AND highway_class(highway, '') NOT IN ('minor', 'track', 'path')
AND NOT highway_is_link(highway) AND NOT highway_is_link(highway)
UNION ALL UNION ALL
@ -54,7 +54,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
SELECT * FROM osm_transportation_name_linestring SELECT * 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)
AND highway_class(highway) NOT IN ('track', 'path') AND highway_class(highway, '') NOT IN ('track', 'path')
UNION ALL UNION ALL
-- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z14_ -- etldoc: osm_transportation_name_linestring -> layer_transportation_name:z14_