@opengis/gis 0.2.2 → 0.2.4

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

@@ -1,70 +1,74 @@
 import path from 'node:path';
 import yaml from 'js-yaml';
-import { getMeta, getTemplate, pgClients, getTemplates, getTemplateSync } from "@opengis/fastify-table/utils.js";
+import {
+  getMeta, getTemplate, pgClients, getTemplates, getTemplateSync,
+} 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',
+  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 { 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 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 ? 'map_id=$1' : '1=1'}`,
-        [params.id].filter(Boolean),
-    ).then(el => el.rows || []) : [];
+  const rows = pg.pk?.['gis.maps'] ? await pg.query(
+    `SELECT map_id as id, * FROM gis.maps where ${params.id ? 'map_id=$1' : '1=1'}`,
+    [params.id].filter(Boolean),
+  ).then(el => el.rows || []) : [];
 
-    if (params.id && !mapList.includes(params.id) && !rows[0]) {
-        return { status: 404, message: 'map not found' }
-    }
+  if (params.id && !mapList?.includes(params.id) && !rows[0]) {
+    return { 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 slug, name FROM gis.maps`).then(el => el.rows || []) : [];
-    
-    
-    if (params.id) {
-        const map = rows[0] || {};
-        const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
+  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 slug, name FROM gis.maps',
+  ).then(el => el.rows || []) : [];
 
-        const obj = loadTemplate;
+  if (params.id) {
+    const map = rows[0] || {};
+    const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
 
-        if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
-            const layers = await Promise.all(obj.layers.map(async (layer) => {
-                const layerData = await getTemplate('layer', layer);
-                const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
-                Object.assign(serviceData, { count: totals[serviceData.source_path || ''] || 0 });
-                serviceData.style = typeof serviceData.style ==='object'?serviceData.style: yaml.load(serviceData.style);
-                return { ...serviceData, id: layer, visible: true };
-            }));
-            return { maps,...rows[0], ...obj, layers };
-        }
+    const obj = loadTemplate;
 
-        return reply.status(200).send({ maps, ...rows[0], ...loadTemplate });
+    if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
+      const layers = await Promise.all(obj.layers.map(async (layer) => {
+        const layerData = await getTemplate('layer', layer);
+        const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
+        Object.assign(serviceData, { count: totals[serviceData.source_path || ''] || 0 });
+        serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yaml.load(serviceData.style);
+        return { ...serviceData, id: layer, visible: true };
+      }));
+      return {
+        maps, ...rows[0], ...obj, layers,
+      };
     }
 
-    if (params.id && !rows.length) {
-        return reply.status(404).send('map not found');
-    }
+    return reply.status(200).send({ maps, ...rows[0], ...loadTemplate });
+  }
 
-    if (params.id) {
-        return reply.status(200).send({ ...rows[0], fields });
-    }
+  if (params.id && !rows.length) {
+    return reply.status(404).send('map not found');
+  }
+
+  if (params.id) {
+    return reply.status(200).send({ ...rows[0], fields });
+  }
 
-    return reply.status(200).send({
-        rows,
-        fields,
-    });
-}
+  return reply.status(200).send({
+    rows,
+    fields,
+  });
+}

package/server/routes/map/vtile1.js

@@ -1,94 +1,89 @@
 const headers = {
-    'Content-Type': 'application/x-protobuf',
-    'Cache-Control': 'no-cache',
+  'Content-Type': 'application/x-protobuf',
+  'Cache-Control': 'no-cache',
 };
 import Sphericalmercator from '@mapbox/sphericalmercator';
+
 const mercator = new Sphericalmercator({ size: 256 });
-import { getColumnCLS, getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import {
+  getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
+} from '@opengis/fastify-table/utils.js';
 import yaml from 'js-yaml';
 
 const propsCache = {};
 
-export default async function vtile({ params = {}, query, pg, user }, reply) {
-    const { y, z } = params;
-    const x = params.x.split('.')[0] - 0;
-
-    // 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 is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
-
-    const geom = data?.geometry_column || 'geom';
-    const table = data?.source_path;
-    const style = typeof data?.style ==='object'?data?.style: yaml.load(data?.style) ;
-    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, columns } = metaTable;
-
-    // props
-    const columnsFiltered = columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
-    const props = columnsFiltered.map(el => {
-        return el.type?.[0] === '_' ? `${el.name}[1] as ${el.name}` : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
-    });
-
-    const obj = (data.card || []).concat(data.popup || []).filter(el => el.data).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    const propsWithCls = propsCache[layer] ?? await Promise.all(props.map(async (key, idx) => {
-        const { name, type, sql } = getColumnCLS(table, key) || {};
-        if (name && type === 'cls') {
-            return `(select name from admin.cls where parent='${name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
-        }
-        if (type === 'select' && sql) {
-            const { fields = [] } = await pg.query(sql + ' limit 0');
-            return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
-        }
-
-        if (obj[key]) {
-            const clsdata = await pg.query('select name, type, data as sql from admin.cls where name=$1', [obj[key]]).then(el => el.rows?.[0] || {});
-            if (clsdata.name && clsdata.type === 'json') {
-                return `(select name from admin.cls where parent='${clsdata.name}' and code::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
-            }
-            if (clsdata.type === 'sql' && clsdata.sql) {
-                const { fields = [] } = await pg.query(clsdata.sql + ' limit 0');
-                return `(select "${fields[1].name}" from (${clsdata.sql})s${idx} where "${fields[0].name}"="${key}" limit 1) as "${key}_text","${key}"::text`
-            }
-        }
-        return `"${key}"::text`;
-    }));
-    if (!propsCache[layer]) { propsCache[layer] = propsWithCls; }
-
-    const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
+export default async function vtile({
+  params = {}, query, pg, user,
+}, reply) {
+  const { y, z } = params;
+  const x = params.x.split('.')[0] - 0;
+
+  // 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 is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+
+  const geom = data?.geometry_column || 'geom';
+  const table = data?.source_path;
+  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
+  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, columns } = metaTable;
+
+  // props
+  const props = !query.all ? data.popup || [] : 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' : '');
+  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 => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
+    const { name, type, sql } = cls || getColumnCLS(table, col.data || key) || {};
+    // console.log({ name, type, sql });
+    if (name && type === 'cls') {
+      return `(select name from admin.cls where parent='${name}' and code::text=${key}::text limit 1) as "${key}_text","${key}"::text`;
+    }
+    if (type === 'select' && sql) {
+      const { fields = [] } = await pg.query(`${sql} limit 0`);
+      return `(select "${fields[1].name}" from (${sql})s${idx} where "${fields[0].name}"::text="${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 koef = {
+    10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
+  }[z] || 0.0005;
 
-    const { type } = query;
-    const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
-    const sql = ((query.clusterZoom - z) > 2
-        ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+  const { type } = query;
+  const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
+  const sql = ((query.clusterZoom - z) > 2
+    ? `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`: null
-    ) || ((query.clusterZoom - z) > 0 ?
-        `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+                )q` : null
+  ) || ((query.clusterZoom - z) > 0
+    ? `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) geom
                 FROM (
@@ -99,7 +94,7 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
                 ORDER BY 1 DESC
                 )q`
 
-        : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+    : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
                 FROM (
                     SELECT
 
@@ -125,8 +120,8 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
                     limit 3000)q
                 ) q`);
 
-    if (query.sql === '1') { return sql; }
-    const tile = await pg.query(sql);
-    const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
-    return reply.headers(headers).send(buffer);
-}
+  if (query.sql === '1') { return sql; }
+  const tile = await pg.query(sql);
+  const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
+  return reply.headers(headers).send(buffer);
+}