@opengis/gis 0.2.174 → 0.2.176

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

@@ -1,89 +1,89 @@
-import { NotFoundError } from '@opengis/fastify-table/errors.js';
-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({ id }, pg = pgClients.client) {
-  const t = await getTemplate('layer', id);
-  if (t) return t;
-
-  if (!pg.tlist.includes('gis.services')) {
-    throw NotFoundError('table 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 ${id ? 'service_id=$1' : '1=1'}
-    `, [id].filter(Boolean)).then(r => r.rows || []);
-
-  if (id && !rows.length) {
-    throw NotFoundError('service not found');
-  }
-
-  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
-    .then(r => r.rows?.[0]?.json_object_agg || {}) : {};
-
-  if (id) {
-    const html = await pg.query('select body from admin.templates where template_id=$1', [id]).then(r => r.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 = rows[0].source_path ? await getMeta({ pg, table: rows[0].source_path }).then(r => r?.columns || []) : [];
-
-  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(r => r.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 (id) {
-    return { ...rows[0], fields };
-  }
-
-  return {
-    rows,
-    fields,
-  };
-}
+import { NotFoundError } from '@opengis/fastify-table/errors.js';
+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({ id }, pg = pgClients.client) {
+  const t = await getTemplate('layer', id);
+  if (t) return t;
+
+  if (!pg.tlist.includes('gis.services')) {
+    throw NotFoundError('table 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 ${id ? 'service_id=$1' : '1=1'}
+    `, [id].filter(Boolean)).then(r => r.rows || []);
+
+  if (id && !rows.length) {
+    throw NotFoundError('service not found');
+  }
+
+  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
+    .then(r => r.rows?.[0]?.json_object_agg || {}) : {};
+
+  if (id) {
+    const html = await pg.query('select body from admin.templates where template_id=$1', [id]).then(r => r.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 = rows[0].source_path ? await getMeta({ pg, table: rows[0].source_path }).then(r => r?.columns || []) : [];
+
+  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(r => r.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 (id) {
+    return { ...rows[0], fields };
+  }
+
+  return {
+    rows,
+    fields,
+  };
+}

package/server/routes/services/functions/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);
 }

package/server/routes/services/services.route.js

@@ -1,76 +1,76 @@
-// import getLayerGeom from './functions/get.layer.geom.js';
-import getServices from './functions/get.services.js';
-import getServiceUsers from './functions/get.service.users.js';
-import deleteService from './functions/del.service.js';
-import addService from './functions/add.service.js';
-import getServicesCol from './functions/get.services.col.js';
-// import legendAuto from './functions/legend.auto.js';
-import createRoute from './functions/create.route.js';
-
-import {
-    getServicesSchema,
-    getServicesColSchema,
-    addServiceSchema,
-    editServiceSchema,
-    deleteServiceSchema,
-    getServiceUsersSchema,
-    createRouteSchema,
-} from './services.schema.js';
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-    app.get('/gis-service/:id?', { ...publicParams, schema: getServicesSchema }, async ({ params, pg }) => {
-        const result = await getServices({
-            id: params.id,
-        }, pg);
-        return result;
-    });
-    app.get('/gis-service/:id/:col', { ...publicParams, schema: getServicesColSchema }, async ({ params, pg }) => {
-        const result = await getServicesCol({
-            id: params.id,
-            column: params.col,
-        }, pg);
-        return result;
-    });
-    app.post('/gis-service/:id?', { ...publicParams, schema: addServiceSchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addService({
-            method,
-            id: params.id,
-            body,
-            uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.put('/gis-service/:id', { ...publicParams, schema: editServiceSchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addService({
-            method,
-            id: params.id,
-            body,
-            uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.delete('/gis-service/:id', { ...publicParams, schema: deleteServiceSchema }, async ({ params, user, pg }) => {
-        const result = await deleteService({
-            id: params.id,
-            uid: user?.uid
-        }, pg);
-        return result;
-    });
-    // app.get('/legend-auto/:id', { ...publicParams, schema: legendAutoSchema }, legendAuto);
-    app.get('/gis-service-users/:id', { ...publicParams, schema: getServiceUsersSchema }, async ({ params, query, pg }) => {
-        const result = await getServiceUsers({
-            id: params.id,
-            search: query.search,
-            limit: query.limit,
-            offset: query.offset,
-        }, pg);
-        return result;
-    });
-    app.get('/routes', { ...publicParams, schema: createRouteSchema }, async ({ query }) => {
-        const { from, to, via, mode, alternatives, steps, optimize, surface, weight } = query;
-        const result = await createRoute({ from, to, via, mode, alternatives, steps, optimize, surface, weight });
-        return result;
-    });
-}
-export default route;
+// import getLayerGeom from './functions/get.layer.geom.js';
+import getServices from './functions/get.services.js';
+import getServiceUsers from './functions/get.service.users.js';
+import deleteService from './functions/del.service.js';
+import addService from './functions/add.service.js';
+import getServicesCol from './functions/get.services.col.js';
+// import legendAuto from './functions/legend.auto.js';
+import createRoute from './functions/create.route.js';
+
+import {
+    getServicesSchema,
+    getServicesColSchema,
+    addServiceSchema,
+    editServiceSchema,
+    deleteServiceSchema,
+    getServiceUsersSchema,
+    createRouteSchema,
+} from './services.schema.js';
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-service/:id?', { ...publicParams, schema: getServicesSchema }, async ({ params, pg }) => {
+        const result = await getServices({
+            id: params.id,
+        }, pg);
+        return result;
+    });
+    app.get('/gis-service/:id/:col', { ...publicParams, schema: getServicesColSchema }, async ({ params, pg }) => {
+        const result = await getServicesCol({
+            id: params.id,
+            column: params.col,
+        }, pg);
+        return result;
+    });
+    app.post('/gis-service/:id?', { ...publicParams, schema: addServiceSchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addService({
+            method,
+            id: params.id,
+            body,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.put('/gis-service/:id', { ...publicParams, schema: editServiceSchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addService({
+            method,
+            id: params.id,
+            body,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.delete('/gis-service/:id', { ...publicParams, schema: deleteServiceSchema }, async ({ params, user, pg }) => {
+        const result = await deleteService({
+            id: params.id,
+            uid: user?.uid
+        }, pg);
+        return result;
+    });
+    // app.get('/legend-auto/:id', { ...publicParams, schema: legendAutoSchema }, legendAuto);
+    app.get('/gis-service-users/:id', { ...publicParams, schema: getServiceUsersSchema }, async ({ params, query, pg }) => {
+        const result = await getServiceUsers({
+            id: params.id,
+            search: query.search,
+            limit: query.limit,
+            offset: query.offset,
+        }, pg);
+        return result;
+    });
+    app.get('/routes', { ...publicParams, schema: createRouteSchema }, async ({ query }) => {
+        const { from, to, via, mode, alternatives, steps, optimize, surface, weight } = query;
+        const result = await createRoute({ from, to, via, mode, alternatives, steps, optimize, surface, weight });
+        return result;
+    });
+}
+export default route;