From 5f9f77ded14d300120f2980697064d8ec9846b2e Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Tue, 8 May 2018 17:50:01 +0200 Subject: [PATCH] Fixed errors --- src/pg/sql/45_observatory_mvt.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pg/sql/45_observatory_mvt.sql b/src/pg/sql/45_observatory_mvt.sql index da678e5..5c3bd82 100644 --- a/src/pg/sql/45_observatory_mvt.sql +++ b/src/pg/sql/45_observatory_mvt.sql @@ -35,7 +35,6 @@ DECLARE BEGIN bounds := cdb_observatory.OBS_GetTileBounds(z, x, y); geom := ST_MakeEnvelope(bounds[1], bounds[2], bounds[3], bounds[4], 4326); - ext := ST_Extent(geom); meta := cdb_observatory.obs_getmeta(geom, params::json, 1::integer, 1::integer, 1::integer); /* Read metadata to generate clauses for query */ @@ -60,7 +59,7 @@ BEGIN SELECT '_procgeoms_' || Coalesce(geom_tablename || '_' || geom_geomref_colname, api_method) || ' AS (' || 'SELECT ' || - 'ST_AsMVTGeom(st_intersection(' || geom_tablename || '.' || geom_colname || ', _geoms.geom), $2, $3, $4, $5) AS mvtgeom, ' || + 'ST_AsMVTGeom(st_intersection(' || geom_tablename || '.' || geom_colname || ', _geoms.geom), ST_MakeBox2D(ST_Point(0, 0), ST_Point($2, $2)), $2, $3, $4) AS mvtgeom, ' || geom_tablename || '.' || geom_geomref_colname || ' AS geomref, ' || 'CASE WHEN ST_Within(_geoms.geom, ' || geom_tablename || '.' || geom_colname || ') THEN ST_Area(_geoms.geom) / Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0) @@ -180,7 +179,8 @@ BEGIN -- Generate JSON clause. This puts together vals from val_clauses _json_clause AS (SELECT - 'SELECT ST_AsMVT(q, ''data'', $3) FROM (SELECT ' || cdb_observatory.FIRST(cte_name) || '.geomref::TEXT id, ' + 'SELECT ST_AsMVT(q, ''data'', $2) FROM (' || + 'SELECT ' || cdb_observatory.FIRST(cte_name) || '.geomref::TEXT id, ' || cdb_observatory.FIRST(cte_name) || '.mvtgeom geom, to_JSONB(ARRAY[' || (SELECT String_Agg('val_' || colid, ', ') FROM _meta) || ']) FROM ' || String_Agg(cte_name, ', ') || @@ -215,7 +215,7 @@ BEGIN String_Agg(procgeom_clauses, E',\n '), String_Agg(val_clauses, E',\n '), json_clause) - USING geom, ext, extent, buf, clip_geom; + USING geom, extent, buf, clip_geom; RETURN; END