@opengis/gis 0.2.118 → 0.2.120

package/server/routes/map/widgets/add.widget.js

@@ -1,39 +1,39 @@
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-export default async function addWidget({
-    method, params = {}, body, pg = pgClients.client, user = {},
-}, reply) {
-    const { uid } = user;
-
-    if (!uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    if (!params.map) {
-        return reply.status(400).send('not enough params: map id');
-    }
-
-    if (method === 'PUT' && !params.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (method === 'POST') {
-        Object.assign(body, { map_id: params.map });
-        const { rows = [] } = await dataInsert({
-            pg,
-            id: params.id,
-            table: 'gis.widgets',
-            data: body,
-            uid,
-        });
-        return reply.status(200).send(rows[0]);
-    }
-
-    const row = await dataUpdate({
-        pg,
-        id: params.id,
-        table: 'gis.widgets',
-        data: body,
-        uid,
-    });
-    return reply.status(200).send(row);
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+export default async function addWidget({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    const { uid } = user;
+
+    if (!uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    if (!params.map) {
+        return reply.status(400).send('not enough params: map id');
+    }
+
+    if (method === 'PUT' && !params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (method === 'POST') {
+        Object.assign(body, { map_id: params.map });
+        const { rows = [] } = await dataInsert({
+            pg,
+            id: params.id,
+            table: 'gis.widgets',
+            data: body,
+            uid,
+        });
+        return reply.status(200).send(rows[0]);
+    }
+
+    const row = await dataUpdate({
+        pg,
+        id: params.id,
+        table: 'gis.widgets',
+        data: body,
+        uid,
+    });
+    return reply.status(200).send(row);
 }

package/server/routes/map/widgets/del.widget.js

@@ -1,23 +1,23 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function delWidget({
-    params = {}, pg = pgClients.client, user = {},
-}, reply) {
-    const { uid } = user;
-
-    if (!uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    if (!params.map) {
-        return reply.status(400).send('not enough params: map id');
-    }
-
-    const row = await dataDelete({
-        pg,
-        id: params.id,
-        table: 'gis.widgets',
-        uid,
-    });
-    return reply.status(200).send(row);
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function delWidget({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const { uid } = user;
+
+    if (!uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    if (!params.map) {
+        return reply.status(400).send('not enough params: map id');
+    }
+
+    const row = await dataDelete({
+        pg,
+        id: params.id,
+        table: 'gis.widgets',
+        uid,
+    });
+    return reply.status(200).send(row);
 }

package/server/routes/map/widgets/get.widget.js

@@ -1,41 +1,41 @@
-import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
-
-const table = 'gis.widgets';
-
-const columnType = {
-    text: 'text',
-    date: 'date',
-    bool: 'yes/no',
-    numeric: 'number',
-    integer: 'number',
-    'timestamp without time zone': 'date',
-    'timestamp with time zone': 'date',
-};
-
-export default async function getWidget({ params = {}, pg = pgClients.client }, reply) {
-    if (!params.map) {
-        return reply.status(400).send('not enough params: map id');
-    }
-
-    const { columns = [] } = await getMeta({ pg, table }) || {};
-
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-    const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
-        `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${params.id ? 'widget_id=$2' : '1=1'}`,
-        [params.map, params.id].filter(Boolean),
-    ).then(el => el.rows || []) : [];
-
-    if (params.id && !rows.length) {
-        return reply.status(404).send('widget not found');
-    }
-
-    if (params.id) {
-        return reply.status(200).send({ ...rows[0], fields });
-    }
-
-    return reply.status(200).send({
-        rows,
-        fields,
-    });
+import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
+
+const table = 'gis.widgets';
+
+const columnType = {
+    text: 'text',
+    date: 'date',
+    bool: 'yes/no',
+    numeric: 'number',
+    integer: 'number',
+    'timestamp without time zone': 'date',
+    'timestamp with time zone': 'date',
+};
+
+export default async function getWidget({ params = {}, pg = pgClients.client }, reply) {
+    if (!params.map) {
+        return reply.status(400).send('not enough params: map id');
+    }
+
+    const { columns = [] } = await getMeta({ pg, table }) || {};
+
+    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+    const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
+        `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${params.id ? 'widget_id=$2' : '1=1'}`,
+        [params.map, params.id].filter(Boolean),
+    ).then(el => el.rows || []) : [];
+
+    if (params.id && !rows.length) {
+        return reply.status(404).send('widget not found');
+    }
+
+    if (params.id) {
+        return reply.status(200).send({ ...rows[0], fields });
+    }
+
+    return reply.status(200).send({
+        rows,
+        fields,
+    });
 }

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

@@ -1,98 +1,106 @@
-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 });
-    }
-
-    const relpath = [config.mapnik?.folder, carto.cartocss_id ? 'vector' : 'raster', raster.source_path || (carto.cartocss_id && carto.source_path ? carto.source_path : params.id)].filter(Boolean).join('/');
-
-    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,
-        };
-    }
-
-    const opt = {
-        path: carto.cartocss_id ? null : relpath, // for rasters only
-        name: carto.cartocss_id ? `/data/map/tiles/${carto.source_path}` : null, // ! refactor w/ gis-rtile, required for cartocss
-    };
-
-    try {
-        const data = await ClearTile(opt);
-
-        // 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 });
+    }
+
+    const getParams = () => {
+        if (carto.cartocss_id && carto.source_path) {
+            return { name: [config.mapnik?.folder, 'vector', carto.source_path].filter(Boolean).join('/') };
+        }
+        if (carto.cartocss_id) {
+            return { name: [config.mapnik?.folder, 'xml', carto.cartocss_id].filter(Boolean).join('/') };
+        }
+        return { path: [config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/') };
+    };
+
+    const { path: relpath, name } = getParams();
+
+    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: relpath, // for rasters only
+            name, // 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,67 @@
-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 { config, 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}`;
+    const relpath = [config.mapnik?.folder, 'raster', data.source_path].filter(Boolean).join('/');
+
+    // check raster upload status, skip for directories
+    const uploadStatus = path.extname(data.source_path) ? await GetRasterStatus({ path: relpath }) : {};
+
+    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: relpath,
+        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);
+}