@opengis/gis 0.2.77 → 0.2.78

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

@@ -15,6 +15,11 @@
             "format": "text",
             "link": "/gis.cartocss/{id}"
         },
+        {
+            "ua": "Шлях",
+            "name": "source_path",
+            "format": "text"
+        },
         {
             "ua": "Опис",
             "name": "description",
@@ -30,13 +35,15 @@
             "ua": "Включений",
             "name": "enabled",
             "data": "yes_no",
-            "format": "badge"
+            "format": "boolean",
+            "edit": true
         },
         {
             "ua": "Публічний",
             "name": "is_public",
             "data": "yes_no",
-            "format": "badge"
+            "format": "boolean",
+            "edit": true
         }
     ],
     "filterList": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.77",
+  "version": "0.2.78",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -52,12 +52,12 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.125",
+    "@opengis/fastify-table": "^2.0.132",
     "@opengis/filter": "0.1.31",
     "@opengis/form": "^0.0.103",
     "@opengis/table": "^0.0.27",
     "@vitejs/plugin-vue": "^5.2.4",
-    "axios": "^1.13.2",
+    "axios": "^1.13.5",
     "eslint": "^8.57.1",
     "eslint-config-airbnb": "19.0.4",
     "eslint-plugin-import": "^2.32.0",
@@ -68,8 +68,8 @@
     "sass-embedded": "1.86.3",
     "typescript": "^5.9.3",
     "vite": "^6.4.1",
-    "vue": "^3.5.26",
+    "vue": "^3.5.28",
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/server/plugins/mapnik/map.proto

@@ -11,6 +11,8 @@ service MapService {
     rpc RenderTile(RenderTileRequest) returns (RenderTileOut);
     rpc ClearTile(ClearTileRequest) returns (ClearTileOut);
     rpc ReadDir(ReadDirRequest) returns (ReadDirOut);
+    rpc FileStat(FileStatRequest) returns (FileStatOut);
+    rpc FileSearch(FileSearchRequest) returns (FileSearchOut);
     rpc CreateXML(CreateXMLRequest) returns (stream JobProgress); // streaming XML creation
     rpc UploadXML(UploadXMLRequest) returns (UploadXMLOut);
     rpc UploadRaster(UploadRasterRequest) returns (UploadRasterOut);
@@ -50,6 +52,33 @@ message ClearTileOut {
     string err = 2;
 }
 
+message FileStatRequest {
+    string path = 1;
+}
+
+message FileStatOut {
+    bool exists = 1;
+    string name = 2;
+    int64 size = 3;
+    string adate = 4;
+    string cdate = 5;
+    string mdate = 6;
+}
+
+message FileSearchRequest {
+    string path = 1;
+    string key = 2;
+    string period = 3;
+    int64 size = 4;
+}
+
+message FileSearchOut {
+    bool exists = 1;
+    int32 count = 2;
+    repeated FileInfo files = 3;
+    repeated DirInfo directories = 4;
+}
+
 message ReadDirRequest {
     string path = 1;
 }
@@ -58,12 +87,21 @@ message FileInfo {
     string name = 1;
     int64 size = 2;
     string date = 3;
+    string dir = 4;
+}
+
+message DirInfo {
+    string name = 1;
+    int64 size = 2;
+    string date = 3;
+    int64 children = 4;
 }
 
 message ReadDirOut {
     bool exists = 1;
     int32 count = 2;
     repeated FileInfo files = 3;
+    repeated DirInfo directories = 4;
 }
 
 message CreateXMLRequest {
@@ -75,6 +113,7 @@ message CreateXMLRequest {
     string name = 6;
     string debug = 7;
     string nocache = 8;
+    string proj4 = 9;
 }
 
 message UploadXMLRequest {
@@ -145,6 +184,7 @@ message GetRasterInfoRequest {
     string path = 1;
     string ttl = 2;
     int64 srid = 3;
+    string proj4 = 4;
 }
 
 message FileItem {

package/server/routes/gis/cartocss/get.cartocss.js

@@ -15,7 +15,7 @@ export default async function checkCarto({
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
-    const cartocss = await pg.query('select config,  ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, cartocss_key,name,description,style,group_id,enabled,is_public from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+    const cartocss = await pg.query('select config,  ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, cartocss_key,name,description,style,group_id,enabled,is_public, source_path from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
 
     if (!cartocss) {
         return reply.status(404).send({ error: `cartocss not found: ${params.id}`, code: 404 });

package/server/routes/map/controllers/layerList.js

@@ -39,6 +39,11 @@ export default async function layerList({
                         )||'/{z}/{x}/{y}.png',null) as url, 'raster' as service, group_id,
         null as popup, null as card, null as filters, source_path
     from gis.rasters s where is_active and ${!user.uid ? 'is_public' : '1=1'}
+    union all 
+    select cartocss_id as id, name, null as category, style, geom::box2d as bbox, st_asgeojson(geom)::json as geom,
+     coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png?nottl=1',null) as url, 'cartocss' as service, group_id,
+        null as popup, null as card, null as filters, source_path
+    from gis.cartocss where enabled and ${!user.uid ? 'is_public' : '1=1'}
     `;
 
   if (user.uid && sql) return q;
@@ -58,7 +63,7 @@ export default async function layerList({
   }
 
   // parse service style
-  rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
+  rows.forEach(row => Object.assign(row, { style: row.style && ['vtile', 'geojson'].includes(row.service) ? yml2json(row.style) : row.style }));
   // parse extent string to number[]
   rows.filter(row => row.extent).forEach(row => Object.assign(row, {
     extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]

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

@@ -0,0 +1,94 @@
+import { createHash } from 'node:crypto';
+
+import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { ClearTile } = mapnik();
+
+/**
+ * Формування растрового tile cartoCss
+ *
+ * @method GET
+ * @alias rtile
+ * @param {String} bbox - bbox
+ * @param {Number} height - висота по координатам
+ * @param {Number} width - ширина по координатам
+ * @param {String} data - стилізація
+ * @param {String} lang - мова
+ * @param {String} z - координата z
+ * @param {String} x - координата y
+ * @param {String} y - координата x
+ */
+
+export default async function clearTiles({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!ClearTile) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    if (!params.id) {
+        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
+    }
+
+    const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+
+    const raster = pg.pk?.['gis.rasters']
+        ? await pg.query(`select raster_id, source_path from gis.rasters where raster_id=$1::text union all
+        select raster_id, source_path from gis.rasters where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
+        : {};
+
+    const carto = pg.pk?.['gis.cartocss']
+        ? await pg.query(`select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text union all
+        select cartocss_id, source_path from gis.cartocss where source_path=$2::text`, [params.id, decodedPath]).then(el => el.rows?.[0] || {})
+        : {};
+
+    if (!raster.raster_id && !carto.cartocss_id) {
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    if (!raster.source_path && !carto.cartocss_id) {
+        return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
+    }
+
+    if (query.debug) {
+        const md5 = raster.source_path
+            ? createHash('md5').update(raster.source_path).digest('hex')
+            : undefined;
+        const base64 = raster.source_path
+            ? Buffer.from(raster.source_path).toString('base64url')
+            : undefined;
+        return {
+            id: raster.raster_id || carto.cartocss_id,
+            carto: !!carto.cartocss_id,
+            raster: !!raster.raster_id,
+            md5_path: md5,
+            base64_path: base64,
+            source_path: raster.source_path || carto.source_path,
+        };
+    }
+
+    try {
+        const data = await ClearTile({
+            path: carto.cartocss_id ? null : raster.source_path, // for rasters only
+            name: carto.cartocss_id && carto.source_path ? `vector/${carto.source_path}` : params.id, // required for cartocss
+        });
+
+        // if empty directory not found (no tiles rendered yet)
+        if (data.result === 'skip') {
+            return reply.status(200).send({ message: 'tiles directory not found', code: 200 });
+        }
+
+        // if cache deleted or empty directory exists = ok
+        if (data.result === 'success') {
+            return reply.status(200).send({ message: 'ok', code: 200 });
+        }
+
+        throw new Error(data.err);
+    }
+    catch (err) {
+        logger.file('clearTiles/error', { error: err.toString(), stack: err.stack });
+        return reply.status(500).send({ error: config.local ? err.toString() : 'clearTiles error', code: 500 });
+    }
+}

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

@@ -47,12 +47,15 @@ export default async function createXml({
 
     const callback = eventStream(reply);
 
+    const proj4 = data.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [data.srid]).then(el => el.rows?.[0]?.proj4text) : undefined;
+
     // create at xml/:id with name only, always - by path
     const resp = await CreateXML({
         path: data.source_path,
         name: id, // create additional xml named as primary key at xml directory
         previewZoom: data.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
-        srid: data.srid, // auto detected if not supplied
+        // srid: data.srid, // auto detected if not supplied
+        proj4,
         vrt: query.vrt, // force vrt even if relpath leads to single raster file
         debug: query.debug, // stream debug info
         nocache: query.nocache, // recreate if exists

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

@@ -0,0 +1,34 @@
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileSearch } = mapnik();
+
+const maxLimit = 100;
+
+// example: GET /api/gis-files?dir=tiles/3828667893214610450/13/4884&key=1&size=1675&period=5m
+export default async function fileSearch({
+    query,
+}, reply) {
+    if (!FileSearch) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const {
+        dir, key, period, size, page,
+    } = query;
+
+    const limit = Math.min(query.limit || 16, maxLimit);
+    const offset = page && page > 0 ? (page - 1) * limit : 0;
+
+    if (!key && !period && !size) {
+        return reply.status(400).send({ error: 'not enough query params: key / period / size', code: 400 });
+    }
+
+    const result = await FileSearch({
+        path: dir, key, period, size,
+    });
+
+    return {
+        count: result.count,
+        data: (result.files || []).slice(offset, offset + limit).map(el => ({ type: 'file', ...el })),
+    };
+}

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

@@ -0,0 +1,27 @@
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { FileStat } = mapnik();
+
+// example: GET /api/gis-files?path=tiles/3828667893214610450/13/4884/2828.png
+export default async function fileStat({
+    query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server not configured', code: 400 });
+    }
+
+    if (config.ready?.mapnik !== true) {
+        return reply.status(400).send({ error: 'mapnik server not ready', code: 400 });
+    }
+
+    const { path } = query || {};
+
+    if (!path) {
+        return reply.status(400).send({ error: 'not enough query params: path', code: 400 });
+    }
+
+    const data = await FileStat({ path });
+    return { data };
+}

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

@@ -14,7 +14,7 @@ export default async function rtile({
     }
 
     const raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public from gis.rasters where raster_id=$1::text', [params.id])
+        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid from gis.rasters where raster_id=$1::text', [params.id])
             .then(el => el.rows?.[0] || {})
         : {};
 
@@ -27,12 +27,20 @@ export default async function rtile({
         Object.assign(raster, { source_path: decodedPath });
     }
 
+    const proj4 = raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined;
+
     const { data, cache } = await GetRasterInfo({
         path: raster.source_path,
+        // srid: raster.srid,
+        // proj4,
         ttl: query.nocache ? '0' : '1h',
     });
 
+    if (query.debug) {
+        return { data, cache, raster };
+    }
+
     return {
- ...data, ...raster, cache, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
-};
+        ...data, ...raster, cache, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
+    };
 }

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

@@ -0,0 +1,19 @@
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { ReadDir } = mapnik();
+
+// example: GET /api/gis-files?dir=tiles/3828667893214610450
+export default async function readDir({
+    query,
+}, reply) {
+    if (!ReadDir) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { dir } = query;
+
+    const {
+        exists = false, count = 0, files = [], directories = [],
+    } = await ReadDir({ path: dir });
+    return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
+}

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

@@ -82,7 +82,7 @@ export default async function rtile({
 
         const data = await RenderTile({
             path: cartoExists ? null : raster.source_path, // for rasters only
-            name: cartoExists && carto.source_path ? carto.source_path : id, // required for cartocss
+            name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
             width: 256,
             bbox,
             ttl,
@@ -91,21 +91,30 @@ export default async function rtile({
 
         if (query.debug) {
             return {
-                ...data, ttl, md5_path: md5, base64_path: base64,
+                ...data,
+                ttl,
+                md5_path: md5,
+                base64_path: base64,
+                raster: !!raster.raster_id,
+                carto: cartoExists,
             };
         }
 
         if (data.err) {
-            logger.file('rtile/error', { error: data.err });
+            logger.file('rtile/error', {
+                error: data.err, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+            });
             return reply.status(500).send({ error: config.local ? data.err : 'render error', code: 500 });
         }
 
         const buffer = Buffer.from(data.base64, 'base64');
 
-        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
+        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
     }
     catch (err) {
-        logger.file('rtile/error', { error: err.toString(), stack: err.stack });
+        logger.file('rtile/error', {
+            error: err.toString(), stack: err.stack, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+        });
         return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
     }
 }

package/server/routes/mapnik/functions/uploadXML.js

@@ -98,7 +98,7 @@ export default async function uploadXML({
         throw new Error('xml generation error');
     }
     const { status } = await UploadXML({
-        path: relpath,
+        path: relpath ? `vector/${relpath}` : null,
         name: relpath ? null : id,
         xml: xmlFileText,
     });

package/server/routes/mapnik/index.js

@@ -5,6 +5,10 @@ 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';
+import fileSearch from './controllers/fileSearch.js';
+import clearTiles from './controllers/clearTiles.js';
 
 const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
 const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
@@ -18,4 +22,8 @@ export default async function route(app) {
   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);
+  app.get('/gis-file-search', adminParams, fileSearch);
+  app.get('/gis-clear-rtile/:id', adminParams, clearTiles);
 }