@opengis/gis 0.2.32 → 0.2.33

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

@@ -1,12 +1,12 @@
-export default async function getCartocss(req, reply) {
-  const { pg, params } = req;
-
-  const { id } = params;
-  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
-
-  const selectCartocss = `select cartocss_key,name,description,config,style,group_id,is_public,enabled from gis.cartocss where cartocss_id='${id}'`;
-  const { cartocss } = await pg.one(selectCartocss);
-  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
-
-  return reply.status(200).send({ message: cartocss, status: 200 });
-}
+export default async function getCartocss(req, reply) {
+  const { pg, params } = req;
+
+  const { id } = params;
+  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
+
+  const selectCartocss = `select cartocss_key,name,description,config,style,group_id,is_public,enabled from gis.cartocss where cartocss_id='${id}'`;
+  const cartocss = await pg.one(selectCartocss).catch(() => null);
+  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
+
+  return reply.status(200).send({ message: cartocss, status: 200 });
+}

package/server/routes/gis/dashboard.js

@@ -1,29 +1,29 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getDashboard({ pg = pgClients.client }) {
-  try {
-    const statsQuery = `
-      SELECT
-        (SELECT COUNT(*)::int FROM gis.services) as services_count,
-        (SELECT COUNT(*)::int FROM gis.registers) as registers_count,
-        (SELECT COUNT(*)::int FROM gis.maps) as maps_count,
-        (SELECT COUNT(*)::int FROM gis.ogc_service) as ogc_count
-    `;
-
-    const result = await pg.query(statsQuery);
-    const stats = result?.rows?.[0] || {};
-
-    return {
-      cards: {
-        services: stats.services_count || 0,
-        registers: stats.registers_count || 0,
-        maps: stats.maps_count || 0,
-        ogc: stats.ogc_count || 0,
-      },
-    };
-  }
-  catch (error) {
-    console.error('Dashboard error:', error);
-    return { status: 500, error: 'Internal Server Error' };
-  }
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getDashboard({ pg = pgClients.client }) {
+  try {
+    const statsQuery = `
+      SELECT
+        (SELECT COUNT(*)::int FROM gis.services) as services_count,
+        (SELECT COUNT(*)::int FROM gis.registers) as registers_count,
+        (SELECT COUNT(*)::int FROM gis.maps) as maps_count,
+        (SELECT COUNT(*)::int FROM gis.ogc_service) as ogc_count
+    `;
+
+    const result = await pg.query(statsQuery);
+    const stats = result?.rows?.[0] || {};
+
+    return {
+      cards: {
+        services: stats.services_count || 0,
+        registers: stats.registers_count || 0,
+        maps: stats.maps_count || 0,
+        ogc: stats.ogc_count || 0,
+      },
+    };
+  }
+  catch (error) {
+    console.error('Dashboard error:', error);
+    return { status: 500, error: 'Internal Server Error' };
+  }
+}

package/server/routes/gis/index.mjs

@@ -1,73 +1,73 @@
-import insertColumns from './registers/insert.columns.js';
-import insertFilters from './registers/insert.filters.js';
-
-import metadataXML from './metadata/metadataXML.js';
-
-import getLayerGeom from './services/get.layer.geom.js';
-import gisRegistry from './registers/gis.registry.js';
-import gisRegistryList from './registers/gis.registry.list.js';
-import mapRegistry from './registers/map.registry.js';
-import gisExport from './registers/gis.export.js';
-
-import getServices from './services/get.services.js';
-import deleteService from './services/del.service.js';
-import addService from './services/add.service.js';
-
-import addGisRegistry from './registers/add.registry.js';
-import deleteGisRegistry from './registers/del.registry.js';
-import getServicesCol from './services/get.services.col.js';
-import legendAuto from './services/legend.auto.js';
-import mapInfoPoint from './ogc/map.info.point.js';
-import getDashboard from './dashboard.js';
-
-import getCartocss from './cartocss/get.cartocss.js';
-import addCartocss from './cartocss/add.cartocss.js';
-
-const mapInfoPointSchema = {
-  querystring: {
-    type: 'object',
-    properties: {
-      x: { type: 'number' },
-      y: { type: 'number' },
-      layers: { type: 'string' },
-      index: { type: 'number', minimum: 0 },
-    },
-    required: ['x', 'y', 'layers'],
-  },
-};
-
-const params = { config: { package: 'gis' } };
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-  app.put('/insert-columns/:token', params, insertColumns);
-  app.put('/insert-filters/:token', params, insertFilters);
-  app.get('/gis-registry/:slug', publicParams, gisRegistry);
-  app.get('/gis-registry/:slug/:objectId', publicParams, gisRegistry);
-  app.get('/gis-registry', publicParams, gisRegistryList);
-  app.post('/gis-registry', publicParams, addGisRegistry);
-  app.put('/gis-registry/:slug', publicParams, addGisRegistry);
-  app.delete('/gis-registry/:slug', publicParams, deleteGisRegistry);
-  app.get('/map-registry/:slug/:id', publicParams, mapRegistry);
-
-  app.get('/xml/:id', publicParams, metadataXML);
-
-  app.get('/get-layer-geom/:id', publicParams, getLayerGeom);
-
-  app.get('/gis-export/:type/:slug', publicParams, gisExport);
-
-  app.get('/gis-service/:id?', publicParams, getServices);
-  app.get('/gis-service/:id/:col', publicParams, getServicesCol);
-  app.post('/gis-service/:id?', publicParams, addService);
-  app.put('/gis-service/:id', publicParams, addService);
-  app.delete('/gis-service/:id', publicParams, deleteService);
-  app.get('/legend-auto/:id', publicParams, legendAuto);
-
-  app.get('/map-info-point', { ...publicParams, schema: mapInfoPointSchema }, mapInfoPoint);
-
-  app.get('/dashboard', publicParams, getDashboard);
-
-  app.get('/cartocss/:id', publicParams, getCartocss);
-  app.post('/cartocss/:id', publicParams, addCartocss);
-}
-export default route;
+import insertColumns from './registers/insert.columns.js';
+import insertFilters from './registers/insert.filters.js';
+
+import metadataXML from './metadata/metadataXML.js';
+
+import getLayerGeom from './services/get.layer.geom.js';
+import gisRegistry from './registers/gis.registry.js';
+import gisRegistryList from './registers/gis.registry.list.js';
+import mapRegistry from './registers/map.registry.js';
+import gisExport from './registers/gis.export.js';
+
+import getServices from './services/get.services.js';
+import deleteService from './services/del.service.js';
+import addService from './services/add.service.js';
+
+import addGisRegistry from './registers/add.registry.js';
+import deleteGisRegistry from './registers/del.registry.js';
+import getServicesCol from './services/get.services.col.js';
+import legendAuto from './services/legend.auto.js';
+import mapInfoPoint from './ogc/map.info.point.js';
+import getDashboard from './dashboard.js';
+
+import getCartocss from './cartocss/get.cartocss.js';
+import addCartocss from './cartocss/add.cartocss.js';
+
+const mapInfoPointSchema = {
+  querystring: {
+    type: 'object',
+    properties: {
+      x: { type: 'number' },
+      y: { type: 'number' },
+      layers: { type: 'string' },
+      index: { type: 'number', minimum: 0 },
+    },
+    required: ['x', 'y', 'layers'],
+  },
+};
+
+const params = { config: { package: 'gis' } };
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+  app.put('/insert-columns/:token', params, insertColumns);
+  app.put('/insert-filters/:token', params, insertFilters);
+  app.get('/gis-registry/:slug', publicParams, gisRegistry);
+  app.get('/gis-registry/:slug/:objectId', publicParams, gisRegistry);
+  app.get('/gis-registry', publicParams, gisRegistryList);
+  app.post('/gis-registry', publicParams, addGisRegistry);
+  app.put('/gis-registry/:slug', publicParams, addGisRegistry);
+  app.delete('/gis-registry/:slug', publicParams, deleteGisRegistry);
+  app.get('/map-registry/:slug/:id', publicParams, mapRegistry);
+
+  app.get('/xml/:id', publicParams, metadataXML);
+
+  app.get('/get-layer-geom/:id', publicParams, getLayerGeom);
+
+  app.get('/gis-export/:type/:slug', publicParams, gisExport);
+
+  app.get('/gis-service/:id?', publicParams, getServices);
+  app.get('/gis-service/:id/:col', publicParams, getServicesCol);
+  app.post('/gis-service/:id?', publicParams, addService);
+  app.put('/gis-service/:id', publicParams, addService);
+  app.delete('/gis-service/:id', publicParams, deleteService);
+  app.get('/legend-auto/:id', publicParams, legendAuto);
+
+  app.get('/map-info-point', { ...publicParams, schema: mapInfoPointSchema }, mapInfoPoint);
+
+  app.get('/dashboard', publicParams, getDashboard);
+
+  app.get('/cartocss/:id', publicParams, getCartocss);
+  app.post('/cartocss/:id', publicParams, addCartocss);
+}
+export default route;

package/server/routes/gis/metadata/metadataXML.js

@@ -1,13 +1,13 @@
-import {  handlebars, getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function insertColumns(req,reply) {
-  const { params} = req;
-  const { id } = params;
-
-  const pt = await getTemplate('templates','ISO19136_2017_gml_template');
-  const data = await handlebars.compile(pt)({ id: id });
-
-  return reply
-    .header('Content-Type', 'text/xml; charset=utf-8')
-    .send(data);
-}
+import {  handlebars, getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function insertColumns(req,reply) {
+  const { params} = req;
+  const { id } = params;
+
+  const pt = await getTemplate('templates','ISO19136_2017_gml_template');
+  const data = await handlebars.compile(pt)({ id: id });
+
+  return reply
+    .header('Content-Type', 'text/xml; charset=utf-8')
+    .send(data);
+}

package/server/routes/gis/ogc/map.info.point.js

@@ -1,124 +1,124 @@
-import {
-  pgClients, handlebars, getMeta, getTemplate, getFilterSQL,
-} 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 mapInfoPoint(req, reply) {
-  const { pg = pgClients.client, query = {} } = req;
-  const {
-    x, y, layers, index = 0,
-  } = query;
-  const time = Date.now();
-
-  if (!x || !y || !layers) {
-    return reply.status(400).send('not enough query params: x, y, layers are required');
-  }
-
-  const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query('select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)', [layers.split(',')]).then(el => el.rows || []) : [];
-
-  if (!rows.length) {
-    return reply.status(404).send('layers not found');
-  }
-
-  const point = `srid=4326;point(${x} ${y})`; // 30, 50
-
-  const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
-
-  await Promise.all(rows.map(async (layer, idx) => {
-    const { table_name: source, ogc_service_id: layerId } = 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 { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
-
-    const cls = columns
-      ?.filter(el => el.name && el.data)
-      ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    const pk = pg.pk?.[table] || loadTable?.key;
-
-    const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
-
-    Object.assign(layer, {
-      layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
-      table,
-      pk,
-      cls,
-      geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
-      optimizedSQL,
-      srid,
-      step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
-    });
-  }));
-
-  const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
-
-  const qList = unique.map((el) => ({
-    query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
-    row_to_json(t) as data, 
-    st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') as distance,
-    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
-    where 1=1`,
-    queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
-    /* where: `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`, */
-    where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`,
-  }));
-
-  const q = qList.map(el => `${el.query} and ${el.where}`).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
-
-  const qCount = qList.map(el => `${el.queryCount} and ${el.where}`).join(' union all ');
-
-  if (query.sql === '1') return q;
-  if (query.sql === '2') return qCount;
-
-  const count = await pg.query(qCount).then(el => el.rowCount);
-
-  const row = await pg.query(q).then(el => el.rows?.[0]);
-
-  if (!row) {
-    return reply.status(404).send('object not found');
-  }
-
-  const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
-  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-  const htmlTemplate = pg?.pk?.['admin.templates'] && row.layer && false
-    ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
-    : rows.find(el => el.ogc_service_id === row.layer)?.html;
-
-  const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
-
-  const res = {
-    time: Date.now() - time,
-    index,
-    count,
-    data: {
-      layer: row.layer,
-      geom: row.geom,
-      id: row.pk,
-      distance: row.distance,
-      data: row.data,
-    },
-    fields,
-    html,
-  };
-
-  return res;
-}
+import {
+  pgClients, handlebars, getMeta, getTemplate, getFilterSQL,
+} 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 mapInfoPoint(req, reply) {
+  const { pg = pgClients.client, query = {} } = req;
+  const {
+    x, y, layers, index = 0,
+  } = query;
+  const time = Date.now();
+
+  if (!x || !y || !layers) {
+    return reply.status(400).send('not enough query params: x, y, layers are required');
+  }
+
+  const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query('select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)', [layers.split(',')]).then(el => el.rows || []) : [];
+
+  if (!rows.length) {
+    return reply.status(404).send('layers not found');
+  }
+
+  const point = `srid=4326;point(${x} ${y})`; // 30, 50
+
+  const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
+
+  await Promise.all(rows.map(async (layer, idx) => {
+    const { table_name: source, ogc_service_id: layerId } = 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 { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
+
+    const cls = columns
+      ?.filter(el => el.name && el.data)
+      ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+    const pk = pg.pk?.[table] || loadTable?.key;
+
+    const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
+
+    Object.assign(layer, {
+      layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
+      table,
+      pk,
+      cls,
+      geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
+      optimizedSQL,
+      srid,
+      step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
+    });
+  }));
+
+  const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
+
+  const qList = unique.map((el) => ({
+    query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
+    row_to_json(t) as data, 
+    st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') as distance,
+    st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
+    where 1=1`,
+    queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
+    /* where: `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`, */
+    where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`,
+  }));
+
+  const q = qList.map(el => `${el.query} and ${el.where}`).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
+
+  const qCount = qList.map(el => `${el.queryCount} and ${el.where}`).join(' union all ');
+
+  if (query.sql === '1') return q;
+  if (query.sql === '2') return qCount;
+
+  const count = await pg.query(qCount).then(el => el.rowCount);
+
+  const row = await pg.query(q).then(el => el.rows?.[0]);
+
+  if (!row) {
+    return reply.status(404).send('object not found');
+  }
+
+  const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
+  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+  const htmlTemplate = pg?.pk?.['admin.templates'] && row.layer && false
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
+    : rows.find(el => el.ogc_service_id === row.layer)?.html;
+
+  const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
+
+  const res = {
+    time: Date.now() - time,
+    index,
+    count,
+    data: {
+      layer: row.layer,
+      geom: row.geom,
+      id: row.pk,
+      distance: row.distance,
+      data: row.data,
+    },
+    fields,
+    html,
+  };
+
+  return res;
+}

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

@@ -1,36 +1,36 @@
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function addGisRegistry({
-    method, params = {}, body, pg = pgClients.client, user = {},
-}, reply) {
-    if (method === 'POST') {
-
-        if (!body?.register_key) {
-            return reply.status(400).send('not enough body params: register_key');
-        }
-
-        const { rows = [] } = await dataInsert({
-            pg,
-            table: 'gis.registers',
-            data: body,
-            uid: user?.uid,
-        });
-        return reply.status(200).send(rows[0]);
-    }
-
-    if (!params.slug) {
-        return reply.status(400).send('not enough params: slug');
-    }
-
-    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
-
-    const row = await dataUpdate({
-        pg,
-        id,
-        table: 'gis.registers',
-        data: body,
-        uid: user?.uid,
-    });
-
-    return reply.status(200).send(row);
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function addGisRegistry({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    if (method === 'POST') {
+
+        if (!body?.register_key) {
+            return reply.status(400).send('not enough body params: register_key');
+        }
+
+        const { rows = [] } = await dataInsert({
+            pg,
+            table: 'gis.registers',
+            data: body,
+            uid: user?.uid,
+        });
+        return reply.status(200).send(rows[0]);
+    }
+
+    if (!params.slug) {
+        return reply.status(400).send('not enough params: slug');
+    }
+
+    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
+
+    const row = await dataUpdate({
+        pg,
+        id,
+        table: 'gis.registers',
+        data: body,
+        uid: user?.uid,
+    });
+
+    return reply.status(200).send(row);
 }

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

@@ -1,15 +1,15 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function deleteGisRegistry({
-    params = {}, pg = pgClients.client, user = {},
-}, reply) {
-    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
-
-    const row = await dataDelete({
-        pg,
-        id,
-        table: 'gis.registers',
-        uid: user?.uid,
-    });
-    return reply.status(200).send(row);
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function deleteGisRegistry({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const id = await pg.query('select register_id from gis.registers where register_key=$1', [params.slug]).then(el => el.rows?.[0]?.register_id) || params.slug;
+
+    const row = await dataDelete({
+        pg,
+        id,
+        table: 'gis.registers',
+        uid: user?.uid,
+    });
+    return reply.status(200).send(row);
 }