@opengis/gis 0.2.97 → 0.2.99

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/map/main.json

@@ -31,6 +31,7 @@
     "home",
     "geolocation",
     "length",
+    "ruler",
     "area",
     "print"
   ]

package/module/test/map/mbd.json

@@ -85,6 +85,7 @@
     "home",
     "geolocation",
     "length",
+    "ruler",
     "area",
     "print"
   ]

package/module/test/map/ts.json

@@ -46,6 +46,7 @@
     "home",
     "geolocation",
     "length",
+    "ruler",
     "area",
     "print"
   ]

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

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

@@ -2,7 +2,9 @@ import { createHash } from 'node:crypto';
 
 import Sphericalmercator from '@mapbox/sphericalmercator';
 
-import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
+import {
+    config, logger, pgClients, dataUpdate,
+} from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
@@ -26,7 +28,7 @@ const mercator = new Sphericalmercator({ size: 256 });
  */
 
 export default async function rtile({
-    pg = pgClients.client, params, query,
+    pg = pgClients.client, params, query, user,
 }, reply) {
     if (!RenderTile) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
@@ -44,26 +46,35 @@ export default async function rtile({
         return reply.status(400).send({ error: 'not enough params: xyz', code: 400 });
     }
 
-    const raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [id])
+    const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
+
+    const data = pg.pk?.['gis.rasters']
+        ? await pg.queryCache(`select raster_id as id, source_path, is_public, 'raster' as type from gis.rasters where raster_id=$1::text or source_path=$2::text`, { args: [id, decodedPath], table: 'gis.rasters' })
             .then(el => el.rows?.[0] || {})
         : {};
 
-    // const relpath = raster ? `/map/raster/${raster.source_path}` : null;
-
     const carto = pg.pk?.['gis.cartocss']
-        ? await pg.query('select cartocss_id, source_path from gis.cartocss where cartocss_id=$1::text', [id])
-            .then(el => el.rows?.[0] || {})
+        ? await pg.queryCache('select cartocss_id, source_path, is_public from gis.cartocss where cartocss_id=$1::text', { args: [id], table: 'gis.cartocss' }).then(el => el.rows?.[0] || {})
         : {};
 
-    const cartoExists = !!carto.cartocss_id;
+    if (carto.cartocss_id) {
+        Object.assign(data, {
+            id: carto.cartocss_id,
+            source_path: carto.source_path,
+            is_public: carto.is_public,
+            type: 'css',
+        });
+    }
+
+    if (!user?.uid && data.is_public === false) {
+        return reply.status(403).send({ error: 'access restricted', code: 403 });
+    }
 
-    if (!raster.raster_id && !cartoExists) {
-        const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
-        Object.assign(raster, { source_path: decodedPath });
+    if (!data.id && data.type !== 'css') {
+        Object.assign(data, { source_path: decodedPath });
     }
 
-    if (!raster.source_path && !cartoExists) {
+    if (!data.source_path && data.type !== 'css') {
         return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
     }
 
@@ -71,51 +82,51 @@ export default async function rtile({
 
     try {
         const ttl = (query.nocache ? '0' : null)
-            || (cartoExists ? '1h' : null);
+            || (data.type === 'css' ? '1h' : null);
 
-        const md5 = raster.source_path
-            ? createHash('md5').update(raster.source_path).digest('hex')
+        const md5 = data.source_path
+            ? createHash('md5').update(data.source_path).digest('hex')
             : undefined;
-        const base64 = raster.source_path
-            ? Buffer.from(raster.source_path).toString('base64url')
+        const base64 = data.source_path
+            ? Buffer.from(data.source_path).toString('base64url')
             : undefined;
 
         const param = {
-            path: cartoExists ? null : raster.source_path, // for rasters only
-            name: cartoExists && carto.source_path ? `vector/${carto.source_path}` : id, // required for cartocss
+            path: data.type === 'css' ? null : data.source_path, // for rasters only
+            name: data.type === 'css' && data.source_path ? `vector/${data.source_path}` : id, // required for cartocss
             width: 256,
             bbox,
             ttl,
             debug: query.debug,
         };
         // console.log(param);
-        const data = await RenderTile(param);
+        const result = await RenderTile(param);
 
         if (query.debug) {
             return {
-                ...data,
+                ...result,
                 ttl,
                 md5_path: md5,
                 base64_path: base64,
-                raster: !!raster.raster_id,
-                carto: cartoExists,
+                raster: !!data.id,
+                carto: data.type === 'css',
             };
         }
 
-        if (data.err) {
+        if (result.err) {
             logger.file('rtile/error', {
-                error: data.err, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+                error: result.err, x, y, z, id: data.id, type: data.type,
             });
-            return reply.status(500).send({ error: config.local ? data.err : 'render error', code: 500 });
+            return reply.status(500).send({ error: config.local ? result.err : 'render error', code: 500 });
         }
 
-        const buffer = Buffer.from(data.base64, 'base64');
+        const buffer = Buffer.from(result.base64, 'base64');
 
         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, x, y, z, id: cartoExists ? carto.cartocss_id : raster.raster_id, type: cartoExists ? 'css' : 'raster',
+            error: err.toString(), stack: err.stack, x, y, z, id: data.id, type: data.type,
         });
         return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
     }