@opengis/gis 0.2.112 → 0.2.113

package/module/test/cls/doc_status.json

@@ -1,32 +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"
-    }
+[
+    {
+        "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

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+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.2.112",
+  "version": "0.2.113",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -73,4 +73,4 @@
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

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/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);
 }