@opengis/gis 0.2.43 → 0.2.44

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

@@ -1,124 +1,124 @@
-import path from 'node:path';
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { fileURLToPath } from 'url';
-import { createHash } from 'node:crypto';
-
-import { config, getMeta, getTemplate, getTemplateSync, pgClients, getSelect, getSelectVal, getTemplatePath } from '@opengis/fastify-table/utils.js';
-
-const { prefix = '/api' } = config;
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const maps = getTemplatePath('map')?.map?.(el => {
-    const { name = el[0] } = getTemplateSync('map', el[0]) || {};
-    return { slug: el[0], name };
-});
-
-async function processObject(loadTemplate, pg = pgClients.client, unittest) {
-    // default center for all maps (frontend dependends on it)
-    const { bbox = [], center = [30, 50] } = loadTemplate?.source_path && pg.pk?.[loadTemplate.source_path]
-        ? await pg.query(`select
-                array[ST_XMin(env), ST_YMin(env), ST_XMax(env),ST_YMax(env)] as bbox,
-                st_asgeojson(st_centroid(env))::json->'coordinates' as center
-            from ( select st_extent(geom) as env from ${loadTemplate.source_path} where ${loadTemplate.source_query || '1=1'})q`
-        ).then(el => el.rows?.[0] || {})
-        : {};
-    loadTemplate.map = { bbox, center };
-
-
-    if (!loadTemplate?.widgets?.length) return;
-    // add legend if not exists in widget
-    const idx = loadTemplate.widgets.findIndex(el => el.type === 'attribute_style');
-    const { source_path: attrTable, attribute, cls: clsName, legend = [], colors } = loadTemplate.widgets.find(el => el.type === 'attribute_style')?.config || {};
-    const colors1 = colors || ['red', 'black', 'blue', 'green', 'orange'];
-
-    if (!legend?.length && attribute && attrTable) {
-        const { columns = {} } = await getMeta({ pg, table: attrTable });
-        const { dataTypeID = 0 } = columns.find(item => item.name === attribute) || {};
-        const q = pg.pgType?.[dataTypeID]?.includes?.('[]')
-            ? `select unnest(${attribute})::text as id,count(*) from ${attrTable} group by unnest(${attribute}) limit 100`
-            : `select ${attribute}::text as id,count(*) from ${attrTable} group by ${attribute} limit 100`;
-
-        if (config.trace || unittest) console.log(q);
-        const countArr = await pg.queryCache(q, { time: 5 });
-
-        const ids = countArr.rows.map(item => item.id);
-
-        const cls = await getSelect(clsName, pg);
-        const clsData = await getSelectVal({ pg, values: ids, cls: clsName });
-
-        const options = countArr.rows.map((cel, idx) => {
-            const data = cls?.arr?.find?.(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] };
-            const color = (colors?.length ? colors1[idx % colors1.length] : null) || data?.color || colors1[idx % colors1.length];
-            return { ...cel, ...data, color };
-        });
-        loadTemplate.widgets[idx].config.legend = options;
-    }
-
-
-    const { source_path: table, filters = [] } = loadTemplate.widgets.find(el => el.type === 'filters')?.config || {};
-
-    filters.forEach(el => Object.assign(el, { name: el.name || el.id }));
-
-    // md5 hash for suggest security
-    filters.filter(el => el.type?.toLowerCase() === 'select').map(async (el) => {
-        const hash = createHash('md5').update([table, el.name].join()).digest('hex');
-        el.api = `${prefix}/suggest/hash-${hash}`;
-        const filepath = path.join(dirname, `../../../../log/suggest/${hash}.json`);
-        if (existsSync(filepath)) { return; };
-        mkdirSync(path.dirname(filepath), { recursive: true });
-        writeFileSync(filepath, JSON.stringify({ table, column: el.name }), { encoding: 'utf8' });
-    });
-
-    // add options to filters
-    if (filters.filter(el => el.data).length && table) {
-        const { columns = {} } = await getMeta({ pg, table });
-        await Promise.all(filters.filter(el => el.data && el.name).map(async (el) => {
-            const { dataTypeID = 0 } = columns.find(item => item.name === el.name) || {};
-            const q = pg.pgType?.[dataTypeID]?.includes?.('[]')
-                ? `select unnest(${el.name})::text as id,count(*) from ${table} group by unnest(${el.name}) limit 100`
-                : `select ${el.name}::text as id,count(*) from ${table} group by ${el.name} limit 100`;
-
-            if (config.trace || unittest) console.log(q);
-            const countArr = await pg.queryCache(q, { time: 5 });
-
-            const ids = countArr.rows.map(item => item.id);
-
-            const cls = await getSelect(el.data, pg);
-            const clsData = await getSelectVal({ pg, values: ids, name: el.data });
-
-            const options = countArr.rows.map(cel => {
-                const data = cls?.arr?.find?.(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData[cel.id]?.text || clsData[cel.id] };
-                return { ...cel, ...data };
-            });
-            Object.assign(el, { options });
-        }));
-    }
-    return loadTemplate;
-}
-
-export default async function map({ pg = pgClients.client, params = {}, unittest }, reply) {
-    const { slug } = params;
-
-    const loadTemplate = await getTemplate('map', slug);
-
-    if (!loadTemplate) {
-        return reply.status(404).send('map not found');
-    }
-
-    if (!Array.isArray(loadTemplate)) {
-        await processObject(loadTemplate, pg, unittest);
-        return { ...loadTemplate, maps };
-    }
-
-    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
-
-    if (!index) {
-        return reply.status(404).send('map index not found');
-    }
-
-    await processObject(index, pg, unittest);
-
-    const layers = loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
-
-    return reply.status(200).send({ ...index, layers, maps });
+import path from 'node:path';
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { fileURLToPath } from 'url';
+import { createHash } from 'node:crypto';
+
+import { config, getMeta, getTemplate, getTemplateSync, pgClients, getSelect, getSelectVal, getTemplatePath } from '@opengis/fastify-table/utils.js';
+
+const { prefix = '/api' } = config;
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const maps = getTemplatePath('map')?.map?.(el => {
+    const { name = el[0] } = getTemplateSync('map', el[0]) || {};
+    return { slug: el[0], name };
+});
+
+async function processObject(loadTemplate, pg = pgClients.client, unittest) {
+    // default center for all maps (frontend dependends on it)
+    const { bbox = [], center = [30, 50] } = loadTemplate?.source_path && pg.pk?.[loadTemplate.source_path]
+        ? await pg.query(`select
+                array[ST_XMin(env), ST_YMin(env), ST_XMax(env),ST_YMax(env)] as bbox,
+                st_asgeojson(st_centroid(env))::json->'coordinates' as center
+            from ( select st_extent(geom) as env from ${loadTemplate.source_path} where ${loadTemplate.source_query || '1=1'})q`
+        ).then(el => el.rows?.[0] || {})
+        : {};
+    loadTemplate.map = { bbox, center };
+
+
+    if (!loadTemplate?.widgets?.length) return;
+    // add legend if not exists in widget
+    const idx = loadTemplate.widgets.findIndex(el => el.type === 'attribute_style');
+    const { source_path: attrTable, attribute, cls: clsName, legend = [], colors } = loadTemplate.widgets.find(el => el.type === 'attribute_style')?.config || {};
+    const colors1 = colors || ['red', 'black', 'blue', 'green', 'orange'];
+
+    if (!legend?.length && attribute && attrTable) {
+        const { columns = {} } = await getMeta({ pg, table: attrTable });
+        const { dataTypeID = 0 } = columns.find(item => item.name === attribute) || {};
+        const q = pg.pgType?.[dataTypeID]?.includes?.('[]')
+            ? `select unnest(${attribute})::text as id,count(*) from ${attrTable} group by unnest(${attribute}) limit 100`
+            : `select ${attribute}::text as id,count(*) from ${attrTable} group by ${attribute} limit 100`;
+
+        if (config.trace || unittest) console.log(q);
+        const countArr = await pg.queryCache(q, { time: 5 });
+
+        const ids = countArr.rows.map(item => item.id);
+
+        const cls = await getSelect(clsName, pg);
+        const clsData = await getSelectVal({ pg, values: ids, cls: clsName });
+
+        const options = countArr.rows.map((cel, idx) => {
+            const data = cls?.arr?.find?.(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] };
+            const color = (colors?.length ? colors1[idx % colors1.length] : null) || data?.color || colors1[idx % colors1.length];
+            return { ...cel, ...data, color };
+        });
+        loadTemplate.widgets[idx].config.legend = options;
+    }
+
+
+    const { source_path: table, filters = [] } = loadTemplate.widgets.find(el => el.type === 'filters')?.config || {};
+
+    filters.forEach(el => Object.assign(el, { name: el.name || el.id }));
+
+    // md5 hash for suggest security
+    filters.filter(el => el.type?.toLowerCase() === 'select').map(async (el) => {
+        const hash = createHash('md5').update([table, el.name].join()).digest('hex');
+        el.api = `${prefix}/suggest/hash-${hash}`;
+        const filepath = path.join(dirname, `../../../../log/suggest/${hash}.json`);
+        if (existsSync(filepath)) { return; };
+        mkdirSync(path.dirname(filepath), { recursive: true });
+        writeFileSync(filepath, JSON.stringify({ table, column: el.name }), { encoding: 'utf8' });
+    });
+
+    // add options to filters
+    if (filters.filter(el => el.data).length && table) {
+        const { columns = {} } = await getMeta({ pg, table });
+        await Promise.all(filters.filter(el => el.data && el.name).map(async (el) => {
+            const { dataTypeID = 0 } = columns.find(item => item.name === el.name) || {};
+            const q = pg.pgType?.[dataTypeID]?.includes?.('[]')
+                ? `select unnest(${el.name})::text as id,count(*) from ${table} group by unnest(${el.name}) limit 100`
+                : `select ${el.name}::text as id,count(*) from ${table} group by ${el.name} limit 100`;
+
+            if (config.trace || unittest) console.log(q);
+            const countArr = await pg.queryCache(q, { time: 5 });
+
+            const ids = countArr.rows.map(item => item.id);
+
+            const cls = await getSelect(el.data, pg);
+            const clsData = await getSelectVal({ pg, values: ids, name: el.data });
+
+            const options = countArr.rows.map(cel => {
+                const data = cls?.arr?.find?.(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData[cel.id]?.text || clsData[cel.id] };
+                return { ...cel, ...data };
+            });
+            Object.assign(el, { options });
+        }));
+    }
+    return loadTemplate;
+}
+
+export default async function map({ pg = pgClients.client, params = {}, unittest }, reply) {
+    const { slug } = params;
+
+    const loadTemplate = await getTemplate('map', slug);
+
+    if (!loadTemplate) {
+        return reply.status(404).send('map not found');
+    }
+
+    if (!Array.isArray(loadTemplate)) {
+        await processObject(loadTemplate, pg, unittest);
+        return { ...loadTemplate, maps };
+    }
+
+    const index = loadTemplate?.find?.(el => el[0].split('.').shift() === 'index')?.[1];
+
+    if (!index) {
+        return reply.status(404).send('map index not found');
+    }
+
+    await processObject(index, pg, unittest);
+
+    const layers = loadTemplate?.filter?.(el => el[0].split('.').shift() !== 'index')?.map(el => ({ ...el[1], id: el[0].replace('.yml', '').replace('.json', '') }));
+
+    return reply.status(200).send({ ...index, layers, maps });
 }

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

@@ -1,73 +1,73 @@
-import { config, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
-
-const { prefix = '/api' } = config;
-
-function getBBox(coordinates) {
-    return coordinates[0].reduce(
-        ([minLon, minLat, maxLon, maxLat], [lon, lat]) => [
-            Math.min(minLon, lon),
-            Math.min(minLat, lat),
-            Math.max(maxLon, lon),
-            Math.max(maxLat, lat)
-        ],
-        [coordinates[0][0][0], coordinates[0][0][1], coordinates[0][0][0], coordinates[0][0][1]]
-    );
-}
-
-export default async function mapCatalog({ pg = pgClients.client }, reply) {
-    const { rows: services = [] } = pg.pk?.['gis.services']
-        ? await pg.query(`select 
-                service_id as id, name, service_type, service_url as url, 
-                source_type, source_path, geometry_column, style, layers, 
-                st_asgeojson(bbox)::json->'coordinates' as bbox, 
-                st_asgeojson(center)::json->'coordinates' as center,
-                popup, card, filters
-            from gis.services where is_active and is_public`
-        )
-        : {};
-
-    const bboxq = services.filter(el => el.source_path && pg?.pk?.[el.source_path] && !el.bbox).map(el => `update gis.services set bbox = (select st_extent(${el.geometry_column || 'geom'})::geometry from ${el.source_path}) where service_id='${el.id}'`).join(';');
-    await pg.query(bboxq).catch(err => console.error(err.toString()));
-
-    services.filter(row => row.style).map(row => {
-        row.style = yml2json(row.style);
-    });
-
-    services.filter(el => el.bbox).forEach(el => {
-        el.bbox = getBBox(el.bbox);
-    });
-
-    services.filter(el => el.source_type === 'database').forEach(el => {
-        el.url = `${prefix}/layer-vtile/${el.id}/{z}/{x}/{y}.vmt`;
-    });
-
-    const { rows: rasters = [] } = pg.pk?.['gis.rasters']
-        ? await pg.query(
-            `select
-                raster_id as id, name, source_type,
-                st_asgeojson(bbox):: json -> 'coordinates' as bbox,
-                st_asgeojson(center):: json -> 'coordinates' as center
-            from gis.rasters where is_active and is_public`
-        )
-        : {};
-    
-     const { rows: ogc = [] } = pg.pk?.['gis.ogc_service']
-        ? await pg.query(
-            `select
-                service_id as id, name, 'raster' as source_type,  url
-            from gis.ogc_service `
-        )
-        : {};
-    
-    
-    
-    rasters.forEach(el => {
-        el.url = `${prefix}/layer-rtile/${el.id}/{z}/{x}/{y}.png`;
-    });
-
-    rasters.filter(el => el.bbox).forEach(el => {
-        el.bbox = getBBox(el.bbox);
-    });
-
-    return reply.status(200).send({ services, rasters: rasters.concat(ogc) });
+import { config, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
+
+const { prefix = '/api' } = config;
+
+function getBBox(coordinates) {
+    return coordinates[0].reduce(
+        ([minLon, minLat, maxLon, maxLat], [lon, lat]) => [
+            Math.min(minLon, lon),
+            Math.min(minLat, lat),
+            Math.max(maxLon, lon),
+            Math.max(maxLat, lat)
+        ],
+        [coordinates[0][0][0], coordinates[0][0][1], coordinates[0][0][0], coordinates[0][0][1]]
+    );
+}
+
+export default async function mapCatalog({ pg = pgClients.client }, reply) {
+    const { rows: services = [] } = pg.pk?.['gis.services']
+        ? await pg.query(`select 
+                service_id as id, name, service_type, service_url as url, 
+                source_type, source_path, geometry_column, style, layers, 
+                st_asgeojson(bbox)::json->'coordinates' as bbox, 
+                st_asgeojson(center)::json->'coordinates' as center,
+                popup, card, filters
+            from gis.services where is_active and is_public`
+        )
+        : {};
+
+    const bboxq = services.filter(el => el.source_path && pg?.pk?.[el.source_path] && !el.bbox).map(el => `update gis.services set bbox = (select st_extent(${el.geometry_column || 'geom'})::geometry from ${el.source_path}) where service_id='${el.id}'`).join(';');
+    await pg.query(bboxq).catch(err => console.error(err.toString()));
+
+    services.filter(row => row.style).map(row => {
+        row.style = yml2json(row.style);
+    });
+
+    services.filter(el => el.bbox).forEach(el => {
+        el.bbox = getBBox(el.bbox);
+    });
+
+    services.filter(el => el.source_type === 'database').forEach(el => {
+        el.url = `${prefix}/layer-vtile/${el.id}/{z}/{x}/{y}.vmt`;
+    });
+
+    const { rows: rasters = [] } = pg.pk?.['gis.rasters']
+        ? await pg.query(
+            `select
+                raster_id as id, name, source_type,
+                st_asgeojson(bbox):: json -> 'coordinates' as bbox,
+                st_asgeojson(center):: json -> 'coordinates' as center
+            from gis.rasters where is_active and is_public`
+        )
+        : {};
+    
+     const { rows: ogc = [] } = pg.pk?.['gis.ogc_service']
+        ? await pg.query(
+            `select
+                service_id as id, name, 'raster' as source_type,  url
+            from gis.ogc_service `
+        )
+        : {};
+    
+    
+    
+    rasters.forEach(el => {
+        el.url = `${prefix}/layer-rtile/${el.id}/{z}/{x}/{y}.png`;
+    });
+
+    rasters.filter(el => el.bbox).forEach(el => {
+        el.bbox = getBBox(el.bbox);
+    });
+
+    return reply.status(200).send({ services, rasters: rasters.concat(ogc) });
 }

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

@@ -1,56 +1,56 @@
-import { pgClients, getMeta, getSelect, getSelectVal } from "@opengis/fastify-table/utils.js";
-
-export default async function mapCatalogAttribute({ pg = pgClients.client, params = {}, query = {} }, reply) {
-    const { service, attr } = params;
-    if (!service) {
-        return reply.status(404).send('not enough params: service');
-    }
-
-    if (!attr) {
-        return reply.status(404).send('not enough params: attr');
-    }
-
-    if (!pg.pk?.['gis.services']) {
-        return reply.status(404).send('services table not found');
-    }
-
-    const source = await pg.query(
-        'select source_path from gis.services where service_id=$1 and is_active and is_public',
-        [params.service]
-    ).then(el => el.rows?.[0]?.source_path);
-
-    if (!source) {
-        return reply.status(404).send('service not found');
-    }
-
-    const cls = await getSelect(query.cls || attr, pg);
-    const colname = query.cls ? attr : attr.split(':').pop();
-
-    if (!colname) {
-        return reply.status(400).send('invalid params: attr');
-    }
-
-    const { columns = [] } = await getMeta({ pg, table: source });
-    const { dataTypeID } = columns.find(el => el.name === colname) || {};
-
-    const q = pg.pgType[dataTypeID]?.includes('[]')
-        ? `select unnest(${colname})::text as id,count(*) from ${source} group by unnest(${colname}) limit 100`
-        : `select ${colname}::text as id,count(*) from ${source} group by ${colname} limit 100`;
-
-    const countArr = await pg.queryCache(q);
-
-    const ids = countArr.rows.map(el => el.id);
-
-    const clsData = await getSelectVal({ pg, values: ids, name: query.cls || attr });
-
-    const legend = countArr.rows.map(cel => {
-        const data = cls?.arr?.find(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] };
-        return { ...cel, ...data };
-    });
-
-    const { min, max } = await pg.queryCache(
-        `select min(${attr}), max(${attr}) from ${source} where 1=1`,
-    ).then(el => { return el.rows?.[0] || {}; });
-
-    return reply.status(200).send({ legend, min, max });
+import { pgClients, getMeta, getSelect, getSelectVal } from "@opengis/fastify-table/utils.js";
+
+export default async function mapCatalogAttribute({ pg = pgClients.client, params = {}, query = {} }, reply) {
+    const { service, attr } = params;
+    if (!service) {
+        return reply.status(404).send('not enough params: service');
+    }
+
+    if (!attr) {
+        return reply.status(404).send('not enough params: attr');
+    }
+
+    if (!pg.pk?.['gis.services']) {
+        return reply.status(404).send('services table not found');
+    }
+
+    const source = await pg.query(
+        'select source_path from gis.services where service_id=$1 and is_active and is_public',
+        [params.service]
+    ).then(el => el.rows?.[0]?.source_path);
+
+    if (!source) {
+        return reply.status(404).send('service not found');
+    }
+
+    const cls = await getSelect(query.cls || attr, pg);
+    const colname = query.cls ? attr : attr.split(':').pop();
+
+    if (!colname) {
+        return reply.status(400).send('invalid params: attr');
+    }
+
+    const { columns = [] } = await getMeta({ pg, table: source });
+    const { dataTypeID } = columns.find(el => el.name === colname) || {};
+
+    const q = pg.pgType[dataTypeID]?.includes('[]')
+        ? `select unnest(${colname})::text as id,count(*) from ${source} group by unnest(${colname}) limit 100`
+        : `select ${colname}::text as id,count(*) from ${source} group by ${colname} limit 100`;
+
+    const countArr = await pg.queryCache(q);
+
+    const ids = countArr.rows.map(el => el.id);
+
+    const clsData = await getSelectVal({ pg, values: ids, name: query.cls || attr });
+
+    const legend = countArr.rows.map(cel => {
+        const data = cls?.arr?.find(c => c.id?.toString?.() === cel.id?.toString?.()) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] };
+        return { ...cel, ...data };
+    });
+
+    const { min, max } = await pg.queryCache(
+        `select min(${attr}), max(${attr}) from ${source} where 1=1`,
+    ).then(el => { return el.rows?.[0] || {}; });
+
+    return reply.status(200).send({ legend, min, max });
 }