@opengis/gis 0.2.48 → 0.2.50

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/{createXML.js → createXml.js}

@@ -1,61 +1,63 @@
-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: 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);
-
-    // create at xml/:id with name only, always - by path
-    const resp = await CreateXML({
-        path: data.source_path,
-        name: id,
-        previewZoom: data.raster_zoom,
-        srid: data.srid,
-        vrt: query.vrt === '1' /* || !data.source_path.toLowerCase().endsWith('.tif') */,
-    }, 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);
+
+    // 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
+        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/rtile.js

@@ -1,86 +1,106 @@
-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 rtile({
-    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 raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [id])
-            .then(el => el.rows?.[0])
-        : null;
-
-    // const relpath = raster ? `/map/raster/${raster.source_path}` : null;
-
-    const cartoExists = pg.pk?.['gis.cartocss']
-        ? await pg.query('select cartocss_id from gis.cartocss where cartocss_id=$1::text', [id])
-            .then(el => el.rows?.[0]?.cartocss_id)
-        : null;
-
-    if (!raster && !cartoExists) {
-        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
-    }
-
-    const bbox = mercator.bbox(y, x, z, false, '900913');
-
-    try {
-        const data = await RenderTile({
-            path: raster ? raster.source_path : null,
-            name: id,
-            width: 256,
-            height: 256,
-            bbox,
-            ttl: query.nocache ? '0' : '1h',
-        });
-
-        if (data.err) {
-            logger.file('rtile/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/error', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
-    }
-}
+import path from 'node:path';
+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, GetRasterStatus } = 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 rtile({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!RenderTile || !GetRasterStatus) {
+        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 raster = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [id])
+            .then(el => el.rows?.[0] || {})
+        : {};
+
+    // const relpath = raster ? `/map/raster/${raster.source_path}` : null;
+
+    const cartoExists = pg.pk?.['gis.cartocss']
+        ? await pg.query('select cartocss_id from gis.cartocss where cartocss_id=$1::text', [id])
+            .then(el => el.rows?.[0]?.cartocss_id)
+        : null;
+
+    if (!raster.raster_id && !cartoExists) {
+        const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
+        const uploadStatus = path.extname(decodedPath) ? await GetRasterStatus({ path: decodedPath }) : {};
+
+        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 });
+        }
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    if (!raster && !cartoExists) {
+        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
+    }
+
+    const bbox = mercator.bbox(y, x, z, false, '900913');
+
+    try {
+        const data = await RenderTile({
+            path: raster.source_path, // for rasters only
+            name: id, // required for cartocss
+            width: 256,
+            height: 256,
+            bbox,
+            ttl: query.nocache ? '0' : '1h',
+            debug: query.debug,
+        });
+
+        if (query.debug) {
+            return { ...data, base64_path: Buffer.from(raster.source_path).toString('base64url') };
+        }
+
+        if (data.err) {
+            logger.file('rtile/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/error', { error: err.toString(), stack: err.stack });
+        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
+    }
+}

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

@@ -0,0 +1,91 @@
+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 });
+    }
+}