@opengis/gis 0.2.176 → 0.2.178

package/server/routes/mapnik/functions/convertBoundToTile.js

@@ -1,27 +1,27 @@
-export default async function boundsToTiles({
-  bounds, minzoom, maxzoom, mercator,
-}) {
-  if (!bounds) return { error: 'param bounds is required', status: 400 };
-  if (!minzoom) return { error: 'param minzoom is required ', status: 400 };
-  if (!maxzoom) return { error: 'param maxzoom is required ', status: 400 };
-
-  const minzoom1 = minzoom - 0;
-  const maxzoom1 = maxzoom - 0;
-
-  if (maxzoom1 < minzoom1) {
-    return { error: 'maxzoom must be >= minzoom', status: 400 };
-  }
-
-  const arr = Array.from(
-    { length: maxzoom1 - minzoom1 + 1 },
-    (_, i) => minzoom1 + i,
-  );
-
-  const TILE = arr.reduce((prev, z) => {
-    const convert = mercator.convert(Array.isArray(bounds) ? bounds : bounds.split(','), '900913');
-    const XY = mercator.xyz(convert, z, false, '900913');
-    prev.push({ ...XY, z, count: (XY.maxX - XY.minX + 1) * (XY.maxY - XY.minY + 1) });
-    return prev;
-  }, []);
-  return TILE;
-}
+export default async function boundsToTiles({
+  bounds, minzoom, maxzoom, mercator,
+}) {
+  if (!bounds) return { error: 'param bounds is required', status: 400 };
+  if (!minzoom) return { error: 'param minzoom is required ', status: 400 };
+  if (!maxzoom) return { error: 'param maxzoom is required ', status: 400 };
+
+  const minzoom1 = minzoom - 0;
+  const maxzoom1 = maxzoom - 0;
+
+  if (maxzoom1 < minzoom1) {
+    return { error: 'maxzoom must be >= minzoom', status: 400 };
+  }
+
+  const arr = Array.from(
+    { length: maxzoom1 - minzoom1 + 1 },
+    (_, i) => minzoom1 + i,
+  );
+
+  const TILE = arr.reduce((prev, z) => {
+    const convert = mercator.convert(Array.isArray(bounds) ? bounds : bounds.split(','), '900913');
+    const XY = mercator.xyz(convert, z, false, '900913');
+    prev.push({ ...XY, z, count: (XY.maxX - XY.minX + 1) * (XY.maxY - XY.minY + 1) });
+    return prev;
+  }, []);
+  return TILE;
+}

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

@@ -1,76 +1,76 @@
-import path from 'node:path';
-
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetRasterStatus, CreateXML } = mapnik();
-
-export default async function createXml({
-    id, vrt, srid, proj4: queryProj4, debug, nocache, callback = () => { },
-}, pg = pgClients.client) {
-    if (!GetRasterStatus || !CreateXML) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    if (!id) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    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(r => r.rows?.[0])
-        : null;
-
-    if (!data?.id) {
-        // throw NotFoundError('raster not found');
-    }
-
-    if (data && !data?.source_path) {
-        throw BadRequestError('raster source_path not set');
-    }
-
-    const sourcePath = data?.id ? data.source_path : Buffer.from(id, "base64").toString("utf-8");
-
-    const extension = path.extname(sourcePath)?.toLowerCase();
-
-    if (!data && (!extension || !extension.match(/^(\.tif|\.tiff)$/i))) {
-        throw BadRequestError('invalid params: id');
-    }
-
-    if (!data && !(srid || queryProj4)) {
-        // throw BadRequestError('not enough query params: srid/proj4');
-    }
-
-    // const relpath = `/map/raster/${data.source_path}`;
-    const relpath = ['raster', config.mapnik?.folder, sourcePath].filter(Boolean).join('/');
-
-    // check raster upload status, skip for directories
-    const uploadStatus = extension ? await GetRasterStatus({ path: relpath }) : {};
-
-    if (uploadStatus.exists === false) {
-        throw BadRequestError('raster not uploaded');
-    }
-
-    if (uploadStatus.finished === false) {
-        throw BadRequestError('upload not finished');
-    }
-
-    const proj4 = queryProj4 || (data?.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [srid || data?.srid]).then(r => r.rows?.[0]?.proj4text) : undefined);
-
-    // create at xml/:id with name only, always - by path
-    const resp = await CreateXML({
-        path: relpath,
-        name: [config.mapnik?.folder, id].filter(Boolean).join('/'), // 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, // force vrt even if relpath leads to single raster file
-        debug, // stream debug info
-        nocache, // recreate if exists
-    }, callback);
-
-    callback('finish', true);
-    return resp;
-}
+import path from 'node:path';
+
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetRasterStatus, CreateXML } = mapnik();
+
+export default async function createXml({
+    id, vrt, srid, proj4: queryProj4, debug, nocache, callback = () => { },
+}, pg = pgClients.client) {
+    if (!GetRasterStatus || !CreateXML) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    if (!id) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    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(r => r.rows?.[0])
+        : null;
+
+    if (!data?.id) {
+        // throw NotFoundError('raster not found');
+    }
+
+    if (data && !data?.source_path) {
+        throw BadRequestError('raster source_path not set');
+    }
+
+    const sourcePath = data?.id ? data.source_path : Buffer.from(id, "base64").toString("utf-8");
+
+    const extension = path.extname(sourcePath)?.toLowerCase();
+
+    if (!data && (!extension || !extension.match(/^(\.tif|\.tiff)$/i))) {
+        throw BadRequestError('invalid params: id');
+    }
+
+    if (!data && !(srid || queryProj4)) {
+        // throw BadRequestError('not enough query params: srid/proj4');
+    }
+
+    // const relpath = `/map/raster/${data.source_path}`;
+    const relpath = ['raster', config.mapnik?.folder, sourcePath].filter(Boolean).join('/');
+
+    // check raster upload status, skip for directories
+    const uploadStatus = extension ? await GetRasterStatus({ path: relpath }) : {};
+
+    if (uploadStatus.exists === false) {
+        throw BadRequestError('raster not uploaded');
+    }
+
+    if (uploadStatus.finished === false) {
+        throw BadRequestError('upload not finished');
+    }
+
+    const proj4 = queryProj4 || (data?.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [srid || data?.srid]).then(r => r.rows?.[0]?.proj4text) : undefined);
+
+    // create at xml/:id with name only, always - by path
+    const resp = await CreateXML({
+        path: relpath,
+        name: [config.mapnik?.folder, id].filter(Boolean).join('/'), // 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, // force vrt even if relpath leads to single raster file
+        debug, // stream debug info
+        nocache, // recreate if exists
+    }, callback);
+
+    callback('finish', true);
+    return resp;
+}

package/server/routes/mapnik/functions/createXmlMulti.js

@@ -1,72 +1,72 @@
-import {
-    applyHookSync, config, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-import checkRasterFile from '../../../plugins/mapnik/funcs/checkRasterFile.js';
-import { NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-// todo: add to kamianske, remove custom api and test
-// addHook('beforeCreateXmlMulti', ({ list = [], id }) => {
-//     list.push({
-//         id: 'mbd_existent_detail_id',
-//         table: 'data_mbd.mbd_existent_detail',
-//         relpath: 'upfile',
-//         q: `select mbd_existent_detail_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     left(upfile,7) != '/files/'
-//         ${id ? ` and mbd_existent_detail_id = '${id}'` : ''}`,
-//     });
-// });
-
-export default async function createXmlMulti({
-    id, nocache, callback = () => { }
-}, pg = pgClients.client) {
-    if (!config.mapnik?.server) {
-        throw NotImplementedError('mapnik grpc service address not set');
-    }
-
-    if (config.ready?.mapnik !== true) {
-        return NotImplementedError('mapnik grpc service not ready');
-    }
-
-    const list = [{
-        id: 'raster_id',
-        relpath: 'source_path',
-        table: 'gis.rasters',
-        srid: 'srid',
-        query: `source_path is not null ${id ? ` and raster_id = $1` : ''}`,
-        args: [id].filter(Boolean)
-    }];
-
-    applyHookSync('beforeCreateXmlMulti', { list, id });
-
-    const rows = await Promise.all(list.filter(el => el.id && el.table && el.relpath).map(async el => pg.query(el.q ? `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from (${el.q})q` : `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table, ${el.srid || ''} as srid from ${el.table} where ${el.query || 'true'}`).then(e => e.rows || []))).then(e => e.flat());
-
-    if (!rows.length) {
-        throw NotFoundError('empty rows');
-    }
-
-    const results = await checkRasterFile({ rows, callback, nocache });
-
-    const q = Object.keys(results || {}).filter(key => results[key] && results[key].extent).map(key => {
-        const { extent } = results[key];
-        const extentString = `ST_MakeEnvelope(${extent[0]}, ${extent[1]}, ${extent[2]}, ${extent[3]}, 4326)`;
-
-        const { id, table } = rows.find(row => row.relpath === key) || {};
-        const pk = pg.pk?.[table];
-        return id && pk ? `update ${table} set geom=${extentString} where ${pk}='${id}'` : null;
-    })
-        .filter(Boolean);
-
-    if (config.trace) {
-        console.log('createXmlMulti: update bounds of', q.length, 'rows');
-    }
-
-    if (q.length) await pg.query(q.join(';\n'));
-
-    return 'all finished';
-}
+import {
+    applyHookSync, config, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import checkRasterFile from '../../../plugins/mapnik/funcs/checkRasterFile.js';
+import { NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+// todo: add to kamianske, remove custom api and test
+// addHook('beforeCreateXmlMulti', ({ list = [], id }) => {
+//     list.push({
+//         id: 'mbd_existent_detail_id',
+//         table: 'data_mbd.mbd_existent_detail',
+//         relpath: 'upfile',
+//         q: `select mbd_existent_detail_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     left(upfile,7) != '/files/'
+//         ${id ? ` and mbd_existent_detail_id = '${id}'` : ''}`,
+//     });
+// });
+
+export default async function createXmlMulti({
+    id, nocache, callback = () => { }
+}, pg = pgClients.client) {
+    if (!config.mapnik?.server) {
+        throw NotImplementedError('mapnik grpc service address not set');
+    }
+
+    if (config.ready?.mapnik !== true) {
+        return NotImplementedError('mapnik grpc service not ready');
+    }
+
+    const list = [{
+        id: 'raster_id',
+        relpath: 'source_path',
+        table: 'gis.rasters',
+        srid: 'srid',
+        query: `source_path is not null ${id ? ` and raster_id = $1` : ''}`,
+        args: [id].filter(Boolean)
+    }];
+
+    applyHookSync('beforeCreateXmlMulti', { list, id });
+
+    const rows = await Promise.all(list.filter(el => el.id && el.table && el.relpath).map(async el => pg.query(el.q ? `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from (${el.q})q` : `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table, ${el.srid || ''} as srid from ${el.table} where ${el.query || 'true'}`).then(e => e.rows || []))).then(e => e.flat());
+
+    if (!rows.length) {
+        throw NotFoundError('empty rows');
+    }
+
+    const results = await checkRasterFile({ rows, callback, nocache });
+
+    const q = Object.keys(results || {}).filter(key => results[key] && results[key].extent).map(key => {
+        const { extent } = results[key];
+        const extentString = `ST_MakeEnvelope(${extent[0]}, ${extent[1]}, ${extent[2]}, ${extent[3]}, 4326)`;
+
+        const { id, table } = rows.find(row => row.relpath === key) || {};
+        const pk = pg.pk?.[table];
+        return id && pk ? `update ${table} set geom=${extentString} where ${pk}='${id}'` : null;
+    })
+        .filter(Boolean);
+
+    if (config.trace) {
+        console.log('createXmlMulti: update bounds of', q.length, 'rows');
+    }
+
+    if (q.length) await pg.query(q.join(';\n'));
+
+    return 'all finished';
+}

package/server/routes/mapnik/functions/fileSearch.js

@@ -1,35 +1,35 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-const { FileSearch } = mapnik();
-
-const maxLimit = 100;
-
-// example: GET /api/gis-file-search?dir=raster/dpt&key=Аркуш_5_1_изм_ДПТ_смт_Карнаухівка_А2_modified_k
-export default async function fileSearch({
-    dir, key, period, size, page, limit: queryLimit,
-}) {
-    if (!FileSearch) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    const limit = Math.min(queryLimit || 16, maxLimit);
-    const offset = page && page > 0 ? (page - 1) * limit : 0;
-
-    if (!key && !period && !size) {
-        throw BadRequestError('not enough query params: key / period / size');
-    }
-
-    const relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
-
-    const result = await FileSearch({
-        path: relpath, key, period, size,
-    });
-
-    return {
-        count: result.count,
-        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
-    };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+const { FileSearch } = mapnik();
+
+const maxLimit = 100;
+
+// example: GET /api/gis-file-search?dir=raster/dpt&key=Аркуш_5_1_изм_ДПТ_смт_Карнаухівка_А2_modified_k
+export default async function fileSearch({
+    dir, key, period, size, page, limit: queryLimit,
+}) {
+    if (!FileSearch) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    const limit = Math.min(queryLimit || 16, maxLimit);
+    const offset = page && page > 0 ? (page - 1) * limit : 0;
+
+    if (!key && !period && !size) {
+        throw BadRequestError('not enough query params: key / period / size');
+    }
+
+    const relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
+
+    const result = await FileSearch({
+        path: relpath, key, period, size,
+    });
+
+    return {
+        count: result.count,
+        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
+    };
+}

package/server/routes/mapnik/functions/fileStat.js

@@ -1,28 +1,28 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { FileStat } = mapnik();
-
-// example: GET /api/gis-file-info?path=raster/henplan_osnovne_kreslennia.tif
-export default async function fileStat({
-    path: queryPath,
-}) {
-    if (!config.mapnik?.server) {
-        throw NotImplementedError('mapnik server not configured');
-    }
-
-    if (config.ready?.mapnik !== true) {
-        throw NotImplementedError('mapnik server not ready');
-    }
-
-    if (!queryPath) {
-        throw BadRequestError('not enough query params: path');
-    }
-
-    const relpath = `raster/${[config.mapnik?.folder, queryPath].filter(Boolean).join('/')}`;
-    const data = await FileStat({ path: relpath });
-    return { data };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileStat } = mapnik();
+
+// example: GET /api/gis-file-info?path=raster/henplan_osnovne_kreslennia.tif
+export default async function fileStat({
+    path: queryPath,
+}) {
+    if (!config.mapnik?.server) {
+        throw NotImplementedError('mapnik server not configured');
+    }
+
+    if (config.ready?.mapnik !== true) {
+        throw NotImplementedError('mapnik server not ready');
+    }
+
+    if (!queryPath) {
+        throw BadRequestError('not enough query params: path');
+    }
+
+    const relpath = `raster/${[config.mapnik?.folder, queryPath].filter(Boolean).join('/')}`;
+    const data = await FileStat({ path: relpath });
+    return { data };
+}