@opengis/gis 0.2.189 → 0.2.191

package/package.json

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

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

@@ -1,9 +1,13 @@
+import { createHash } from 'node:crypto';
+
 import {
-  pgClients, yml2json, getTemplates, getTemplate,
+  pgClients, yml2json, getTemplates, getTemplate, getSelect, getRedis
 } from '@opengis/fastify-table/utils.js';
 
 import getPermissions from '../../permissions/functions/get.permissions.js';
 
+const rclient = getRedis();
+
 export default async function layerList({
   sql, uid,
 }, pg = pgClients.client) {
@@ -87,6 +91,33 @@ export default async function layerList({
     return [];
   }
 
+  await Promise.all(rows.filter((row) => row.filters && row.source_path).map(async (row) => {
+    const filters = await Promise.all((row.filters || []).filter((f) => f.disabled !== true).map(async (el) => {
+
+      const hash = createHash('md5').update([row.id, el.name, el.data].filter(Boolean).join('-')).digest('hex');
+      const redisKey = `${pg?.options?.database}:gis-suggest-filter:${hash}`;
+
+      const cls = el.data ? await getSelect(el.data, pg) : undefined;
+      const { arr, sql } = cls || {};
+
+      const r = {
+        ...el, id: el.name || el.id, type: el.type, api: `/api/gis-suggest/${hash}`, options: arr, select: sql
+      };
+
+      const unique = await rclient.setnx(redisKey, 1);
+      const ttl = await rclient.ttl(redisKey);
+
+      // skip subsequent calls
+      if (!unique && ttl !== -1) {
+        return r;
+      }
+
+      await rclient.set(redisKey, JSON.stringify({ service: row.id, filter: el.name }), 'EX', 15 * 60);
+      return r;
+    }));
+    row.filters = filters;
+  }));
+
   // parse service style
   rows.forEach(row => Object.assign(row, { style: row.style && ['vtile', 'geojson'].includes(row.service) ? yml2json(row.style) : row.style }));
   // parse extent string to number[]

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