@opengis/bi 1.2.2 → 1.2.4

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,
+        };
+    }
 }

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

@@ -1,183 +1,183 @@
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-import path from 'path';
-import { createHash } from 'crypto';
-import { writeFile, mkdir } from 'fs/promises';
-import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
-import { getWidget } from '../../../../utils.js';
-
-import { getFolder, getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import normalizeData from '../../data/controllers/util/normalizeData.js';
-
-const mercator = new Sphericalmercator({ size: 256 });
-
-const types = {
-  point: 'ST_Point' /* ,ST_MultiPoint */,
-  polygon: 'ST_Polygon,ST_MultiPolygon',
-};
-
-const area = {
-  1: 1000000,
-  2: 100000,
-  3: 100000,
-  4: 100000,
-  5: 100000,
-  6: 100000,
-  7: 100000,
-  8: 100000,
-  9: 100000,
-  10: 50000,
-  11: 40000,
-  12: 20000,
-  13: 20000,
-};
-
-export default async function vtile(req, reply) {
-  const { params = {}, query = {} } = req;
-
-  const {
-    filter,
-    widget,
-    dashboard,
-    sql,
-    cluster,
-    type,
-    nocache,
-    geom = 'geom',
-    pointZoom = 0,
-  } = query;
-
-  if (!widget) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const { y, z } = params;
-  const x = params.x?.split('.')[0] - 0;
-
-  if (!x || !y || !z) {
-    return { message: 'not enough params: xyz', status: 400 };
-  }
-
-  const { pg = req.pg || pgClients.client, data } = await getWidget({ pg: req.pg, widget, dashboard });
-
-  const headers = {
-    'Content-Type': 'application/x-protobuf',
-    'Cache-Control': nocache || sql ? 'no-cache' : 'public, max-age=86400',
-  };
-
-  const hash = [pointZoom, filter].filter((el) => el).join();
-
-  const root = getFolder(req);
-  const file = path.join(
-    root,
-    `/map/vtile/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}${z}/${x}/${y}.mvt`
-  );
-
-  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 = {},
-      metric,
-    } = normalizeData(data, query);
-
-    // get sql
-    const columns = data.columns?.map((el) => el.name || el)?.join(',') || '1';
-    const filterQ = filter
-      ? await getFilterSQL({ pg, table, filter })
-      : undefined;
-    const q = `select "${pkey}", 
-                      ${data?.color ? `"${data?.color}"` : '0'} as x, 
-                      ${data.metrics?.[0] ? `"${data.metrics[0]}"::float` : '0'} as metric, 
-                      ${columns}, 
-                      ${geom} as geom 
-                      from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
-
-    if (sql === '1') return q;
-
-    const koef =
-      {
-        10: 0.1,
-        11: 0.05,
-        12: 0.005,
-        13: 0.0002,
-        14: 0.00005,
-      }[z] || 0.000001;
-
-    const geomCol =
-      parseInt(z, 10) < parseInt(pointZoom, 10) || true
-        ? `ST_Centroid(${geom})`
-        : geom;
-
-    const bbox = mercator.bbox(+y, +x, +z, false /* , '900913' */);
-    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
-
-    const areaZoom =
-      area[z] && false
-        ? ` and (st_area(st_transform(${geom},3857)))>'${area[z]}'`
-        : '';
-
-    const q1 =
-      cluster > z
-        ? `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
-        FROM (
-          SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, count(*) as point_count,
-          ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
-          FROM (
-          SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster 
-          FROM (${q})q where ${geom} && ${bbox2d}  ) j
-          WHERE cluster IS NOT NULL
-          GROUP BY cluster
-          ORDER BY 1 DESC
-        )q`
-        : `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
-          FROM (
-            SELECT  
-              floor(random() * 100000 + 1)::int + row_number() over() as row,
-
-              ${pkey} as id, 
-              x,
-              metric,
-              ${columns},
-              ST_AsMVTGeom(st_transform(${geomCol}, 3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
-
-              FROM (select * from (${q})q where ${geom} && ${bbox2d} 
-              
-              and ${geom} is not null and st_srid(${geom}) >0
-              
-              ${areaZoom}
-
-            ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
-            
-            limit 3000)q
-          ) q`;
-
-    if (sql === '2') return q1;
-
-    const { rows = [] } = await pg.query(q1);
-
-    if (sql === '3') return rows.map((el) => el.tile);
-
-    const buffer = Buffer.concat(rows.map((el) => Buffer.from(el.tile)));
-
-    if (!nocache) {
-      await mkdir(path.dirname(file), { recursive: true });
-      await writeFile(file, buffer, 'binary');
-    }
-
-    return reply.headers(headers).send(buffer);
-  } catch (err) {
-    logger.file('bi/vtile', { level: 'ERROR', error: err.toString(), query, params });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import Sphericalmercator from '@mapbox/sphericalmercator';
+
+import path from 'path';
+import { createHash } from 'crypto';
+import { writeFile, mkdir } from 'fs/promises';
+import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
+import { getWidget } from '../../../../utils.js';
+
+import { getFolder, getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+import normalizeData from '../../data/controllers/util/normalizeData.js';
+
+const mercator = new Sphericalmercator({ size: 256 });
+
+const types = {
+  point: 'ST_Point' /* ,ST_MultiPoint */,
+  polygon: 'ST_Polygon,ST_MultiPolygon',
+};
+
+const area = {
+  1: 1000000,
+  2: 100000,
+  3: 100000,
+  4: 100000,
+  5: 100000,
+  6: 100000,
+  7: 100000,
+  8: 100000,
+  9: 100000,
+  10: 50000,
+  11: 40000,
+  12: 20000,
+  13: 20000,
+};
+
+export default async function vtile(req, reply) {
+  const { params = {}, query = {} } = req;
+
+  const {
+    filter,
+    widget,
+    dashboard,
+    sql,
+    cluster,
+    type,
+    nocache,
+    geom = 'geom',
+    pointZoom = 0,
+  } = query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { y, z } = params;
+  const x = params.x?.split('.')[0] - 0;
+
+  if (!x || !y || !z) {
+    return { message: 'not enough params: xyz', status: 400 };
+  }
+
+  const { pg = req.pg || pgClients.client, data } = await getWidget({ pg: req.pg, widget, dashboard });
+
+  const headers = {
+    'Content-Type': 'application/x-protobuf',
+    'Cache-Control': nocache || sql ? 'no-cache' : 'public, max-age=86400',
+  };
+
+  const hash = [pointZoom, filter].filter((el) => el).join();
+
+  const root = getFolder(req);
+  const file = path.join(
+    root,
+    `/map/vtile/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}${z}/${x}/${y}.mvt`
+  );
+
+  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 = {},
+      metric,
+    } = normalizeData(data, query);
+
+    // get sql
+    const columns = data.columns?.map((el) => el.name || el)?.join(',') || '1';
+    const filterQ = filter
+      ? await getFilterSQL({ pg, table, filter })
+      : undefined;
+    const q = `select "${pkey}", 
+                      ${data?.color ? `"${data?.color}"` : '0'} as x, 
+                      ${data.metrics?.[0] ? `"${data.metrics[0]}"::float` : '0'} as metric, 
+                      ${columns}, 
+                      ${geom} as geom 
+                      from ${filterQ ? `(${filterQ})` : table} q where ${where}`;
+
+    if (sql === '1') return q;
+
+    const koef =
+      {
+        10: 0.1,
+        11: 0.05,
+        12: 0.005,
+        13: 0.0002,
+        14: 0.00005,
+      }[z] || 0.000001;
+
+    const geomCol =
+      parseInt(z, 10) < parseInt(pointZoom, 10) || true
+        ? `ST_Centroid(${geom})`
+        : geom;
+
+    const bbox = mercator.bbox(+y, +x, +z, false /* , '900913' */);
+    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
+
+    const areaZoom =
+      area[z] && false
+        ? ` and (st_area(st_transform(${geom},3857)))>'${area[z]}'`
+        : '';
+
+    const q1 =
+      cluster > z
+        ? `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
+        FROM (
+          SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, count(*) as point_count,
+          ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
+          FROM (
+          SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster 
+          FROM (${q})q where ${geom} && ${bbox2d}  ) j
+          WHERE cluster IS NOT NULL
+          GROUP BY cluster
+          ORDER BY 1 DESC
+        )q`
+        : `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
+          FROM (
+            SELECT  
+              floor(random() * 100000 + 1)::int + row_number() over() as row,
+
+              ${pkey} as id, 
+              x,
+              metric,
+              ${columns},
+              ST_AsMVTGeom(st_transform(${geomCol}, 3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) as geom
+
+              FROM (select * from (${q})q where ${geom} && ${bbox2d} 
+              
+              and ${geom} is not null and st_srid(${geom}) >0
+              
+              ${areaZoom}
+
+            ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
+            
+            limit 3000)q
+          ) q`;
+
+    if (sql === '2') return q1;
+
+    const { rows = [] } = await pg.query(q1);
+
+    if (sql === '3') return rows.map((el) => el.tile);
+
+    const buffer = Buffer.concat(rows.map((el) => Buffer.from(el.tile)));
+
+    if (!nocache) {
+      await mkdir(path.dirname(file), { recursive: true });
+      await writeFile(file, buffer, 'binary');
+    }
+
+    return reply.headers(headers).send(buffer);
+  } catch (err) {
+    logger.file('bi/vtile', { level: 'ERROR', error: err.toString(), query, params });
+    return { error: err.toString(), status: 500 };
+  }
+}

package/utils.js

@@ -1,12 +1,12 @@
-// This file contains code that we reuse
-// between our tests.
-
-// import getTemplatePath from '@opengis/fastify-table/table/controllers/utils/getTemplatePath.js';
-import getWidget from './server/utils/getWidget.js';
-import yamlSafe from './server/routes/dashboard/controllers/utils/yaml.js';
-
-export {
-  // getTemplatePath,
-  yamlSafe,
-  getWidget,
-};
+// This file contains code that we reuse
+// between our tests.
+
+// import getTemplatePath from '@opengis/fastify-table/table/controllers/utils/getTemplatePath.js';
+import getWidget from './server/utils/getWidget.js';
+import yamlSafe from './server/routes/dashboard/controllers/utils/yaml.js';
+
+export {
+  // getTemplatePath,
+  yamlSafe,
+  getWidget,
+};