@opengis/gis 0.1.76 → 0.1.78

package/module/test/cls/bp_build_type.json

@@ -0,0 +1,37 @@
+[
+  {
+    "id": "1",
+    "text": "Нове будівництво",
+    "color": "#34c0ea"
+  },
+  {
+    "id": "2",
+    "text": "Реконструкція",
+    "color": "#b54aa2"
+  },
+  {
+    "id": "3",
+    "text": "Реставрація",
+    "color": "#7f74da"
+  },
+  {
+    "id": "4",
+    "text": "Капітальний ремонт",
+    "color": "#f8ac59"
+  },
+  {
+    "id": "5",
+    "text": "Реконструкція без зміни зовнішніх геометричних розмірів",
+    "color": "#17a2b8"
+  },
+  {
+    "id": "6",
+    "text": "Реставрація без зміни зовнішніх геометричних розмірів",
+    "color": "#F08FA1"
+  },
+  {
+    "id": "7",
+    "text": "Існуюча забудова",
+    "color": "green"
+  }
+]

package/module/test/cls/doc_status.json

@@ -0,0 +1,32 @@
+[
+    {
+        "id": "1",
+        "text": "Діючий",
+        "color": "#1ab394"
+    },
+    {
+        "id": "2",
+        "text": "Зупинений",
+        "color": "#ed82c8"
+    },
+    {
+        "id": "3",
+        "text": "Скасований",
+        "color": "#4a4a4a"
+    },
+    {
+        "id": "5",
+        "text": "Проектний",
+        "color": "#6495ed"
+    },
+    {
+        "id": "7",
+        "text": "Очікує розгляду",
+        "color": "#92b8ef"
+    },
+    {
+        "id": "10",
+        "text": "Архівний",
+        "color": "#d48428"
+    }
+]

package/module/test/select/core.user_uid.sql

@@ -0,0 +1 @@
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.76",
+  "version": "0.1.78",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -31,12 +31,17 @@
   },
   "dependencies": {
     "@mapbox/sphericalmercator": "1.2.0",
-    "carto": "0.16.3"
+    "carto": "0.16.3",
+    "yaml": "2.8.1",
+    "@opengis/form": "^0.0.28"
+  },
+  "peerDependencies": {
+    "@opengis/fastify-table": "^1.5.4"
   },
   "devDependencies": {
-    "@opengis/core": "^0.0.18",
+    "@opengis/core": "^0.0.23",
     "@opengis/fastify-auth": "^1.1.22",
-    "@opengis/fastify-table": "^1.4.77",
+    "@opengis/fastify-table": "^1.5.4",
     "@opengis/filter": "^0.1.7",
     "@vitejs/plugin-vue": "^5.2.3",
     "axios": "^1.11.0",
@@ -45,8 +50,12 @@
     "lucide-vue-next": "^0.514.0",
     "sass-embedded": "1.86.3",
     "vite": "^6.3.5",
+    "vitest": "^3.2.4",
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
-    "vuedraggable": "^4.1.0"
+    "vuedraggable": "^4.1.0",
+    "yaml": "^2.8.1",
+    "typescript": "^5.9.2",
+    "@opengis/table": "^0.0.27"
   }
 }

package/server/routes/gis/index.mjs

@@ -1,3 +1,5 @@
+import fp from 'fastify-plugin';
+
 import insertColumns from './registers/insert.columns.js';
 import insertFilters from './registers/insert.filters.js';
 import metadataXML from './metadata/metadataXML.js';
@@ -6,8 +8,11 @@ import gisRegistry from './registers/gis.registry.js';
 import gisRegistryList from './registers/gis.registry.list.js';
 import mapRegistry from './registers/map.registry.js';
 import gisExport from './registers/gis.export.js';
+import getServices from './services/get.services.js';
+import deleteService from './services/del.service.js';
+import addService from './services/add.service.js';
 
-export default async function route(app) {
+async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
   app.put('/insert-filters/:token', insertFilters);
   app.get('/gis-registry/:slug', { config: { policy: ['public'] } }, gisRegistry);
@@ -20,4 +25,11 @@ export default async function route(app) {
   app.get('/get-layer-geom/:id', { config: { policy: ['public'] } }, getLayerGeom);
 
   app.get('/gis-export/:type/:slug', { config: { policy: ['public'] } }, gisExport);
+
+  app.get('/gis-service/:id?', { config: { policy: ['public'] } }, getServices);
+  app.post('/gis-service/:id?', { config: { policy: ['public'] } }, addService);
+  app.put('/gis-service/:id', { config: { policy: ['public'] } }, addService);
+  app.delete('/gis-service/:id', { config: { policy: ['public'] } }, deleteService);
 }
+
+export default route;

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

@@ -1,4 +1,4 @@
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
+import { getSelectVal, getSelect } from '@opengis/fastify-table/utils.js';
 
 export async function attachClassifiers(rowOrRows, classifiers = []) {
     const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
@@ -35,3 +35,49 @@ export async function attachClassifiers(rowOrRows, classifiers = []) {
 
     return rowOrRows;
 }
+
+export async function populateFilterOptions({ pg, table, filters, columns, whereConditions }) {
+    if (!filters?.length || !table || !columns?.length) return;
+
+    const optimizedSQL = `select * from ${table} where ${whereConditions || '1=1'}`;
+
+    await Promise.all(
+        filters
+            .filter(
+                (el) =>
+                    el.id &&
+                    el.type !== "Autocomplete" &&
+                    !el.sql &&
+                    !el.options?.find?.((item) => item.sql)
+            )
+            .map(async (el) => {
+                const cls = el.data ? await getSelect(el.data, pg) : null;
+
+                if (!cls && !el.type?.includes?.("Check")) return;
+                const { dataTypeID } = (columns || []).find((item) => item.name === el.id) || {};
+
+                const q = pg.pgType[dataTypeID || '']?.includes("[]")
+                    ? `select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id}) limit 100`
+                    : `select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id} limit 100`;
+
+                const countArr = await pg.queryCache(q, { table });
+
+                if (countArr.timeout) {
+                    Object.assign(el, { timeout: countArr.timeout });
+                    console.warn("timeout filter", table, el.id);
+                }
+
+                const ids = countArr.rows.map((el1) => el1.id);
+
+                const clsData = await getSelectVal({ pg, values: ids, name: el.data });
+
+                const options = countArr.rows.map((cel) => {
+                    const data = cls?.arr?.find?.(
+                        (c) => c.id?.toString?.() === cel.id?.toString?.()
+                    ) || { text: clsData?.[cel.id]?.text || clsData?.[cel.id] || cel.id };
+                    return { ...cel, id: cel.id === null ? "null" : cel.id, ...data };
+                });
+                Object.assign(el, { options });
+            })
+    );
+}

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

@@ -1,4 +1,4 @@
-import { attachClassifiers } from './classifiers.js';
+import { attachClassifiers, populateFilterOptions } from './classifiers.js';
 import { extractVisibleColumns } from './columns.js';
 import { getMeta, getFilterSQL } from "@opengis/fastify-table/utils.js";
 
@@ -26,7 +26,7 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
 
     if (object_id) {
         const sql = `
-            SELECT "${pk}" as id, ${selectColumns.join(", ")} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''}
+            SELECT "${pk}" as id,* , ${selectColumns.join(", ")} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''}
             FROM ${table_name}
             WHERE ${pk} = $1
         `;
@@ -84,6 +84,14 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
         if (col.view_type === 'subtitle') listConfig.subtitle = col.name;
     }
 
+    await populateFilterOptions({
+        pg,
+        table: table_name,
+        filters: activeFilters,
+        columns,
+        whereConditions
+    });
+
     return {
         register_id,
         name,

package/server/routes/gis/services/add.service.js

@@ -0,0 +1,30 @@
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function addService({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    if (method === 'PUT' && !params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    if (method === 'POST') {
+        const { rows = [] } = await dataInsert({
+            pg,
+            id: params.id,
+            table: 'gis.services',
+            data: body,
+            uid: user?.uid,
+        });
+        return reply.status(200).send(rows[0]);
+    }
+
+    const row = await dataUpdate({
+        pg,
+        id: params.id,
+        table: 'gis.services',
+        data: body,
+        uid: user?.uid,
+    });
+
+    return reply.status(200).send(row);
+}

package/server/routes/gis/services/del.service.js

@@ -0,0 +1,13 @@
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function deleteService({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const row = await dataDelete({
+        pg,
+        id: params.id,
+        table: 'gis.services',
+        uid: user?.uid,
+    });
+    return reply.status(200).send(row);
+}

package/server/routes/gis/services/get.services.js

@@ -0,0 +1,43 @@
+import { getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
+
+const table = 'gis.services';
+
+const columnType = {
+    text: 'text',
+    date: 'date',
+    bool: 'yes/no',
+    numeric: 'number',
+    integer: 'number',
+    'timestamp without time zone': 'date',
+    'timestamp with time zone': 'date',
+};
+
+export default async function getServices({ params = {}, pg = pgClients.client }, reply) {
+    const { columns = [] } = await getMeta({ pg, table }) || {};
+
+    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+    const rows = await pg.query(`
+        SELECT 
+            service_id, service_key, name, description, keywords, category, holder, group_id, service_type, 
+            source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
+            popup, style, legend, card, srid, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, is_active as enabled, is_public, is_active, is_downloadable, metadata, 
+            metadata_url, thumbnail_url, created_by, updated_by, updated_at, created_at 
+        FROM gis.services where ${params.id ? 'service_id=$1' : '1=1'}
+    `, [params.id].filter(Boolean)).then(el => el.rows || []);
+
+    rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : undefined }));
+
+    if (params.id && !rows.length) {
+        return reply.status(404).send('service not found');
+    }
+
+    if (params.id) {
+        return reply.status(200).send({ ...rows[0], fields });
+    }
+
+    return reply.status(200).send({
+        rows,
+        fields,
+    });
+}

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

@@ -5,7 +5,7 @@ import { readFile, stat, mkdir, writeFile } from 'node:fs/promises';
 
 import Sphericalmercator from '@mapbox/sphericalmercator';
 
-import { getTemplate, pgClients, getFilterSQL, getMeta, yml2json } from '@opengis/fastify-table/utils.js';
+import { getTemplate, pgClients, getFilterSQL, getMeta, yml2json, getColumnCLS, getSelect } from '@opengis/fastify-table/utils.js';
 
 import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
 
@@ -80,6 +80,8 @@ export default async function vtile({ pg = pgClients.client, params = {}, query
         return reply.status(404).send('layer table not found');
     }
 
+    const cls = await getColumnCLS(table);
+
     const meta = await getMeta({ pg, table });
     const { columns = [] } = meta || {};
 
@@ -100,13 +102,29 @@ export default async function vtile({ pg = pgClients.client, params = {}, query
             : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
     });
 
+    const propsColumns = props.length ? await Promise.all(props.map(async colname => {
+        if (!cls?.[colname]) return `"${colname}"`;
+        const { type, data } = await pg.queryCache('select type, data from admin.cls where parent is null and name=$1 limit 1', { args: [cls[colname]], table: 'admin.cls' })
+            .then(el => el.rows?.[0] || {}) || {};
+
+        if (!type || type === 'sql' && !data) {
+            return `"${colname}"`;
+        }
+
+        if (type === 'json') {
+            return `(select name from admin.cls where parent='${cls[colname]}' and code="${colname}"::text) as "${colname}"`;
+        }
+
+        return `(with c(id,text) as (select * from (${data})q limit 1) select text from c where id::text="${colname}"::text) as "${colname}"`;
+    })) : '';
+
     const q = `SELECT ST_AsMVT(q, '${id.replace(/'/g, "''")}', 4096, 'geom','row') as tile
                       FROM (
                         SELECT
 
                            floor(random() * 100000 + 1)::int + row_number() over() as row,
                             
-                           ${style?.colorAttr ? `${style.colorAttr},` : ''} ${props?.length ? `${props.map(el => `"${el}"`).join(',')},` : ''}
+                           ${style?.colorAttr ? `${style.colorAttr},` : ''} ${propsColumns ? `${propsColumns.filter(Boolean).join('\n,') || ''},` : ''}
 
                             ${pk} as  id, 
                             ST_AsMVTGeom(st_transform(${style?.type === 'point' ? `st_pointonsurface(${geomCol})` : geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,true) geom