@opengis/gis 0.2.176 → 0.2.178

package/server/routes/cartocss/functions/get.cartocss.js

@@ -1,57 +1,57 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import cartoBounds from '../../mapnik/functions/cartoBounds.js';
-import { NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-const { RenderTile } = mapnik();
-
-const { prefix = '/api' } = config;
-
-const exclude = ['created_at', 'updated_at', 'created_by', 'updated_by'];
-
-export default async function checkCarto({
-    id, sql, nocache, isAdmin,
-}, pg = pgClients.client) {
-    const time = Date.now();
-    if (!config.mapnik?.server) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    // extract all columns, migrations-agnostic
-    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [id]).then(r => r.rows?.[0]);
-
-    if (!cartocss) {
-        throw NotFoundError(`cartocss not found: ${id}`);
-    }
-
-    // filter system columns
-    Object.keys(cartocss).filter(key => exclude.includes(key)).forEach(key => delete cartocss[key]);
-
-    const rtile = await RenderTile({
-        name: cartocss.source_path ? `vector/${cartocss.source_path}` : id, // required for cartocss
-        width: 256,
-        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
-        ttl: '0',
-    }).catch(err => ({ err: err.toString() }));
-
-    // skip empty bounds[null,null,null,null]
-    const bounds = cartocss.bounds && cartocss.geom && !(nocache && isAdmin) ? cartocss.bounds : await cartoBounds({
-        id: id, dataset: cartocss.config, table: cartocss.card_table, sql,
-    }, pg).catch(err => ({ err: err.toString() }));
-
-    if (!(cartocss.bounds && cartocss.geom) && sql && isAdmin) {
-        return bounds;
-    }
-
-    return {
-        time: Date.now() - time,
-        ...cartocss,
-        info: !!(cartocss.card_auto || (cartocss.card_html && cartocss.card_table)),
-        url: `${prefix}/gis-rtile/${id}/{z}/{x}/{y}.png`,
-        bounds,
-        render: !!rtile.base64,
-        renderError: rtile.err && config.local ? rtile.err : !!rtile.err,
-        boundsError: bounds?.err && config.local ? bounds.err : !!bounds.err,
-    };
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+import cartoBounds from '../../mapnik/functions/cartoBounds.js';
+import { NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+const { RenderTile } = mapnik();
+
+const { prefix = '/api' } = config;
+
+const exclude = ['created_at', 'updated_at', 'created_by', 'updated_by'];
+
+export default async function checkCarto({
+    id, sql, nocache, isAdmin,
+}, pg = pgClients.client) {
+    const time = Date.now();
+    if (!config.mapnik?.server) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    // extract all columns, migrations-agnostic
+    const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [id]).then(r => r.rows?.[0]);
+
+    if (!cartocss) {
+        throw NotFoundError(`cartocss not found: ${id}`);
+    }
+
+    // filter system columns
+    Object.keys(cartocss).filter(key => exclude.includes(key)).forEach(key => delete cartocss[key]);
+
+    const rtile = await RenderTile({
+        name: cartocss.source_path ? `vector/${cartocss.source_path}` : id, // required for cartocss
+        width: 256,
+        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
+        ttl: '0',
+    }).catch(err => ({ err: err.toString() }));
+
+    // skip empty bounds[null,null,null,null]
+    const bounds = cartocss.bounds && cartocss.geom && !(nocache && isAdmin) ? cartocss.bounds : await cartoBounds({
+        id: id, dataset: cartocss.config, table: cartocss.card_table, sql,
+    }, pg).catch(err => ({ err: err.toString() }));
+
+    if (!(cartocss.bounds && cartocss.geom) && sql && isAdmin) {
+        return bounds;
+    }
+
+    return {
+        time: Date.now() - time,
+        ...cartocss,
+        info: !!(cartocss.card_auto || (cartocss.card_html && cartocss.card_table)),
+        url: `${prefix}/gis-rtile/${id}/{z}/{x}/{y}.png`,
+        bounds,
+        render: !!rtile.base64,
+        renderError: rtile.err && config.local ? rtile.err : !!rtile.err,
+        boundsError: bounds?.err && config.local ? bounds.err : !!bounds.err,
+    };
+}

package/server/routes/gis/functions/checkXML.js

@@ -1,107 +1,107 @@
-import path from 'node:path';
-
-import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
-
-export default async function checkXML(pg, send = () => { }) {
-    if (!pg?.pk) {
-        throw new Error("empty pg");
-    }
-
-    const {
-        GetRasterStatus, GetRasterInfo, RenderTile,
-    } = mapnik();
-
-    const errors = { raster: 0, css: 0, service: 0 };
-
-    const rasters = pg.pk['gis.rasters'] ? await pg.query('select * from gis.rasters').then(r => r.rows || []) : [];
-
-    const css = pg.pk['gis.cartocss'] ? await pg.query('select * from gis.cartocss').then(r => r.rows || []) : [];
-
-    const dataset = pg.pk['gis.dataset'] && false ? await pg.query('select * from gis.dataset').then(r => r.rows || []) : [];
-
-    const total = rasters.length + css.length + dataset.length;
-    let successCount = 0;
-
-    send(`Всього растрів: ${rasters.length || '0'}`);
-
-    await rasters.reduce(
-        (promise, row, idx) => promise.then(async () => {
-            const uploadStatus = path.extname(row.source_path) ? await GetRasterStatus({ path: row.source_path }) : {};
-
-            if (uploadStatus.exists === false) {
-                errors.raster += 1;
-                send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id}/${row.name})`);
-                return null;
-            }
-
-            if (uploadStatus.finished === false) {
-                errors.raster += 1;
-                send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id}/${row.name})`);
-                return null;
-            }
-
-            const rasterInfo = await GetRasterInfo({
-                path: row.source_path,
-            }).catch(err => ({ err }));
-
-            if (rasterInfo.err) {
-                errors.raster += 1;
-                send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id}/${row.name})`);
-                return null;
-            }
-
-            const data = await RenderTile({
-                path: row.source_path,
-                width: 256,
-                bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
-                ttl: '0',
-            }).catch(err => ({ err: err.toString() }));
-
-            if (data.err) {
-                errors.raster += 1;
-                send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id}/${row.name})`);
-                return null;
-            }
-
-            send(`${idx}/${rasters.length} OK: (raster:${row.raster_id}/${row.name})`);
-            successCount += 1;
-        }),
-        Promise.resolve(),
-    );
-
-    send(`Всього CSS: ${css.length || '0'}`);
-
-    await css.reduce(
-        (promise, row, idx) => promise.then(async () => {
-            const data = await RenderTile({
-                path: row.source_path,
-                name: row.source_path ? undefined : row.cartocss_id,
-                width: 256,
-                bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
-                ttl: '0',
-            }).catch(err => ({ err: err.toString() }));
-
-            if (data.err) {
-                errors.css += 1;
-                send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id}/${row.name})`);
-                return null;
-            }
-
-            send(`${idx}/${css.length} OK: (css:${row.cartocss_id}/${row.name})`);
-            successCount += 1;
-        }),
-        Promise.resolve(),
-    );
-
-    send(`Всього наборів: ${dataset.length || '0'}`);
-    // ? place dataset check logic here
-
-    const errorCount = Object.keys(errors).reduce((acc, curr) => acc + errors[curr], 0);
-    send(`Всього помилок: ${errorCount || '0'}`);
-    send(`Помилки растрів: ${errors.raster || '0'}`);
-    send(`Помилки CSS: ${errors.css || '0'}`);
-    send(`Помилки наборів: ${errors.dataset || '0'}`);
-
-    send(`Успіх: ${successCount || '0'}/${total || '0'}`);
-
-}
+import path from 'node:path';
+
+import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
+
+export default async function checkXML(pg, send = () => { }) {
+    if (!pg?.pk) {
+        throw new Error("empty pg");
+    }
+
+    const {
+        GetRasterStatus, GetRasterInfo, RenderTile,
+    } = mapnik();
+
+    const errors = { raster: 0, css: 0, service: 0 };
+
+    const rasters = pg.pk['gis.rasters'] ? await pg.query('select * from gis.rasters').then(r => r.rows || []) : [];
+
+    const css = pg.pk['gis.cartocss'] ? await pg.query('select * from gis.cartocss').then(r => r.rows || []) : [];
+
+    const dataset = pg.pk['gis.dataset'] && false ? await pg.query('select * from gis.dataset').then(r => r.rows || []) : [];
+
+    const total = rasters.length + css.length + dataset.length;
+    let successCount = 0;
+
+    send(`Всього растрів: ${rasters.length || '0'}`);
+
+    await rasters.reduce(
+        (promise, row, idx) => promise.then(async () => {
+            const uploadStatus = path.extname(row.source_path) ? await GetRasterStatus({ path: row.source_path }) : {};
+
+            if (uploadStatus.exists === false) {
+                errors.raster += 1;
+                send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id}/${row.name})`);
+                return null;
+            }
+
+            if (uploadStatus.finished === false) {
+                errors.raster += 1;
+                send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id}/${row.name})`);
+                return null;
+            }
+
+            const rasterInfo = await GetRasterInfo({
+                path: row.source_path,
+            }).catch(err => ({ err }));
+
+            if (rasterInfo.err) {
+                errors.raster += 1;
+                send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id}/${row.name})`);
+                return null;
+            }
+
+            const data = await RenderTile({
+                path: row.source_path,
+                width: 256,
+                bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
+                ttl: '0',
+            }).catch(err => ({ err: err.toString() }));
+
+            if (data.err) {
+                errors.raster += 1;
+                send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id}/${row.name})`);
+                return null;
+            }
+
+            send(`${idx}/${rasters.length} OK: (raster:${row.raster_id}/${row.name})`);
+            successCount += 1;
+        }),
+        Promise.resolve(),
+    );
+
+    send(`Всього CSS: ${css.length || '0'}`);
+
+    await css.reduce(
+        (promise, row, idx) => promise.then(async () => {
+            const data = await RenderTile({
+                path: row.source_path,
+                name: row.source_path ? undefined : row.cartocss_id,
+                width: 256,
+                bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
+                ttl: '0',
+            }).catch(err => ({ err: err.toString() }));
+
+            if (data.err) {
+                errors.css += 1;
+                send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id}/${row.name})`);
+                return null;
+            }
+
+            send(`${idx}/${css.length} OK: (css:${row.cartocss_id}/${row.name})`);
+            successCount += 1;
+        }),
+        Promise.resolve(),
+    );
+
+    send(`Всього наборів: ${dataset.length || '0'}`);
+    // ? place dataset check logic here
+
+    const errorCount = Object.keys(errors).reduce((acc, curr) => acc + errors[curr], 0);
+    send(`Всього помилок: ${errorCount || '0'}`);
+    send(`Помилки растрів: ${errors.raster || '0'}`);
+    send(`Помилки CSS: ${errors.css || '0'}`);
+    send(`Помилки наборів: ${errors.dataset || '0'}`);
+
+    send(`Успіх: ${successCount || '0'}/${total || '0'}`);
+
+}

package/server/routes/gis/functions/dashboard.js

@@ -1,24 +1,24 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function getDashboard({ pg = pgClients.client }) {
-
-  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 stats = await pg.query(statsQuery).then(r => r.rows?.[0] || {});
-
-  return {
-    cards: {
-      services: stats.services_count || 0,
-      registers: stats.registers_count || 0,
-      maps: stats.maps_count || 0,
-      ogc: stats.ogc_count || 0,
-    },
-  };
-
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function getDashboard({ pg = pgClients.client }) {
+
+  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 stats = await pg.query(statsQuery).then(r => r.rows?.[0] || {});
+
+  return {
+    cards: {
+      services: stats.services_count || 0,
+      registers: stats.registers_count || 0,
+      maps: stats.maps_count || 0,
+      ogc: stats.ogc_count || 0,
+    },
+  };
+
+}

package/server/routes/gis/gis.route.js

@@ -1,26 +1,26 @@
-import getDashboard from './functions/dashboard.js';
-import checkXML from './functions/checkXML.js';
-
-import { logger, eventStream, pgClients } from '@opengis/fastify-table/utils.js';
-
-const privateParams = { config: { policy: 'L1', package: 'gis' } };
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-    app.get('/gis-check', privateParams, async (req, reply) => {
-        const { pg = pgClients.client } = req;
-        const callback = process.env.NODE_ENV === 'test' || process.env.VITEST
-            ? console.log
-            : eventStream(reply);
-        try {
-            await checkXML(pg, callback);
-        } catch (err) {
-            logger.error(err);
-            callback(process.env.local === 'true' ? err.toString() : 'check error');
-        } finally {
-            callback('finish', true);
-        }
-    });
-    app.get('/dashboard', publicParams, getDashboard); // no params required
-}
-export default route;
+import getDashboard from './functions/dashboard.js';
+import checkXML from './functions/checkXML.js';
+
+import { logger, eventStream, pgClients } from '@opengis/fastify-table/utils.js';
+
+const privateParams = { config: { policy: 'L1', package: 'gis' } };
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-check', privateParams, async (req, reply) => {
+        const { pg = pgClients.client } = req;
+        const callback = process.env.NODE_ENV === 'test' || process.env.VITEST
+            ? console.log
+            : eventStream(reply);
+        try {
+            await checkXML(pg, callback);
+        } catch (err) {
+            logger.error(err);
+            callback(process.env.local === 'true' ? err.toString() : 'check error');
+        } finally {
+            callback('finish', true);
+        }
+    });
+    app.get('/dashboard', publicParams, getDashboard); // no params required
+}
+export default route;

package/server/routes/gis/gis.route.test.js

@@ -1,34 +1,34 @@
-import { beforeAll, describe, expect, test } from 'vitest';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-const user = { id: '2', type: 'admin' };
-
-beforeAll(async () => {
-    await build();
-});
-
-describe('GIS routes', () => {
-    test('GET /gis-check returns 200', async () => {
-        const res = await injectWithHeaders({
-            url: '/api/gis-check',
-            headers: { uid: user.id, user_type: user.type }
-        });
-
-        // event stream
-        expect(res.statusCode).toBe(200);
-    });
-
-    test('GET /dashboard returns 200', async () => {
-        const res = await injectWithHeaders({
-            url: '/api/dashboard',
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('cards');
-        expect(res.body.cards).toHaveProperty('services');
-        expect(res.body.cards).toHaveProperty('registers');
-        expect(res.body.cards).toHaveProperty('maps');
-        expect(res.body.cards).toHaveProperty('ogc');
-    });
+import { beforeAll, describe, expect, test } from 'vitest';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+const user = { id: '2', type: 'admin' };
+
+beforeAll(async () => {
+    await build();
+});
+
+describe('GIS routes', () => {
+    test('GET /gis-check returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: '/api/gis-check',
+            headers: { uid: user.id, user_type: user.type }
+        });
+
+        // event stream
+        expect(res.statusCode).toBe(200);
+    });
+
+    test('GET /dashboard returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: '/api/dashboard',
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('cards');
+        expect(res.body.cards).toHaveProperty('services');
+        expect(res.body.cards).toHaveProperty('registers');
+        expect(res.body.cards).toHaveProperty('maps');
+        expect(res.body.cards).toHaveProperty('ogc');
+    });
 });

package/server/routes/map/functions/clearTiles.js

@@ -1,35 +1,35 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import {
-    rm, stat, readdir, mkdir,
-} from 'node:fs/promises';
-
-import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
-import { BadRequestError, NotFoundError } from '@opengis/fastify-table/errors.js';
-
-export default async function clearTiles({
-    id, debug,
-}) {
-    const filepath = path.join(rootFolder, 'vtile', id);
-
-    if (debug) {
-        return { filepath };
-    }
-
-    const exists = existsSync(filepath);
-    const isDirectory = exists ? await stat(filepath).then(el => el.isDirectory()) : false;
-
-    const count = isDirectory ? await readdir(filepath).then(el => el.length) : 0;
-
-    if (isDirectory && count === 0) {
-        throw NotFoundError('Тайли не знайдено');
-    }
-
-    if (isDirectory && exists) {
-        await rm(filepath, { force: true, recursive: true });
-        await mkdir(filepath, { recursive: true });
-        return { message: 'Тайли очищено', code: 200 };
-    }
-
-    throw BadRequestError('Некорректний параметр: id');
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import {
+    rm, stat, readdir, mkdir,
+} from 'node:fs/promises';
+
+import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
+import { BadRequestError, NotFoundError } from '@opengis/fastify-table/errors.js';
+
+export default async function clearTiles({
+    id, debug,
+}) {
+    const filepath = path.join(rootFolder, 'vtile', id);
+
+    if (debug) {
+        return { filepath };
+    }
+
+    const exists = existsSync(filepath);
+    const isDirectory = exists ? await stat(filepath).then(el => el.isDirectory()) : false;
+
+    const count = isDirectory ? await readdir(filepath).then(el => el.length) : 0;
+
+    if (isDirectory && count === 0) {
+        throw NotFoundError('Тайли не знайдено');
+    }
+
+    if (isDirectory && exists) {
+        await rm(filepath, { force: true, recursive: true });
+        await mkdir(filepath, { recursive: true });
+        return { message: 'Тайли очищено', code: 200 };
+    }
+
+    throw BadRequestError('Некорректний параметр: id');
+}