@opengis/bi 1.0.39 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",

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

@@ -1,4 +1,4 @@
-import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL, getSelectVal } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -29,6 +29,12 @@ export default async function map(req) {
     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),
+      });
+      rows.forEach(row => Object.assign(row, { val: vals?.[row.val || ''] || row.val }));
+    }
     Object.assign(res, { colors: rows }); // кольори для легенди
   }
   if (data?.metrics?.length) {
@@ -40,13 +46,13 @@ export default async function map(req) {
                     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((res1) => Object.values(res1.rows?.[0] || {}));
+      .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((res) => res.rows?.[0] || {});
+  from ${data.table} where ${data.query || '1=1'}`).then(el => el.rows?.[0] || {});
   const extent = extentStr ? extentStr.split(',') : undefined;
 
   Object.assign(res, {