From 765d6fbc769f9f145434e67ba2f2d305a82f9026 Mon Sep 17 00:00:00 2001 From: jirik Date: Wed, 7 Nov 2018 15:55:07 +0100 Subject: [PATCH] Add line piers --- layers/transportation/layer.sql | 15 ++++++++++++--- layers/transportation/mapping.yaml | 11 ++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql index 1b8355e..dfa6dc8 100644 --- a/layers/transportation/layer.sql +++ b/layers/transportation/layer.sql @@ -143,7 +143,7 @@ indoor INT) 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, NULL as man_made, + is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, man_made, layer, CASE WHEN highway IN ('footway', 'steps') THEN "level" ELSE NULL::int @@ -157,10 +157,19 @@ indoor INT) AS $$ zoom_level = 12 AND ( highway_class(highway, public_transport) NOT IN ('track', 'path', 'minor') OR highway IN ('unclassified', 'residential') - ) + ) AND man_made <> 'pier' OR zoom_level = 13 - AND highway_class(highway, public_transport) NOT IN ('track', 'path') + AND ( + highway_class(highway, public_transport) NOT IN ('track', 'path') AND man_made <> 'pier' + OR + man_made = 'pier' AND NOT ST_IsClosed(geometry) + ) OR zoom_level >= 14 + AND ( + man_made <> 'pier' + OR + NOT ST_IsClosed(geometry) + ) ) UNION ALL diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml index b1ece6c..8819329 100644 --- a/layers/transportation/mapping.yaml +++ b/layers/transportation/mapping.yaml @@ -126,6 +126,10 @@ indoor_field: &indoor key: indoor name: indoor type: bool +man_made_field: &man_made + key: man_made + name: man_made + type: string z_order_field: &z_order name: z_order type: wayzorder @@ -163,6 +167,7 @@ tables: - *service - *usage - *public_transport + - *man_made mapping: highway: - motorway @@ -191,6 +196,8 @@ tables: - steps public_transport: - platform + man_made: + - pier # etldoc: imposm3 -> osm_railway_linestring railway_linestring: @@ -316,9 +323,7 @@ tables: key: area type: bool - *public_transport - - name: man_made - key: man_made - type: string + - *man_made mapping: highway: - path