@opengis/gis 0.2.149 → 0.2.151

package/server/routes/map/maps/get.map.js

@@ -1,118 +1,118 @@
-import {
-  getMeta, getTemplate, pgClients, getTemplates, yml2json,
-} from '@opengis/fastify-table/utils.js';
-
-const table = 'gis.maps';
-
-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 getMap({ params = {}, pg = pgClients.client }, reply) {
-  const { columns = [] } = await getMeta({ pg, table }) || {};
-
-  const fields = columns.map(({ name, dataTypeID, title }) => ({
-    name,
-    type: columnType[pg.pgType?.[dataTypeID] || 'text'],
-    label: title || name,
-  }));
-
-  const mapList = getTemplates('map').map(el => el[0]);
-
-  const rows = pg.pk?.['gis.maps'] ? await pg.query(
-    `SELECT map_id as id, * FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
-    [params.id].filter(Boolean),
-  ).then(el => el.rows || []) : [];
-
-  if (params.id && !mapList?.includes(params.id) && !rows[0]) {
-    return reply.status(404).send({ status: 404, message: 'map not found' });
-  }
-
-  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
-    .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
-  const maps = pg.pk?.['gis.maps'] ? await pg.query(
-    'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
-  ).then(el => el.rows || []) : [];
-
-  if (mapList.includes('main') && !maps.find(el => el.slug === 'main')) {
-    maps.unshift({ id: 'main', slug: 'main', name: 'Основна карта' });
-  }
-
-  if (params.id) {
-    const map = rows[0] || {};
-    const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
-    const obj = loadTemplate || map;
-
-    const rawIds = [
-      ...(Array.isArray(obj?.layers) ? obj.layers : []),
-      ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
-      ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
-      ...(Array.isArray(obj?.rasters) ? obj.rasters : []),
-    ];
-    const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
-
-    let layers = [];
-
-    if (layerIds.length > 0) {
-      const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
-        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/vtile/'||service_id||'/ua/{z}/{x}/{y}.vmt',null) as url FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/gis-rtile/'||raster_id||'/{z}/{x}/{y}.png',null) as url FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox, coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds]),
-      ]);
-
-      const allFetchedLayers = [
-        ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
-        ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
-        ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
-        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' })),
-      ];
-
-      const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
-
-      const layersResults = await Promise.all(layerIds.map(async (id) => {
-        const idStr = String(id);
-
-        if (!dbLayersMap.has(idStr)) {
-          return null;
-        }
-
-        const dbData = dbLayersMap.get(idStr);
-        const templateData = await getTemplate('layer', idStr);
-
-        const layerData = { ...dbData, ...(templateData || {}) };
-
-        layerData.count = totals[layerData.source_path || ''] || 0;
-        layerData.visible = true;
-
-        if (layerData.style && typeof layerData.style === 'string') {
-          if (layerData.type === 'cartocss') {
-            layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
-          }
-          else if (layerData.type !== 'ogc') {
-            layerData.style = yml2json(layerData.style);
-          }
-        }
-
-        return layerData;
-      }));
-
-      layers = layersResults.filter(Boolean);
-    }
-
-    return reply.status(200).send({ maps, ...obj, layers });
-  }
-
-  if (params.id && !rows.length) {
-    return reply.status(404).send('map not found');
-  }
-
-  return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
-}
+import {
+  getMeta, getTemplate, pgClients, getTemplates, yml2json,
+} from '@opengis/fastify-table/utils.js';
+
+const table = 'gis.maps';
+
+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 getMap({ params = {}, pg = pgClients.client }, reply) {
+  const { columns = [] } = await getMeta({ pg, table }) || {};
+
+  const fields = columns.map(({ name, dataTypeID, title }) => ({
+    name,
+    type: columnType[pg.pgType?.[dataTypeID] || 'text'],
+    label: title || name,
+  }));
+
+  const mapList = getTemplates('map').map(el => el[0]);
+
+  const rows = pg.pk?.['gis.maps'] ? await pg.query(
+    `SELECT map_id as id, * FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
+    [params.id].filter(Boolean),
+  ).then(el => el.rows || []) : [];
+
+  if (params.id && !mapList?.includes(params.id) && !rows[0]) {
+    return reply.status(404).send({ status: 404, message: 'map not found' });
+  }
+
+  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
+    .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
+  const maps = pg.pk?.['gis.maps'] ? await pg.query(
+    'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
+  ).then(el => el.rows || []) : [];
+
+  if (mapList.includes('main') && !maps.find(el => el.slug === 'main')) {
+    maps.unshift({ id: 'main', slug: 'main', name: 'Основна карта' });
+  }
+
+  if (params.id) {
+    const map = rows[0] || {};
+    const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
+    const obj = loadTemplate || map;
+
+    const rawIds = [
+      ...(Array.isArray(obj?.layers) ? obj.layers : []),
+      ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
+      ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
+      ...(Array.isArray(obj?.rasters) ? obj.rasters : []),
+    ];
+    const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
+
+    let layers = [];
+
+    if (layerIds.length > 0) {
+      const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
+        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/vtile/'||service_id||'/ua/{z}/{x}/{y}.vmt',null) as url FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/gis-rtile/'||raster_id||'/{z}/{x}/{y}.png',null) as url FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox, coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds]),
+      ]);
+
+      const allFetchedLayers = [
+        ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
+        ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
+        ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
+        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' })),
+      ];
+
+      const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
+
+      const layersResults = await Promise.all(layerIds.map(async (id) => {
+        const idStr = String(id);
+
+        if (!dbLayersMap.has(idStr)) {
+          return null;
+        }
+
+        const dbData = dbLayersMap.get(idStr);
+        const templateData = await getTemplate('layer', idStr);
+
+        const layerData = { ...dbData, ...(templateData || {}) };
+
+        layerData.count = totals[layerData.source_path || ''] || 0;
+        layerData.visible = true;
+
+        if (layerData.style && typeof layerData.style === 'string') {
+          if (layerData.type === 'cartocss') {
+            layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
+          }
+          else if (layerData.type !== 'ogc') {
+            layerData.style = yml2json(layerData.style);
+          }
+        }
+
+        return layerData;
+      }));
+
+      layers = layersResults.filter(Boolean);
+    }
+
+    return reply.status(200).send({ maps, ...obj, layers });
+  }
+
+  if (params.id && !rows.length) {
+    return reply.status(404).send('map not found');
+  }
+
+  return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
+}

package/server/routes/map/vtile1.js

@@ -1,179 +1,179 @@
-const headers = {
-  'Content-Type': 'application/x-protobuf',
-  'Cache-Control': '86400',
-};
-
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { createHash } from 'node:crypto';
-import {
-  readFile, stat, mkdir, writeFile,
-} from 'node:fs/promises';
-
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-const mercator = new Sphericalmercator({ size: 256 });
-
-// import { SphericalMercator } from '@mapbox/sphericalmercator';
-// const mercator = new SphericalMercator({ size: 256 });
-
-import {
-  getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
-} from '@opengis/fastify-table/utils.js';
-import yaml from 'js-yaml';
-import rootFolder from '../../plugins/mapnik/funcs/rootFolder.mjs';
-
-const propsCache = {};
-
-export default async function vtile({
-  params = {}, query, pg, user,
-}, reply) {
-  const { y, z } = params;
-  const x = params.x.split('.')[0] - 0;
-  const {
-    type, nocache, sql, clusterZoom, filter, nottl,
-  } = query;
-
-  const hash = [type, clusterZoom, filter].join();
-
-  const filepath = path.join(
-    rootFolder,
-    `/vtile/${params.layer}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.vmt`,
-  );
-
-  // layer
-  const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
-
-  // service
-  const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
-  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
-
-  const cacheZoom = style?.cacheZoom || 13;
-  const ttl = typeof style?.ttl === 'number' && style.ttl >= 0 ? style.ttl : 86400000;
-
-  if (existsSync(filepath) && +z < cacheZoom && !nocache && !sql && process.env.NODE_ENV !== 'test') {
-    const { birthtimeMs = Date.now() } = await stat(filepath);
-    const ageInMs = Date.now() - birthtimeMs;
-    if (ageInMs < ttl) {
-      const buffer = await readFile(filepath);
-      return reply.status(200).headers(headers).send(buffer);
-    }
-  }
-
-  const geom = data?.geometry_column || 'geom';
-  const table = data?.source_path;
-  const filterList = data?.filters;
-  const layerQuery = data?.query;
-
-  // bbox
-  const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
-  const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
-
-  const filterData = query.filter ? await getFilterSQL({
-    filter: query.filter, table, filterList,
-  }) : {};
-
-  // meta
-  const metaTable = await getMeta({ pg, table });
-  if (metaTable.error) { return metaTable; }
-  const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
-
-  // props
-  const statusColumn = style?.colorAttr || style?.iconAttr ? columns.filter(col => col.name === style.colorAttr || style?.iconAttr) : [];
-  const props = !query.all ? (statusColumn || []).concat(data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
-
-  const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
-  const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
-    const key = col.name;
-    const select = data.popup?.find(el => el.name === key);
-    // console.log(select);
-    const clsData = select?.data || col.data;
-    const cls = clsData ? await getSelect(clsData).then(el => {
-      if (!el) {
-        console.error('gis vtile: cls not found', clsData);
-        return null;
-      }
-      return { name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql };
-    }) : null;
-    const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
-    // console.log({ name, type, sql });
-    if (name && type1 === 'cls') {
-      return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
-    }
-    if (type1 === 'select' && sql1) {
-      const { fields = [] } = await pg.query(`${sql1} limit 0`);
-      return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
-    }
-    return `"${key}"::text`;
-  }));
-  propsCache[cache] = propsCache[cache] || propsWithCls;
-
-  const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
-    || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
-
-  const koef = {
-    10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
-  }[z] || 0.0005;
-
-  const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
-  const clusterZoom1 = style?.clusterZoom || clusterZoom;
-  const queryMode = ((clusterZoom1 - z) > 2 ? 1 : null) || ((clusterZoom1 - z) > 0 ? 2 : null) || 3;
-  // console.log(z, clusterZoom, queryMode);
-  const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
-  const q = {
-    1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
-            FROM (
-                SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, point_count, ST_AsMVTGeom(st_transform(geom,3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
-                FROM (
-                SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
-                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j            
-                )q`,
-    2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
-            FROM (
-                SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,                
-                ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
-                FROM (
-                SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster 
-                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j
-                WHERE cluster IS NOT NULL
-                GROUP BY cluster
-                ORDER BY 1 DESC
-                )q`,
-    3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
-                FROM (
-                    SELECT
-
-                        floor(random() * 100000 + 1)::int + row_number() over() as row,
-
-                        ${props?.length ? `${propsWithCls.join(',')},` : ''}
-
-                        ${pkey} as  id, 
-                        ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
-
-                        FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} 
-                        
-                        and ${geom} is not null  and st_srid(${geom}) >0
-                        
-                        
-
-                    ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
-
-                    and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
-                    
-                    ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
-
-                    limit 3000)q
-                ) q`,
-  }[queryMode];
-
-  if (query.sql === '1') { return q; }
-  const tile = await pg.query(q);
-  const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
-
-  if (!nocache) {
-    await mkdir(path.dirname(filepath), { recursive: true });
-    await writeFile(filepath, buffer, 'binary');
-  }
-
-  return reply.headers({ ...headers, 'Cache-Control': nocache || nottl ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
-}
+const headers = {
+  'Content-Type': 'application/x-protobuf',
+  'Cache-Control': '86400',
+};
+
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import {
+  readFile, stat, mkdir, writeFile,
+} from 'node:fs/promises';
+
+import Sphericalmercator from '@mapbox/sphericalmercator';
+
+const mercator = new Sphericalmercator({ size: 256 });
+
+// import { SphericalMercator } from '@mapbox/sphericalmercator';
+// const mercator = new SphericalMercator({ size: 256 });
+
+import {
+  getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
+} from '@opengis/fastify-table/utils.js';
+import yaml from 'js-yaml';
+import rootFolder from '../../plugins/mapnik/funcs/rootFolder.mjs';
+
+const propsCache = {};
+
+export default async function vtile({
+  params = {}, query, pg, user,
+}, reply) {
+  const { y, z } = params;
+  const x = params.x.split('.')[0] - 0;
+  const {
+    type, nocache, sql, clusterZoom, filter, nottl,
+  } = query;
+
+  const hash = [type, clusterZoom, filter].join();
+
+  const filepath = path.join(
+    rootFolder,
+    `/vtile/${params.layer}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.vmt`,
+  );
+
+  // layer
+  const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
+
+  // service
+  const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
+
+  const cacheZoom = style?.cacheZoom || 13;
+  const ttl = typeof style?.ttl === 'number' && style.ttl >= 0 ? style.ttl : 86400000;
+
+  if (existsSync(filepath) && +z < cacheZoom && !nocache && !sql && process.env.NODE_ENV !== 'test') {
+    const { birthtimeMs = Date.now() } = await stat(filepath);
+    const ageInMs = Date.now() - birthtimeMs;
+    if (ageInMs < ttl) {
+      const buffer = await readFile(filepath);
+      return reply.status(200).headers(headers).send(buffer);
+    }
+  }
+
+  const geom = data?.geometry_column || 'geom';
+  const table = data?.source_path;
+  const filterList = data?.filters;
+  const layerQuery = data?.query;
+
+  // bbox
+  const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
+  const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
+
+  const filterData = query.filter ? await getFilterSQL({
+    filter: query.filter, table, filterList,
+  }) : {};
+
+  // meta
+  const metaTable = await getMeta({ pg, table });
+  if (metaTable.error) { return metaTable; }
+  const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
+
+  // props
+  const statusColumn = style?.colorAttr || style?.iconAttr ? columns.filter(col => col.name === style.colorAttr || style?.iconAttr) : [];
+  const props = !query.all ? (statusColumn || []).concat(data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
+
+  const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
+  const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
+    const key = col.name;
+    const select = data.popup?.find(el => el.name === key);
+    // console.log(select);
+    const clsData = select?.data || col.data;
+    const cls = clsData ? await getSelect(clsData).then(el => {
+      if (!el) {
+        console.error('gis vtile: cls not found', clsData);
+        return null;
+      }
+      return { name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql };
+    }) : null;
+    const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
+    // console.log({ name, type, sql });
+    if (name && type1 === 'cls') {
+      return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
+    }
+    if (type1 === 'select' && sql1) {
+      const { fields = [] } = await pg.query(`${sql1} limit 0`);
+      return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
+    }
+    return `"${key}"::text`;
+  }));
+  propsCache[cache] = propsCache[cache] || propsWithCls;
+
+  const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
+    || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
+
+  const koef = {
+    10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
+  }[z] || 0.0005;
+
+  const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
+  const clusterZoom1 = style?.clusterZoom || clusterZoom;
+  const queryMode = ((clusterZoom1 - z) > 2 ? 1 : null) || ((clusterZoom1 - z) > 0 ? 2 : null) || 3;
+  // console.log(z, clusterZoom, queryMode);
+  const props1 = props.filter((el, idx, arr) => idx === arr.findIndex(item => item.name === el.name));
+  const q = {
+    1: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+            FROM (
+                SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, point_count, ST_AsMVTGeom(st_transform(geom,3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
+                FROM (
+                SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
+                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j            
+                )q`,
+    2: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+            FROM (
+                SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count,                
+                ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
+                FROM (
+                SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster 
+                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j
+                WHERE cluster IS NOT NULL
+                GROUP BY cluster
+                ORDER BY 1 DESC
+                )q`,
+    3: `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+                FROM (
+                    SELECT
+
+                        floor(random() * 100000 + 1)::int + row_number() over() as row,
+
+                        ${props?.length ? `${propsWithCls.join(',')},` : ''}
+
+                        ${pkey} as  id, 
+                        ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
+
+                        FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} 
+                        
+                        and ${geom} is not null  and st_srid(${geom}) >0
+                        
+                        
+
+                    ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
+
+                    and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
+                    
+                    ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
+
+                    limit 3000)q
+                ) q`,
+  }[queryMode];
+
+  if (query.sql === '1') { return q; }
+  const tile = await pg.query(q);
+  const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
+
+  if (!nocache) {
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, buffer, 'binary');
+  }
+
+  return reply.headers({ ...headers, 'Cache-Control': nocache || nottl ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
+}