@opengis/gis 0.2.52 → 0.2.53

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/checkCarto.js

@@ -1,40 +1,40 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import cartoBounds from '../functions/cartoBounds.js';
-
-const { RenderTile } = mapnik();
-
-const { prefix = '/api' } = config;
-
-export default async function checkCarto({
-    pg = pgClients.client, params,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const cartocss = await pg.query('select config, geom::box2d from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
-
-    if (!cartocss) {
-        return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });
-    }
-
-    const rtile = await RenderTile({
-        name: params.id,
-        width: 256,
-        height: 256,
-        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
-        ttl: '0',
-        // debug: query.debug,
-    }).catch(err => ({ err: err.toString() }));
-
-    const bounds = cartocss.geom || await cartoBounds({ id: params.id, dataset: cartocss.config }, pg);
-
-    return {
-        url: `${prefix}/gis-rtile/${params.id}/{z}/{x}/{y}.png`,
-        bounds,
-        render: !!rtile.base64,
-        renderError: !!rtile.err,
-    };
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+import cartoBounds from '../functions/cartoBounds.js';
+
+const { RenderTile } = mapnik();
+
+const { prefix = '/api' } = config;
+
+export default async function checkCarto({
+    pg = pgClients.client, params,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const cartocss = await pg.query('select config, geom::box2d from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+
+    if (!cartocss) {
+        return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });
+    }
+
+    const rtile = await RenderTile({
+        name: params.id,
+        width: 256,
+        height: 256,
+        bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
+        ttl: '0',
+        // debug: query.debug,
+    }).catch(err => ({ err: err.toString() }));
+
+    const bounds = cartocss.geom || await cartoBounds({ id: params.id, dataset: cartocss.config }, pg);
+
+    return {
+        url: `${prefix}/gis-rtile/${params.id}/{z}/{x}/{y}.png`,
+        bounds,
+        render: !!rtile.base64,
+        renderError: !!rtile.err,
+    };
+}

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

@@ -1,63 +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: 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);
-}
+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/mapnikLogger.js

@@ -1,23 +1,23 @@
-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, query,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    if (!['render', 'error', 'info', 'critical'].includes(params.type)) {
-        return reply.status(400).send({ error: 'invalid params: type', code: 400 });
-    }
-
-    const { result } = await GetLogs({
-        period: query.period,
-        type: params.type,
-    });
-    return reply.status(200).send(result.join('\n'));
-}
+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, query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    if (!['render', 'error', 'info', 'critical'].includes(params.type)) {
+        return reply.status(400).send({ error: 'invalid params: type', code: 400 });
+    }
+
+    const { result } = await GetLogs({
+        period: query.period,
+        type: params.type,
+    });
+    return reply.status(200).send(result.join('\n'));
+}

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

@@ -1,20 +1,20 @@
-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, query,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const stat = await GetStat({
-        period: params.period,
-        ttl: query.nocache ? '0' : undefined,
-    });
-
-    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, query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const stat = await GetStat({
+        period: params.period,
+        ttl: query.nocache ? '0' : undefined,
+    });
+
+    return reply.status(200).send(stat);
+}

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

@@ -1,36 +1,36 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetRasterInfo } = mapnik();
-
-const { prefix = '/api' } = config;
-
-export default async function rtile({
-    pg = pgClients.client, params, query,
-}, reply) {
-    if (!config.mapServerAddress) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [params.id])
-            .then(el => el.rows?.[0] || {})
-        : {};
-
-    if (raster.raster_id && !raster.source_path) {
-        return reply.status(400).send({ error: 'empty source_path', code: 400 });
-    }
-
-    if (!raster.raster_id) {
-        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
-        Object.assign(raster, { source_path: decodedPath });
-    }
-
-    const data = await GetRasterInfo({
-        path: raster.source_path,
-        ttl: query.nocache ? '0' : '1h',
-    });
-
-    return { ...data, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png` };
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetRasterInfo } = mapnik();
+
+const { prefix = '/api' } = config;
+
+export default async function rtile({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const raster = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [params.id])
+            .then(el => el.rows?.[0] || {})
+        : {};
+
+    if (raster.raster_id && !raster.source_path) {
+        return reply.status(400).send({ error: 'empty source_path', code: 400 });
+    }
+
+    if (!raster.raster_id) {
+        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    const data = await GetRasterInfo({
+        path: raster.source_path,
+        ttl: query.nocache ? '0' : '1h',
+    });
+
+    return { ...data, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png` };
+}