@opengis/bi 1.0.14 → 1.0.15

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

@@ -1,104 +1,109 @@
-import { getWidget } from '../../../../utils.js';
-
-export default async function cluster({ pg, funcs, query = {}, log }) {
-  const { widget, filter, dashboard, search } = query;
-
-  if (!widget) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const { data } = await getWidget({ dashboard, widget });
-
-  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,
-      query: where = '1=1',
-      metrics = [],
-      cluster,
-      clusterTable = {},
-    } = data;
-
-    if (!cluster) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
-        status: 400,
-      };
-    }
-
-    if (!metrics.length) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
-        status: 400,
-      };
-    }
-
-    if (!clusterTable?.name) {
-      return {
-        message: 'not enough widget params: clusterTable name',
-        status: 400,
-      };
-    }
-
-    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
-      return {
-        message: 'invalid widget params: clusterTable pkey not found',
-        status: 404,
-      };
-    }
-
-    const { total = 0 } = pg.pk?.[table]
-      ? await pg
-          .queryCache(
-            `select oid::regclass as table, reltuples AS total from pg_class`
-          )
-          .then((res) => res.rows?.find((row) => row.table === table))
-      : {};
-
-    const { bbox } = await pg
-      .query(
-        `select st_asgeojson(box2d(geom))::json as bbox from ${table} where ${where || '1=1'}`
-      )
-      .then((res1) => res1.rows?.[0] || {});
-
-    // get sql
-    const { optimizedSQL } =
-      filter || search
-        ? await funcs.getFilterSQL({ pg, table, filter, search })
-        : {};
-
-    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric 
-        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id from ${clusterTable?.name} where ${clusterTable?.title}=q."${cluster}" limit 1)b on 1=1
-        where ${where} group by ${cluster}, b.id`;
-
-    if (query.sql === '1') return q;
-
-    // auto Index
-    //  funcs.autoIndex({ table, columns: (metrics || []).concat([cluster]) });
-
-    const { rows = [] } = await pg.query(q);
-    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
-    const len = vals.length;
-    const sizes = [
-      vals[0],
-      vals[Math.floor(len / 4)],
-      vals[Math.floor(len / 2)],
-      vals[Math.floor(len * 0.75)],
-      vals[len - 1],
-    ];
-    return { sizes, rows, bbox, count: rows.length, total };
-  } catch (err) {
-    log.error('bi/cluster', { error: err.toString(), query });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+import downloadClusterData from './utils/downloadClusterData.js';
+
+const clusterExists = {};
+
+export default async function cluster({ pg, query = {}, log }) {
+  const { widget, filter, dashboard, search } = query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { data } = await getWidget({ dashboard, widget });
+
+  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,
+      query: where = '1=1',
+      metrics = [],
+      cluster,
+      clusterTable = {},
+    } = data;
+
+    if (!cluster) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+        status: 400,
+      };
+    }
+
+    if (!metrics.length) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+        status: 400,
+      };
+    }
+
+    if (!clusterTable?.name) {
+      Object.assign(clusterTable, {
+        name: 'bi.cluster',
+        title: 'title',
+        query: `type='${cluster}'`,
+      });
+    }
+
+    if (cluster && !clusterExists[cluster]) {
+      const res = await downloadClusterData({ pg, log, cluster });
+      if (res) return res;
+      clusterExists[cluster] = 1;
+    }
+
+    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
+      return {
+        message: 'invalid widget params: clusterTable pkey not found',
+        status: 404,
+      };
+    }
+
+    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 ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    // get sql
+    const { optimizedSQL } =
+      filter || search
+        ? await getFilterSQL({ pg, table, filter, search })
+        : {};
+
+    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric 
+        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
+        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id from ${clusterTable?.name} where ${clusterTable?.title}=q."${cluster}" limit 1)b on 1=1
+        where ${where} group by ${cluster}, b.id order by sum("${metrics[0]}")::float desc`;
+
+    if (query.sql === '1') return q;
+
+    // auto Index
+    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
+
+    const { rows = [] } = await pg.query(q);
+    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
+    const len = vals.length;
+    const sizes = [
+      vals[0],
+      vals[Math.floor(len / 4)],
+      vals[Math.floor(len / 2)],
+      vals[Math.floor(len * 0.75)],
+      vals[len - 1],
+    ];
+    return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+  } catch (err) {
+    log.error('bi/cluster', { error: err.toString(), query });
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,213 +1,166 @@
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-import path from 'path';
-import { createHash } from 'crypto';
-import { writeFile, mkdir } from 'fs/promises';
-
-import { getWidget } from '../../../../utils.js';
-
-const mercator = new Sphericalmercator({ size: 256 });
-
-const clusterExists = {};
-
-export default async function clusterVtile(req, reply) {
-  const { pg, funcs, params = {}, query = {}, log } = req;
-  const { z, y } = params;
-  const x = params.x?.split('.')[0] - 0;
-
-  if (!x || !y || !z) {
-    return { message: 'not enough params: xyz', status: 400 };
-  }
-
-  const { widget, filter, dashboard, search, clusterZoom, nocache, pointZoom } =
-    query;
-
-  if (!widget) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const { data } = await getWidget({ dashboard, widget });
-
-  const headers = {
-    'Content-Type': 'application/x-protobuf',
-    'Cache-Control':
-      nocache || query.sql ? 'no-cache' : 'public, max-age=86400',
-  };
-
-  const hash = [pointZoom, filter].filter((el) => el).join();
-
-  const root = funcs.getFolder(req);
-  const file = path.join(
-    root,
-    `/map/vtile/${widget}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}${z}/${x}/${y}.mvt`
-  );
-
-  try {
-    if (!data?.table) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: table not specified`,
-        status: 400,
-      };
-    }
-
-    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,
-      query: where = '1=1',
-      metrics = [],
-      cluster,
-      clusterTable = {},
-    } = data;
-    if (!clusterTable?.name) {
-      Object.assign(clusterTable, {
-        name: 'bi.cluster',
-        title: 'title',
-        query: `type='${data.cluster}'`,
-      });
-    }
-
-    if (cluster && !clusterExists[data.cluster]) {
-      const res = await fetch(
-        `https://cdn.softpro.ua/data/bi/${data.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) {
-          // await pg.query(`delete from bi.cluster where type=$1`, [cluster]);
-          const values = features
-            ?.map(
-              (el) =>
-                `('${el.properties.name?.replace(/'/g, "''") || ''}', '${cluster}', ST_GeomFromGeoJSON('${JSON.stringify(el.geometry)}')::geometry)`
-            )
-            .join(',');
-          const { rowCount } = await pg.query(
-            `insert into bi.cluster (title,type,geom) values ${values} on conflict(title,type) do update set geom=excluded.geom`
-          );
-          log.info('bi/clusterVtile', { cluster, rowCount });
-        }
-        clusterExists[cluster] = 1;
-      } catch (err) {
-        log.error('bi/clusterVtile', {
-          error: err.toString(),
-          filename: `${cluster}-ua.json`,
-        });
-        return {
-          message: `cluster file import error: ${cluster}-ua.json`,
-          status: 500,
-        };
-      }
-    }
-
-    if (!cluster) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
-        status: 400,
-      };
-    }
-
-    if (!metrics.length) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
-        status: 400,
-      };
-    }
-
-    // get sql
-    const { optimizedSQL } =
-      filter || search
-        ? await funcs.getFilterSQL({ pg, table, filter, search })
-        : {};
-
-    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric, b.* 
-        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-            left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id,
-                ${clusterTable?.geom || 'geom'} as geom from ${clusterTable?.name} 
-                where ${clusterTable?.query || '1=1'} and ${clusterTable?.title}=q."${cluster}" limit 1
-            )b on 1=1 
-        where ${where} group by 
-        ${cluster}, b.id, b.${clusterTable?.geom || 'geom'}`;
-
-    if (query.sql === '1') return q;
-
-    const geomCol =
-      parseInt(z, 10) < parseInt(pointZoom, 10)
-        ? `ST_Centroid(${clusterTable?.geom || data?.geom || 'geom'})`
-        : clusterTable?.geom || data?.geom || 'geom';
-
-    const bbox = mercator.bbox(+y, +x, +z, false /* , '900913' */);
-    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
-
-    const q1 = `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
-            FROM (
-                SELECT  
-                floor(random() * 100000 + 1)::int + row_number() over() as row,
-
-                ${pg.pk?.[clusterTable?.name] ? 'id,' : ''} name, metric,
-
-                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
-
-                and ST_GeometryType(geom) = any ('{ "ST_Polygon", "ST_MultiPolygon" }')
-                
-                limit 3000)q
-            ) q`;
-
-    if (query.sql === '2') return q1;
-
-    // auto Index
-    funcs.autoIndex({ table, columns: (metrics || []).concat([cluster]) });
-
-    const { rows = [] } = await pg.query(q1);
-
-    if (query.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) {
-    log.error('bi/clusterVtile', { 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 { getFolder, getFilterSQL, autoIndex } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+import downloadClusterData from './utils/downloadClusterData.js';
+
+const mercator = new Sphericalmercator({ size: 256 });
+
+const clusterExists = {};
+
+export default async function clusterVtile(req, reply) {
+  const { pg, funcs, params = {}, query = {}, log } = req;
+  const { z, y } = params;
+  const x = params.x?.split('.')[0] - 0;
+
+  if (!x || !y || !z) {
+    return { message: 'not enough params: xyz', status: 400 };
+  }
+
+  const { widget, filter, dashboard, search, clusterZoom, nocache, pointZoom } =
+    query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { data } = await getWidget({ dashboard, widget });
+
+  const headers = {
+    'Content-Type': 'application/x-protobuf',
+    'Cache-Control':
+      nocache || query.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 {
+    if (!data?.table) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: table not specified`,
+        status: 400,
+      };
+    }
+
+    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,
+      query: where = '1=1',
+      metrics = [],
+      cluster,
+      clusterTable = {},
+    } = data;
+    if (!clusterTable?.name) {
+      Object.assign(clusterTable, {
+        name: 'bi.cluster',
+        title: 'title',
+        query: `type='${data.cluster}'`,
+      });
+    }
+
+    if (cluster && !clusterExists[data.cluster]) {
+      const res = await downloadClusterData({ pg, log, cluster });
+      if (res) return res;
+      clusterExists[cluster] = 1;
+    }
+
+    if (!cluster) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+        status: 400,
+      };
+    }
+
+    if (!metrics.length) {
+      return {
+        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+        status: 400,
+      };
+    }
+
+    // get sql
+    const { optimizedSQL } =
+      filter || search
+        ? await getFilterSQL({ pg, table, filter, search })
+        : {};
+
+    const q = `select "${cluster}" as name, sum("${metrics[0]}")::float as metric, b.* 
+        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
+            left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id,
+                ${clusterTable?.geom || 'geom'} as geom from ${clusterTable?.name} 
+                where ${clusterTable?.query || '1=1'} and ${clusterTable?.title}=q."${cluster}" limit 1
+            )b on 1=1 
+        where ${where} group by 
+        ${cluster}, b.id, b.${clusterTable?.geom || 'geom'}`;
+
+    if (query.sql === '1') return q;
+
+    const geomCol =
+      parseInt(z, 10) < parseInt(pointZoom, 10)
+        ? `ST_Centroid(${clusterTable?.geom || data?.geom || 'geom'})`
+        : clusterTable?.geom || data?.geom || 'geom';
+
+    const bbox = mercator.bbox(+y, +x, +z, false /* , '900913' */);
+    const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
+
+    const q1 = `SELECT ST_AsMVT(q, 'bi', 4096, 'geom','row') as tile
+            FROM (
+                SELECT  
+                floor(random() * 100000 + 1)::int + row_number() over() as row,
+
+                ${pg.pk?.[clusterTable?.name] ? 'id,' : ''} name, metric,
+
+                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
+
+                and ST_GeometryType(geom) = any ('{ "ST_Polygon", "ST_MultiPolygon" }')
+                
+                limit 3000)q
+            ) q`;
+
+    if (query.sql === '2') return q1;
+
+    // auto Index
+    autoIndex({ table, columns: (metrics || []).concat([cluster]) });
+
+    const { rows = [] } = await pg.query(q1);
+
+    if (query.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) {
+    log.error('bi/clusterVtile', { error: err.toString(), query, params });
+    return { error: err.toString(), status: 500 };
+  }
+}