fix(tiler): fix query where clause for unclustered server

chargetrip · Oct 23, 2019 · da3b72b · da3b72b
1 parent aa15196
commit da3b72b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/js/createClusterQuery.ts b/js/createClusterQuery.ts
@@ -39,12 +39,14 @@ const unclusteredQuery = ({
   geometry,
   resolution,
   attributes,
+  query
 }) =>
   `
 WITH filtered AS
     (SELECT ${table}.${geometry} ${attributesToSelect(attributes)}
     FROM ${table}
     WHERE ST_Intersects(TileBBox(${z}, ${x}, ${y}, 3857), ST_Transform(${table}.${geometry}, 3857))
+      ${query.length > 0 ? `AND ${query.join(' AND ')}` : ''}
     ),
     q as
     (SELECT 1 as c1,
@@ -177,6 +179,7 @@ export function createQueryForTile({
       geometry,
       resolution,
       attributes,
+      query
     });
     // console.log(ret);
     return ret;

diff --git a/js/server.ts b/js/server.ts
@@ -70,7 +70,7 @@ export default async function Server({
             geometry,
             resolution,
             attributes,
-            query: urlQueryToSql(query)
+            query: urlQueryToSql(query),
           })
         );