From ed5cab651226e442450009177a6757bb12e33f7b Mon Sep 17 00:00:00 2001 From: stirringhalo Date: Sun, 4 Jun 2017 21:59:16 -0400 Subject: [PATCH] Get it finally working --- server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server.py b/server.py index 092c00e..8122558 100644 --- a/server.py +++ b/server.py @@ -28,9 +28,8 @@ def GeneratePrepared(layers): for layer in layers['Layer']: layer_query = layer['Datasource']['table'].lstrip().rstrip() # Remove lead and trailing whitespace layer_query = layer_query[1:len(layer_query)-6] # Remove enough characters to remove first and last () and "AS t" -# base_query = "SELECT ST_AsMVT('"+layer['id']+"', 4096, 'geom', tile) FROM (SELECT ST_AsMVTGeom(select geometry from layer_"+layer['id']+"($1,z($2)) as , !bbox!, 4096, 0, true) AS geom) AS tile" layer_query = layer_query.replace("geometry", "ST_AsMVTGeom(geometry,!bbox!,4096,0,true) AS mvtgeometry") - base_query = "SELECT ST_ASMVT('"+layer['id']+"', 4096, 'mvtgeometry', tile) FROM ("+layer_query+" WHERE geometry IS NOT NULL) AS tile" + base_query = "SELECT ST_ASMVT('"+layer['id']+"', 4096, 'mvtgeometry', tile) FROM ("+layer_query+" WHERE ST_AsMVTGeom(geometry, !bbox!,4096,0,true) IS NOT NULL) AS tile" queries.append(base_query.replace("!bbox!","$1").replace("!scale_denominator!","$2").replace("!pixel_width!","$3").replace("!pixel_height!","$4")) prepared = prepared + " UNION ALL ".join(queries) + ";" print(prepared)