@opengis/gis 0.2.112 → 0.2.114

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.112",
+  "version": "0.2.114",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/plugins/vite.js

@@ -63,7 +63,6 @@ async function plugin(fastify, opts) {
     const { user } = req.session?.passport || {};
 
     if (!user && req.url.split('?')[0] !== '/login') {
-      console.log(req.url);
       return reply.redirect(`/login?redirect=${req.url}`);
     }
     if (!isProduction) return null; // admin vite

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/controllers/clearTiles.js

@@ -0,0 +1,34 @@
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import {
+    rm, stat, readdir, mkdir,
+} from 'node:fs/promises';
+
+import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
+
+export default async function clearTiles({
+    params, query, user,
+}, reply) {
+    const filepath = path.join(rootFolder, 'vtile', params.id);
+
+    if (query.debug && user?.user_type?.includes?.('admin')) {
+        return filepath;
+    }
+
+    const exists = existsSync(filepath);
+    const isDirectory = exists ? await stat(filepath).then(el => el.isDirectory()) : false;
+
+    const count = isDirectory ? await readdir(filepath).then(el => el.length) : 0;
+
+    if (isDirectory && count === 0) {
+        return reply.status(404).send({ error: 'Тайли не знайдено', code: 404 });
+    }
+
+    if (isDirectory && exists) {
+        await rm(filepath, { force: true, recursive: true });
+        await mkdir(filepath, { recursive: true });
+        return reply.status(200).send({ message: 'Тайли очищено', code: 200 });
+    }
+
+    return reply.status(400).send({ error: 'Некорректний параметр: id', code: 400 });
+}

package/server/routes/map/index.mjs

@@ -4,9 +4,10 @@ import mapFeatures from './controllers/mapFeatures.js';
 
 import mapCatalog from './controllers/mapCatalog.js';
 import mapCatalogAttribute from './controllers/mapCatalogAttribute.js';
-// import rtile from './controllers/rtile.js';
+
 import vtile from './controllers/vtile.js';
 import vtile1 from './vtile1.js';
+import clearTiles from './controllers/clearTiles.js';
 import geojson from './controllers/geojson.js';
 import jsonData from './controllers/jsonData.js';
 import layerList from './controllers/layerList.js';
@@ -133,6 +134,9 @@ export default async function route(app) {
     console.log('\x1b[34m%s\x1b[0m', 'add vtile from gis');
     app.get('/vtile/:layer/:lang/:z/:y/:x', publicParams, vtile1);
   }
+  if (!app.hasRoute({ method: 'GET', url: '/api/gis-clear-vtile/:id' })) {
+    app.get('/gis-clear-vtile/:id', publicParams, clearTiles);
+  }
 
   if (!app.hasRoute({ method: 'GET', url: '/api/geojson/:layer' })) {
     console.log('\x1b[34m%s\x1b[0m', 'add geojson from gis');

package/server/routes/map/vtile1.js

@@ -31,7 +31,7 @@ export default async function vtile({
   const { y, z } = params;
   const x = params.x.split('.')[0] - 0;
   const {
-    type, nocache, sql, clusterZoom, filter,
+    type, nocache, sql, clusterZoom, filter, nottl,
   } = query;
 
   const hash = [type, clusterZoom, filter].join();
@@ -41,24 +41,27 @@ export default async function vtile({
     `/vtile/${params.layer}/${hash ? `${createHash('md5').update(hash).digest('hex')}/` : ''}${z}/${x}/${y}.vmt`,
   );
 
-  if (existsSync(filepath) && +z < 13 && !nocache && !sql && process.env.NODE_ENV !== 'test') {
+  // layer
+  const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
+
+  // service
+  const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
+
+  const cacheZoom = style?.cacheZoom || 13;
+  const ttl = typeof style?.ttl === 'number' && style.ttl >= 0 ? style.ttl : 86400000;
+
+  if (existsSync(filepath) && +z < cacheZoom && !nocache && !sql && process.env.NODE_ENV !== 'test') {
     const { birthtimeMs = Date.now() } = await stat(filepath);
     const ageInMs = Date.now() - birthtimeMs;
-    if (ageInMs < 86400000) {
+    if (ageInMs < ttl) {
       const buffer = await readFile(filepath);
       return reply.status(200).headers(headers).send(buffer);
     }
   }
 
-  // layer
-  const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
-
-  // service
-  const data = await getTemplate('layer', layer) || await pg.query(`select * from gis.services where ${!user?.uid ? 'is_public and is_active' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
-
   const geom = data?.geometry_column || 'geom';
   const table = data?.source_path;
-  const style = typeof data?.style === 'object' ? data?.style : yaml.load(data?.style);
   const filterList = data?.filters;
   const layerQuery = data?.query;
 
@@ -172,5 +175,5 @@ export default async function vtile({
     await writeFile(filepath, buffer, 'binary');
   }
 
-  return reply.headers({ ...headers, 'Cache-Control': nocache ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
+  return reply.headers({ ...headers, 'Cache-Control': nocache || nottl ? 'no-cache' : headers['Cache-Control'] }).send(buffer);
 }