@opengis/gis 0.2.151 → 0.2.154

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

@@ -1,76 +1,76 @@
-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.mapnik?.server) {
-        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',
-        srid: 'srid',
-        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, ${el.srid || ''} as srid 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({ rows, 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.mapnik?.server) {
+        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',
+        srid: 'srid',
+        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, ${el.srid || ''} as srid 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({ rows, 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,38 +1,38 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { FileSearch } = mapnik();
-
-const maxLimit = 100;
-
-// example: GET /api/gis-file-search?dir=raster/dpt&key=Аркуш_5_1_изм_ДПТ_смт_Карнаухівка_А2_modified_k
-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 relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
-
-    const result = await FileSearch({
-        path: relpath, key, period, size,
-    });
-
-    return {
-        count: result.count,
-        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
-    };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileSearch } = mapnik();
+
+const maxLimit = 100;
+
+// example: GET /api/gis-file-search?dir=raster/dpt&key=Аркуш_5_1_изм_ДПТ_смт_Карнаухівка_А2_modified_k
+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 relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
+
+    const result = await FileSearch({
+        path: relpath, 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,28 +1,28 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { FileStat } = mapnik();
-
-// example: GET /api/gis-file-info?path=raster/henplan_osnovne_kreslennia.tif
-export default async function fileStat({
-    query,
-}, reply) {
-    if (!config.mapnik?.server) {
-        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 relpath = `raster/${[config.mapnik?.folder, path].filter(Boolean).join('/')}`;
-    const data = await FileStat({ path: relpath });
-    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-file-info?path=raster/henplan_osnovne_kreslennia.tif
+export default async function fileStat({
+    query,
+}, reply) {
+    if (!config.mapnik?.server) {
+        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 relpath = `raster/${[config.mapnik?.folder, path].filter(Boolean).join('/')}`;
+    const data = await FileStat({ path: relpath });
+    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.mapnik?.server) {
-        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.mapnik?.server) {
+        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);
+}

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

@@ -1,19 +1,19 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetStat } = mapnik();
-
-export default async function mapnikStat({
-    params,
-}, reply) {
-    if (!config.mapnik?.server) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const stat = await GetStat({
-        period: params.period,
-    });
-
-    return reply.status(200).send(stat);
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetStat } = mapnik();
+
+export default async function mapnikStat({
+    params,
+}, reply) {
+    if (!config.mapnik?.server) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const stat = await GetStat({
+        period: params.period,
+    });
+
+    return reply.status(200).send(stat);
+}