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

Use new classes in transport_name and add network

Browse Source
This commit is contained in:
Lukas Martinelli 2016-11-28 11:09:50 +00:00
parent a04d5776e6
commit de2f538ef5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layers/transportation_name/layer.sql
View File

@ -3,10 +3,12 @@
-- etldoc: label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ; -- etldoc: label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer) CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer)
RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, class text, subclass text) AS $$ RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text, subclass text) AS $$
SELECT osm_id, geometry, name, SELECT osm_id, geometry, name,
NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length, NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length,
to_highway_class(highway) AS class, highway AS subclass --TODO: The road network of the road is not yet implemented
NULL::text AS network,
highway_class(highway) AS class, highway AS subclass
FROM ( FROM (
-- etldoc: osm_transportation_name_linestring_gen3 -> layer_transportation_name:z8 -- etldoc: osm_transportation_name_linestring_gen3 -> layer_transportation_name:z8
@ -29,7 +31,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length
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 to_highway_class(highway) NOT IN ('minor_road', '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
@ -37,7 +39,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length
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 to_highway_class(highway) <> '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_