@opengis/gis 0.2.45 → 0.2.46

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

@@ -1,18 +1,152 @@
-export default async function addCartocss(req, reply) {
-  const { pg, body, params } = req;
-
-  const { id } = params;
-  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
-
-  const { config, style } = body;
-  if (!config && !style) return reply.status(400).send({ message: 'config, style is empty', status: 400 });
-
-  const selectCartocss = `select cartocss_id from gis.cartocss where cartocss_id=$1`;
-  const cartocss = await pg.one(selectCartocss, [id]);
-  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
-
-  const updateCartocss = `update gis.cartocss set config=$2::jsonb, style=$3::text where cartocss_id=$1`;
-  await pg.query(updateCartocss, [id, config, style]);
-
-  return reply.status(200).send({ message: 'cartocss updated', status: 200 });
-}
+import carto from 'carto';
+
+import { dataUpdate } from '@opengis/fastify-table/utils.js';
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { UploadXML } = mapnik();
+
+const srsList = {};
+
+const getGeomColumn = (geoms, customColumn) => {
+  if (customColumn && geoms.includes(customColumn)) {
+    return customColumn;
+  }
+  if (geoms.includes('geom')) {
+    return 'geom';
+  }
+  return geoms[0];
+};
+
+async function cartoBounds({ id, dataset }, pg) {
+  const sqlBounds = dataset.map(el => ({ tbl: el.table.split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}')`);
+
+  const geom = await pg.query(
+    `update gis.style set             
+      geom=(select st_extent(st_estimatedextent) from ( ${sqlBounds.join(' union all ')})q )
+      where style_id=$1 returning geom::box2d`,
+    [id],
+  ).then(e => e.rows?.[0]?.geom);
+
+  const bounds = geom
+    ? geom.replace(/[A-Z\)\(]+/g, '').split(/[ ,]+/).map(el => el - 0)
+    : null;
+
+  if (!bounds) {
+    throw new Error('empty bounds');
+  }
+
+  return bounds;
+}
+
+function cartoData(el, extent, pg) {
+  const minzoom = el.zoom ? (+el.zoom || 5) : 5;
+  const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
+  const view = `(select ${el.columns || '1'}, ${el.gcol} from ${el.table} where ${el.query || 'true'} ) as data`;
+  const layerBound = extent || [-180, -85, 180, 85];
+
+  return {
+    id: el.caption,
+    name: el.caption,
+    properties: { minzoom, maxzoom },
+    srs: el.proj4text || '+proj=longlat +datum=WGS84 +no_defs',
+    Datasource: {
+      simplify_geometries: true,
+      type: 'postgis',
+      extent: layerBound.join(','),
+      table: view,
+      geometry_field: el.gcol,
+      host: pg.options?.host || 'localhost',
+      dbname: pg.options?.database || 'postgres',
+      port: pg.options?.port || 5432,
+      user: pg.options?.user || 'postgres',
+      password: pg.options?.password || 'postgres',
+    },
+  };
+}
+
+async function uploadXML({ id, dataset, style }, pg) {
+  if (!id || !dataset?.length) {
+    return null;
+  }
+  await Promise.all(dataset.filter((el) => el.active !== false).map(async el => {
+    const { table } = el;
+
+    const geoms = await pg.query(`SELECT json_agg(attname) as geoms FROM pg_attribute
+      where attrelid = to_regclass($1::text)
+      and attnum > 0
+      AND NOT attisdropped
+      and atttypid::regtype::text ='geometry'`, [table]).then(e => e.rows?.[0]?.geoms || []);
+
+    const gcol = getGeomColumn(geoms, el.gcol);
+    Object.assign(el, { gcol });
+
+    const srid = el.srid ? el.srid
+      : await pg.query(`select st_srid(${gcol}) as srid from ${table} where ${gcol} is not null limit 1`).then(e => e.rows[0]?.srid);
+
+    if (srid && !srsList[srid] && (srid - 0 > 0)) {
+      srsList[srid] = await pg.query(`SELECT proj4text from spatial_ref_sys where srid=$1`, [srid])
+        .then(e => e.rows[0]?.proj4text);
+    }
+    Object.assign(el, { gcol, proj4text: srsList[srid] });
+  }));
+
+  const bounds = await cartoBounds({ id, dataset }, pg);
+
+  const arrayLayers = dataset.filter((el) => el.active !== false).map((el) => cartoData(el, bounds, pg));
+
+  const configJson = {
+    format: 'png',
+    Layer: arrayLayers.reverse(),
+    srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
+    bounds,
+    'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
+    center: [0, 0, 2],
+    minzoom: 1,
+    maxzoom: 25,
+    Stylesheet: [{
+      id: 'carto_css_style',
+      data: style || '',
+    }],
+  };
+
+  // generate
+  const res = new carto.Renderer().render(configJson);
+  const xmlFileText = typeof res === 'string' ? res : res?.data;
+  if (!xmlFileText) {
+    throw new Error('xml generation error');
+  }
+  const { status } = await UploadXML({
+    name: id,
+    xml: xmlFileText,
+  });
+  if (status !== 'success') {
+    throw new Error('xml upload error');
+  }
+  return xmlFileText;
+}
+
+export default async function addCartocss(req, reply) {
+  const { pg, body, params } = req;
+
+  const { id } = params;
+  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
+
+  const { config: dataset, style } = body;
+  if (!dataset && !style) return reply.status(400).send({ message: 'config, style is empty', status: 400 });
+
+  const selectCartocss = `select cartocss_id from gis.cartocss where cartocss_id=$1`;
+  const cartocss = await pg.one(selectCartocss, [id]);
+  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
+
+  await dataUpdate({
+    pg,
+    id,
+    table: 'gis.cartocss',
+    data: { config: dataset, style },
+    uid: req.user?.uid,
+  });
+
+  await uploadXML({ id, dataset, style }, pg);
+
+  return reply.status(200).send({ message: 'cartocss updated', status: 200 });
+}

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).catch(() => null);
-  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);
+}