@opengis/bi 1.2.27 → 1.2.29

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

@@ -1,127 +1,127 @@
-import path from 'path';
-import { createHash } from 'crypto';
-import { writeFile, mkdir, readFile, stat } from 'fs/promises';
-import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
-
-
-import { getFolder, getFilterSQL, autoIndex, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import normalizeData from '../../data/controllers/util/normalizeData.js';
-
-import { getWidget } from '../../../../utils.js';
-
-const types = {
-  point: 'ST_Point' /* ,ST_MultiPoint */,
-  polygon: 'ST_Polygon,ST_MultiPolygon',
-};
-const hourMs = 3.6e6;
-
-export default async function geojson(req, reply) {
-  const { query = {} } = req;
-
-  const {
-    filter,
-    widget,
-    sql,
-    type,
-    nocache,
-    id,
-    dashboard,
-    geom = 'geom',
-    pointZoom = 0,
-  } = query;
-
-  if (!widget && !dashboard) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const data = await getWidget({ pg: req.pg, dashboard, widget });
-  if (data.status) return data;
-
-  const pg = data.pg || req.pg || pgClients.client;
-  const hash = [pointZoom, filter].filter((el) => el).join();
-
-  const root = getFolder(req);
-  const file = path.join(
-    root,
-    `/map/geojson/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}.geojson`
-  );
-
-  if (existsSync(file)) {
-    const timeNow = Date.now();
-    const stats = await stat(file);
-    const birthTime = new Date(stats.birthtime).getTime();
-    if (!(birthTime - timeNow > hourMs * 24) && !nocache) {
-      const res = JSON.parse((await readFile(file, 'utf-8')) || {});
-      return res;
-    }
-  }
-
-  try {
-    const pkey = pg.pk?.[data?.table];
-    if (!pkey) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
-        status: 400,
-      };
-    }
-
-    // data param
-    const { table, where = '1=1', xName, x } = normalizeData(data, query);
-
-    if (!xName && !x) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: x axis column not specified`,
-        status: 400,
-      };
-    }
-
-    // get sql
-    const filterQ = filter
-      ? await getFilterSQL({ pg, table, filter, query })
-      : undefined;
-    const q = `select "${pkey}", "${xName || x}", /* st_asgeojson(geom)::json as */ ${geom} as geom from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
-
-    if (sql === '1') return q;
-
-    const { st_geometrytype: geomType = 'point' } = await pg
-      .query(
-        `select st_geometrytype(${geom}), count(*) from ${table} 
-    where ${where} group by st_geometrytype(${geom})`
-      )
-      .then((res) => res.rows?.[0] || {});
-
-    const q1 = `SELECT 'FeatureCollection' As type, json_agg(f) As features FROM ( 
-      SELECT 'Feature' As type, row_number() over() as id,
-      st_asgeojson(st_force2d(${query.srid
-        ? `st_transform(${type === 'centroid' ? `st_centroid(${geom})` : geom},${query.srid})`
-        : `${type === 'centroid' || query.point || query.centroid ? `st_centroid(${geom})` : geom}`
-      }), 6, 0)::json as geometry,    
-      (select row_to_json(tc) from (select ${'' ? `${''} as status, ` : ''} 
-      ${xName ? `${xName},` : ''} 
-      ${data.style?.colorAttr ? `${data.style.colorAttr},` : ''}
-      ${pkey} as id,(select file_path from crm.files 
-        where entity_id=q.${pkey}::text and file_status <>'3' and ext in ('png','jpg') limit 1) as image
-      )tc) as properties
-      from (${q})q where ${id && pkey ? ` ${pkey} = '${id}' and ` : ''} ${geom} is not null
-      ${data.query ? ` and ${data.query}` : ''}
-      ${query.extent ? `and ${geom} && 'BOX(${query.extent.split(',').reduce((p, el, i) => p + el + (i % 2 ? ',' : ' '), '')})'::box2d` : ''}
-      ${types[type] ? ` and ST_GeometryType(${geom}) = any ('{ ${types[type]} }') ` : ''}
-      limit ${geomType?.toLowerCase()?.includes('point') ? '15000' : '2500'})f`;
-
-    if (sql === '2') return q1;
-
-    // auto Index
-    autoIndex({ table, columns: [xName] });
-
-    const res = await pg.query(q1).then((res) => res.rows?.[0] || {});
-
-    await mkdir(path.dirname(file), { recursive: true });
-    await writeFile(file, JSON.stringify(res));
-
-    return res;
-  } catch (err) {
-    logger.file('bi/geojson', { level: 'ERROR', error: err.toString(), query });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import path from 'path';
+import { createHash } from 'crypto';
+import { writeFile, mkdir, readFile, stat } from 'fs/promises';
+import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
+
+
+import { getFolder, getFilterSQL, autoIndex, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+import normalizeData from '../../data/controllers/util/normalizeData.js';
+
+import { getWidget } from '../../../../utils.js';
+
+const types = {
+  point: 'ST_Point' /* ,ST_MultiPoint */,
+  polygon: 'ST_Polygon,ST_MultiPolygon',
+};
+const hourMs = 3.6e6;
+
+export default async function geojson(req, reply) {
+  const { query = {} } = req;
+
+  const {
+    filter,
+    widget,
+    sql,
+    type,
+    nocache,
+    id,
+    dashboard,
+    geom = 'geom',
+    pointZoom = 0,
+  } = query;
+
+  if (!widget && !dashboard) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const data = await getWidget({ pg: req.pg, dashboard, widget });
+  if (data.status) return data;
+
+  const pg = data.pg || req.pg || pgClients.client;
+  const hash = [pointZoom, filter].filter((el) => el).join();
+
+  const root = getFolder(req);
+  const file = path.join(
+    root,
+    `/map/geojson/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}.geojson`
+  );
+
+  if (existsSync(file)) {
+    const timeNow = Date.now();
+    const stats = await stat(file);
+    const birthTime = new Date(stats.birthtime).getTime();
+    if (!(birthTime - timeNow > hourMs * 24) && !nocache) {
+      const res = JSON.parse((await readFile(file, 'utf-8')) || {});
+      return res;
+    }
+  }
+
+  try {
+    const pkey = pg.pk?.[data?.table];
+    if (!pkey) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
+        status: 400,
+      };
+    }
+
+    // data param
+    const { table, where = '1=1', xName, x } = normalizeData(data, query);
+
+    if (!xName && !x) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: x axis column not specified`,
+        status: 400,
+      };
+    }
+
+    // get sql
+    const filterQ = filter
+      ? await getFilterSQL({ pg, table, filter, query })
+      : undefined;
+    const q = `select "${pkey}", "${xName || x}", /* st_asgeojson(geom)::json as */ ${geom} as geom from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
+
+    if (sql === '1') return q;
+
+    const { st_geometrytype: geomType = 'point' } = await pg
+      .query(
+        `select st_geometrytype(${geom}), count(*) from ${table} 
+    where ${where} group by st_geometrytype(${geom})`
+      )
+      .then((res) => res.rows?.[0] || {});
+
+    const q1 = `SELECT 'FeatureCollection' As type, json_agg(f) As features FROM ( 
+      SELECT 'Feature' As type, row_number() over() as id,
+      st_asgeojson(st_force2d(${query.srid
+        ? `st_transform(${type === 'centroid' ? `st_centroid(${geom})` : geom},${query.srid})`
+        : `${type === 'centroid' || query.point || query.centroid ? `st_centroid(${geom})` : geom}`
+      }), 6, 0)::json as geometry,    
+      (select row_to_json(tc) from (select ${'' ? `${''} as status, ` : ''} 
+      ${xName ? `${xName},` : ''} 
+      ${data.style?.colorAttr ? `${data.style.colorAttr},` : ''}
+      ${pkey} as id,(select file_path from crm.files 
+        where entity_id=q.${pkey}::text and file_status <>'3' and ext in ('png','jpg') limit 1) as image
+      )tc) as properties
+      from (${q})q where ${id && pkey ? ` ${pkey} = '${id}' and ` : ''} ${geom} is not null
+      ${data.query ? ` and ${data.query}` : ''}
+      ${query.extent ? `and ${geom} && 'BOX(${query.extent.split(',').reduce((p, el, i) => p + el + (i % 2 ? ',' : ' '), '')})'::box2d` : ''}
+      ${types[type] ? ` and ST_GeometryType(${geom}) = any ('{ ${types[type]} }') ` : ''}
+      limit ${geomType?.toLowerCase()?.includes('point') ? '15000' : '2500'})f`;
+
+    if (sql === '2') return q1;
+
+    // auto Index
+    autoIndex({ table, columns: [xName] });
+
+    const res = await pg.query(q1).then((res) => res.rows?.[0] || {});
+
+    await mkdir(path.dirname(file), { recursive: true });
+    await writeFile(file, JSON.stringify(res));
+
+    return res;
+  } catch (err) {
+    logger.file('bi/geojson', { level: 'ERROR', error: err.toString(), query });
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,69 +1,69 @@
-import { pgClients, getFilterSQL, getSelectVal } from '@opengis/fastify-table/utils.js';
-
-import { getWidget } from '../../../../utils.js';
-
-export default async function map(req) {
-  const { query = {} } = req;
-  const { dashboard, widget } = query;
-
-  const { pg = req.pg || pgClients.client, data, type, layers, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
-
-  if (!['map'].includes(type)) {
-    return { message: 'access restricted: invalid widget type', status: 403 };
-  }
-  if (!data?.table) {
-    return { message: 'invalid widget: param table is required', status: 400 };
-  }
-  if (!pg.pk[data?.table]) {
-    return { message: 'invalid widget: table pkey not found', status: 400 };
-  }
-
-  const { q = '' } = await getFilterSQL({
-    pg,
-    table: data?.table,
-    filter: query.filter,
-  });
-
-  const res = {};
-  if (data?.color) {
-    const { rows = [] } = await pg.query(
-      `select count(*), "${data.color}" as val from ${data.table} where ${data.query || '1=1'} group by "${data.color}"`
-    );
-    if (data?.cls) {
-      const vals = await getSelectVal({
-        pg, name: data.cls, values: rows.map(el => el.val), ar: true,
-      });
-      rows.forEach(row => Object.assign(row, { ...vals?.find?.(el => el.id === row.val) || { text: row.val } }));
-    }
-    Object.assign(res, { colors: rows }); // кольори для легенди
-  }
-  if (data?.metrics?.length) {
-    const metric = data?.metrics[0];
-    const q1 = `select PERCENTILE_CONT(0)  WITHIN GROUP (ORDER BY "${metric}") as "0",
-                    PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY "${metric}") as "25",
-                    PERCENTILE_CONT(0.50) WITHIN GROUP (ORDER BY "${metric}") as "50",
-                    PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY "${metric}") as "75",
-                    PERCENTILE_CONT(1) WITHIN GROUP (ORDER BY "${metric}") as "100" from ${data.table} where ${data.query || '1=1'} and ${q || '1=1'}`;
-    const sizes = await pg
-      .query(q1)
-      .then(el => Object.values(el.rows?.[0] || {}));
-    Object.assign(res, { sizes }); // розміри для легенди
-  }
-  const { bounds, extentStr } = await pg.query(`select count(*),
-    st_asgeojson(st_extent(geom))::json as bounds,
-    replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
-  from ${data.table} where ${data.query || '1=1'}`).then(el => el.rows?.[0] || {});
-  const extent = extentStr ? extentStr.split(',') : undefined;
-
-  Object.assign(res, {
-    layers,
-    style,
-    controls,
-    columns: data.columns,
-    bounds, // Map bounds
-    extent,
-    top: [], // 10 найкращих
-    bottom: [], // 10 найгірших
-  });
-  return res;
-}
+import { pgClients, getFilterSQL, getSelectVal } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+export default async function map(req) {
+  const { query = {} } = req;
+  const { dashboard, widget } = query;
+
+  const { pg = req.pg || pgClients.client, data, type, layers, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
+
+  if (!['map'].includes(type)) {
+    return { message: 'access restricted: invalid widget type', status: 403 };
+  }
+  if (!data?.table) {
+    return { message: 'invalid widget: param table is required', status: 400 };
+  }
+  if (!pg.pk[data?.table]) {
+    return { message: 'invalid widget: table pkey not found', status: 400 };
+  }
+
+  const { q = '' } = await getFilterSQL({
+    pg,
+    table: data?.table,
+    filter: query.filter,
+  });
+
+  const res = {};
+  if (data?.color) {
+    const { rows = [] } = await pg.query(
+      `select count(*), "${data.color}" as val from ${data.table} where ${data.query || '1=1'} group by "${data.color}"`
+    );
+    if (data?.cls) {
+      const vals = await getSelectVal({
+        pg, name: data.cls, values: rows.map(el => el.val), ar: true,
+      });
+      rows.forEach(row => Object.assign(row, { ...vals?.find?.(el => el.id === row.val) || { text: row.val } }));
+    }
+    Object.assign(res, { colors: rows }); // кольори для легенди
+  }
+  if (data?.metrics?.length) {
+    const metric = data?.metrics[0];
+    const q1 = `select PERCENTILE_CONT(0)  WITHIN GROUP (ORDER BY "${metric}") as "0",
+                    PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY "${metric}") as "25",
+                    PERCENTILE_CONT(0.50) WITHIN GROUP (ORDER BY "${metric}") as "50",
+                    PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY "${metric}") as "75",
+                    PERCENTILE_CONT(1) WITHIN GROUP (ORDER BY "${metric}") as "100" from ${data.table} where ${data.query || '1=1'} and ${q || '1=1'}`;
+    const sizes = await pg
+      .query(q1)
+      .then(el => Object.values(el.rows?.[0] || {}));
+    Object.assign(res, { sizes }); // розміри для легенди
+  }
+  const { bounds, extentStr } = await pg.query(`select count(*),
+    st_asgeojson(st_extent(geom))::json as bounds,
+    replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
+  from ${data.table} where ${data.query || '1=1'}`).then(el => el.rows?.[0] || {});
+  const extent = extentStr ? extentStr.split(',') : undefined;
+
+  Object.assign(res, {
+    layers,
+    style,
+    controls,
+    columns: data.columns,
+    bounds, // Map bounds
+    extent,
+    top: [], // 10 найкращих
+    bottom: [], // 10 найгірших
+  });
+  return res;
+}

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

@@ -1,45 +1,45 @@
-import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function downloadClusterData({ pg = pgClients.client, cluster }) {
-    if (!pg || !cluster) return null;
-    const res = await fetch(`https://cdn.softpro.ua/data/bi/${cluster}-ua.geojson`);
-    if (res?.status !== 200) {
-        return {
-            message: `cluster file not found: ${cluster}-ua.json`,
-            status: 404,
-        };
-    }
-    try {
-        const geojson = await res.json();
-        const features = geojson?.features?.filter(
-            (el, idx, arr) => el?.geometry &&
-                arr.map((item) => item.properties.name)
-                    .indexOf(el.properties.name) === idx
-        ); // unique
-        if (!features?.length) {
-            return {
-                message: `cluster file empty: ${cluster}-ua.json`,
-                status: 400,
-            };
-        }
-        const { count = 0 } = await pg.query(`select count(*)::int from bi.cluster where type=$1`, [cluster])
-            .then((res1) => res1.rows?.[0] || {});
-        if (count !== features?.length || config.debug) {
-            // await pg.query(`delete from bi.cluster where type=$1`, [cluster]);
-            const values = features?.map((el) => `('${el.properties.codifier?.replace(/'/g, "''") || ''}','${el.properties.name?.replace(/'/g, "''") || ''}', '${cluster}', ST_GeomFromGeoJSON('${JSON.stringify(el.geometry)}')::geometry)`).join(',');
-
-            const { rowCount } = await pg.query(`insert into bi.cluster (codifier,title,type,geom) 
-            values ${values} on conflict(title,type) do update set codifier=excluded.codifier, geom=excluded.geom`);
-            logger.file('bi/clusterVtile', { cluster, rowCount });
-        }
-    } catch (err) {
-        logger.file('bi/clusterVtile/error', {
-            error: err.toString(),
-            filename: `${cluster}-ua.json`,
-        });
-        return {
-            message: `cluster file import error: ${cluster}-ua.json`,
-            status: 500,
-        };
-    }
+import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function downloadClusterData({ pg = pgClients.client, cluster }) {
+    if (!pg || !cluster) return null;
+    const res = await fetch(`https://cdn.softpro.ua/data/bi/${cluster}-ua.geojson`);
+    if (res?.status !== 200) {
+        return {
+            message: `cluster file not found: ${cluster}-ua.json`,
+            status: 404,
+        };
+    }
+    try {
+        const geojson = await res.json();
+        const features = geojson?.features?.filter(
+            (el, idx, arr) => el?.geometry &&
+                arr.map((item) => item.properties.name)
+                    .indexOf(el.properties.name) === idx
+        ); // unique
+        if (!features?.length) {
+            return {
+                message: `cluster file empty: ${cluster}-ua.json`,
+                status: 400,
+            };
+        }
+        const { count = 0 } = await pg.query(`select count(*)::int from bi.cluster where type=$1`, [cluster])
+            .then((res1) => res1.rows?.[0] || {});
+        if (count !== features?.length || config.debug) {
+            // await pg.query(`delete from bi.cluster where type=$1`, [cluster]);
+            const values = features?.map((el) => `('${el.properties.codifier?.replace(/'/g, "''") || ''}','${el.properties.name?.replace(/'/g, "''") || ''}', '${cluster}', ST_GeomFromGeoJSON('${JSON.stringify(el.geometry)}')::geometry)`).join(',');
+
+            const { rowCount } = await pg.query(`insert into bi.cluster (codifier,title,type,geom) 
+            values ${values} on conflict(title,type) do update set codifier=excluded.codifier, geom=excluded.geom`);
+            logger.file('bi/clusterVtile', { cluster, rowCount });
+        }
+    } catch (err) {
+        logger.file('bi/clusterVtile/error', {
+            error: err.toString(),
+            filename: `${cluster}-ua.json`,
+        });
+        return {
+            message: `cluster file import error: ${cluster}-ua.json`,
+            status: 500,
+        };
+    }
 }