Show narrow gauges sooner

pull/350/head
jirik 2017-09-22 15:03:10 +02:00 zatwierdzone przez Jiri Kozel
rodzic ed90400fef
commit 98aba61b05
3 zmienionych plików z 6 dodań i 5 usunięć

Plik binarny nie jest wyświetlany.

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 264 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 273 KiB

Wyświetl plik

@ -150,7 +150,8 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
service_value(service) AS service, 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 AND railway='rail' AND service = '' WHERE zoom_level = 10
AND railway IN ('rail', 'narrow_gauge') AND service = ''
UNION ALL UNION ALL
-- etldoc: osm_railway_linestring_gen2 -> layer_transportation:z11 -- etldoc: osm_railway_linestring_gen2 -> layer_transportation:z11
@ -160,7 +161,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
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
AND railway IN ('rail', 'light_rail') AND service = '' AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
UNION ALL UNION ALL
-- etldoc: osm_railway_linestring_gen1 -> layer_transportation:z12 -- etldoc: osm_railway_linestring_gen1 -> layer_transportation:z12
@ -170,7 +171,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
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
AND railway IN ('rail', 'light_rail') AND service = '' AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
UNION ALL UNION ALL
-- etldoc: osm_railway_linestring -> layer_transportation:z13 -- etldoc: osm_railway_linestring -> layer_transportation:z13
@ -181,7 +182,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
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
AND railway IN ('rail', 'light_rail') AND service = '' AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = ''
OR zoom_Level >= 14 OR zoom_Level >= 14
UNION ALL UNION ALL

Wyświetl plik

@ -22,7 +22,7 @@ generalized_tables:
# etldoc: imposm3 -> osm_railway_linestring_gen1 # etldoc: imposm3 -> osm_railway_linestring_gen1
railway_linestring_gen1: railway_linestring_gen1:
source: railway_linestring source: railway_linestring
sql_filter: railway IN ('rail', 'light_rail') AND service='' sql_filter: railway IN ('rail', 'narrow_gauge', 'light_rail') AND service=''
tolerance: ZRES13 tolerance: ZRES13
# etldoc: imposm3 -> osm_highway_linestring_gen2 # etldoc: imposm3 -> osm_highway_linestring_gen2