@opengis/gis 0.1.25 → 0.1.27

package/dist/import-file.js

@@ -25107,7 +25107,8 @@ const Ab = { class: "w-full flex flex-col bg-white border border-stone-200 shado
                 default: tr(() => [
                   v[1] || (v[1] = Br(" Перейти на карту "))
                 ]),
-                _: 1
+                _: 1,
+                __: [1]
               })
             ]),
             default: tr(() => [
@@ -29804,7 +29805,8 @@ const Iw = {
             default: tr(() => [
               E[1] || (E[1] = Br(" Відкрити бокову панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [1]
           })
         ]),
         _: 1
@@ -29996,7 +29998,8 @@ function oS(h, d, y, b, k, P) {
       default: tr(() => [
         d[0] || (d[0] = re("div", null, "Повернутися до початкових налаштувань", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [0]
     })
   ]);
 }
@@ -30168,7 +30171,8 @@ function dS(h, d, y, b, k, P) {
     default: tr(() => [
       d[0] || (d[0] = re("div", null, "Надрукувати", -1))
     ]),
-    _: 1
+    _: 1,
+    __: [0]
   });
 }
 const fS = /* @__PURE__ */ rr(pS, [["render", dS]]), mS = {
@@ -30223,7 +30227,8 @@ function gS(h, d, y, b, k, P) {
     default: tr(() => [
       d[1] || (d[1] = re("div", null, "Перемикач виду", -1))
     ]),
-    _: 1
+    _: 1,
+    __: [1]
   });
 }
 const yS = /* @__PURE__ */ rr(mS, [["render", gS]]), _S = {}, vS = {
@@ -30443,7 +30448,8 @@ function OS(h, d, y, b, k, P) {
       default: tr(() => [
         d[7] || (d[7] = re("div", null, "Дізнатися геолокацію", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [7]
     })
   ]);
 }
@@ -31203,7 +31209,8 @@ function dA(h, d, y, b, k, P) {
             default: tr(() => [
               d[2] || (d[2] = Br(" Приховати панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [2]
           })
         ]),
         re("div", cA, [
@@ -31248,7 +31255,8 @@ function dA(h, d, y, b, k, P) {
       default: tr(() => [
         d[6] || (d[6] = re("div", null, "Виміряти довжину", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [6]
     })
   ]);
 }
@@ -31549,7 +31557,8 @@ function PA(h, d, y, b, k, P) {
             default: tr(() => [
               d[1] || (d[1] = Br(" Приховати панель "))
             ]),
-            _: 1
+            _: 1,
+            __: [1]
           })
         ]),
         re("div", kA, [
@@ -31586,7 +31595,8 @@ function PA(h, d, y, b, k, P) {
       default: tr(() => [
         d[4] || (d[4] = re("div", null, "Виміряти площу", -1))
       ]),
-      _: 1
+      _: 1,
+      __: [4]
     })
   ]);
 }
@@ -32323,9 +32333,8 @@ const IA = /* @__PURE__ */ rr(wA, [["render", PA], ["__scopeId", "data-v-024154e
                 key: 0,
                 map: y.value,
                 activeTool: E.value,
-                setActiveTool: Yn,
-                ref_for: !0
-              }, _t === "home" ? { initialView: Fn.value } : {}, { onCardValuesId: oi }), null, 16, ["map", "activeTool"])) : kt("", !0)
+                setActiveTool: Yn
+              }, { ref_for: !0 }, _t === "home" ? { initialView: Fn.value } : {}, { onCardValuesId: oi }), null, 16, ["map", "activeTool"])) : kt("", !0)
             ], 64))), 128))
           ])) : kt("", !0)
         ], 512), [

package/module/gis/card/gis.maps.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 
+tokens:
+  edit: { table: gis.maps, form: gis.maps.form,  id: '{{id}}', ignoreCheck: true }
+
 panels:
   - type: container # закріплений зліва container  col, width як простіше
     col: 5

package/module/gis/card/gis.metadata.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 
+tokens:
+  edit: { table: gis.metadata, form: gis.metadata.form,  id: '{{id}}', ignoreCheck: true }
+
 panels:
   - type: container
     col: 5

package/module/gis/card/gis.rasters.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 
+tokens:
+  edit: { table: gis.rasters, form: gis.rasters.form,  id: '{{id}}', ignoreCheck: true }
+
 panels:
   - type: container
     col: 5

package/module/gis/card/gis.registers.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 
+tokens:
+  edit: { table: gis.registers, form: gis.registers.form,  id: '{{id}}', ignoreCheck: true }
+
 panels:
   - type: container # закріплений зліва container  col, width як простіше
     col: 5

package/module/gis/card/gis.services.table/index.yml

@@ -1,5 +1,8 @@
 component: default
 
+tokens:
+  edit: { table: gis.services, form: gis.services.form,  id: '{{id}}', ignoreCheck: true }
+
 panels:
   - type: container # закріплений зліва container  col, width як простіше
     col: 4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "type": "module",
   "author": "Softpro",
   "main": "dist/import-file.js",
@@ -30,8 +30,10 @@
     "@grpc/grpc-js": "1.13.4",
     "@grpc/proto-loader": "0.7.15",
     "@mapbox/sphericalmercator": "1.2.0",
-    "@opengis/fastify-table": "1.4.1",
-    "@opengis/v3-core": "^0.3.187",
+    "@opengis/fastify-file": "1.1.2",
+    "@opengis/fastify-table": "1.4.15",
+    "@opengis/fastify-auth": "1.1.0",
+    "@opengis/v3-core": "^0.3.196",
     "@opengis/v3-filter": "0.1.18",
     "@turf/turf": "7.2.0",
     "axios": "1.9.0",
@@ -55,4 +57,4 @@
     "sass-embedded": "1.86.3",
     "vite": "^6.3.5"
   }
-}
+}

package/plugin.js

@@ -5,8 +5,6 @@ import { config } from '@opengis/fastify-table/utils.js';
 config.prefix = config.prefix || '/api';
 
 config.admin = true; // for user-menu
-config.auth = config.auth || {};
-config.auth.disable = true; // if fastify-auth not registered, then auth is disabled
 
 async function plugin(app, opts = config) {
   // API

package/server/plugins/vite.js

@@ -1,12 +1,13 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
 import { createServer } from 'vite';
 
+import { config } from '@opengis/fastify-table/utils.js';
+
 const isProduction = process.env.NODE_ENV === 'production';
 
 console.log({ isProduction });
 
-
 async function plugin(fastify, opts) {
 
   const viteServer = !isProduction ? await createServer({
@@ -28,6 +29,10 @@ async function plugin(fastify, opts) {
 
     // this is middleware for vite's dev server
     fastify.addHook('onRequest', async (request, reply) => {
+      const { user } = request.session?.passport || {};
+      if (!user && config.pg && !config.auth?.disable) {
+        return reply.redirect('/login');
+      }
       const next = () => new Promise((resolve) => {
         viteServer.middlewares(request.raw, reply.raw, () => resolve());
       });
@@ -57,6 +62,10 @@ async function plugin(fastify, opts) {
   fastify.get('/public/*', staticFile);
 
   fastify.get('*', async (req, reply) => {
+    const { user } = req.session?.passport || {};
+    if (!user && config.pg && !config.auth?.disable) {
+      return reply.redirect('/login');
+    }
     if (!isProduction) return null; // admin vite
     const stream = fs.createReadStream('admin/dist/index.html');
     return reply.type('text/html').send(stream);

package/server/routes/gis/index.mjs

@@ -5,6 +5,7 @@ import getLayerGeom from './services/get.layer.geom.js';
 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';
 
 export default async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
@@ -17,4 +18,6 @@ export default async function route(app) {
   app.get('/xml/:id', { config: { policy: ['public'] } }, metadataXML);
 
   app.get('/get-layer-geom/:id', { config: { policy: ['public'] } }, getLayerGeom);
+
+  app.get('/gis-export/:type/:slug', { config: { policy: ['public'] } }, gisExport);
 }

package/server/routes/gis/registers/funcs/content.type.js

@@ -0,0 +1,10 @@
+const ContentType = {
+    xml: 'application/xml',
+    shp: 'application/zip',
+    csv: 'text/csv',
+    geojson: 'application/vnd.geo+json',
+    json: 'application/json',
+    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+};
+
+export default ContentType;

package/server/routes/gis/registers/funcs/get.info.js

@@ -0,0 +1,89 @@
+import { pgClients } from '@opengis/fastify-table/utils.js';
+import { attachClassifiers } from '../../../gis/registers/funcs/classifiers.js';
+const pg = pgClients.client;
+
+export default async function getInfo({ finalInfo, format }, reply) {
+  if (!finalInfo) return { error: 'No data found' };
+
+  const table = finalInfo?.table_name;
+  const queryCondition = finalInfo?.query || '1=1';
+  const columns = finalInfo?.columns || finalInfo?.attributes || '[]';
+  const exportable = columns.filter(c => c.is_export);
+  const selectNames = exportable.map(c => `"${c.name}"`);
+  const selectSQL = `
+    SELECT ${selectNames?.length ? selectNames.join(', ') : ''} ${format === 'geojson' || format === 'shp'? `, ST_AsGeoJSON(geom)::json as geom` : ``}
+    FROM ${table}
+    WHERE ${queryCondition} ${format === 'geojson' || format === 'shp'? `and geom is not null` : ``}
+  `;
+
+  if (format === 'shp') {
+    const { rows: geomTypeRows } = await pg.query(`
+      SELECT DISTINCT ST_GeometryType(geom) AS geom_type
+      FROM ${table}
+      WHERE geom IS NOT NULL
+    `);
+    const geometryTypes = geomTypeRows.map(row => row.geom_type);
+    
+    const sqlList = geometryTypes.map(type => {
+      return {
+        type,
+        query: `
+          SELECT ${selectNames.join(', ')}, ST_AsGeoJSON(geom)::json as geom
+          FROM ${table}
+          WHERE ${queryCondition} AND ST_GeometryType(geom) = '${type}' AND geom IS NOT NULL
+        `,
+      };
+    });
+    
+    const { rows: [{ srid }] } = await pg.query(`
+      SELECT ST_SRID(geom) AS srid
+      FROM ${table}
+      WHERE geom IS NOT NULL
+      LIMIT 1;
+    `);
+
+    return {
+      columns: exportable,
+      table,
+      srid: srid || 4326,
+      geomTypes: geometryTypes,
+      sqlList
+    };
+  }
+
+  const { rows } = await pg.query(selectSQL);
+  if (!rows?.length) {
+      return reply.status(404).send({ message: 'Немає даних, які можна експортувати', status: 404 });
+  }
+
+  const classifiers = exportable
+    .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
+    .map(col => ({ name: col.name, classifier: col.data }));
+
+  const rowsWithClassifiers = await attachClassifiers(rows, classifiers);
+
+  const simplifiedRows = rowsWithClassifiers.map(row => {
+    const newRow = { ...row };
+
+    for (const key of Object.keys(newRow)) {
+        if (key.endsWith('_data') && typeof newRow[key]?.text === 'string') {
+          const baseKey = key.replace(/_data$/, '');
+          newRow[baseKey] = newRow[key].text;
+        }
+
+        if (key.endsWith('_text') && typeof newRow[key] === 'string') {
+          const baseKey = key.replace(/_text$/, '');
+          newRow[baseKey] = newRow[key];
+        }
+      }
+
+    return newRow;
+  });
+  
+  return {
+    rows: simplifiedRows,
+    data: rows,
+    columns: exportable,
+    table
+  };
+}

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

@@ -0,0 +1,149 @@
+import { createReadStream } from 'fs';
+import { mkdir, writeFile } from 'node:fs/promises';
+import path from 'path';
+import { config, getMeta, getFolder } from '@opengis/fastify-table/utils.js';
+import { grpc } from '@opengis/fastify-file/utils.js';
+import convertJSONToCSV from '@opengis/fastify-file/server/routes/file/controllers/utils/convertJSONToCSV.js';
+import getInfo from './funcs/get.info.js';
+import ContentType from './funcs/content.type.js';
+const { jsonToXls, geojsonToShp } = grpc();
+const rootDir = getFolder(config, 'local');
+
+/**
+ * Експорт даних реєстру
+ * @param {Object} query - Об'єкт запиту з форматом.
+ * @param {Object} params - Об'єкт параметрів з slug та type.
+ * @param {Function} reply 
+ * @returns {boolean} File
+ */
+
+export default async function gisExport({ pg, query = {}, params = {} }, reply) {
+    const { format } = query;
+    const { slug, type } = params;
+    if (!['csv', 'xlsx', 'shp', 'geojson'].includes(format)) {
+        return reply.code(401).send({ message: 'Param format is invalid. Allowed: csv, xlsx, shp, geojson', status: 404 });
+    }
+    if (!slug) return reply.code(401).send({ message: 'slug is not defined', status: 404 });
+    if (!type) return reply.code(401).send({ message: 'type is not defined', status: 404 });
+    
+    let registerInfo;
+    let serviceInfo;
+
+    if (type === 'register') { 
+        registerInfo = await pg.query(
+            `SELECT table_name, columns, query
+            FROM gis.registers
+            WHERE register_key = $1`,
+        [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]
+        );
+    }
+    const finalInfo = registerInfo?.rows[0] || serviceInfo?.rows[0];
+
+    const exportable = finalInfo?.columns?.filter(c => c.is_export);
+    const colmodel = exportable.map(col => ({
+        name: col.name,
+        title: col.ua || col.name
+    }));
+    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 meta = await getMeta({ pg, table: table });
+    if ((format === 'geojson' || format === 'shp') && !meta?.geom) {
+        return reply.status(400).send('Ця таблиця не містить полів геометрії. Виберіть тип, який не потребує геометрії для вивантаження');
+    }
+
+    if (format === 'xlsx') {
+        if (!jsonToXls) {
+            const message = 'Сервіс конвертації jsonToXls тимчасово недоступний. Спробуйте експортувати дані у іншому форматі...';
+            const error = new Error(message);
+            error.status = 503;
+
+            throw error;
+        }
+        const { result } = await jsonToXls({
+            json: JSON.stringify(rows),
+            colmodel: JSON.stringify(colmodel),
+        });
+    
+        await mkdir(path.dirname(filePath), { recursive: true });
+        await writeFile(filePath, result, 'base64');
+    }
+
+    if (format === 'csv') {
+        await mkdir(path.dirname(filePathJSON), { recursive: true });
+        await writeFile(filePathJSON, JSON.stringify(rows));
+        
+        await convertJSONToCSV({
+            filePath: filePathJSON, colmodel, columnList: colmodel.map(c => c.name),
+        });
+    }
+
+    if (['shp', 'geojson'].includes(format)) { 
+        if (format === 'geojson') {
+            const geojson = {
+            type: 'FeatureCollection',
+            features: rows.map((row) => ({
+                type: 'Feature',
+                geometry: row.geom,
+                properties: Object.fromEntries(Object.entries(row).filter(([key]) => key !== 'geom')),
+            })),
+        };
+        filePath = filePathJSON.replace('.json', '.geojson');
+        await mkdir(path.dirname(filePath), { recursive: true });
+        await writeFile(filePath, JSON.stringify(geojson));
+    }
+        
+    if (format === 'shp') {
+        const proj = `EPSG:${srid || 4326}`;
+        for (const { type, query } of sqlList) {
+            const { rows } = await pg.query(query);
+            if (!rows.length) continue;
+
+            const geojson = {
+                type: 'FeatureCollection',
+                features: rows.map(row => ({
+                    type: 'Feature',
+                    geometry: row.geom,
+                    properties: Object.fromEntries(Object.entries(row).filter(([k]) => k !== 'geom')),
+                })),
+            };
+            const geomShort = type.toLowerCase().replace('st_', '');
+            const typedPath = filePath.replace('.zip', `_${geomShort}.zip`);
+            
+            const filePathTyped = filePath.replace('.zip', `_${type.toLowerCase().replace('st_', '')}.zip`);
+            const { result: shpZipBuffer } = await geojsonToShp({
+                geojson: JSON.stringify(geojson),
+                proj,
+            });
+
+            await mkdir(path.dirname(filePathTyped), { recursive: true });
+            await writeFile(filePathTyped, Buffer.from(shpZipBuffer, 'base64'));
+
+            exportedZipPaths.push(typedPath);
+        }
+        }
+    }
+
+    let exportFilePath = filePath;
+
+    if (format === 'shp' && exportedZipPaths?.length > 0) {
+        exportFilePath = exportedZipPaths[0];
+    }
+    
+    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(exportFilePath))}`);
+    reply.header('Content-Type', ContentType[format]);
+
+    const fileStream = createReadStream(exportFilePath);
+    return reply.send(fileStream);
+}