@opengis/gis 0.2.190 → 0.2.191

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.190",
+  "version": "0.2.191",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/routes/map/functions/vtile1.js

@@ -17,14 +17,14 @@ import { SphericalMercator } from '@mapbox/sphericalmercator';
 const mercator = new SphericalMercator({ size: 256 });
 
 import {
-  getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
-  pgClients,
-  getFilterSQLParametrized,
+  getColumnCLS, getTemplate, getMeta, getSelect, pgClients
 } from '@opengis/fastify-table/utils.js';
 
 import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
 import { NotFoundError } from '@opengis/fastify-table/errors.js';
 
+import getFilterSQLParametrized from '../../registers/functions/getFilterSQLParametrized/index.js';
+
 const propsCache = {};
 
 const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
@@ -72,13 +72,13 @@ export default async function vtile({
   const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
   const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
 
-  const filterData = queryFilter ? await getFilterSQLParametrized({
-    filter: queryFilter, table, filterList, pg,
-  }) : { args: [] };
-
   // meta
   const metaTable = table ? await getMeta({ pg, table }) : {};
 
+  const filterData = table && queryFilter ? getFilterSQLParametrized({
+    table, fields: metaTable?.columns, filter: queryFilter, filterList,
+  }, pg) : { args: [] };
+
   const { pk: pkey = data.key, columns = [] } = metaTable; // if view - specify via template
 
   // props