Add line piers

This commit is contained in:
jirik 2018-11-07 15:55:07 +01:00 committed by Jiri Kozel
parent 4304c756ad
commit 765d6fbc76
2 changed files with 20 additions and 6 deletions

View File

@ -143,7 +143,7 @@ indoor INT) AS $$
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,
public_transport, service_value(service) AS service, 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, layer,
CASE WHEN highway IN ('footway', 'steps') THEN "level" CASE WHEN highway IN ('footway', 'steps') THEN "level"
ELSE NULL::int ELSE NULL::int
@ -157,10 +157,19 @@ indoor INT) AS $$
zoom_level = 12 AND ( zoom_level = 12 AND (
highway_class(highway, public_transport) 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')
) ) AND man_made <> 'pier'
OR zoom_level = 13 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 OR zoom_level >= 14
AND (
man_made <> 'pier'
OR
NOT ST_IsClosed(geometry)
)
) )
UNION ALL UNION ALL

View File

@ -126,6 +126,10 @@ indoor_field: &indoor
key: indoor key: indoor
name: indoor name: indoor
type: bool type: bool
man_made_field: &man_made
key: man_made
name: man_made
type: string
z_order_field: &z_order z_order_field: &z_order
name: z_order name: z_order
type: wayzorder type: wayzorder
@ -163,6 +167,7 @@ tables:
- *service - *service
- *usage - *usage
- *public_transport - *public_transport
- *man_made
mapping: mapping:
highway: highway:
- motorway - motorway
@ -191,6 +196,8 @@ tables:
- steps - steps
public_transport: public_transport:
- platform - platform
man_made:
- pier
# etldoc: imposm3 -> osm_railway_linestring # etldoc: imposm3 -> osm_railway_linestring
railway_linestring: railway_linestring:
@ -316,9 +323,7 @@ tables:
key: area key: area
type: bool type: bool
- *public_transport - *public_transport
- name: man_made - *man_made
key: man_made
type: string
mapping: mapping:
highway: highway:
- path - path