@opengis/gis 0.2.18 → 0.2.20

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 });
+}

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

@@ -1,84 +1,84 @@
-import {
-  dataUpdate, getMeta, pgClients, yml2json, getTemplate,
-} 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 getServices({ params = {}, pg = pgClients.client }, reply) {
-  const t = await getTemplate('layer', params.id);
-  if (t) return t;
-  if (!pg.tlist.includes('gis.services')) return { status: 404, message: 'not found' };
-  const rows = await pg.query(`
-        SELECT 
-            service_id, service_key, name, description, keywords, category, holder, group_id, b.group_name, service_type, card_mode,
-            source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
-            popup, style, legend, card, srid, bbox::box2d as extent, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, is_active as enabled, is_public, is_active, is_downloadable, metadata, 
-            metadata_url, thumbnail_url, created_by, updated_by, updated_at, created_at, template 
-        FROM gis.services a
-        left join lateral (select group_name from gis.group_list where group_id=a.group_id)b on 1=1
-        where ${params.id ? 'service_id=$1' : '1=1'}
-    `, [params.id].filter(Boolean)).then(el => el.rows || []);
-
-  if (params.id && !rows.length) {
-    return reply.status(404).send('service 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 || {}) : {};
-
-  if (params.id) {
-    const html = await pg.query('select body from admin.templates where template_id=$1', [params.id]).then(el => el.rows?.[0]?.body);
-    Object.assign(rows[0], { html });
-  }
-
-  rows.filter(row => row.source_path).forEach(row => {
-    Object.assign(row, { count: totals[row.source_path] || 0 });
-  });
-
-  const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
-
-  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-  const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
-
-  const centers = noCenterIds.length ? await pg.query('SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)', [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
-  await Promise.all(rows.filter(row => centers[row.service_id]).map(async (row) => {
-    // console.log('update service center', row.service_id, JSON.stringify(centers[row.service_id]));
-    await dataUpdate({
-      pg, id: row.service_id, table: 'gis.services', data: { center: centers[row.service_id] },
-    });
-    Object.assign(row, { center: centers[row.service_id] });
-  }));
-
-  rows.forEach(row => Object.assign(row, {
-    center: row.center?.coordinates,
-    style: row.style ? yml2json(row.style) : undefined,
-  }));
-  rows.filter(row => row.extent).forEach(row => Object.assign(row, {
-    extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
-      ?.replace?.(/ /g, ',')
-      ?.split?.(','),
-  }));
-
-  rows.filter(row => row.filters).forEach(row => Object.assign(row, {
-    filters: row.filters.map(filter => ({ ...filter, api: `/api/suggest/${row.source_path}:${filter.name}${filter.data && filter.name !== filter.data ? `?sel=${filter.data}` : ''}` })),
-  }));
-
-  if (params.id) {
-    return reply.status(200).send({ ...rows[0], fields });
-  }
-
-  return reply.status(200).send({
-    rows,
-    fields,
-  });
-}
+import {
+  dataUpdate, getMeta, pgClients, yml2json, getTemplate,
+} 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 getServices({ params = {}, pg = pgClients.client }, reply) {
+  const t = await getTemplate('layer', params.id);
+  if (t) return t;
+  if (!pg.tlist.includes('gis.services')) return { status: 404, message: 'not found' };
+  const rows = await pg.query(`
+        SELECT 
+            service_id, service_key, name, description, keywords, category, holder, group_id, b.group_name, service_type, card_mode,
+            source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
+            popup, style, legend, card, srid, bbox::box2d as extent, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, is_active as enabled, is_public, is_active, is_downloadable, metadata, 
+            metadata_url, thumbnail_url, created_by, updated_by, updated_at, created_at, template 
+        FROM gis.services a
+        left join lateral (select group_name from gis.group_list where group_id=a.group_id)b on 1=1
+        where ${params.id ? 'service_id=$1' : '1=1'}
+    `, [params.id].filter(Boolean)).then(el => el.rows || []);
+
+  if (params.id && !rows.length) {
+    return reply.status(404).send('service 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 || {}) : {};
+
+  if (params.id) {
+    const html = await pg.query('select body from admin.templates where template_id=$1', [params.id]).then(el => el.rows?.[0]?.body);
+    Object.assign(rows[0], { html });
+  }
+
+  rows.filter(row => row.source_path).forEach(row => {
+    Object.assign(row, { count: totals[row.source_path] || 0 });
+  });
+
+  const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
+
+  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+  const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
+
+  const centers = noCenterIds.length ? await pg.query('SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)', [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
+  await Promise.all(rows.filter(row => centers[row.service_id]).map(async (row) => {
+    // console.log('update service center', row.service_id, JSON.stringify(centers[row.service_id]));
+    await dataUpdate({
+      pg, id: row.service_id, table: 'gis.services', data: { center: centers[row.service_id] },
+    });
+    Object.assign(row, { center: centers[row.service_id] });
+  }));
+
+  rows.forEach(row => Object.assign(row, {
+    center: row.center?.coordinates,
+    style: row.style ? yml2json(row.style) : undefined,
+  }));
+  rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+    extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+      ?.replace?.(/ /g, ',')
+      ?.split?.(','),
+  }));
+
+  rows.filter(row => row.filters).forEach(row => Object.assign(row, {
+    filters: row.filters.map(filter => ({ ...filter, api: `/api/suggest/${row.source_path}:${filter.name}${filter.data && filter.name !== filter.data ? `?sel=${filter.data}` : ''}` })),
+  }));
+
+  if (params.id) {
+    return reply.status(200).send({ ...rows[0], fields });
+  }
+
+  return reply.status(200).send({
+    rows,
+    fields,
+  });
+}

package/server/routes/gis/services/legend.auto.js

@@ -1,78 +1,78 @@
-import { dataUpdate, getMeta, getSelectVal, yml2json } from "@opengis/fastify-table/utils.js";
-
-export default async function legendAuto({ params = {}, query = {}, user = {}, pg = pgClients.client }, reply) {
-    if (!params.id) {
-        return reply.status(400).send({ error: "not enough params: id", code: 400 });
-    }
-
-    const service = await pg.query(`SELECT source_path as table, style, legend as dblegend FROM gis.services where service_id=$1`, [params.id]).then(el => el.rows?.[0]);
-
-    if (!service) {
-        return reply.status(404).send({ error: "Service not found", code: 404 });
-    }
-
-    const { style, dblegend, table } = service;
-
-    if (!table) {
-        return reply.status(400).send({ error: "service table not specified", code: 400 });
-    }
-
-    if (dblegend && !query.nocache) {
-        return reply.status(400).send({ error: "legend already exists", code: 400 });
-    }
-
-    if (!style) {
-        return reply.status(400).send({ error: "empty service style", code: 400 });
-    }
-
-    const { colorAttr, iconAttr } = yml2json(style);
-
-    if (!colorAttr && !iconAttr) {
-        return reply.status(400).send({ error: "colorAttr / iconAttr not specified", code: 400 });
-    }
-
-    const { columns = [] } = await getMeta({ pg, table });
-
-    const attr = columns.find(col => col.name === (colorAttr || iconAttr));
-
-    if (!attr?.name) {
-        return reply.status(404).send({ error: "attribute column not found", code: 404 });
-    }
-
-    const values = await pg.query(`select array_agg(distinct "${attr.name}") from ${table}`).then(el => el.rows?.[0]?.array_agg || []);
-    const arr = await getSelectVal({ pg, name: `${table}.${attr.name}`, table, values, ar: true });
-
-    const colors = {
-        1: "#FFCF1F1F",
-        2: "#FF1FCF2D",
-        3: "#FF1F77CF"
-    };
-
-    const colorKeys = Object.keys(colors).map(Number);
-
-    const legend = arr
-        ? arr.map((el, idx) => ({
-            name: el.id,
-            label: el.text,
-            icon: iconAttr ? el.icon : undefined,
-            color: colorAttr ? (el.color || colors[colorKeys[idx % colorKeys.length]]) : undefined,
-        }))
-        : values.map((el, idx) => ({
-            name: el,
-            label: el,
-            icon: undefined,
-            color: colorAttr ? (colors[colorKeys[idx % colorKeys.length]]) : undefined,
-        }));
-
-    const res = await dataUpdate({
-        pg,
-        table: 'gis.services',
-        id: params.id,
-        data: {
-            legend
-        },
-        uid: user.uid,
-    });
-
-    return reply.status(200).send(res);
+import { dataUpdate, getMeta, getSelectVal, yml2json } from "@opengis/fastify-table/utils.js";
+
+export default async function legendAuto({ params = {}, query = {}, user = {}, pg = pgClients.client }, reply) {
+    if (!params.id) {
+        return reply.status(400).send({ error: "not enough params: id", code: 400 });
+    }
+
+    const service = await pg.query(`SELECT source_path as table, style, legend as dblegend FROM gis.services where service_id=$1`, [params.id]).then(el => el.rows?.[0]);
+
+    if (!service) {
+        return reply.status(404).send({ error: "Service not found", code: 404 });
+    }
+
+    const { style, dblegend, table } = service;
+
+    if (!table) {
+        return reply.status(400).send({ error: "service table not specified", code: 400 });
+    }
+
+    if (dblegend && !query.nocache) {
+        return reply.status(400).send({ error: "legend already exists", code: 400 });
+    }
+
+    if (!style) {
+        return reply.status(400).send({ error: "empty service style", code: 400 });
+    }
+
+    const { colorAttr, iconAttr } = yml2json(style);
+
+    if (!colorAttr && !iconAttr) {
+        return reply.status(400).send({ error: "colorAttr / iconAttr not specified", code: 400 });
+    }
+
+    const { columns = [] } = await getMeta({ pg, table });
+
+    const attr = columns.find(col => col.name === (colorAttr || iconAttr));
+
+    if (!attr?.name) {
+        return reply.status(404).send({ error: "attribute column not found", code: 404 });
+    }
+
+    const values = await pg.query(`select array_agg(distinct "${attr.name}") from ${table}`).then(el => el.rows?.[0]?.array_agg || []);
+    const arr = await getSelectVal({ pg, name: `${table}.${attr.name}`, table, values, ar: true });
+
+    const colors = {
+        1: "#FFCF1F1F",
+        2: "#FF1FCF2D",
+        3: "#FF1F77CF"
+    };
+
+    const colorKeys = Object.keys(colors).map(Number);
+
+    const legend = arr
+        ? arr.map((el, idx) => ({
+            name: el.id,
+            label: el.text,
+            icon: iconAttr ? el.icon : undefined,
+            color: colorAttr ? (el.color || colors[colorKeys[idx % colorKeys.length]]) : undefined,
+        }))
+        : values.map((el, idx) => ({
+            name: el,
+            label: el,
+            icon: undefined,
+            color: colorAttr ? (colors[colorKeys[idx % colorKeys.length]]) : undefined,
+        }));
+
+    const res = await dataUpdate({
+        pg,
+        table: 'gis.services',
+        id: params.id,
+        data: {
+            legend
+        },
+        uid: user.uid,
+    });
+
+    return reply.status(200).send(res);
 }