@opengis/gis 0.1.59 → 0.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "type": "module",
   "author": "Softpro",
   "main": "dist/import-file.js",

package/server/routes/gis/registers/funcs/classifiers.js

@@ -1,9 +1,19 @@
 import { getSelectVal } from '@opengis/fastify-table/utils.js';
 
-export async function attachClassifiers(rowOrRows, classifiers) {
+export async function attachClassifiers(rowOrRows, classifiers = []) {
     const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
 
-    for (const row of rows) {
+    await Promise.all(rows.map(async row => {
+        classifiers.filter(item => item.classifier && item.name && row[item.name]).map(async ({ name, classifier }) => {
+            const arr = await getSelectVal({ name: classifier, values: [row[name]], ar: true });
+            const val = arr?.find?.(el => el.id === row[name]);
+            if (val?.text) { row[`${name}_data`] = val; }
+            row[name] = val?.text || val || row[name]; // for frontend
+            row[`${name}_text`] = val?.text || val || row[name]; // legacy?
+        });
+    }));
+
+    /* for (const row of rows) {
         for (const { name, classifier } of classifiers) {
             const value = row[name];
             if (value != null && classifier) {
@@ -18,9 +28,10 @@ export async function attachClassifiers(rowOrRows, classifiers) {
                 ) {
                     row[`${name}_text`] = matchVal;
                 };
+                
             }
         }
-    }
+    } */
 
     return rowOrRows;
 }

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

@@ -84,7 +84,7 @@ export default async function mapTiles({ pg = pgClients.client, params = {}, que
         if (!columns?.length) return null;
 
         const pk = pg.pk?.[table] || loadTable?.key;
-        const fData = filter ? await getFilterSQL({ pg, table: source, filterList: filter }) : {};
+        const fData = filter ? await getFilterSQL({ pg, table: source, filterList: loadTemplate.widgets?.find?.(el => el.id === 'filters')?.config?.filters, filter }) : {};
 
         const geomCol = parseInt(z, 10) < parseInt(pointZoom || '0', 10) || (style?.centroid && gt === 'point')
             ? `ST_Centroid(${geom})`