@opengis/gis 0.2.54 → 0.2.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.54",
+  "version": "0.2.56",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/plugins/mapnik/funcs/checkRasterFile.js

@@ -20,7 +20,7 @@ function sequence(arr, fn) {
 
 const unsafe = true;
 
-export default async function checkRasterFile({ arr, reply }) {
+export default async function checkRasterFile({ arr, reply, nocache }) {
     const callback = reply ? eventStream(reply) : () => { };
 
     let
@@ -34,7 +34,7 @@ export default async function checkRasterFile({ arr, reply }) {
     const result = await sequence((arr || []), async ({
         relpath, idx,
     }) => {
-        callback(`${idx + 1}/${arr.length}`);
+        callback(`${idx + 1}/${arr.length} (${relpath})`);
 
         // check raster upload status, skip for directories
         const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath });
@@ -46,7 +46,7 @@ export default async function checkRasterFile({ arr, reply }) {
         }
 
         // create at xml/:id with name only, always - by path
-        const resp = await CreateXML({ path: relpath }, (msg) => {
+        const resp = await CreateXML({ path: relpath, nocache }, (msg) => {
             if (typeof msg === 'string' && msg === 'XML creation complete') {
                 createdCount += 1;
             }
@@ -71,7 +71,6 @@ export default async function checkRasterFile({ arr, reply }) {
         const data = await RenderTile({
             path: relpath,
             width: 256,
-            height: 256,
             bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
             ttl: '0',
         }).catch(err => ({ err: err.toString() }));

package/server/plugins/mapnik/funcs/mapnik.js

@@ -12,7 +12,7 @@ const dirname = path.dirname(filepath);
 const PROTO_PATH = path.join(dirname, '../', 'map.proto');
 // const PROTO_PATH = config.mapServerAddress && config.mapServerAddress.startsWith('127.0.0.1') ? path.join(dirname, '../../../../../../service/mapnikp/map.proto') : path.join(dirname, '../', 'map.proto');
 
-const { mapServerAddress, ready } = config;
+const { mapServerAddress } = config;
 
 if (!mapServerAddress) {
   throw new Error("Map server address is not defined in the configuration.");
@@ -38,11 +38,11 @@ const mapClient = new proto.map.MapService(
 
 mapClient.waitForReady(Date.now() + 5000, (err) => {
   if (err) {
-    ready.mapnik = false;
+    config.ready.mapnik = false;
     console.error("Mapnik client connection timeout or failure:", err);
   }
   else {
-    ready.mapnik = true;
+    config.ready.mapnik = true;
     console.log("Mapnik client connected successfully.");
   }
 });

package/server/plugins/mapnik/map.proto

@@ -131,12 +131,13 @@ message GetRenderOut {
 }
 
 message GetLogsRequest {
-    string period = 1;  // "5m", "1h", "1d"
-    string type = 2;    // optional filter
+    string path = 1;  // "info", "info/2026-01-01.log" etc.
 }
 
 message GetLogsOut {
-    repeated string result = 1;
+    string data = 1;
+    string links = 2;
+    string err = 3;
 }
 
 message GetRasterInfoRequest {

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

@@ -46,7 +46,8 @@ export default async function layerList({
   // parse service style
   rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
   // assign service url
-  rows.filter(row => row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
+  rows.filter(row => row.service && ['raster', 'cartocss'].includes(row.service)).forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/gis-rtile/${row.id}/{z}/{x}/{y}.png` }));
+  rows.filter(row => !row.url && row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
   // parse extent string to number[]
   rows.filter(row => row.extent).forEach(row => Object.assign(row, {
     extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]

package/server/routes/map/vtile1.js

@@ -85,7 +85,13 @@ export default async function vtile({
     const select = data.popup?.find(el => el.name === key);
     // console.log(select);
     const clsData = select?.data || col.data;
-    const cls = clsData ? await getSelect(clsData).then(el => ({ name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql })) : null;
+    const cls = clsData ? await getSelect(clsData).then(el => {
+      if (!el) {
+        console.error('gis vtile: cls not found', clsData);
+        return null;
+      }
+      return { name: clsData, type: el.arr ? 'cls' : 'select', sql: el.sql };
+    }) : null;
     const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
     // console.log({ name, type, sql });
     if (name && type1 === 'cls') {

package/server/routes/mapnik/controllers/checkCarto.js

@@ -23,7 +23,6 @@ export default async function checkCarto({
     const rtile = await RenderTile({
         name: params.id,
         width: 256,
-        height: 256,
         bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
         ttl: '0',
         // debug: query.debug,

package/server/routes/mapnik/controllers/createXmlMulti.js

@@ -0,0 +1,75 @@
+import {
+    applyHookSync, config, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import checkRasterFile from '../../../plugins/mapnik/funcs/checkRasterFile.js';
+
+// todo: add to kamianske, remove custom api and test
+// addHook('beforeCreateXmlMulti', ({ list = [], id }) => {
+//     list.push({
+//         id: 'mbd_existent_detail_id',
+//         table: 'data_mbd.mbd_existent_detail',
+//         relpath: 'upfile',
+//         q: `select mbd_existent_detail_id, upfile
+//         from data_mbd.mbd_existent_detail a
+//         left join data_mbd.mbd b on a.mbd_id=b.mbd_id
+//         where   material_type_id = '3245363247443870877'
+//         and     upfile is not null
+//         and     upfile ~ '.tif'
+//         and     left(upfile,7) != '/files/'
+//         ${id ? ` and mbd_existent_detail_id = '${id}'` : ''}`,
+//     });
+// });
+
+export default async function createXmlMulti({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.code(400).send({
+            error: 'mapnik grpc service address not set',
+            code: 400,
+        });
+    }
+
+    if (config.ready?.mapnik !== true) {
+        return reply.code(400).send({
+            error: 'mapnik grpc service not ready',
+            code: 400,
+        });
+    }
+
+    const list = [{
+        id: 'raster_id',
+        relpath: 'source_path',
+        table: 'gis.rasters',
+        query: `source_path is not null ${params.id ? ` and raster_id = '${params.id}'` : ''}`,
+    }];
+
+    applyHookSync('beforeCreateXmlMulti', { list, id: params.id });
+
+    const rows = await Promise.all(list.filter(el => el.id && el.table && el.relpath).map(async el => pg.query(el.q ? `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from (${el.q})q` : `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from ${el.table} where ${el.query || 'true'}`).then(e => e.rows || []))).then(e => e.flat());
+
+    if (!rows.length) {
+        return reply.status(404).send({ error: 'empty rows', code: 404 });
+    }
+
+    const results = await checkRasterFile({ arr: rows.map(row => row.relpath), reply, nocache: query.nocache });
+
+    const q = Object.keys(results || {}).filter(key => results[key] && results[key].extent).map(key => {
+        const { extent } = results[key];
+        const extentString = `ST_MakeEnvelope(${extent[0]}, ${extent[1]}, ${extent[2]}, ${extent[3]}, 4326)`;
+
+        const { id, table } = rows.find(row => row.relpath === key) || {};
+        const pk = pg.pk?.[table];
+        return id && pk ? `update ${table} set geom=${extentString} where ${pk}='${id}'` : null;
+    })
+        .filter(Boolean);
+
+    if (config.trace) {
+        console.log('createXmlMulti: update bounds of', q.length, 'rows');
+    }
+
+    if (q.length) await pg.query(q.join(';\n'));
+
+    return reply.status(200).send('all finished');
+}

package/server/routes/mapnik/controllers/mapnikLogger.js

@@ -11,13 +11,19 @@ export default async function mapnikLogger({
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
-    if (!['render', 'error', 'info', 'critical'].includes(params.type)) {
-        return reply.status(400).send({ error: 'invalid params: type', code: 400 });
+    const { data, links, err } = await GetLogs({ path: params['*'] });
+
+    if (err) {
+        return reply.status(400).send(err);
+    }
+
+    if (links) {
+        return reply.headers({
+            "Content-Type": "text/html; charset=UTF-8",
+            "Content-Security-Policy": "default-src 'none'",
+            "X-Content-Type-Options": "nosniff",
+        }).send(links);
     }
 
-    const { result } = await GetLogs({
-        period: query.period,
-        type: params.type,
-    });
-    return reply.status(200).send(result.join('\n'));
+    return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);
 }

package/server/routes/mapnik/controllers/rtile.js

@@ -70,7 +70,6 @@ export default async function rtile({
             path: cartoExists ? null : raster.source_path, // for rasters only
             name: id, // required for cartocss
             width: 256,
-            height: 256,
             bbox,
             ttl: query.nocache ? '0' : '1h',
             debug: query.debug,
@@ -87,7 +86,7 @@ export default async function rtile({
 
         const buffer = Buffer.from(data.base64, 'base64');
 
-        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache ? 'no-cache' : '30d' }).send(buffer);
+        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
     }
     catch (err) {
         logger.file('rtile/error', { error: err.toString(), stack: err.stack });

package/server/routes/mapnik/index.js

@@ -5,6 +5,7 @@ import rasterInfo from './controllers/rasterInfo.js';
 import mapnikStat from './controllers/mapnikStat.js';
 import mapnikLogger from './controllers/mapnikLogger.js';
 import checkCarto from './controllers/checkCarto.js';
+import createXmlMulti from './controllers/createXmlMulti.js';
 
 const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
 const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
@@ -16,6 +17,7 @@ export default async function route(app) {
   app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
   app.get('/gis-raster/:id', publicParams, rasterInfo);
   app.get('/gis-stat/:period?', adminParams, mapnikStat);
-  app.get('/gis-logger/:type', adminParams, mapnikLogger);
+  app.get('/gis-logger/*', adminParams, mapnikLogger);
   app.get('/gis-css/:id', params, checkCarto);
+  app.get('/gis-create-xml/:id?', adminParams, createXmlMulti);
 }

package/server/routes/mapnik/controllers/rtileMBD.js

@@ -1,91 +0,0 @@
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { RenderTile } = mapnik();
-
-const mercator = new Sphericalmercator({ size: 256 });
-
-/**
- * Формування растрового tile cartoCss
- *
- * @method GET
- * @alias rtile
- * @param {String} bbox - bbox
- * @param {Number} height - висота по координатам
- * @param {Number} width - ширина по координатам
- * @param {String} data - стилізація
- * @param {String} lang - мова
- * @param {String} z - координата z
- * @param {String} x - координата y
- * @param {String} y - координата x
- */
-
-export default async function rtileMBD({
-    pg = pgClients.client, params, query,
-}, reply) {
-    if (!RenderTile) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { id, z, y } = params;
-
-    const x = params.x.split('.')[0] - 0;
-
-    if (!id) {
-        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
-    }
-
-    if (!x || !y || !z) {
-        return reply.status(400).send({ error: 'not enough params: xyz', code: 400 });
-    }
-
-    const mbd = pg.pk?.['data_mbd.mbd_existent_detail'] ? await pg.query(`
-        select
-            mbd_existent_detail_id as id, 
-            upfile
-        from data_mbd.mbd_existent_detail a
-        left join data_mbd.mbd b on a.mbd_id=b.mbd_id
-        where   material_type_id = '3245363247443870877'
-        and     upfile is not null
-        and     upfile ~ '.tif'
-        and mbd_existent_detail_id=$1
-    `, [id]).then(el => el.rows?.[0]) : [];
-
-    if (!mbd) {
-        return reply.status(404).send({ error: 'mbd not found', code: 404 });
-    }
-
-    const bbox = mercator.bbox(y, x, z, false, '900913');
-
-    try {
-        const data = await RenderTile({
-            path: mbd.upfile,
-            name: id,
-            width: 256,
-            height: 256,
-            bbox,
-            ttl: query.nocache ? '0' : '1h',
-            debug: query.debug,
-        });
-
-        if (query.debug) {
-            return data;
-        }
-
-        if (data.err) {
-            logger.file('rtile/mbd/error', { error: data.err });
-            return reply.status(500).send({ error: config.local ? data.err : 'render error', code: 500 });
-        }
-
-        const buffer = Buffer.from(data.base64, 'base64');
-
-        return reply.headers({ 'Content-Type': 'image/png' }).send(buffer);
-    }
-    catch (err) {
-        logger.file('rtile/mbd/error', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
-    }
-}