@opengis/gis 0.2.28 → 0.2.29

package/server/routes/map/controllers/mapFeatures.js

@@ -1,129 +1,129 @@
-import { getMeta, getFilterSQL, getTemplate, metaFormat, pgClients, yml2json } from '@opengis/fastify-table/utils.js';
-
-const layerMetaColumns = ['id', 'name', 'label', 'source', 'table', 'pk', 'geomColumn', 'srid', 'cls', 'htmls'];
-
-export default async function mapFeaturesPoint({ pg = pgClients.client, params = {}, query = {} }, reply) {
-    const { slug, id } = params;
-    const { x, y, sql } = query;
-
-    if (!slug) {
-        return reply.status(400).send('not enough params: slug');
-    }
-
-    if (!(x && y) && !id) {
-        return reply.status(400).send('not enough params: xy');
-    }
-
-    const loadTemplate = await getTemplate('map', slug);
-
-    if (!loadTemplate) {
-        return reply.status(404).send('map not found');
-    }
-
-    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
-
-    const layers1 = !index
-        ? loadTemplate?.layers
-        : loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
-
-    const serviceLayers = await Promise.all(layers1.filter(el => typeof el === 'string').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]);
-        serviceData.style = yml2json(serviceData.style);
-        return { ...serviceData, id: layer, visible: true };
-    }));
-
-    const layers = layers1.filter(el => el && typeof el === 'object').concat(serviceLayers);
-
-    if (!layers?.length) {
-        return reply.status(404).send('map layers not found');
-    }
-
-    if (!layers.filter(el => el.source_path).length) {
-        return reply.status(404).send('map layers sources not provided');
-    }
-
-    const point = `srid=4326;point(${x} ${y})`; // 30, 50
-
-    const { srids } = await pg.queryCache?.('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0] || {}) || {};
-
-    await Promise.all(layers.map(async (layer, idx) => {
-        const { source_path: source, srid = 4326, id: layerId, name } = 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 cls = columns
-            ?.filter(el => el.name && el.data)
-            ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-        const htmls = columns
-            ?.filter(el => el.name && el.html)
-            ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.html }), {});
-
-        const pk = pg.pk?.[table] || loadTable?.key;
-
-        const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
-
-        Object.assign(layer, {
-            layer: (layerId || name || idx.toString())?.replace?.(/'/g, "''"),
-            table,
-            pk,
-            cls,
-            htmls,
-            geomColumn: geom,
-            optimizedSQL,
-            srid,
-            step: srids?.includes?.(srid - 0) && srid !== 4326 ? 10 : 0.0002,
-        });
-    }));
-
-    const unique = layers
-        .filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
-
-    const q = unique.map((el) => {
-        const where = id
-            ? `${el.pk}::text='${id.replace(/'/g, "''")}'`
-            : `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`;
-        return `select ${el.pk}::text as pk, '${el.layer}' as layer,
-    row_to_json(t) as data, 
-    ${id ? 'null' : `st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}')`} as distance,
-    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
-    where ${where}`;
-    }).join(' union all ').concat(' order by distance');
-
-    if (sql === '1') return q;
-
-    const { rows: objects = [] } = await pg.query(q);
-
-    if (!objects.length) {
-        return reply.status(200).send(`object not found: ${id}`);
-    }
-
-    const layerData = layers.find((el) => (el.id || el.name) === objects[0].layer) || {};
-    const rows = objects.slice(0, 1).map(el => ({ ...el.data, data: undefined }));
-
-    const { cls, htmls } = layerData;
-    await metaFormat({ rows, cls, htmls, sufix: false }, pg);
-
-    const resp = {
-        meta: {
-            ...layerMetaColumns.reduce((acc, curr) => ({ ...acc, [curr]: layerData[curr] }), {}),
-            distance: objects[0].distance,
-        },
-        data: {
-            id: rows[0][layerData.pk],
-            ...rows[0],
-        },
-    };
-
-    return reply.status(200).send(resp);
+import { getMeta, getFilterSQL, getTemplate, metaFormat, pgClients, yml2json } from '@opengis/fastify-table/utils.js';
+
+const layerMetaColumns = ['id', 'name', 'label', 'source', 'table', 'pk', 'geomColumn', 'srid', 'cls', 'htmls'];
+
+export default async function mapFeaturesPoint({ pg = pgClients.client, params = {}, query = {} }, reply) {
+    const { slug, id } = params;
+    const { x, y, sql } = query;
+
+    if (!slug) {
+        return reply.status(400).send('not enough params: slug');
+    }
+
+    if (!(x && y) && !id) {
+        return reply.status(400).send('not enough params: xy');
+    }
+
+    const loadTemplate = await getTemplate('map', slug);
+
+    if (!loadTemplate) {
+        return reply.status(404).send('map not found');
+    }
+
+    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
+
+    const layers1 = !index
+        ? loadTemplate?.layers
+        : loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
+
+    const serviceLayers = await Promise.all(layers1.filter(el => typeof el === 'string').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]);
+        serviceData.style = yml2json(serviceData.style);
+        return { ...serviceData, id: layer, visible: true };
+    }));
+
+    const layers = layers1.filter(el => el && typeof el === 'object').concat(serviceLayers);
+
+    if (!layers?.length) {
+        return reply.status(404).send('map layers not found');
+    }
+
+    if (!layers.filter(el => el.source_path).length) {
+        return reply.status(404).send('map layers sources not provided');
+    }
+
+    const point = `srid=4326;point(${x} ${y})`; // 30, 50
+
+    const { srids } = await pg.queryCache?.('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0] || {}) || {};
+
+    await Promise.all(layers.map(async (layer, idx) => {
+        const { source_path: source, srid = 4326, id: layerId, name } = 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 cls = columns
+            ?.filter(el => el.name && el.data)
+            ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+        const htmls = columns
+            ?.filter(el => el.name && el.html)
+            ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.html }), {});
+
+        const pk = pg.pk?.[table] || loadTable?.key;
+
+        const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
+
+        Object.assign(layer, {
+            layer: (layerId || name || idx.toString())?.replace?.(/'/g, "''"),
+            table,
+            pk,
+            cls,
+            htmls,
+            geomColumn: geom,
+            optimizedSQL,
+            srid,
+            step: srids?.includes?.(srid - 0) && srid !== 4326 ? 10 : 0.0002,
+        });
+    }));
+
+    const unique = layers
+        .filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
+
+    const q = unique.map((el) => {
+        const where = id
+            ? `${el.pk}::text='${id.replace(/'/g, "''")}'`
+            : `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`;
+        return `select ${el.pk}::text as pk, '${el.layer}' as layer,
+    row_to_json(t) as data, 
+    ${id ? 'null' : `st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}')`} as distance,
+    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
+    where ${where}`;
+    }).join(' union all ').concat(' order by distance');
+
+    if (sql === '1') return q;
+
+    const { rows: objects = [] } = await pg.query(q);
+
+    if (!objects.length) {
+        return reply.status(200).send(`object not found: ${id}`);
+    }
+
+    const layerData = layers.find((el) => (el.id || el.name) === objects[0].layer) || {};
+    const rows = objects.slice(0, 1).map(el => ({ ...el.data, data: undefined }));
+
+    const { cls, htmls } = layerData;
+    await metaFormat({ rows, cls, htmls, sufix: false }, pg);
+
+    const resp = {
+        meta: {
+            ...layerMetaColumns.reduce((acc, curr) => ({ ...acc, [curr]: layerData[curr] }), {}),
+            distance: objects[0].distance,
+        },
+        data: {
+            id: rows[0][layerData.pk],
+            ...rows[0],
+        },
+    };
+
+    return reply.status(200).send(resp);
 }

package/server/routes/map/controllers/mapFormat.js

@@ -1,83 +1,83 @@
-import {
-  pgClients, getTemplate, handlebars, metaFormat,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function mapFormat(req, reply) {
-  const { pg = pgClients.client, query = {}, user } = req;
-  const { layer, id } = query;
-  const time = Date.now();
-
-  if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
-
-  const service = await getTemplate('layer', layer) || (pg.tlist.includes('gis.services') ? await pg.query('SELECT * FROM gis.services WHERE service_id = $1', [layer]).then(res => res.rows[0]) : null);
-
-  const {
-    source_path: tname, cardInterface, card, template,
-  } = service;
-
-  const columns = (card || []).filter((col) => (user?.uid ? true : !col.is_admin));
-  if (!tname) return reply.status(404).send('missing source_path');
-
-  const pk = pg.pk?.[tname];
-  if (!pk) return reply.status(404).send('missing pk');
-
-  if (!columns) return reply.status(404).send('columns setting not found');
-
-  const columnNames = columns.map(col => col.name);
-  const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
-  const filteredColumns = columnNames.filter(name => !excluded.includes(name));
-
-  const rows = await pg.query(
-    `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
-    [id],
-  ).then(el => el.rows || []);
-
-  if (!rows.length) return reply.status(404).send('object not found');
-
-  const classifiers = columns
-    .filter(col => col.data && ['select', 'badge', 'tags'].includes(col.format))
-    .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-  await metaFormat({
-    rows, table: tname, cls: classifiers, sufix: false,
-  });
-  const fullRow = rows[0];
-
-  const result = [];
-  const filtered = columns.filter(col => !excluded.includes(col.name));
-  for (let i = 0; i < filtered.length; i += 1) {
-    const col = filtered[i];
-
-    const name = col.label || col.ua || col.name;
-    const value = (col.format === 'date' ? new Date(fullRow[col.name]).toLocaleDateString('uk-UA') : null) || fullRow[`${col.name}_data`]?.text
-      || fullRow[`${col.name}_text`]
-      || fullRow[col.name];
-
-    result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
-            <dt class="text-gray-900">${name}</dt>
-            <dd class="text-gray-700 sm:col-span-2">${value || '-'}</dd>
-        </div>`);
-  }
-
-  const htmlTemplate = pg?.pk?.['admin.templates'] && service.card_mode === 'html'
-    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || layer]).then(el => el.rows?.[0]?.body)
-    : null;
-
-  const html1 = htmlTemplate ? await handlebars.compile(htmlTemplate)(fullRow) : null;
-
-  const html = html1 || `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
-
-  const res = {
-    time: Date.now() - time,
-    id,
-    rows: fullRow,
-    columns,
-    template,
-    html,
-  };
-  if (service) {
-    res.cardInterface = cardInterface;
-  }
-
-  return res;
-}
+import {
+  pgClients, getTemplate, handlebars, metaFormat,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function mapFormat(req, reply) {
+  const { pg = pgClients.client, query = {}, user } = req;
+  const { layer, id } = query;
+  const time = Date.now();
+
+  if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
+
+  const service = await getTemplate('layer', layer) || (pg.tlist.includes('gis.services') ? await pg.query('SELECT * FROM gis.services WHERE service_id = $1', [layer]).then(res => res.rows[0]) : null);
+
+  const {
+    source_path: tname, cardInterface, card, template,
+  } = service;
+
+  const columns = (card || []).filter((col) => (user?.uid ? true : !col.is_admin));
+  if (!tname) return reply.status(404).send('missing source_path');
+
+  const pk = pg.pk?.[tname];
+  if (!pk) return reply.status(404).send('missing pk');
+
+  if (!columns) return reply.status(404).send('columns setting not found');
+
+  const columnNames = columns.map(col => col.name);
+  const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
+  const filteredColumns = columnNames.filter(name => !excluded.includes(name));
+
+  const rows = await pg.query(
+    `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
+    [id],
+  ).then(el => el.rows || []);
+
+  if (!rows.length) return reply.status(404).send('object not found');
+
+  const classifiers = columns
+    .filter(col => col.data && ['select', 'badge', 'tags'].includes(col.format))
+    .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+  await metaFormat({
+    rows, table: tname, cls: classifiers, sufix: false,
+  });
+  const fullRow = rows[0];
+
+  const result = [];
+  const filtered = columns.filter(col => !excluded.includes(col.name));
+  for (let i = 0; i < filtered.length; i += 1) {
+    const col = filtered[i];
+
+    const name = col.label || col.ua || col.name;
+    const value = (col.format === 'date' ? new Date(fullRow[col.name]).toLocaleDateString('uk-UA') : null) || fullRow[`${col.name}_data`]?.text
+      || fullRow[`${col.name}_text`]
+      || fullRow[col.name];
+
+    result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
+            <dt class="text-gray-900">${name}</dt>
+            <dd class="text-gray-700 sm:col-span-2">${value || '-'}</dd>
+        </div>`);
+  }
+
+  const htmlTemplate = pg?.pk?.['admin.templates'] && service.card_mode === 'html'
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || layer]).then(el => el.rows?.[0]?.body)
+    : null;
+
+  const html1 = htmlTemplate ? await handlebars.compile(htmlTemplate)(fullRow) : null;
+
+  const html = html1 || `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
+
+  const res = {
+    time: Date.now() - time,
+    id,
+    rows: fullRow,
+    columns,
+    template,
+    html,
+  };
+  if (service) {
+    res.cardInterface = cardInterface;
+  }
+
+  return res;
+}