@opengis/gis 0.2.118 → 0.2.120

package/server/routes/gis/metadata/editMetadata.js

@@ -1,34 +1,34 @@
-import { pgClients, dataUpsert } from "@opengis/fastify-table/utils.js";
-
-export default async function editMetadata(req, reply) {
-  const { pg = pgClients.client, body, params } = req;
-  const { type, id } = params || {};
-  const { uid } = req.user || {};
-
-  const q = {
-    raster: 'select 1 from gis.rasters where raster_id = $1',
-    css: 'select 1 from gis.cartocss where cartocss_id = $1',
-    dataset: 'select 1 from gis.dataset where dataset_id = $1',
-    service: 'select 1 from gis.services where service_id = $1',
-  }[type];
-
-  if (!q) {
-    return reply.code(400).send({ error: 'invalid params: type', code: 400 });
-  }
-
-  const exists = await pg.query(q, [id]).then(el => el.rowCount || 0);
-
-  if (!exists) {
-    return reply.code(404).send({ error: `${type} not found: ${id}`, code: 404 });
-  }
-
-  const data = await dataUpsert({
-    pg,
-    id,
-    table: 'gis.metadata',
-    data: { ...body, type, layer_id: id },
-    uid,
-  });
-
-  return reply.status(200).send(data);
-}
+import { pgClients, dataUpsert } from "@opengis/fastify-table/utils.js";
+
+export default async function editMetadata(req, reply) {
+  const { pg = pgClients.client, body, params } = req;
+  const { type, id } = params || {};
+  const { uid } = req.user || {};
+
+  const q = {
+    raster: 'select 1 from gis.rasters where raster_id = $1',
+    css: 'select 1 from gis.cartocss where cartocss_id = $1',
+    dataset: 'select 1 from gis.dataset where dataset_id = $1',
+    service: 'select 1 from gis.services where service_id = $1',
+  }[type];
+
+  if (!q) {
+    return reply.code(400).send({ error: 'invalid params: type', code: 400 });
+  }
+
+  const exists = await pg.query(q, [id]).then(el => el.rowCount || 0);
+
+  if (!exists) {
+    return reply.code(404).send({ error: `${type} not found: ${id}`, code: 404 });
+  }
+
+  const data = await dataUpsert({
+    pg,
+    id,
+    table: 'gis.metadata',
+    data: { ...body, type, layer_id: id },
+    uid,
+  });
+
+  return reply.status(200).send(data);
+}

package/server/routes/gis/metadata/metadataXML.js

@@ -1,13 +1,13 @@
-import {  handlebars, getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function insertColumns(req,reply) {
-  const { params} = req;
-  const { id } = params;
-
-  const pt = await getTemplate('templates','ISO19136_2017_gml_template');
-  const data = await handlebars.compile(pt)({ id: id });
-
-  return reply
-    .header('Content-Type', 'text/xml; charset=utf-8')
-    .send(data);
-}
+import {  handlebars, getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function insertColumns(req,reply) {
+  const { params} = req;
+  const { id } = params;
+
+  const pt = await getTemplate('templates','ISO19136_2017_gml_template');
+  const data = await handlebars.compile(pt)({ id: id });
+
+  return reply
+    .header('Content-Type', 'text/xml; charset=utf-8')
+    .send(data);
+}

package/server/routes/gis/ogc/map.info.point.js

@@ -1,124 +1,124 @@
-import {
-  pgClients, handlebars, getMeta, getTemplate, getFilterSQL,
-} from '@opengis/fastify-table/utils.js';
-
-const columnType = {
-  text: 'text',
-  date: 'date',
-  bool: 'yes/no',
-  numeric: 'number',
-  integer: 'number',
-  'timestamp without time zone': 'date',
-  'timestamp with time zone': 'date',
-};
-
-export default async function mapInfoPoint(req, reply) {
-  const { pg = pgClients.client, query = {} } = req;
-  const {
-    x, y, layers, index = 0,
-  } = query;
-  const time = Date.now();
-
-  if (!x || !y || !layers) {
-    return reply.status(400).send('not enough query params: x, y, layers are required');
-  }
-
-  const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query('select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)', [layers.split(',')]).then(el => el.rows || []) : [];
-
-  if (!rows.length) {
-    return reply.status(404).send('layers not found');
-  }
-
-  const point = `srid=4326;point(${x} ${y})`; // 30, 50
-
-  const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
-
-  await Promise.all(rows.map(async (layer, idx) => {
-    const { table_name: source, ogc_service_id: layerId } = layer;
-    const loadTable = await getTemplate('table', source);
-    const meta = await getMeta({ pg, table: loadTable?.table || source });
-    const { geom = 'geom' } = meta || {};
-    const { table = source, columns = meta?.columns } = loadTable || {};
-    const { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
-
-    const cls = columns
-      ?.filter(el => el.name && el.data)
-      ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    const pk = pg.pk?.[table] || loadTable?.key;
-
-    const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
-
-    Object.assign(layer, {
-      layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
-      table,
-      pk,
-      cls,
-      geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
-      optimizedSQL,
-      srid,
-      step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
-    });
-  }));
-
-  const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
-
-  const qList = unique.map((el) => ({
-    query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
-    row_to_json(t) as data, 
-    st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') as distance,
-    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
-    where 1=1`,
-    queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
-    /* where: `case
-                    when ST_GeometryType(${el.geomColumn}) in ('ST_Polygon','ST_MultiPolygon')
-                    then st_intersects(${el.geomColumn},st_buffer('${point.replace(/'/g, "''")}',${el.step}))
-
-                    when ST_GeometryType(${el.geomColumn}) in ('ST_Line','ST_MultiLineString', 'ST_MultiPoint', 'ST_Point')
-                    then st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') < ${el.step}
-                    else false
-                end`, */
-    where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`,
-  }));
-
-  const q = qList.map(el => `${el.query} and ${el.where}`).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
-
-  const qCount = qList.map(el => `${el.queryCount} and ${el.where}`).join(' union all ');
-
-  if (query.sql === '1') return q;
-  if (query.sql === '2') return qCount;
-
-  const count = await pg.query(qCount).then(el => el.rowCount);
-
-  const row = await pg.query(q).then(el => el.rows?.[0]);
-
-  if (!row) {
-    return reply.status(404).send('object not found');
-  }
-
-  const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
-  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-  const htmlTemplate = pg?.pk?.['admin.templates'] && row.layer && false
-    ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
-    : rows.find(el => el.ogc_service_id === row.layer)?.html;
-
-  const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
-
-  const res = {
-    time: Date.now() - time,
-    index,
-    count,
-    data: {
-      layer: row.layer,
-      geom: row.geom,
-      id: row.pk,
-      distance: row.distance,
-      data: row.data,
-    },
-    fields,
-    html,
-  };
-
-  return res;
-}
+import {
+  pgClients, handlebars, getMeta, getTemplate, getFilterSQL,
+} from '@opengis/fastify-table/utils.js';
+
+const columnType = {
+  text: 'text',
+  date: 'date',
+  bool: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
+};
+
+export default async function mapInfoPoint(req, reply) {
+  const { pg = pgClients.client, query = {} } = req;
+  const {
+    x, y, layers, index = 0,
+  } = query;
+  const time = Date.now();
+
+  if (!x || !y || !layers) {
+    return reply.status(400).send('not enough query params: x, y, layers are required');
+  }
+
+  const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query('select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)', [layers.split(',')]).then(el => el.rows || []) : [];
+
+  if (!rows.length) {
+    return reply.status(404).send('layers not found');
+  }
+
+  const point = `srid=4326;point(${x} ${y})`; // 30, 50
+
+  const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
+
+  await Promise.all(rows.map(async (layer, idx) => {
+    const { table_name: source, ogc_service_id: layerId } = layer;
+    const loadTable = await getTemplate('table', source);
+    const meta = await getMeta({ pg, table: loadTable?.table || source });
+    const { geom = 'geom' } = meta || {};
+    const { table = source, columns = meta?.columns } = loadTable || {};
+    const { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
+
+    const cls = columns
+      ?.filter(el => el.name && el.data)
+      ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+    const pk = pg.pk?.[table] || loadTable?.key;
+
+    const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
+
+    Object.assign(layer, {
+      layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
+      table,
+      pk,
+      cls,
+      geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
+      optimizedSQL,
+      srid,
+      step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
+    });
+  }));
+
+  const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
+
+  const qList = unique.map((el) => ({
+    query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
+    row_to_json(t) as data, 
+    st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') as distance,
+    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
+    where 1=1`,
+    queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
+    /* where: `case
+                    when ST_GeometryType(${el.geomColumn}) in ('ST_Polygon','ST_MultiPolygon')
+                    then st_intersects(${el.geomColumn},st_buffer('${point.replace(/'/g, "''")}',${el.step}))
+
+                    when ST_GeometryType(${el.geomColumn}) in ('ST_Line','ST_MultiLineString', 'ST_MultiPoint', 'ST_Point')
+                    then st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') < ${el.step}
+                    else false
+                end`, */
+    where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`,
+  }));
+
+  const q = qList.map(el => `${el.query} and ${el.where}`).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
+
+  const qCount = qList.map(el => `${el.queryCount} and ${el.where}`).join(' union all ');
+
+  if (query.sql === '1') return q;
+  if (query.sql === '2') return qCount;
+
+  const count = await pg.query(qCount).then(el => el.rowCount);
+
+  const row = await pg.query(q).then(el => el.rows?.[0]);
+
+  if (!row) {
+    return reply.status(404).send('object not found');
+  }
+
+  const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
+  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+  const htmlTemplate = pg?.pk?.['admin.templates'] && row.layer && false
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
+    : rows.find(el => el.ogc_service_id === row.layer)?.html;
+
+  const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
+
+  const res = {
+    time: Date.now() - time,
+    index,
+    count,
+    data: {
+      layer: row.layer,
+      geom: row.geom,
+      id: row.pk,
+      distance: row.distance,
+      data: row.data,
+    },
+    fields,
+    html,
+  };
+
+  return res;
+}

package/server/routes/gis/registers/add.registry.js

@@ -1,36 +1,36 @@
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function addGisRegistry({
-    method, params = {}, body, pg = pgClients.client, user = {},
-}, reply) {
-    if (method === 'POST') {
-
-        if (!body?.register_key) {
-            return reply.status(400).send('not enough body params: register_key');
-        }
-
-        const { rows = [] } = await dataInsert({
-            pg,
-            table: 'gis.registers',
-            data: body,
-            uid: user?.uid,
-        });
-        return reply.status(200).send(rows[0]);
-    }
-
-    if (!params.slug) {
-        return reply.status(400).send('not enough params: slug');
-    }
-
-    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
-
-    const row = await dataUpdate({
-        pg,
-        id,
-        table: 'gis.registers',
-        data: body,
-        uid: user?.uid,
-    });
-
-    return reply.status(200).send(row);
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function addGisRegistry({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    if (method === 'POST') {
+
+        if (!body?.register_key) {
+            return reply.status(400).send('not enough body params: register_key');
+        }
+
+        const { rows = [] } = await dataInsert({
+            pg,
+            table: 'gis.registers',
+            data: body,
+            uid: user?.uid,
+        });
+        return reply.status(200).send(rows[0]);
+    }
+
+    if (!params.slug) {
+        return reply.status(400).send('not enough params: slug');
+    }
+
+    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
+
+    const row = await dataUpdate({
+        pg,
+        id,
+        table: 'gis.registers',
+        data: body,
+        uid: user?.uid,
+    });
+
+    return reply.status(200).send(row);
 }

package/server/routes/gis/registers/del.registry.js

@@ -1,15 +1,15 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function deleteGisRegistry({
-    params = {}, pg = pgClients.client, user = {},
-}, reply) {
-    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
-
-    const row = await dataDelete({
-        pg,
-        id,
-        table: 'gis.registers',
-        uid: user?.uid,
-    });
-    return reply.status(200).send(row);
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function deleteGisRegistry({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
+
+    const row = await dataDelete({
+        pg,
+        id,
+        table: 'gis.registers',
+        uid: user?.uid,
+    });
+    return reply.status(200).send(row);
 }

package/server/routes/gis/registers/funcs/classifiers.js

@@ -1,101 +1,101 @@
-import { getSelectVal, getSelect, getTemplates } from '@opengis/fastify-table/utils.js';
-
-export async function attachClassifiers(rowOrRows, classifiers, table) {
-    const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
-
-    const list = getTemplates(['cls', 'select']);
-
-    // classifiers as object
-    if (table) {
-        await Promise.all(rows.map(async row => {
-            await Promise.all(Object.keys(row).filter(key => classifiers?.[key] || list.map(el => el[0]).includes(`${table}.${key}`) || list.map(el => el[0]).includes(key)).map(async key => {
-                const clsAsColumn = list.map(el => el[0]).includes(key);
-                const arr = await getSelectVal({ name: classifiers?.[key] || (clsAsColumn ? key : `${table}.${key}`), values: [row[key]], ar: true });
-                const val = arr?.find?.(el => el.id && el.id.toString() === row[key].toString());
-                if (val?.text) { row[`${key}_data`] = val; }
-                row[key] = val?.text || val || row[key]; // for frontend
-                row[`${key}_text`] = val?.text || val || row[key]; // legacy?
-            }));
-        }));
-        return rowOrRows;
-    }
-
-    // classifiers as array of objects
-    await Promise.all(rows.map(async row => {
-        (classifiers || []).filter(item => item.classifier && item.name && row[item.name]).map(async ({ name, classifier }) => {
-            const arr = await getSelectVal({ name: classifier, values: [row[name]], ar: true });
-            const val = arr?.find?.(el => el.id === row[name]);
-            if (val?.text) { row[`${name}_data`] = val; }
-            row[name] = val?.text || val || row[name]; // for frontend
-            row[`${name}_text`] = val?.text || val || row[name]; // legacy?
-        });
-    }));
-
-    /* for (const row of rows) {
-        for (const { name, classifier } of classifiers) {
-            const value = row[name];
-            if (value != null && classifier) {
-
-                const match = await getSelectVal({ name: classifier, values: [value] });
-                const matchVal = Object.values(match)?.[0]
-
-                if (typeof matchVal === 'object' && matchVal !== null) {
-                    row[`${name}_data`] = matchVal;
-                } else if (
-                    typeof matchVal === 'string' && matchVal !== null
-                ) {
-                    row[`${name}_text`] = matchVal;
-                };
-                
-            }
-        }
-    } */
-
-    return rowOrRows;
-}
-
-export async function populateFilterOptions({ pg, table, filters, columns, whereConditions }) {
-    if (!filters?.length || !table || !columns?.length) return;
-
-    const optimizedSQL = `select * from ${table} where ${whereConditions || '1=1'}`;
-
-    await Promise.all(
-        filters
-            .filter(
-                (el) =>
-                    el.id &&
-                    el.type !== "Autocomplete" &&
-                    !el.sql &&
-                    !el.options?.find?.((item) => item.sql)
-            )
-            .map(async (el) => {
-                const cls = el.data ? await getSelect(el.data, pg) : null;
-
-                if (!cls && !el.type?.includes?.("Check")) return;
-                const { dataTypeID } = (columns || []).find((item) => item.name === el.id) || {};
-
-                const q = pg.pgType[dataTypeID || '']?.includes("[]")
-                    ? `select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id}) limit 100`
-                    : `select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id} limit 100`;
-
-                const countArr = await pg.queryCache(q, { table });
-
-                if (countArr.timeout) {
-                    Object.assign(el, { timeout: countArr.timeout });
-                    console.warn("timeout filter", table, el.id);
-                }
-
-                const ids = countArr.rows.map((el1) => el1.id);
-
-                const clsData = await getSelectVal({ pg, values: ids, name: el.data });
-
-                const options = countArr.rows.map((cel) => {
-                    const data = cls?.arr?.find?.(
-                        (c) => c.id?.toString?.() === cel.id?.toString?.()
-                    ) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] || cel.id };
-                    return { ...cel, id: cel.id === null ? "null" : cel.id, ...data };
-                });
-                Object.assign(el, { options });
-            })
-    );
+import { getSelectVal, getSelect, getTemplates } from '@opengis/fastify-table/utils.js';
+
+export async function attachClassifiers(rowOrRows, classifiers, table) {
+    const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
+
+    const list = getTemplates(['cls', 'select']);
+
+    // classifiers as object
+    if (table) {
+        await Promise.all(rows.map(async row => {
+            await Promise.all(Object.keys(row).filter(key => classifiers?.[key] || list.map(el => el[0]).includes(`${table}.${key}`) || list.map(el => el[0]).includes(key)).map(async key => {
+                const clsAsColumn = list.map(el => el[0]).includes(key);
+                const arr = await getSelectVal({ name: classifiers?.[key] || (clsAsColumn ? key : `${table}.${key}`), values: [row[key]], ar: true });
+                const val = arr?.find?.(el => el.id && el.id.toString() === row[key].toString());
+                if (val?.text) { row[`${key}_data`] = val; }
+                row[key] = val?.text || val || row[key]; // for frontend
+                row[`${key}_text`] = val?.text || val || row[key]; // legacy?
+            }));
+        }));
+        return rowOrRows;
+    }
+
+    // classifiers as array of objects
+    await Promise.all(rows.map(async row => {
+        (classifiers || []).filter(item => item.classifier && item.name && row[item.name]).map(async ({ name, classifier }) => {
+            const arr = await getSelectVal({ name: classifier, values: [row[name]], ar: true });
+            const val = arr?.find?.(el => el.id === row[name]);
+            if (val?.text) { row[`${name}_data`] = val; }
+            row[name] = val?.text || val || row[name]; // for frontend
+            row[`${name}_text`] = val?.text || val || row[name]; // legacy?
+        });
+    }));
+
+    /* for (const row of rows) {
+        for (const { name, classifier } of classifiers) {
+            const value = row[name];
+            if (value != null && classifier) {
+
+                const match = await getSelectVal({ name: classifier, values: [value] });
+                const matchVal = Object.values(match)?.[0]
+
+                if (typeof matchVal === 'object' && matchVal !== null) {
+                    row[`${name}_data`] = matchVal;
+                } else if (
+                    typeof matchVal === 'string' && matchVal !== null
+                ) {
+                    row[`${name}_text`] = matchVal;
+                };
+                
+            }
+        }
+    } */
+
+    return rowOrRows;
+}
+
+export async function populateFilterOptions({ pg, table, filters, columns, whereConditions }) {
+    if (!filters?.length || !table || !columns?.length) return;
+
+    const optimizedSQL = `select * from ${table} where ${whereConditions || '1=1'}`;
+
+    await Promise.all(
+        filters
+            .filter(
+                (el) =>
+                    el.id &&
+                    el.type !== "Autocomplete" &&
+                    !el.sql &&
+                    !el.options?.find?.((item) => item.sql)
+            )
+            .map(async (el) => {
+                const cls = el.data ? await getSelect(el.data, pg) : null;
+
+                if (!cls && !el.type?.includes?.("Check")) return;
+                const { dataTypeID } = (columns || []).find((item) => item.name === el.id) || {};
+
+                const q = pg.pgType[dataTypeID || '']?.includes("[]")
+                    ? `select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id}) limit 100`
+                    : `select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id} limit 100`;
+
+                const countArr = await pg.queryCache(q, { table });
+
+                if (countArr.timeout) {
+                    Object.assign(el, { timeout: countArr.timeout });
+                    console.warn("timeout filter", table, el.id);
+                }
+
+                const ids = countArr.rows.map((el1) => el1.id);
+
+                const clsData = await getSelectVal({ pg, values: ids, name: el.data });
+
+                const options = countArr.rows.map((cel) => {
+                    const data = cls?.arr?.find?.(
+                        (c) => c.id?.toString?.() === cel.id?.toString?.()
+                    ) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] || cel.id };
+                    return { ...cel, id: cel.id === null ? "null" : cel.id, ...data };
+                });
+                Object.assign(el, { options });
+            })
+    );
 }