@opengis/gis 0.2.113 → 0.2.115

package/module/gis/table/gis.maps.table.json

@@ -12,7 +12,6 @@
     "list",
     "add"
   ],
-  "access": "user",
   "order": "created_at desc",
   "meta": {
     "title": "name",

package/module/gis/table/gis.registers.table.json

@@ -12,7 +12,6 @@
     "list",
     "add"
   ],
-  "access": "user",
   "order": "created_at desc",
   "meta": {
     "title": "name",

package/module/gis/table/gis.services.table.json

@@ -12,7 +12,6 @@
     "list",
     "add"
   ],
-  "access": "user",
   "order": "created_at desc",
   "meta": {
     "title": "name",

package/module/permissions/table/gis.permissions.table.json

@@ -10,7 +10,6 @@
         "list",
         "add"
     ],
-    "access": "user",
     "order": "cdate desc",
     "form": "admin.users.form",
     "meta": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.113",
+  "version": "0.2.115",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/routes/gis/registers/gis.export.js

@@ -1,7 +1,9 @@
 import { createReadStream } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
-import { grpc, config, getMeta, getFolder, jsonToCsv } from '@opengis/fastify-table/utils.js';
+import {
+ grpc, config, getMeta, getFolder, jsonToCsv,
+} from '@opengis/fastify-table/utils.js';
 
 import getInfo from './funcs/get.info.js';
 import ContentType from './funcs/content.type.js';
@@ -13,7 +15,7 @@ const rootDir = getFolder(config, 'local');
  * Експорт даних реєстру
  * @param {Object} query - Об'єкт запиту з форматом.
  * @param {Object} params - Об'єкт параметрів з slug та type.
- * @param {Function} reply 
+ * @param {Function} reply
  * @returns {boolean} File
  */
 
@@ -33,16 +35,16 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
         registerInfo = await pg.query(
             `SELECT table_name, columns, query
             FROM gis.registers
-            WHERE register_key = $1`,
-            [slug]
+            WHERE  $1 in (register_key,register_id)`,
+            [slug],
         );
     }
     if (type === 'service') {
         serviceInfo = await pg.query(
             `SELECT source_path as table_name, attributes as columns, query
             FROM gis.services
-            WHERE service_key = $1`,
-            [slug]
+            WHERE $1 in (service_key,service_id)`,
+            [slug],
         );
     }
     const finalInfo = registerInfo?.rows[0] || serviceInfo?.rows[0];
@@ -50,15 +52,17 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
     const exportable = finalInfo?.columns?.filter(c => c.is_export);
     const colmodel = exportable.map(col => ({
         name: col.name,
-        title: col.ua || col.name
+        title: col.ua || col.name,
     }));
-    const { rows, table, srid, sqlList } = await getInfo({ finalInfo, format }, reply);
+    const {
+ rows, table, srid, sqlList,
+} = await getInfo({ finalInfo, format }, reply);
     let filePath = ['csv', 'geojson', 'xlsx'].includes(format) ? path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.${format}`) : path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.zip`);
     const ext = path.extname(filePath);
     const filePathJSON = ['csv', 'geojson', 'shp'].includes(format) ? filePath.replace(ext, '.json') : filePath;
-    let exportedZipPaths = [];
+    const exportedZipPaths = [];
 
-    const meta = await getMeta({ pg, table: table });
+    const meta = await getMeta({ pg, table });
     if ((format === 'geojson' || format === 'shp') && !meta?.geom) {
         return reply.status(400).send('Ця таблиця не містить полів геометрії. Виберіть тип, який не потребує геометрії для вивантаження');
     }
@@ -146,4 +150,4 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
 
     const fileStream = createReadStream(exportFilePath);
     return reply.send(fileStream);
-}
+}

package/server/routes/map/vtile1.js

@@ -79,8 +79,8 @@ export default async function vtile({
   const { pk: pkey = data.key, columns } = metaTable; // if view - specify via template
 
   // props
-
-  const props = !query.all ? (data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
+  const statusColumn = style?.colorAttr || style?.iconAttr ? columns.filter(col => col.name === style.colorAttr || style?.iconAttr) : [];
+  const props = !query.all ? (statusColumn || []).concat(data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
 
   const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
   const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {