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

Respect current grouping of osm_transportation_name_network

Browse Source
This commit is contained in:
jirik 2018-11-07 09:57:32 +01:00 committed by Jiri Kozel
parent 7ec9e49a44
commit bae5f21bb4
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layers/transportation_name/name.sql
View File

@ -1,7 +0,0 @@
DO $$
BEGIN
update osm_highway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
update osm_railway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
update osm_aerialway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
update osm_shipway_linestring SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry);
END $$;

1
layers/transportation_name/transportation_name.yaml
View File

@ -76,7 +76,6 @@ layer:
srid: 900913 srid: 900913
query: (SELECT geometry, name, name_en, name_de, {name_languages}, ref, ref_length, network::text, class::text, subclass, layer, level, indoor FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t query: (SELECT geometry, name, name_en, name_de, {name_languages}, ref, ref_length, network::text, class::text, subclass, layer, level, indoor FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
schema: schema:
- ./name.sql
- ./network_type.sql - ./network_type.sql
- ./update_route_member.sql - ./update_route_member.sql
- ./update_transportation_name.sql - ./update_transportation_name.sql

19
layers/transportation_name/update_transportation_name.sql
View File

@ -50,7 +50,7 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS (
name, name,
name_en, name_en,
name_de, name_de,
tags, tags || get_basic_names(tags, geometry) AS "tags",
ref, ref,
highway, highway,
"level", "level",
@ -64,19 +64,20 @@ CREATE MATERIALIZED VIEW osm_transportation_name_linestring AS (
name, name,
name_en, name_en,
name_de, name_de,
slice_language_tags(tags) AS tags, hstore(string_agg(nullif(slice_language_tags(tags)::text, ''), ','))
max(ref) AS ref, AS "tags",
max(highway) AS highway, ref,
max("level") AS "level", highway,
max(layer) AS layer, "level",
bool_or(indoor) AS indoor, layer,
max(network_type) AS network_type, indoor,
network_type,
min(z_order) AS z_order min(z_order) AS z_order
FROM osm_transportation_name_network FROM osm_transportation_name_network
WHERE ("rank"=1 OR "rank" is null) WHERE ("rank"=1 OR "rank" is null)
AND (name <> '' OR ref <> '') AND (name <> '' OR ref <> '')
AND NULLIF(highway, '') IS NOT NULL AND NULLIF(highway, '') IS NOT NULL
group by name, name_en, name_de, slice_language_tags(tags) group by name, name_en, name_de, ref, highway, "level", layer, indoor, network_type
) AS highway_union ) AS highway_union
); );
CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_geometry_idx ON osm_transportation_name_linestring USING gist(geometry); CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_geometry_idx ON osm_transportation_name_linestring USING gist(geometry);