@opengis/gis 0.2.28 → 0.2.29

package/server/routes/gis/registers/insert.filters.js

@@ -1,110 +1,110 @@
-import { getToken } from '@opengis/fastify-table/utils.js';
-
-/**
- * Автозаповнення фільтрів Реєстру
- *
- * @method put
- * @summary Автозаповнення фільтрів Реєстру
- * @alias createDatasetFromApplicationApi
- * @type api
- * @tag dataset
- * @param   {String} token - токен Реєстру
- * @returns {Number} status - номер помилки
- * @returns {String} error - опис помилки
- * @returns {String} message - повідомлення про успішне виконання і передача певних даних
- * @returns {String} headers - заголовки HTTP
- */
-export default async function insertFilters(req,reply) {
-  const {
-    pg, user, params,
-  } =req;
-  const token = params.token ;
-  if (!token) return { message: 'empty token', status: 400 };
-  try {
-
-    const tokenData = await getToken({ token, uid: user?.uid });
-    if (!tokenData) return reply.code(400).send({ message: 'access restricted', status: 400 });
-
-    const { id, type } = JSON.parse(tokenData) || {};
-
-    if (!id||!type) return reply.code(403).send({ message: 'access restricted', status: 403 });
-    if (!['services','registers'].includes(type)) return reply.code(403).send({ message: 'invalid type', status: 403 });
-
-    const tableColumn =  (type === 'registers') ? 'table_name':'source_path';
-    const pk = (type === 'registers')?'register_id':'service_id';
-
-
-    const select = `update gis.${type} set filters=
-        (select
-          jsonb_agg(row_to_json(q)) as filter_list
-          from
-          (select 
-            q.column_name as id,
-            case 
-              when q.column_name='editor_id' and comment is null then 'Хто редагував'
-              when q.column_name ilike '%geom%' and comment is null then 'Геометрія'
-              when q.column_name='editor_date' and comment is null then 'Дата редагування'
-              when q.column_name='image' and comment is null then 'Зображення'
-              when q.column_name='file' and comment is null then 'Файл'
-               when q.column_name='files' and comment is null then 'Файли'
-              else comment
-            end as label, 
-            case 
-              when q.data_type in ('text','character varying','integer','numeric','double precision') then 'Text'
-              when q.data_type ='ARRAY' then 'Tags'
-              when q.data_type ='boolean' then 'Switcher'
-              when q.data_type in ('date','timestamp without time zone') then 'Date'
-              --else q.data_type
-            end as type,
-            '' as data,
-            false as disabled
-          from 
-            (
-              select 
-                column_name, 
-                data_type, 
-                table_schema || '.' || table_name as table_name 
-              from 
-                (
-                  select 
-                    distinct table_name, 
-                    table_schema, 
-                    column_name, 
-                    data_type
-                  from 
-                    information_schema.columns
-                ) q
-            ) q 
-          
-            left join lateral (
-               SELECT
-                  pgd.description AS comment,
-                   pgns.nspname||'.'||pgc.relname AS table_name,
-                  pg_attribute.attname AS column_name
-                  
-                  FROM
-                  pg_catalog.pg_description pgd
-                  JOIN pg_catalog.pg_class pgc ON pgd.objoid = pgc.oid
-                  JOIN pg_catalog.pg_namespace pgns ON pgc.relnamespace = pgns.oid
-                  JOIN pg_catalog.pg_attribute pg_attribute ON pgc.oid = pg_attribute.attrelid
-                  AND pg_attribute.attnum = pgd.objsubid
-            )b on b.column_name=q.column_name and b.table_name=q.table_name
-          where 
-            q.table_name = (
-              select 
-                ${tableColumn} 
-              from 
-                gis.${type} 
-              where
-               ${pk} = '${id}'
-            ) and q.column_name not in ('cdate','uid','geom') and q.data_type not in ('json','USER-DEFINED'))q
-        )
-        where ${pk} = '${id}'
-        `;
-    await pg.one(select);
-
-    return { message: 'Фільтри заповнені упішно', status: 200 };
-  } catch (err) {
-    return reply.code(500).send({ message: err.message, status: 500 });
-  }
-}
+import { getToken } from '@opengis/fastify-table/utils.js';
+
+/**
+ * Автозаповнення фільтрів Реєстру
+ *
+ * @method put
+ * @summary Автозаповнення фільтрів Реєстру
+ * @alias createDatasetFromApplicationApi
+ * @type api
+ * @tag dataset
+ * @param   {String} token - токен Реєстру
+ * @returns {Number} status - номер помилки
+ * @returns {String} error - опис помилки
+ * @returns {String} message - повідомлення про успішне виконання і передача певних даних
+ * @returns {String} headers - заголовки HTTP
+ */
+export default async function insertFilters(req,reply) {
+  const {
+    pg, user, params,
+  } =req;
+  const token = params.token ;
+  if (!token) return { message: 'empty token', status: 400 };
+  try {
+
+    const tokenData = await getToken({ token, uid: user?.uid });
+    if (!tokenData) return reply.code(400).send({ message: 'access restricted', status: 400 });
+
+    const { id, type } = JSON.parse(tokenData) || {};
+
+    if (!id||!type) return reply.code(403).send({ message: 'access restricted', status: 403 });
+    if (!['services','registers'].includes(type)) return reply.code(403).send({ message: 'invalid type', status: 403 });
+
+    const tableColumn =  (type === 'registers') ? 'table_name':'source_path';
+    const pk = (type === 'registers')?'register_id':'service_id';
+
+
+    const select = `update gis.${type} set filters=
+        (select
+          jsonb_agg(row_to_json(q)) as filter_list
+          from
+          (select 
+            q.column_name as id,
+            case 
+              when q.column_name='editor_id' and comment is null then 'Хто редагував'
+              when q.column_name ilike '%geom%' and comment is null then 'Геометрія'
+              when q.column_name='editor_date' and comment is null then 'Дата редагування'
+              when q.column_name='image' and comment is null then 'Зображення'
+              when q.column_name='file' and comment is null then 'Файл'
+               when q.column_name='files' and comment is null then 'Файли'
+              else comment
+            end as label, 
+            case 
+              when q.data_type in ('text','character varying','integer','numeric','double precision') then 'Text'
+              when q.data_type ='ARRAY' then 'Tags'
+              when q.data_type ='boolean' then 'Switcher'
+              when q.data_type in ('date','timestamp without time zone') then 'Date'
+              --else q.data_type
+            end as type,
+            '' as data,
+            false as disabled
+          from 
+            (
+              select 
+                column_name, 
+                data_type, 
+                table_schema || '.' || table_name as table_name 
+              from 
+                (
+                  select 
+                    distinct table_name, 
+                    table_schema, 
+                    column_name, 
+                    data_type
+                  from 
+                    information_schema.columns
+                ) q
+            ) q 
+          
+            left join lateral (
+               SELECT
+                  pgd.description AS comment,
+                   pgns.nspname||'.'||pgc.relname AS table_name,
+                  pg_attribute.attname AS column_name
+                  
+                  FROM
+                  pg_catalog.pg_description pgd
+                  JOIN pg_catalog.pg_class pgc ON pgd.objoid = pgc.oid
+                  JOIN pg_catalog.pg_namespace pgns ON pgc.relnamespace = pgns.oid
+                  JOIN pg_catalog.pg_attribute pg_attribute ON pgc.oid = pg_attribute.attrelid
+                  AND pg_attribute.attnum = pgd.objsubid
+            )b on b.column_name=q.column_name and b.table_name=q.table_name
+          where 
+            q.table_name = (
+              select 
+                ${tableColumn} 
+              from 
+                gis.${type} 
+              where
+               ${pk} = '${id}'
+            ) and q.column_name not in ('cdate','uid','geom') and q.data_type not in ('json','USER-DEFINED'))q
+        )
+        where ${pk} = '${id}'
+        `;
+    await pg.one(select);
+
+    return { message: 'Фільтри заповнені упішно', status: 200 };
+  } catch (err) {
+    return reply.code(500).send({ message: err.message, status: 500 });
+  }
+}

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

@@ -1,79 +1,79 @@
-import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
-import { attachClassifiers } from './funcs/classifiers.js';
-const pg = pgClients.client;
-
-export default async function mapRegistry(req,reply) {
-const { params = {}, query = {} } = req;
-    const { slug, id } = params;
-    const { filter, page = 1 } = query;
-
-    if (!slug || !id) return reply.code(404).send({ message: 'Params slug and id is required', status: 404 });
-
-    const mapTemplate = await getTemplate('map', slug);
-    if (!mapTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
-
-    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
-    if (!listWidget) return reply.code(404).send({ message: 'List widget not found', status: 404 });
-
-    const {
-        table,
-        pk,
-        query: baseQuery = '1=1',
-        order,
-        config = {},
-        name = '',
-    } = listWidget;
-
-    const { columns = [], filters = [], limit: configLimit = 20 } = config;
-    const limit = query.limit || configLimit;
-    const offset = limit * (page - 1);
-    const selectColumns = columns.map(col => col.name);
-
-    const classifiers = columns
-        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
-        .map(col => ({ name: col.name, classifier: col.data }));
-
-
-    const { q: sqlFilter } = filter
-        ? await getFilterSQL({ table, filter, json: 1 })
-        : { q: '1=1' };
-
-    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
-    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
-
-    const sqlBase = `FROM ${table} ${whereClause}`;
-    const sqlOrder = order ? `ORDER BY ${order}` : "";
-    const sqlLimit = `LIMIT $1 OFFSET $2`;
-    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
-    ${sqlBase}`;
-    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
-    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
-
-    const [dataRes, countRes] = await Promise.all([
-        pg.query(dataQuery, [limit, offset]),
-        pg.query(totalQuery)
-    ]);
-
-    const rows = await attachClassifiers(dataRes?.rows, classifiers);
-    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
-
-    const listViewConfig = {};
-    columns.forEach(col => {
-        if (col.view_type === 'title') listViewConfig.title = col?.name;
-        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
-    });
-
-    return {
-        name,
-        rows,
-        total,
-        columns,
-        filters,
-        config: {
-            ...listWidget,
-            list: {
-                ...listViewConfig
-            }
-        }
-    };
-}
+import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
+import { attachClassifiers } from './funcs/classifiers.js';
+const pg = pgClients.client;
+
+export default async function mapRegistry(req,reply) {
+const { params = {}, query = {} } = req;
+    const { slug, id } = params;
+    const { filter, page = 1 } = query;
+
+    if (!slug || !id) return reply.code(404).send({ message: 'Params slug and id is required', status: 404 });
+
+    const mapTemplate = await getTemplate('map', slug);
+    if (!mapTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
+
+    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
+    if (!listWidget) return reply.code(404).send({ message: 'List widget not found', status: 404 });
+
+    const {
+        table,
+        pk,
+        query: baseQuery = '1=1',
+        order,
+        config = {},
+        name = '',
+    } = listWidget;
+
+    const { columns = [], filters = [], limit: configLimit = 20 } = config;
+    const limit = query.limit || configLimit;
+    const offset = limit * (page - 1);
+    const selectColumns = columns.map(col => col.name);
+
+    const classifiers = columns
+        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
+        .map(col => ({ name: col.name, classifier: col.data }));
+
+
+    const { q: sqlFilter } = filter
+        ? await getFilterSQL({ table, filter, json: 1 })
+        : { q: '1=1' };
+
+    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
+    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
+
+    const sqlBase = `FROM ${table} ${whereClause}`;
+    const sqlOrder = order ? `ORDER BY ${order}` : "";
+    const sqlLimit = `LIMIT $1 OFFSET $2`;
+    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
+    ${sqlBase}`;
+    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
+    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
+
+    const [dataRes, countRes] = await Promise.all([
+        pg.query(dataQuery, [limit, offset]),
+        pg.query(totalQuery)
+    ]);
+
+    const rows = await attachClassifiers(dataRes?.rows, classifiers);
+    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
+
+    const listViewConfig = {};
+    columns.forEach(col => {
+        if (col.view_type === 'title') listViewConfig.title = col?.name;
+        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
+    });
+
+    return {
+        name,
+        rows,
+        total,
+        columns,
+        filters,
+        config: {
+            ...listWidget,
+            list: {
+                ...listViewConfig
+            }
+        }
+    };
+}

package/server/routes/gis/services/add.service.js

@@ -1,65 +1,65 @@
-import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-
-async function updateTemplate(client, body, uid, id) {
-    if (!body || !id) return;
-
-    await dataDelete({
-        pg: client,
-        id,
-        table: 'admin.templates',
-        uid,
-    });
-    const rowCount = await dataInsert({
-        pg: client,
-        id,
-        table: 'admin.templates',
-        data: { body, name: id },
-        uid,
-    }).then(el => el.rowCount);
-    return rowCount;
-}
-export default async function addService({
-    method, params = {}, body, pg = pgClients.client, user = {},
-}, reply) {
-    if (method === 'PUT' && !params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    const { uid = '0' } = user;
-
-    const client = await pg.connect();
-    try {
-        await client.query('begin');
-
-        if (method === 'POST') {
-            const { rows = [] } = await dataInsert({
-                pg: client,
-                id: params.id,
-                table: 'gis.services',
-                data: body,
-                uid,
-            });
-            const istemplate = await updateTemplate(client, body.html, uid, rows[0]?.service_id);
-            await client.query('commit');
-            return reply.status(200).send(rows[0]);
-        }
-
-
-        const row = await dataUpdate({
-            pg: client,
-            id: params.id,
-            table: 'gis.services',
-            data: body,
-            uid,
-        });
-        const istemplate = await updateTemplate(client, body.html, uid, params.id);
-        await client.query('commit');
-        return reply.status(200).send(row);
-
-    } catch (err) {
-        await client.query('rollback');
-        return reply.status(500).send(err.toString());
-    } finally {
-        client.release();
-    }
+import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+async function updateTemplate(client, body, uid, id) {
+    if (!body || !id) return;
+
+    await dataDelete({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        uid,
+    });
+    const rowCount = await dataInsert({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        data: { body, name: id },
+        uid,
+    }).then(el => el.rowCount);
+    return rowCount;
+}
+export default async function addService({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    if (method === 'PUT' && !params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    const { uid = '0' } = user;
+
+    const client = await pg.connect();
+    try {
+        await client.query('begin');
+
+        if (method === 'POST') {
+            const { rows = [] } = await dataInsert({
+                pg: client,
+                id: params.id,
+                table: 'gis.services',
+                data: body,
+                uid,
+            });
+            const istemplate = await updateTemplate(client, body.html, uid, rows[0]?.service_id);
+            await client.query('commit');
+            return reply.status(200).send(rows[0]);
+        }
+
+
+        const row = await dataUpdate({
+            pg: client,
+            id: params.id,
+            table: 'gis.services',
+            data: body,
+            uid,
+        });
+        const istemplate = await updateTemplate(client, body.html, uid, params.id);
+        await client.query('commit');
+        return reply.status(200).send(row);
+
+    } catch (err) {
+        await client.query('rollback');
+        return reply.status(500).send(err.toString());
+    } finally {
+        client.release();
+    }
 }

package/server/routes/gis/services/del.service.js

@@ -1,13 +1,13 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function deleteService({
-    params = {}, pg = pgClients.client, user = {},
-}, reply) {
-    const row = await dataDelete({
-        pg,
-        id: params.id,
-        table: 'gis.services',
-        uid: user?.uid,
-    });
-    return reply.status(200).send(row);
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function deleteService({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const row = await dataDelete({
+        pg,
+        id: params.id,
+        table: 'gis.services',
+        uid: user?.uid,
+    });
+    return reply.status(200).send(row);
 }

package/server/routes/gis/services/get.layer.geom.js

@@ -1,27 +1,27 @@
-export default async function getLayerGeom(req) {
-  const { pg, params, query } = req;
-
-  const { id } = params;
-  if (!id) return { message: 'id is empty', status: 403 };
-
-  const selectTable = `select source_path,geometry_column from gis.services where service_id='${id}'`;
-  const { source_path: table, geometry_column: geometryColumn = 'geom' } = await pg.one(selectTable);
-  if (!table) return;
-  const selectGeom = `
-    SELECT 'FeatureCollection' As type,
-                               json_agg(q) as features
-                        FROM (
-                                SELECT 'Feature' as type,
-                                     row_number() over() as id, st_asgeojson(
-                                    st_force2d(${geometryColumn}),
-                                        6,
-                                        0
-                                    ) :: json as geometry
-                              from ${table}
-                              where ${geometryColumn} is not null) q`;
-  if (query?.sql) return selectGeom;
-  const { rows } = await pg.query(selectGeom);
-
-  return { message: rows, status: 200 };
-
-}
+export default async function getLayerGeom(req) {
+  const { pg, params, query } = req;
+
+  const { id } = params;
+  if (!id) return { message: 'id is empty', status: 403 };
+
+  const selectTable = `select source_path,geometry_column from gis.services where service_id='${id}'`;
+  const { source_path: table, geometry_column: geometryColumn = 'geom' } = await pg.one(selectTable);
+  if (!table) return;
+  const selectGeom = `
+    SELECT 'FeatureCollection' As type,
+                               json_agg(q) as features
+                        FROM (
+                                SELECT 'Feature' as type,
+                                     row_number() over() as id, st_asgeojson(
+                                    st_force2d(${geometryColumn}),
+                                        6,
+                                        0
+                                    ) :: json as geometry
+                              from ${table}
+                              where ${geometryColumn} is not null) q`;
+  if (query?.sql) return selectGeom;
+  const { rows } = await pg.query(selectGeom);
+
+  return { message: rows, status: 200 };
+
+}

package/server/routes/gis/services/get.services.col.js

@@ -1,33 +1,33 @@
-import { metaFormat, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function getServicesCol({ params = {}, pg = pgClients.client }, reply) {
-  const row = await getTemplate('layer', params.id) || await pg.query(`
-           SELECT 
-               service_id, source_path, attributes
-           FROM gis.services where ${params.id ? 'service_id=$1' : '1=1'}
-       `, [params.id].filter(Boolean)).then(el => el.rows[0] || {});
-
-  if (!row.source_path) {
-    return reply.status(404).send({ code: 404, message: 'source not found' });
-  }
-
-  const fields = await pg.query(` SELECT *  FROM ${row.source_path} limit 0`).then(el => el.fields);
-  const field = fields.find(el => el.name === params.col);
-
-  if (!field) {
-    return reply.status(404).send({ message: { error: 'column not found', fields }, code: 404 });
-  }
-
-  const rows = await pg.query(`SELECT ${params.col}::text as id, ${params.col}, count(*) FROM ${row.source_path} 
-        where ${params.col} is not null group by ${params.col} order by count(*) desc limit 10`).then(el => el.rows || []);
-
-  const cls = row.attributes?.filter?.((col) => col.name && col.data && ['select', 'badge', 'tags'].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
-
-  await metaFormat({ rows, table: row.source_path, cls });
-
-  const rows1 = rows.map(row => ({
-    ...row[`${params.col}_data`], ...row, [`${params.col}_data`]: undefined, [params.col]: undefined,
-  }));
-
-  return reply.status(200).send({ rows: rows1, field, fields });
-}
+import { metaFormat, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function getServicesCol({ params = {}, pg = pgClients.client }, reply) {
+  const row = await getTemplate('layer', params.id) || await pg.query(`
+           SELECT 
+               service_id, source_path, attributes
+           FROM gis.services where ${params.id ? 'service_id=$1' : '1=1'}
+       `, [params.id].filter(Boolean)).then(el => el.rows[0] || {});
+
+  if (!row.source_path) {
+    return reply.status(404).send({ code: 404, message: 'source not found' });
+  }
+
+  const fields = await pg.query(` SELECT *  FROM ${row.source_path} limit 0`).then(el => el.fields);
+  const field = fields.find(el => el.name === params.col);
+
+  if (!field) {
+    return reply.status(404).send({ message: { error: 'column not found', fields }, code: 404 });
+  }
+
+  const rows = await pg.query(`SELECT ${params.col}::text as id, ${params.col}, count(*) FROM ${row.source_path} 
+        where ${params.col} is not null group by ${params.col} order by count(*) desc limit 10`).then(el => el.rows || []);
+
+  const cls = row.attributes?.filter?.((col) => col.name && col.data && ['select', 'badge', 'tags'].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
+
+  await metaFormat({ rows, table: row.source_path, cls });
+
+  const rows1 = rows.map(row => ({
+    ...row[`${params.col}_data`], ...row, [`${params.col}_data`]: undefined, [params.col]: undefined,
+  }));
+
+  return reply.status(200).send({ rows: rows1, field, fields });
+}