@opengis/gis 0.2.129 → 0.2.131

package/dist/{vs-datatable-D6g7tjZo.js → vs-datatable-D-FY2azp.js}

@@ -1,7 +1,7 @@
 import { defineComponent as F, mergeModels as O, defineAsyncComponent as I, useModel as R, ref as y, watch as K, openBlock as o, createElementBlock as s, createElementVNode as e, createVNode as $, unref as x, withCtx as S, createStaticVNode as V, useSlots as P, computed as H, Fragment as b, createTextVNode as U, createCommentVNode as N, renderList as A, normalizeStyle as Q, toDisplayString as M, normalizeClass as z, withModifiers as X, createBlock as Y, resolveDynamicComponent as ee, withDirectives as te, renderSlot as ne } from "vue";
 import { notify as E } from "@opengis/core";
 import { Edit as le, Trash as oe } from "lucide-vue-next";
-import { _ as u } from "./index-UGx54M0Q.js";
+import { _ as u } from "./index-DtOSF_ba.js";
 const se = { class: "flex items-center justify-center col-span-3 gap-2" }, re = { class: "flex justify-end p-[20px] gap-[10px] border-t w-full" }, ie = /* @__PURE__ */ F({
   __name: "vs-datatable-controls",
   props: /* @__PURE__ */ O({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.129",
+  "version": "0.2.131",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.147",
+    "@opengis/fastify-table": "^2.1.1",
     "@opengis/filter": "0.1.33",
     "@opengis/form": "^0.0.133",
     "@opengis/table": "^0.0.27",

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

@@ -10,13 +10,15 @@ const { prefix = '/api' } = config;
 const exclude = ['created_at', 'updated_at', 'created_by', 'updated_by'];
 
 export default async function checkCarto({
-    pg = pgClients.client, params,
+    pg = pgClients.client, params, query, user,
 }, reply) {
     const time = Date.now();
     if (!config.mapnik?.server) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
+    const { sql } = query || {};
+
     // extract all columns, migrations-agnostic
     const cartocss = await pg.query('select *, ARRAY[ST_XMin(geom), ST_YMin(geom),  ST_XMax(geom),  ST_YMax(geom)] as bounds, st_asgeojson(geom)::json as geom, source_path from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
 
@@ -36,7 +38,13 @@ export default async function checkCarto({
     }).catch(err => ({ err: err.toString() }));
 
     // skip empty bounds[null,null,null,null]
-    const bounds = cartocss.bounds && cartocss.geom ? cartocss.bounds : await cartoBounds({ id: params.id, dataset: cartocss.config, table: cartocss.card_table }, pg);
+    const bounds = cartocss.bounds && cartocss.geom && !(query.nocache && user?.user_type?.includes?.('admin')) ? cartocss.bounds : await cartoBounds({
+        id: params.id, dataset: cartocss.config, table: cartocss.card_table, sql,
+    }, pg).catch(err => ({ err: err.toString() }));
+
+    if (!(cartocss.bounds && cartocss.geom) && sql && user?.user_type?.includes?.('admin')) {
+        return bounds;
+    }
 
     return {
         time: Date.now() - time,
@@ -46,5 +54,6 @@ export default async function checkCarto({
         bounds,
         render: !!rtile.base64,
         renderError: rtile.err && config.local ? rtile.err : !!rtile.err,
+        boundsError: bounds?.err && config.local ? bounds.err : !!bounds.err,
     };
 }

package/server/routes/gis/registers/add.registry.js

@@ -4,18 +4,17 @@ export default async function addGisRegistry({
     method, params = {}, body, pg = pgClients.client, user = {},
 }, reply) {
     if (method === 'POST') {
-
         if (!body?.register_key) {
             return reply.status(400).send('not enough body params: register_key');
         }
 
-        const { rows = [] } = await dataInsert({
+        const res = await dataInsert({
             pg,
             table: 'gis.registers',
             data: body,
             uid: user?.uid,
         });
-        return reply.status(200).send(rows[0]);
+        return reply.status(200).send(res.data);
     }
 
     if (!params.slug) {
@@ -33,4 +32,4 @@ export default async function addGisRegistry({
     });
 
     return reply.status(200).send(row);
-}
+}

package/server/routes/gis/registers/funcs/columns.js

@@ -1,5 +1,3 @@
 export function extractVisibleColumns(columns, mode = "table") {
-    return columns.filter((col) =>
-        mode === "card" ? col.hidden_card !== true : col.hidden_register !== true
-    );
-}
+    return (columns || []).filter((col) => (mode === "card" ? col.hidden_card !== true : col.hidden_register !== true));
+}

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

@@ -47,13 +47,17 @@ export default async function pretile({
     return reply.status(422).send({ error: 'Error: querystring/max must be > querystring/zoom', code: 422 });
   }
 
-  const data = await pg.query(`select *, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
-    || await pg.query(`select *, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
+  const data = await pg.query(`select *, geom::box2d as bounds, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
+    || await pg.query(`select *, geom::box2d as bounds, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
 
   if (!data) {
     return reply.status(404).send({ error: 'not found', code: 404 });
   }
 
+  if (!data.bounds || data.bounds === 'BOX(-180 -85.05112877980659,180 85.05112877980659)') {
+    return reply.status(400).send({ error: 'geom is not set', code: 400 });
+  }
+
   const send = eventStream(reply);
 
   try {
@@ -61,16 +65,10 @@ export default async function pretile({
     const name = data.source_type === 'css' ? ['vector', config.mapnik?.folder || '', data.source_path || params.id].filter(Boolean).join('/') : null;
 
     // refresh extent
-    const bounds = data.source_type === 'css'
-      ? await cartoBounds({ id: data.cartocss_id, dataset: data.config/* , table: data.card_table */ }, pg)
-      : await rasterInfo({ pg, params: { id: data.raster_id }, query: {} }).then(el => el?.extent); // data.bounds?.replace?.(')', '').substr(4).split(/[, ]/g).map((el) => el - 0)
+    const bounds = data.bounds.replace(')', '').substr(4).split(/[, ]/g).map((el) => el - 0);
 
     send(`start: ${data.name} ${params.id} ${bounds} ${data.srid} ${data.proj4}`);
 
-    if (!bounds) {
-      return send('geom is not set');
-    }
-
     bounds[0] = Math.max(bounds[0], maxBounds[0]);
     bounds[1] = Math.max(bounds[1], maxBounds[1]);
 

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

@@ -4,7 +4,7 @@ import { createHash } from 'node:crypto';
 import SphericalMercator from '@mapbox/sphericalmercator';
 
 import {
-    config, logger, pgClients,
+    config, logger, pgClients, getRedis,
 } from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
@@ -13,6 +13,8 @@ const { RenderTile } = mapnik();
 
 const mercator = new SphericalMercator({ size: 256 });
 
+const rclient = getRedis();
+
 /**
  * Формування растрового tile cartoCss
  *
@@ -47,6 +49,16 @@ export default async function gisRtile({
         return reply.status(400).send({ error: 'not enough params: xyz', code: 400 });
     }
 
+    const isLocked = rclient ? await rclient.get(`rtile:${id}:${x}:${y}:${z}`) : false;
+
+    if (isLocked) {
+        console.log('is locked', `rtile:${id}:${x}:${y}:${z}`);
+        return reply.status(400).send({ error: 'tile locked', code: 400 });
+    }
+
+    if (rclient) await rclient.set(`rtile:${id}:${x}:${y}:${z}`, 1, 'EX', 10);
+    console.log('not locked', `rtile:${id}:${x}:${y}:${z}`);
+
     const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
 
     const data = pg.pk?.['gis.rasters']

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

@@ -1,14 +1,18 @@
 import { pgClients } from "@opengis/fastify-table/utils.js";
 
-export default async function cartoBounds({ id, dataset, table }, pg = pgClients.client) {
+export default async function cartoBounds({
+    id, dataset, table, sql,
+}, pg = pgClients.client) {
     if (!dataset?.length && !table) {
         return [-180, -85.05112877980659, 180, 85.05112877980659];
     }
 
     const sqlBounds = dataset
-        ? dataset.map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_Transform(ST_SetSRID( ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'), (SELECT st_srid(${geom}) from ${tbl[0]}."${tbl[1]}" limit 1)),4326)`)
+        ? dataset.filter((el, idx, arr) => el.table && arr.findIndex(item => item.table === el.table && (el.gcol || 'geom') === (item.gcol || 'geom')) === idx).map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_Transform(ST_SetSRID( ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'), (SELECT st_srid(${geom}) from ${tbl[0]}."${tbl[1]}" limit 1)),4326)`)
         : [`select ST_Transform(ST_SetSRID(ST_EstimatedExtent('${table.replace(/"/g, "").split('.')[0]}', '${table.replace(/"/g, "").split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table.split('.')[0]}."${table.split('.')[1]}" limit 1)),4326)`];
 
+    if (sql) return sqlBounds.join(' \nunion all\n ');
+
     const geom = await pg.query(
         `update gis.cartocss set             
         geom=(select st_extent(st_transform) from ( ${sqlBounds.join(' union all ')})q )