From ee7a0ad0a91e69192f874cea4ba344af6a47dc05 Mon Sep 17 00:00:00 2001 From: Manuel Roth Date: Wed, 27 Apr 2016 11:39:18 +0200 Subject: [PATCH] Add new osm_id transformation to modified layers --- osm2vectortiles.tm2source/data.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osm2vectortiles.tm2source/data.yml b/osm2vectortiles.tm2source/data.yml index 491382b..2ce823f 100644 --- a/osm2vectortiles.tm2source/data.yml +++ b/osm2vectortiles.tm2source/data.yml @@ -43,13 +43,13 @@ Layer: srid: '' table: |- ( - SELECT osm_id_polygon(MAX(osm_id)) AS osm_id, ST_CollectionExtract(ST_Collect(geometry), 3) AS geometry, landuse_class(type) AS class, type + SELECT osm_ids2mbid(MAX(osm_id), true) AS osm_id, ST_CollectionExtract(ST_Collect(geometry), 3) AS geometry, landuse_class(type) AS class, type FROM landuse_z5toz8 WHERE z(!scale_denominator!) BETWEEN 5 AND 8 AND geometry && !bbox! GROUP BY type UNION ALL - SELECT osm_id_polygon(osm_id) as osm_id, geometry, landuse_class(type) as class, type + SELECT osm_ids2mbid(osm_id, true) AS osm_id, geometry, landuse_class(type) AS class, type FROM ( SELECT osm_id, geometry, type FROM landuse_z9 @@ -343,7 +343,7 @@ Layer: table: |- ( SELECT osm_id, geometry, type, class, oneway, structure FROM ( - SELECT osm_id_polygon(MAX(osm_id)) as osm_id, ST_CollectionExtract(ST_Collect(geometry), 2) AS geometry, + SELECT osm_ids2mbid(MAX(osm_id), is_polygon(geometry)) AS osm_id, ST_CollectionExtract(ST_Collect(geometry), 2) AS geometry, road_type(road_class(type, NULL, NULL), type, NULL, NULL, NULL) AS type, road_class(type, NULL, NULL) AS class, road_oneway(0) AS oneway, 'none' AS structure, NULL AS z_order FROM ( @@ -362,7 +362,7 @@ Layer: WHERE geometry && !bbox! GROUP BY type UNION ALL - SELECT osm_id_geometry(osm_id, geometry) as osm_id, geometry, + SELECT osm_ids2mbid(osm_id, is_polygon(geometry)) AS osm_id, geometry, road_type(road_class(type, service, access), type, construction, tracktype, service) AS type, road_class(type, service, access) AS class, road_oneway(oneway) AS oneway, structure, z_order FROM (