@opengis/gis 0.2.87 → 0.2.89

package/module/gis/table/gis.cartocss.table.json

@@ -13,15 +13,19 @@
             "ua": "Назва",
             "name": "name",
             "format": "text",
+            "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.source_path}}</p>",
             "link": "/gis.cartocss/{id}"
         },
         {
             "ua": "Шлях",
             "name": "source_path",
+            "width": 100,
+            "hidden": true,
             "format": "text"
         },
         {
             "ua": "Опис",
+            "hidden": true,
             "name": "description",
             "format": "text"
         },
@@ -35,6 +39,7 @@
             "ua": "Включений",
             "name": "enabled",
             "data": "yes_no",
+            "width": 100,
             "format": "boolean",
             "edit": true
         },
@@ -42,6 +47,7 @@
             "ua": "Публічний",
             "name": "is_public",
             "data": "yes_no",
+            "width": 100,
             "format": "boolean",
             "edit": true
         }
@@ -66,4 +72,4 @@
             "type": "Check"
         }
     ]
-}
+}

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

@@ -37,12 +37,14 @@
       "meta": "title",
       "name": "name",
       "format": "slot",
+      "max-w": 500,
       "link": "/gis.maps/{id}",
       "slot": "<div><p>{{data?.name}}</p></div><p class='text-xs text-gray-500'>{{data?.description}}</p>"
     },
     {
       "ua": "Ключові слова",
       "name": "keywords",
+      "hidden": true,
       "format": "text"
     },
     {
@@ -54,6 +56,7 @@
     {
       "ua": "Набори даних",
       "name": "services",
+      "hidden": true,
       "format": "text"
     },
     {
@@ -82,6 +85,7 @@
       "ua": "Карта",
       "name": "map",
       "format": "slot",
+      "width": 50,
       "link": "/maps/{}id}",
       "slot": "<div class='flex items-center gap-3'><svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' class='w-5 h-5 text-blue-600' fill='none' stroke='currentColor' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'><path d='M14.106 5.553a2 2 0 0 0 1.788 0l3.659-1.83A1 1 0 0 1 21 4.619v12.764a1 1 0 0 1-.553.894l-4.553 2.277a2 2 0 0 1-1.788 0l-4.212-2.106a2 2 0 0 0-1.788 0l-3.659 1.83A1 1 0 0 1 3 19.381V6.618a1 1 0 0 1 .553-.894l4.553-2.277a2 2 0 0 1 1.788 0z'></path><path d='M15 5.764v15'></path><path d='M9 3.236v15'></path></svg></div>"
     }
@@ -105,4 +109,4 @@
       "type": "Check"
     }
   ]
-}
+}

package/module/gis/table/gis.ogc_service.table.json

@@ -37,6 +37,7 @@
          "ua": "Тип сервісу",
          "name": "service",
          "data": "ogc.service",
+         "hidden": true,
          "format": "select"
       },
       {
@@ -48,7 +49,7 @@
       {
          "ua": "Шлях",
          "name": "url",
-         "width": 300,
+         "width": 200,
          "edit": true,
          "hidden": true,
          "format": "text"
@@ -57,6 +58,7 @@
          "ua": "Активний",
          "name": "enabled",
          "data": "yes_no",
+         "width": 100,
          "edit": true,
          "format": "boolean"
       },
@@ -65,6 +67,7 @@
          "name": "ispublic",
          "data": "yes_no",
          "edit": true,
+         "width": 100,
          "format": "boolean"
       }
    ],
@@ -95,4 +98,4 @@
          "type": "Check"
       }
    ]
-}
+}

package/module/gis/table/gis.rasters.table.json

@@ -23,13 +23,14 @@
       "link": "/gis.rasters/{id}"
     },
     {
-      "ua": "Система координат",
-      "name": "srid",
+      "ua": "Шлях до растру",
+      "name": "source_path",
       "format": "text"
     },
     {
-      "ua": "Шлях до растру",
-      "name": "source_path",
+      "ua": "Система координат",
+      "name": "srid",
+      "width": 100,
       "format": "text"
     },
     {
@@ -98,4 +99,4 @@
       "type": "Check"
     }
   ]
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.87",
+  "version": "0.2.89",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -24,7 +24,7 @@
     "poltava": "bun --env-file=.env.poltava --hot server",
     "dev:kyiv-demo": "bun --env-file=.env.kyiv-demo --hot server",
     "dev:kamyanske": "bun --env-file=.env.kamyanske --hot server",
-    "dev:kr": "bun --env-file=.env.kr --hot server",
+    "kr": "bun --env-file=.env.kr --hot server",
     "lint": "eslint src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts",
     "fix": "eslint src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "patch": "npm version patch && git push && npm publish",
@@ -73,4 +73,4 @@
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/plugin.js

@@ -5,9 +5,10 @@ import {
 } from '@opengis/fastify-table/utils.js';
 
 config.prefix = config.prefix || '/api';
-
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import mapnikLogger from './server/routes/mapnik/controllers/mapnikLogger.js';
+import mapnikStat from './server/routes/mapnik/controllers/mapnikStat.js';
 
 const dir = dirname(fileURLToPath(import.meta.url));
 
@@ -22,13 +23,15 @@ const columnType = {
   'timestamp without time zone': 'date',
   'timestamp with time zone': 'date',
 };
-
+const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
 async function plugin(app, opts = config) {
   // API
   app.register(import('./server/routes/map/index.mjs'), opts);
   app.register(import('./server/plugins/crons.js'), opts);
   app.register(import('./server/routes/gis/index.mjs'), opts);
   app.register(import('./server/routes/mapnik/index.js'), opts);
+  app.get('/logger-gis/stat', adminParams, mapnikStat);
+  app.get('/logger-gis/*', adminParams, mapnikLogger);
 
   addHook('afterData', async ({
     pg = pgClients.client, payload, id, template,

package/server/plugins/vite.js

@@ -2,9 +2,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { createServer } from 'vite';
 
-import { config } from '@opengis/fastify-table/utils.js';
+// import { config } from '@opengis/fastify-table/utils.js';
 
-const isProduction = process.env.NODE_ENV === 'production' || config.production;
+const isProduction = process.env.NODE_ENV === 'production';
 
 console.log({ isProduction });
 
@@ -61,9 +61,10 @@ async function plugin(fastify, opts) {
 
   fastify.get('*', async (req, reply) => {
     const { user } = req.session?.passport || {};
-    // console.log(req.url);
-    if (!user && req.url !== '/login') {
-      return reply.redirect('/login');
+
+    if (!user && req.url.split('?')[0] !== '/login') {
+      console.log(req.url);
+      return reply.redirect(`/login?redirect=${req.url}`);
     }
     if (!isProduction) return null; // admin vite
     const stream = fs.createReadStream('admin/dist/index.html');

package/server/routes/mapnik/controllers/mapnikLogger.js

@@ -5,14 +5,14 @@ import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 const { GetLogs } = mapnik();
 
 export default async function mapnikLogger({
-    params, query,
+    params,
 }, reply) {
     if (!config.mapServerAddress) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
     const { data, links, err } = await GetLogs({ path: params['*'] });
-
+    console.log(links);
     if (err) {
         return reply.status(400).send(err);
     }
@@ -22,7 +22,7 @@ export default async function mapnikLogger({
             "Content-Type": "text/html; charset=UTF-8",
             "Content-Security-Policy": "default-src 'none'",
             "X-Content-Type-Options": "nosniff",
-        }).send(links);
+        }).send(links.replace(/\/api\/gis-logger/g, '/logger-gis'));
     }
 
     return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);

package/server/routes/mapnik/controllers/rasterInfo.js

@@ -9,6 +9,7 @@ const { prefix = '/api' } = config;
 export default async function rasterInfo({
     pg = pgClients.client, params, query,
 }, reply) {
+    const time = Date.now();
     if (!config.mapServerAddress) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
@@ -40,6 +41,10 @@ export default async function rasterInfo({
     }
 
     return {
-        ...data, ...raster, cache, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
+        time: Date.now() - time,
+        ...data,
+        ...raster,
+        cache,
+        url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
     };
 }

package/server/routes/mapnik/index.js

@@ -3,7 +3,7 @@ import createXml from './controllers/createXml.js';
 import rtile from './controllers/rtile.js';
 import rasterInfo from './controllers/rasterInfo.js';
 import mapnikStat from './controllers/mapnikStat.js';
-import mapnikLogger from './controllers/mapnikLogger.js';
+
 import createXmlMulti from './controllers/createXmlMulti.js';
 import readDir from './controllers/readDir.js';
 import fileStat from './controllers/fileStat.js';
@@ -19,8 +19,7 @@ export default async function route(app) {
   app.get('/gis-xml/:id', publicParams, createXml);
   app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
   app.get('/gis-raster/:id', publicParams, rasterInfo);
-  app.get('/gis-stat/:period?', adminParams, mapnikStat);
-  app.get('/gis-logger/*', adminParams, mapnikLogger);
+
   app.get('/gis-create-xml/:id?', adminParams, createXmlMulti);
   app.get('/gis-files', adminParams, readDir);
   app.get('/gis-file-info', adminParams, fileStat);