@opengis/gis 0.2.91 → 0.2.93

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,50 +1,50 @@
-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 rasterInfo({
-    pg = pgClients.client, params, query,
-}, reply) {
-    const time = Date.now();
-    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, name, description, raster_key, is_active, is_public, srid, proj4 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 proj4 = raster.proj4 || (raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined);
-
-    const { data, cache } = await GetRasterInfo({
-        path: raster.source_path,
-        proj4,
-        ttl: query.nocache ? '0' : '1h',
-    });
-
-    if (query.debug) {
-        return { data, cache, raster };
-    }
-
-    return {
-        time: Date.now() - time,
-        ...data,
-        ...raster,
-        cache,
-        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 rasterInfo({
+    pg = pgClients.client, params, query,
+}, reply) {
+    const time = Date.now();
+    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, name, description, raster_key, is_active, is_public, srid, proj4 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 proj4 = raster.proj4 || (raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined);
+
+    const { data, cache } = await GetRasterInfo({
+        path: raster.source_path,
+        proj4,
+        ttl: query.nocache ? '0' : '1h',
+    });
+
+    if (query.debug) {
+        return { data, cache, raster };
+    }
+
+    return {
+        time: Date.now() - time,
+        ...data,
+        ...raster,
+        cache,
+        url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
+    };
+}

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

@@ -1,19 +1,19 @@
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { ReadDir } = mapnik();
-
-// example: GET /api/gis-files?dir=tiles/3828667893214610450
-export default async function readDir({
-    query,
-}, reply) {
-    if (!ReadDir) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { dir } = query;
-
-    const {
-        exists = false, count = 0, files = [], directories = [],
-    } = await ReadDir({ path: dir });
-    return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
-}
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { ReadDir } = mapnik();
+
+// example: GET /api/gis-files?dir=tiles/3828667893214610450
+export default async function readDir({
+    query,
+}, reply) {
+    if (!ReadDir) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { dir } = query;
+
+    const {
+        exists = false, count = 0, files = [], directories = [],
+    } = await ReadDir({ path: dir });
+    return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
+}

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

@@ -1,122 +1,122 @@
-import { createHash } from 'node:crypto';
-
-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] || {})
-        : {};
-
-    // const relpath = raster ? `/map/raster/${raster.source_path}` : null;
-
-    const carto = pg.pk?.['gis.cartocss']
-        ? await pg.query('select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text', [id])
-            .then(el => el.rows?.[0] || {})
-        : {};
-
-    const cartoExists = !!carto.cartocss_id;
-
-    if (!raster.raster_id && !cartoExists) {
-        const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
-        Object.assign(raster, { source_path: decodedPath });
-    }
-
-    if (!raster.source_path && !cartoExists) {
-        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
-    }
-
-    const bbox = mercator.bbox(y, x, z, false, '900913');
-
-    try {
-        const ttl = (query.nocache ? '0' : null)
-            || (cartoExists ? '1h' : null);
-
-        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;
-
-        const param = {
-            path: cartoExists ? null : raster.source_path, // for rasters only
-            name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
-            width: 256,
-            bbox,
-            ttl,
-            debug: query.debug,
-        };
-        // console.log(param);
-        const data = await RenderTile(param);
-
-        if (query.debug) {
-            return {
-                ...data,
-                ttl,
-                md5_path: md5,
-                base64_path: base64,
-                raster: !!raster.raster_id,
-                carto: cartoExists,
-            };
-        }
-
-        if (data.err) {
-            logger.file('rtile/error', {
-                error: data.err, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
-            });
-            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', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
-    }
-    catch (err) {
-        logger.file('rtile/error', {
-            error: err.toString(), stack: err.stack, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
-        });
-        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
-    }
-}
+import { createHash } from 'node:crypto';
+
+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] || {})
+        : {};
+
+    // const relpath = raster ? `/map/raster/${raster.source_path}` : null;
+
+    const carto = pg.pk?.['gis.cartocss']
+        ? await pg.query('select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text', [id])
+            .then(el => el.rows?.[0] || {})
+        : {};
+
+    const cartoExists = !!carto.cartocss_id;
+
+    if (!raster.raster_id && !cartoExists) {
+        const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    if (!raster.source_path && !cartoExists) {
+        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
+    }
+
+    const bbox = mercator.bbox(y, x, z, false, '900913');
+
+    try {
+        const ttl = (query.nocache ? '0' : null)
+            || (cartoExists ? '1h' : null);
+
+        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;
+
+        const param = {
+            path: cartoExists ? null : raster.source_path, // for rasters only
+            name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
+            width: 256,
+            bbox,
+            ttl,
+            debug: query.debug,
+        };
+        // console.log(param);
+        const data = await RenderTile(param);
+
+        if (query.debug) {
+            return {
+                ...data,
+                ttl,
+                md5_path: md5,
+                base64_path: base64,
+                raster: !!raster.raster_id,
+                carto: cartoExists,
+            };
+        }
+
+        if (data.err) {
+            logger.file('rtile/error', {
+                error: data.err, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+            });
+            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', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
+    }
+    catch (err) {
+        logger.file('rtile/error', {
+            error: err.toString(), stack: err.stack, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+        });
+        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
+    }
+}