@opengis/gis 0.2.93 → 0.2.95

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

@@ -1,94 +1,94 @@
-import { createHash } from 'node:crypto';
-
-import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { ClearTile } = mapnik();
-
-/**
- * Формування растрового 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 clearTiles({
-    pg = pgClients.client, params, query,
-}, reply) {
-    if (!ClearTile) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    if (!params.id) {
-        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
-    }
-
-    const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
-
-    const raster = pg.pk?.['gis.rasters']
-        ? await pg.query(`select raster_id, source_path from gis.rasters where raster_id=$1::text union all
-        select raster_id, source_path from gis.rasters where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
-        : {};
-
-    const carto = pg.pk?.['gis.cartocss']
-        ? await pg.query(`select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text union all
-        select cartocss_id, source_path from gis.cartocss where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
-        : {};
-
-    if (!raster.raster_id && !carto.cartocss_id) {
-        Object.assign(raster, { source_path: decodedPath });
-    }
-
-    if (!raster.source_path && !carto.cartocss_id) {
-        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
-    }
-
-    if (query.debug) {
-        const md5 = raster.source_path
-            ? createHash('md5').update(raster.source_path).digest('hex')
-            : undefined;
-        const base64 = raster.source_path
-            ? Buffer.from(raster.source_path).toString('base64url')
-            : undefined;
-        return {
-            id: raster.raster_id || carto.cartocss_id,
-            carto: !!carto.cartocss_id,
-            raster: !!raster.raster_id,
-            md5_path: md5,
-            base64_path: base64,
-            source_path: raster.source_path || carto.source_path,
-        };
-    }
-
-    try {
-        const data = await ClearTile({
-            path: carto.cartocss_id ? null : raster.source_path, // for rasters only
-            name: carto.cartocss_id && carto.source_path ? `vector/${carto.source_path}` : params.id, // required for cartocss
-        });
-
-        // if empty directory not found (no tiles rendered yet)
-        if (data.result === 'skip') {
-            return reply.status(200).send({ message: 'tiles directory not found', code: 200 });
-        }
-
-        // if cache deleted or empty directory exists = ok
-        if (data.result === 'success') {
-            return reply.status(200).send({ message: 'ok', code: 200 });
-        }
-
-        throw new Error(data.err);
-    }
-    catch (err) {
-        logger.file('clearTiles/error', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send({ error: config.local ? err.toString() : 'clearTiles error', code: 500 });
-    }
-}
+import { createHash } from 'node:crypto';
+
+import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { ClearTile } = mapnik();
+
+/**
+ * Формування растрового 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 clearTiles({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!ClearTile) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    if (!params.id) {
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
+    }
+
+    const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+
+    const raster = pg.pk?.['gis.rasters']
+        ? await pg.query(`select raster_id, source_path from gis.rasters where raster_id=$1::text union all
+        select raster_id, source_path from gis.rasters where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
+        : {};
+
+    const carto = pg.pk?.['gis.cartocss']
+        ? await pg.query(`select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text union all
+        select cartocss_id, source_path from gis.cartocss where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
+        : {};
+
+    if (!raster.raster_id && !carto.cartocss_id) {
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    if (!raster.source_path && !carto.cartocss_id) {
+        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
+    }
+
+    if (query.debug) {
+        const md5 = raster.source_path
+            ? createHash('md5').update(raster.source_path).digest('hex')
+            : undefined;
+        const base64 = raster.source_path
+            ? Buffer.from(raster.source_path).toString('base64url')
+            : undefined;
+        return {
+            id: raster.raster_id || carto.cartocss_id,
+            carto: !!carto.cartocss_id,
+            raster: !!raster.raster_id,
+            md5_path: md5,
+            base64_path: base64,
+            source_path: raster.source_path || carto.source_path,
+        };
+    }
+
+    try {
+        const data = await ClearTile({
+            path: carto.cartocss_id ? null : raster.source_path, // for rasters only
+            name: carto.cartocss_id && carto.source_path ? `vector/${carto.source_path}` : params.id, // required for cartocss
+        });
+
+        // if empty directory not found (no tiles rendered yet)
+        if (data.result === 'skip') {
+            return reply.status(200).send({ message: 'tiles directory not found', code: 200 });
+        }
+
+        // if cache deleted or empty directory exists = ok
+        if (data.result === 'success') {
+            return reply.status(200).send({ message: 'ok', code: 200 });
+        }
+
+        throw new Error(data.err);
+    }
+    catch (err) {
+        logger.file('clearTiles/error', { error: err.toString(), stack: err.stack });
+        return reply.status(500).send({ error: config.local ? err.toString() : 'clearTiles error', code: 500 });
+    }
+}

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

@@ -1,66 +1,66 @@
-import path from 'node:path';
-
-import { pgClients, eventStream } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetRasterStatus, CreateXML } = mapnik();
-
-export default async function createXml({
-    pg = pgClients.client, params, query,
-}, reply) {
-    if (!GetRasterStatus || !CreateXML) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { id } = params;
-
-    if (!id) {
-        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
-    }
-
-    const data = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id as id, source_path, srid, raster_zoom from gis.rasters where raster_id=$1::text', [id])
-            .then(el => el.rows?.[0])
-        : null;
-
-    if (!data?.id) {
-        return reply.status(404).send({ error: 'raster not found', code: 404 });
-    }
-
-    if (!data.source_path) {
-        return reply.status(400).send({ error: 'raster source_path not set', code: 400 });
-    }
-
-    const relpath = `/map/raster/${data.source_path}`;
-
-    // check raster upload status, skip for directories
-    const uploadStatus = path.extname(relpath) ? await GetRasterStatus({ path: data.source_path }) : {};
-
-    if (uploadStatus.exists === false) {
-        return reply.status(400).send({ error: 'raster not uploaded', code: 400 });
-    }
-
-    if (uploadStatus.finished === false) {
-        return reply.status(400).send({ error: 'upload not finished', code: 400 });
-    }
-
-    const callback = eventStream(reply);
-
-    const proj4 = data.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [data.srid]).then(el => el.rows?.[0]?.proj4text) : undefined;
-
-    // create at xml/:id with name only, always - by path
-    const resp = await CreateXML({
-        path: data.source_path,
-        name: id, // create additional xml named as primary key at xml directory
-        previewZoom: data.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
-        // srid: data.srid, // auto detected if not supplied
-        proj4,
-        vrt: query.vrt, // force vrt even if relpath leads to single raster file
-        debug: query.debug, // stream debug info
-        nocache: query.nocache, // recreate if exists
-    }, callback);
-
-    callback('finish', 1);
-    return reply.status(200).send(resp);
-}
+import path from 'node:path';
+
+import { pgClients, eventStream } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetRasterStatus, CreateXML } = mapnik();
+
+export default async function createXml({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!GetRasterStatus || !CreateXML) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { id } = params;
+
+    if (!id) {
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
+    }
+
+    const data = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id as id, source_path, srid, raster_zoom from gis.rasters where raster_id=$1::text', [id])
+            .then(el => el.rows?.[0])
+        : null;
+
+    if (!data?.id) {
+        return reply.status(404).send({ error: 'raster not found', code: 404 });
+    }
+
+    if (!data.source_path) {
+        return reply.status(400).send({ error: 'raster source_path not set', code: 400 });
+    }
+
+    const relpath = `/map/raster/${data.source_path}`;
+
+    // check raster upload status, skip for directories
+    const uploadStatus = path.extname(relpath) ? await GetRasterStatus({ path: data.source_path }) : {};
+
+    if (uploadStatus.exists === false) {
+        return reply.status(400).send({ error: 'raster not uploaded', code: 400 });
+    }
+
+    if (uploadStatus.finished === false) {
+        return reply.status(400).send({ error: 'upload not finished', code: 400 });
+    }
+
+    const callback = eventStream(reply);
+
+    const proj4 = data.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [data.srid]).then(el => el.rows?.[0]?.proj4text) : undefined;
+
+    // create at xml/:id with name only, always - by path
+    const resp = await CreateXML({
+        path: data.source_path,
+        name: id, // create additional xml named as primary key at xml directory
+        previewZoom: data.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
+        // srid: data.srid, // auto detected if not supplied
+        proj4,
+        vrt: query.vrt, // force vrt even if relpath leads to single raster file
+        debug: query.debug, // stream debug info
+        nocache: query.nocache, // recreate if exists
+    }, callback);
+
+    callback('finish', 1);
+    return reply.status(200).send(resp);
+}

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

@@ -1,75 +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');
-}
+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/fileSearch.js

@@ -1,34 +1,34 @@
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { FileSearch } = mapnik();
-
-const maxLimit = 100;
-
-// example: GET /api/gis-files?dir=tiles/3828667893214610450/13/4884&key=1&size=1675&period=5m
-export default async function fileSearch({
-    query,
-}, reply) {
-    if (!FileSearch) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const {
-        dir, key, period, size, page,
-    } = query;
-
-    const limit = Math.min(query.limit || 16, maxLimit);
-    const offset = page && page > 0 ? (page - 1) * limit : 0;
-
-    if (!key && !period && !size) {
-        return reply.status(400).send({ error: 'not enough query params: key / period / size', code: 400 });
-    }
-
-    const result = await FileSearch({
-        path: dir, key, period, size,
-    });
-
-    return {
-        count: result.count,
-        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
-    };
-}
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileSearch } = mapnik();
+
+const maxLimit = 100;
+
+// example: GET /api/gis-files?dir=tiles/3828667893214610450/13/4884&key=1&size=1675&period=5m
+export default async function fileSearch({
+    query,
+}, reply) {
+    if (!FileSearch) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const {
+        dir, key, period, size, page,
+    } = query;
+
+    const limit = Math.min(query.limit || 16, maxLimit);
+    const offset = page && page > 0 ? (page - 1) * limit : 0;
+
+    if (!key && !period && !size) {
+        return reply.status(400).send({ error: 'not enough query params: key / period / size', code: 400 });
+    }
+
+    const result = await FileSearch({
+        path: dir, key, period, size,
+    });
+
+    return {
+        count: result.count,
+        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
+    };
+}

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

@@ -1,27 +1,27 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { FileStat } = mapnik();
-
-// example: GET /api/gis-files?path=tiles/3828667893214610450/13/4884/2828.png
-export default async function fileStat({
-    query,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server not configured', code: 400 });
-    }
-
-    if (config.ready?.mapnik !== true) {
-        return reply.status(400).send({ error: 'mapnik server not ready', code: 400 });
-    }
-
-    const { path } = query || {};
-
-    if (!path) {
-        return reply.status(400).send({ error: 'not enough query params: path', code: 400 });
-    }
-
-    const data = await FileStat({ path });
-    return { data };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileStat } = mapnik();
+
+// example: GET /api/gis-files?path=tiles/3828667893214610450/13/4884/2828.png
+export default async function fileStat({
+    query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server not configured', code: 400 });
+    }
+
+    if (config.ready?.mapnik !== true) {
+        return reply.status(400).send({ error: 'mapnik server not ready', code: 400 });
+    }
+
+    const { path } = query || {};
+
+    if (!path) {
+        return reply.status(400).send({ error: 'not enough query params: path', code: 400 });
+    }
+
+    const data = await FileStat({ path });
+    return { data };
+}

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

@@ -1,29 +1,29 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetLogs } = mapnik();
-
-export default async function mapnikLogger({
-    params,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { data, links, err } = await GetLogs({ path: params['*'] });
-    console.log(links);
-    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.replace(/\/api\/gis-logger/g, '/logger-gis'));
-    }
-
-    return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetLogs } = mapnik();
+
+export default async function mapnikLogger({
+    params,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { data, links, err } = await GetLogs({ path: params['*'] });
+    console.log(links);
+    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.replace(/\/api\/gis-logger/g, '/logger-gis'));
+    }
+
+    return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);
+}