@opengis/gis 0.1.80 → 0.1.82

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

@@ -1,5 +1,23 @@
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
 
+async function updateTemplate(client, body, name, uid, id) {
+    if (!body || !name || !id) return;
+
+    await dataDelete({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        uid,
+    });
+    const rowCount = await dataInsert({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        data: { body, name },
+        uid,
+    }).then(el => el.rowCount);
+    return rowCount;
+}
 export default async function addService({
     method, params = {}, body, pg = pgClients.client, user = {},
 }, reply) {
@@ -7,24 +25,41 @@ export default async function addService({
         return reply.status(400).send('not enough params: id');
     }
 
-    if (method === 'POST') {
-        const { rows = [] } = await dataInsert({
-            pg,
+    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, body.template, 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: user?.uid,
+            uid,
         });
-        return reply.status(200).send(rows[0]);
-    }
+        const istemplate = await updateTemplate(client, body.html, body.template, uid, params.id);
+        await client.query('commit');
+        return reply.status(200).send(row);
 
-    const row = await dataUpdate({
-        pg,
-        id: params.id,
-        table: 'gis.services',
-        data: body,
-        uid: user?.uid,
-    });
-
-    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/get.services.js

@@ -1,4 +1,4 @@
-import { getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
+import { dataUpdate, getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
 
 const table = 'gis.services';
 
@@ -21,12 +21,33 @@ export default async function getServices({ params = {}, pg = pgClients.client }
         SELECT 
             service_id, service_key, name, description, keywords, category, holder, group_id, service_type, 
             source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
-            popup, style, legend, card, srid, 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 
+            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 where ${params.id ? 'service_id=$1' : '1=1'}
     `, [params.id].filter(Boolean)).then(el => el.rows || []);
 
+    if (params.id && rows[0]?.template) {
+        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 });
+    }
+
+    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, { style: row.style ? yml2json(row.style) : undefined }));
+    rows.forEach(row => Object.assign(row, { center: row.center?.coordinates }));
+    rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+        extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+            ?.replace?.(/ /g, ",")
+            ?.split?.(",")
+    }));
 
     if (params.id && !rows.length) {
         return reply.status(404).send('service not found');

package/server/routes/map/controllers/mapFormat.js

@@ -37,9 +37,9 @@ export default async function mapFormat(req, reply) {
         }
     }
 
-    let source_path, attributes, tpl, cardInterface;
+    let source_path, tpl, cardInterface, card, template;
     if (service) {
-        ({ source_path, attributes, interface: cardInterface } = service);
+        ({ source_path, interface: cardInterface, card, template } = service);
     } else {
         // git
         tpl = await getTemplate('map', map);
@@ -48,11 +48,12 @@ export default async function mapFormat(req, reply) {
             return reply.status(404).send('template not found');
         };
         source_path = matchedLayer.source_path;
-        attributes = matchedLayer.card;
+        card = matchedLayer.card;
+        template = matchedLayer.template;
 
     }
 
-    const columns = attributes;
+    const columns = card;
     if (!source_path) return reply.status(404).send('missing source_path');
 
     const pk = pg.pk?.[source_path];
@@ -102,13 +103,22 @@ export default async function mapFormat(req, reply) {
         </div>`);
     }
 
-    const html = `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
+    const htmlTemplate = pg?.pk?.['admin.template']
+        ? await pg.query('select body from admin.templates where name=$1 limit 1').then(el => el.rows?.[0]?.body)
+        : null;
+
+    const html1 = await handlebars.compile(htmlTemplate || 'template not found')(fullRow);
+
+    const html = template
+        ? html1
+        : `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
 
     const res = {
         time: Date.now() - time,
         id,
         rows: fullRow,
         columns,
+        template,
         html
     };
     if (service) {

package/server/routes/map/controllers/marker_icon.js

@@ -31,7 +31,8 @@ export default async function markerIconApi(req, reply) {
   const iconPath = path.join(fileIconDir, params?.data);
 
   if (fs.existsSync(iconPath)) {
-    return fs.createReadStream(iconPath);
+    const buffer = fs.readFileSync(iconPath); // works for small files same as stream, but also unit-test-friendly
+    return reply.type('image/png').send(buffer);
   }
 
   await downloadImage(`https://data.softpro.ua/api-user/marker/${params.data}`, iconPath).catch(err => {

package/server/routes/map/index.mjs

@@ -60,6 +60,8 @@ export default async function route(app) {
     app.get('/gis-layer-list', { config: { policy }, }, layerList);
   }
 
+  app.get('/gis-icon/*', { config: { policy }, schema: {} }, markerIconApi);
+  app.get('/icon/*', { config: { policy }, schema: {} }, markerIconApi);
   app.get('/marker-icon/*', { config: { policy }, schema: {} }, markerIconApi);
   app.get('/map-format', { config: { policy }, schema: {} }, mapFormat);
 }

package/server/routes/map/vtile1.js

@@ -5,6 +5,7 @@ const headers = {
 import Sphericalmercator from '@mapbox/sphericalmercator';
 const mercator = new Sphericalmercator({ size: 256 });
 import { getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import yaml from 'js-yaml';
 
 export default async function vtile({ params = {}, query, pg, user }, reply) {
     const { y, z } = params;
@@ -23,7 +24,7 @@ export default async function vtile({ params = {}, query, pg, user }, reply) {
 
     const geom = data1?.geometry_column || 'geom';
     const table = data?.table_name || data1?.source_path;
-    const style = mapStyle || data?.style || data1?.style;
+    const style = mapStyle || data?.style || yaml.load(data1?.style);
     const filterList = data?.filter_list || data1?.filters;
     const layerQuery = data?.query || data1?.query;