@opengis/gis 0.2.20 → 0.2.22

package/server/routes/map/controllers/mapFormat.js

@@ -1,83 +1,83 @@
-import {
-  pgClients, getTemplate, handlebars, metaFormat,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function mapFormat(req, reply) {
-  const { pg = pgClients.client, query = {} } = req;
-  const { layer, id } = query;
-  const time = Date.now();
-
-  if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
-
-  const service = await getTemplate('layer', layer) || (pg.tlist.includes('gis.services') ? await pg.query('SELECT * FROM gis.services WHERE service_id = $1', [layer]).then(res => res.rows[0]) : null);
-
-  const {
-    source_path: tname, cardInterface, card, template,
-  } = service;
-
-  const columns = card;
-  if (!tname) return reply.status(404).send('missing source_path');
-
-  const pk = pg.pk?.[tname];
-  if (!pk) return reply.status(404).send('missing pk');
-
-  if (!columns) return reply.status(404).send('columns setting not found');
-
-  const columnNames = columns.map(col => col.name);
-  const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
-  const filteredColumns = columnNames.filter(name => !excluded.includes(name));
-
-  const rows = await pg.query(
-    `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
-    [id],
-  ).then(el => el.rows || []);
-
-  if (!rows.length) return reply.status(404).send('object not found');
-
-  const classifiers = columns
-    .filter(col => col.data && ['select', 'badge', 'tags'].includes(col.format))
-    .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-  await metaFormat({
-    rows, table: tname, cls: classifiers, sufix: false,
-  });
-  const fullRow = rows[0];
-
-  const result = [];
-  const filtered = columns.filter(col => !excluded.includes(col.name));
-  for (let i = 0; i < filtered.length; i += 1) {
-    const col = filtered[i];
-
-    const name = col.label || col.ua || col.name;
-    const value = (col.format === 'date' ? new Date(fullRow[col.name]).toLocaleDateString('uk-UA') : null) || fullRow[`${col.name}_data`]?.text
-            || fullRow[`${col.name}_text`]
-            || fullRow[col.name];
-
-    result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
-            <dt class="text-gray-900">${name}</dt>
-            <dd class="text-gray-700 sm:col-span-2">${value || '-'}</dd>
-        </div>`);
-  }
-
-  const htmlTemplate = pg?.pk?.['admin.templates'] && service.card_mode === 'html'
-    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || layer]).then(el => el.rows?.[0]?.body)
-    : null;
-
-  const html1 = htmlTemplate ? await handlebars.compile(htmlTemplate)(fullRow) : null;
-
-  const html = html1 || `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
-
-  const res = {
-    time: Date.now() - time,
-    id,
-    rows: fullRow,
-    columns,
-    template,
-    html,
-  };
-  if (service) {
-    res.cardInterface = cardInterface;
-  }
-
-  return res;
-}
+import {
+  pgClients, getTemplate, handlebars, metaFormat,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function mapFormat(req, reply) {
+  const { pg = pgClients.client, query = {} } = req;
+  const { layer, id } = query;
+  const time = Date.now();
+
+  if (!layer || !id) return reply.status(404).send('not enough params: layer,id,map is required');
+
+  const service = await getTemplate('layer', layer) || (pg.tlist.includes('gis.services') ? await pg.query('SELECT * FROM gis.services WHERE service_id = $1', [layer]).then(res => res.rows[0]) : null);
+
+  const {
+    source_path: tname, cardInterface, card, template,
+  } = service;
+
+  const columns = card;
+  if (!tname) return reply.status(404).send('missing source_path');
+
+  const pk = pg.pk?.[tname];
+  if (!pk) return reply.status(404).send('missing pk');
+
+  if (!columns) return reply.status(404).send('columns setting not found');
+
+  const columnNames = columns.map(col => col.name);
+  const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
+  const filteredColumns = columnNames.filter(name => !excluded.includes(name));
+
+  const rows = await pg.query(
+    `SELECT ${pk} as "id", geom::json, ${filteredColumns.map(n => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
+    [id],
+  ).then(el => el.rows || []);
+
+  if (!rows.length) return reply.status(404).send('object not found');
+
+  const classifiers = columns
+    .filter(col => col.data && ['select', 'badge', 'tags'].includes(col.format))
+    .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+  await metaFormat({
+    rows, table: tname, cls: classifiers, sufix: false,
+  });
+  const fullRow = rows[0];
+
+  const result = [];
+  const filtered = columns.filter(col => !excluded.includes(col.name));
+  for (let i = 0; i < filtered.length; i += 1) {
+    const col = filtered[i];
+
+    const name = col.label || col.ua || col.name;
+    const value = (col.format === 'date' ? new Date(fullRow[col.name]).toLocaleDateString('uk-UA') : null) || fullRow[`${col.name}_data`]?.text
+            || fullRow[`${col.name}_text`]
+            || fullRow[col.name];
+
+    result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
+            <dt class="text-gray-900">${name}</dt>
+            <dd class="text-gray-700 sm:col-span-2">${value || '-'}</dd>
+        </div>`);
+  }
+
+  const htmlTemplate = pg?.pk?.['admin.templates'] && service.card_mode === 'html'
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || layer]).then(el => el.rows?.[0]?.body)
+    : null;
+
+  const html1 = htmlTemplate ? await handlebars.compile(htmlTemplate)(fullRow) : null;
+
+  const html = html1 || `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
+
+  const res = {
+    time: Date.now() - time,
+    id,
+    rows: fullRow,
+    columns,
+    template,
+    html,
+  };
+  if (service) {
+    res.cardInterface = cardInterface;
+  }
+
+  return res;
+}

package/server/routes/map/controllers/mapTiles.js

@@ -1,153 +1,153 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { createHash } from 'node:crypto';
-import { readFile, stat, mkdir, writeFile } from 'node:fs/promises';
-
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-import { getTemplate, pgClients, getFilterSQL, getMeta } from '@opengis/fastify-table/utils.js';
-
-import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
-
-const limit = 3000;
-const mercator = new Sphericalmercator({ size: 256 });
-const types = { point: 'ST_Point', polygon: 'ST_Polygon,ST_MultiPolygon' };
-const systemColumns = ['uid', 'cdate', 'editor_id', 'editor_date', 'created_by', 'created_at', 'updated_by', 'updated_at'];
-
-export default async function mapTiles({ pg = pgClients.client, params = {}, query = {}, unittest }, reply) {
-    const { slug, y, z } = params;
-    const { sql, nocache, filter, pointZoom, type, layers, layer } = query;
-    const x = params.x?.split?.('.')?.[0] - 0;
-
-    if (!slug) {
-        return reply.status(400).send('not enough params: slug');
-    }
-
-    if (!x || !y || !z) {
-        return reply.status(400).send('not enough params: xyz');
-    }
-
-    const bbox = mercator.bbox(+y, +x, +z, false);
-    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
-
-    const headers = {
-        'Content-Type': 'application/x-protobuf',
-        'Cache-Control': nocache || sql ? 'no-cache' : 'public, max-age=86400',
-    };
-
-    const hash = [filter, layer].filter(Boolean).join();
-
-    const filepath = path.join(
-        rootFolder,
-        `/map/vtile/${slug}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.pbf`
-    );
-
-    if (existsSync(filepath) && z < 13 && !nocache && !sql && !unittest) {
-        const { birthtimeMs = Date.now() } = await stat(filepath);
-        const ageInMs = Date.now() - birthtimeMs;
-        if (ageInMs < 86400000) {
-            const buffer = await readFile(filepath);
-            return reply.status(200).headers(headers).send(buffer);
-        }
-    }
-
-    const loadTemplate = await getTemplate('map', slug);
-
-    if (!loadTemplate) {
-        return reply.status(404).send('map not found');
-    }
-
-    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
-
-    const layers1 = !index
-        ? loadTemplate?.layers
-        : loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
-
-    if (!layers1?.length) {
-        return reply.status(404).send('map layers not found');
-    }
-
-    layers1.forEach(el => Object.assign(el, { name: el.name || el.id }));
-
-    const layers2 = layers1.filter(el => el.name && el.source_path).filter(el => layers ? layers.includes(el.name) : true).filter(el => layer ? el.name === layer : true);
-
-    if (!layers2.length) {
-        return reply.status(404).send('map layers sources not provided / invalid query params');
-    }
-
-    const allFilters = loadTemplate.widgets?.filter?.(el => el.type === 'filters') || [];
-    const { filters: filterList = [], layer_id: layerId } = allFilters.find(el => layer ? el.config?.layer_id === layer : el.default)?.config || allFilters[0]?.config || {};
-
-    const q = (await Promise.all(layers2.map(async (layer) => {
-        const { source_path: source, id, name, style, geometry_type: gt, query: lquery, geometry_column: gCol } = layer;
-        const loadTable = await getTemplate('table', source);
-
-        const table = loadTable?.table || source;
-        const meta = await getMeta({ pg, table });
-        const { columns = [] } = meta || {};
-        const geom = gCol || meta?.geom || 'geom';
-        if (!columns?.length) return null;
-
-        const pk = pg.pk?.[table] || loadTable?.key;
-        const fData = filter && layerId === name ? await getFilterSQL({ pg, table: source, filterList, filter }) : {};
-
-        const geomCol = parseInt(z, 10) < parseInt(pointZoom || '0', 10) || (style?.centroid && gt === 'point')
-            ? `ST_Centroid(${geom})`
-            : geom;
-
-        const columnsFiltered = columns
-            .filter(el => !['json', 'geometry'].includes(pg.pgType?.[el.dataTypeID]) && !systemColumns.includes(el.name));
-
-        const props = columnsFiltered.map(el => {
-            return el.type?.[0] === '_'
-                ? `${el.name}[1] as ${el.name}`
-                : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
-        });
-
-        return `SELECT ST_AsMVT(q, '${(id || name).replace(/'/g, "''")}', 4096, 'geom','row') as tile
-                      FROM (
-                        SELECT  /*substr(${pk},12)::int*/ /*${(y - 0 + x) * 10000} + row_number() over()*/ 
-
-                           floor(random() * 100000 + 1)::int + row_number() over() as row,
-                            
-                           ${style?.colorAttr ? `${style.colorAttr},` : ''} ${props?.length ? `${props.map(el => `"${el}"`).join(',')},` : ''}
-
-                            ${pk} as  id, 
-                            ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,true) geom
-
-                            FROM (select * from ${table} where ${loadTable?.query || '1=1'} and ${fData?.q || 'true'} and ${geom} && ${bbox2d} 
-                            
-                            and ${geom} is not null and st_srid(${geom}) >0
-                            
-                        ${types[type] ? ` and ST_GeometryType(${geom}) = any ('{ ${types[type]} }') ` : ''}
-
-                        and ${lquery || '1=1'}
-                        
-                        ${gt === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
-
-                        limit ${limit})q
-                      ) q`;
-    }))).filter(el => el).join(' union all ');
-
-    if (sql === '1') return q;
-    if (sql === '2') return filepath.replace(/\\/g, '/');
-
-    const tile = await pg.query(q);
-
-    if (unittest && !tile.rows?.length) {
-        console.log(slug, q);
-    }
-
-    if (sql === '3') return tile.rows.map((el) => el.tile);
-
-    if (sql === '4') return tile.rows.map((el) => el.tile);
-
-    const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
-
-    if (!nocache) {
-        await mkdir(path.dirname(filepath), { recursive: true });
-        await writeFile(filepath, buffer, 'binary');
-    }
-
-    return reply.status(200).headers(headers).send(buffer);
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import { readFile, stat, mkdir, writeFile } from 'node:fs/promises';
+
+import Sphericalmercator from '@mapbox/sphericalmercator';
+
+import { getTemplate, pgClients, getFilterSQL, getMeta } from '@opengis/fastify-table/utils.js';
+
+import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
+
+const limit = 3000;
+const mercator = new Sphericalmercator({ size: 256 });
+const types = { point: 'ST_Point', polygon: 'ST_Polygon,ST_MultiPolygon' };
+const systemColumns = ['uid', 'cdate', 'editor_id', 'editor_date', 'created_by', 'created_at', 'updated_by', 'updated_at'];
+
+export default async function mapTiles({ pg = pgClients.client, params = {}, query = {}, unittest }, reply) {
+    const { slug, y, z } = params;
+    const { sql, nocache, filter, pointZoom, type, layers, layer } = query;
+    const x = params.x?.split?.('.')?.[0] - 0;
+
+    if (!slug) {
+        return reply.status(400).send('not enough params: slug');
+    }
+
+    if (!x || !y || !z) {
+        return reply.status(400).send('not enough params: xyz');
+    }
+
+    const bbox = mercator.bbox(+y, +x, +z, false);
+    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
+
+    const headers = {
+        'Content-Type': 'application/x-protobuf',
+        'Cache-Control': nocache || sql ? 'no-cache' : 'public, max-age=86400',
+    };
+
+    const hash = [filter, layer].filter(Boolean).join();
+
+    const filepath = path.join(
+        rootFolder,
+        `/map/vtile/${slug}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.pbf`
+    );
+
+    if (existsSync(filepath) && z < 13 && !nocache && !sql && !unittest) {
+        const { birthtimeMs = Date.now() } = await stat(filepath);
+        const ageInMs = Date.now() - birthtimeMs;
+        if (ageInMs < 86400000) {
+            const buffer = await readFile(filepath);
+            return reply.status(200).headers(headers).send(buffer);
+        }
+    }
+
+    const loadTemplate = await getTemplate('map', slug);
+
+    if (!loadTemplate) {
+        return reply.status(404).send('map not found');
+    }
+
+    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
+
+    const layers1 = !index
+        ? loadTemplate?.layers
+        : loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
+
+    if (!layers1?.length) {
+        return reply.status(404).send('map layers not found');
+    }
+
+    layers1.forEach(el => Object.assign(el, { name: el.name || el.id }));
+
+    const layers2 = layers1.filter(el => el.name && el.source_path).filter(el => layers ? layers.includes(el.name) : true).filter(el => layer ? el.name === layer : true);
+
+    if (!layers2.length) {
+        return reply.status(404).send('map layers sources not provided / invalid query params');
+    }
+
+    const allFilters = loadTemplate.widgets?.filter?.(el => el.type === 'filters') || [];
+    const { filters: filterList = [], layer_id: layerId } = allFilters.find(el => layer ? el.config?.layer_id === layer : el.default)?.config || allFilters[0]?.config || {};
+
+    const q = (await Promise.all(layers2.map(async (layer) => {
+        const { source_path: source, id, name, style, geometry_type: gt, query: lquery, geometry_column: gCol } = layer;
+        const loadTable = await getTemplate('table', source);
+
+        const table = loadTable?.table || source;
+        const meta = await getMeta({ pg, table });
+        const { columns = [] } = meta || {};
+        const geom = gCol || meta?.geom || 'geom';
+        if (!columns?.length) return null;
+
+        const pk = pg.pk?.[table] || loadTable?.key;
+        const fData = filter && layerId === name ? await getFilterSQL({ pg, table: source, filterList, filter }) : {};
+
+        const geomCol = parseInt(z, 10) < parseInt(pointZoom || '0', 10) || (style?.centroid && gt === 'point')
+            ? `ST_Centroid(${geom})`
+            : geom;
+
+        const columnsFiltered = columns
+            .filter(el => !['json', 'geometry'].includes(pg.pgType?.[el.dataTypeID]) && !systemColumns.includes(el.name));
+
+        const props = columnsFiltered.map(el => {
+            return el.type?.[0] === '_'
+                ? `${el.name}[1] as ${el.name}`
+                : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
+        });
+
+        return `SELECT ST_AsMVT(q, '${(id || name).replace(/'/g, "''")}', 4096, 'geom','row') as tile
+                      FROM (
+                        SELECT  /*substr(${pk},12)::int*/ /*${(y - 0 + x) * 10000} + row_number() over()*/ 
+
+                           floor(random() * 100000 + 1)::int + row_number() over() as row,
+                            
+                           ${style?.colorAttr ? `${style.colorAttr},` : ''} ${props?.length ? `${props.map(el => `"${el}"`).join(',')},` : ''}
+
+                            ${pk} as  id, 
+                            ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,true) geom
+
+                            FROM (select * from ${table} where ${loadTable?.query || '1=1'} and ${fData?.q || 'true'} and ${geom} && ${bbox2d} 
+                            
+                            and ${geom} is not null and st_srid(${geom}) >0
+                            
+                        ${types[type] ? ` and ST_GeometryType(${geom}) = any ('{ ${types[type]} }') ` : ''}
+
+                        and ${lquery || '1=1'}
+                        
+                        ${gt === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
+
+                        limit ${limit})q
+                      ) q`;
+    }))).filter(el => el).join(' union all ');
+
+    if (sql === '1') return q;
+    if (sql === '2') return filepath.replace(/\\/g, '/');
+
+    const tile = await pg.query(q);
+
+    if (unittest && !tile.rows?.length) {
+        console.log(slug, q);
+    }
+
+    if (sql === '3') return tile.rows.map((el) => el.tile);
+
+    if (sql === '4') return tile.rows.map((el) => el.tile);
+
+    const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
+
+    if (!nocache) {
+        await mkdir(path.dirname(filepath), { recursive: true });
+        await writeFile(filepath, buffer, 'binary');
+    }
+
+    return reply.status(200).headers(headers).send(buffer);
 }

package/server/routes/map/controllers/maps.js

@@ -1,16 +1,16 @@
-import { getTemplatePath, getTemplateSync } from "@opengis/fastify-table/utils.js";
-
-const arr = getTemplatePath('map') || [];
-
-const list = arr.map(el => {
-    const { name = el[0] } = getTemplateSync('map', el[0]);
-    return { name, slug: el[0] };
-});
-
-export default async function mapList(req, reply) {
-    if (!arr.length) {
-        return reply.status(200).send([]);
-    }
-
-    return reply.status(200).send(list);
+import { getTemplatePath, getTemplateSync } from "@opengis/fastify-table/utils.js";
+
+const arr = getTemplatePath('map') || [];
+
+const list = arr.map(el => {
+    const { name = el[0] } = getTemplateSync('map', el[0]);
+    return { name, slug: el[0] };
+});
+
+export default async function mapList(req, reply) {
+    if (!arr.length) {
+        return reply.status(200).send([]);
+    }
+
+    return reply.status(200).send(list);
 }

package/server/routes/map/controllers/marker_icon.js

@@ -1,43 +1,43 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'url';
-
-async function downloadImage(url, file) {
-  const resp = await fetch(url);
-  if (resp.status !== 200) throw new Error(`${url} - not found`);
-  const blob = await resp.blob();
-
-  const arrayBuffer = await blob.arrayBuffer();
-
-  const buffer = Buffer.from(arrayBuffer);
-
-  fs.writeFileSync(file, buffer);
-}
-
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
-
-const fileIconDir = path.join(dirname, '../../../../log/marker-icon');
-
-fs.mkdirSync(fileIconDir, { recursive: true });
-
-export default async function markerIconApi(req, reply) {
-  const { params = {} } = req;
-  params.data = params['*'];
-  if (!params.data) {
-    return reply.status(400).send('not enough params: data');
-  }
-
-  const iconPath = path.join(fileIconDir, params?.data);
-
-  if (fs.existsSync(iconPath)) {
-    const buffer = fs.readFileSync(iconPath); // works for small files same as stream, but also unit-test-friendly
-    return reply.type('image/png').send(buffer);
-  }
-
-  await downloadImage(`https://data.softpro.ua/api-user/marker/${params.data}`, iconPath).catch(err => {
-    return reply.status(404).send('icon not found');
-  });
-  return fs.createReadStream(iconPath);
-
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'url';
+
+async function downloadImage(url, file) {
+  const resp = await fetch(url);
+  if (resp.status !== 200) throw new Error(`${url} - not found`);
+  const blob = await resp.blob();
+
+  const arrayBuffer = await blob.arrayBuffer();
+
+  const buffer = Buffer.from(arrayBuffer);
+
+  fs.writeFileSync(file, buffer);
+}
+
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+
+const fileIconDir = path.join(dirname, '../../../../log/marker-icon');
+
+fs.mkdirSync(fileIconDir, { recursive: true });
+
+export default async function markerIconApi(req, reply) {
+  const { params = {} } = req;
+  params.data = params['*'];
+  if (!params.data) {
+    return reply.status(400).send('not enough params: data');
+  }
+
+  const iconPath = path.join(fileIconDir, params?.data);
+
+  if (fs.existsSync(iconPath)) {
+    const buffer = fs.readFileSync(iconPath); // works for small files same as stream, but also unit-test-friendly
+    return reply.type('image/png').send(buffer);
+  }
+
+  await downloadImage(`https://data.softpro.ua/api-user/marker/${params.data}`, iconPath).catch(err => {
+    return reply.status(404).send('icon not found');
+  });
+  return fs.createReadStream(iconPath);
+
+}