@opengis/gis 0.2.117 → 0.2.119

package/dist/{raster-Du8ZMtjf.js → raster-Cn6l0xfZ.js}

@@ -1,10 +1,10 @@
 import { defineComponent as F, resolveDirective as Ce, openBlock as o, createElementBlock as d, createElementVNode as s, Fragment as q, renderList as B, toDisplayString as c, withDirectives as ie, createTextVNode as Re, normalizeClass as W, ref as h, watch as S, computed as g, vModelText as Ee, onMounted as Se, onBeforeUnmount as Ie, unref as je, createCommentVNode as U, createVNode as M, withCtx as ze, createBlock as L, resolveDynamicComponent as Me } from "vue";
 import { useRouter as Le, useRoute as Ne } from "vue-router";
 import { TooltipDirective as Ue, notify as D } from "@opengis/core";
-import { _ as qe, u as Be, f as Te, M as De, i as Pe, j as le } from "./index-4aSsUBB8.js";
-import { F as Fe } from "./FileEdit-C7tteUeG.js";
-import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CKEep8BL.js";
-import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-Bl5ZwNQX.js";
+import { _ as qe, u as Be, f as Te, M as De, i as Pe, j as le } from "./index-CbdZv1jy.js";
+import { F as Fe } from "./FileEdit-GikPLv1T.js";
+import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CTKkmXWD.js";
+import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DLAIOHJh.js";
 const We = { class: "flex-1 overflow-y-auto p-4 sm:p-6" }, Xe = { class: "space-y-3" }, Ye = { class: "bg-white p-3 rounded-xl border border-gray-200 shadow-sm" }, Ke = { class: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2" }, Ze = { class: "text-xs text-gray-500 mb-1" }, He = {
   key: 0,
   class: "text-base text-md font-semibold text-gray-900"

package/dist/{register-B2gF-GzA.js → register-4wblFcw2.js}

@@ -2,9 +2,9 @@ import { defineComponent as B, mergeModels as j, useModel as S, computed as h, d
 import { useRoute as Z, useRouter as ee } from "vue-router";
 import { notify as F } from "@opengis/core";
 import { _ as te } from "./TableFormHeader.vue_vue_type_script_setup_true_lang-Mci_tseM.js";
-import { V as N } from "./vs-datatable-QKks38xL.js";
-import { _ as z, n as R, m as E, r as H } from "./import-utils-BbZ1gVp-.js";
-import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-4aSsUBB8.js";
+import { V as N } from "./vs-datatable-D_Xzh4qf.js";
+import { _ as z, n as R, m as E, r as H } from "./import-utils-CHIDSKHz.js";
+import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-CbdZv1jy.js";
 import { LucideChevronRight as re } from "lucide-vue-next";
 import { _ as ne } from "./MapSettingsTabs.vue_vue_type_script_setup_true_lang-CKCK3NqY.js";
 const ue = { class: "vs-form" }, de = { class: "vs-form__body auto-rows-max container" }, ce = { class: "flex flex-wrap" }, me = { class: "h-fit w-full mb-6 bg-white border border-gray-200 rounded-lg p-6" }, ve = { class: "h-fit w-full flex flex-wrap" }, pe = { class: "w-full" }, fe = /* @__PURE__ */ B({

package/dist/{service-BnPCDVwm.js → service-2uWyAfnR.js}

@@ -1,12 +1,12 @@
 import { openBlock as C, createElementBlock as M, createElementVNode as v, defineComponent as Z, ref as S, watch as T, createTextVNode as Di, createVNode as j, createBlock as N, createCommentVNode as P, defineAsyncComponent as Ri, unref as ve, withCtx as qe, withDirectives as Be, vModelText as Ye, normalizeClass as he, Fragment as Nn, renderList as Mn, toDisplayString as te, getCurrentInstance as Dn, onBeforeUnmount as Rn, toRef as $i, computed as Se, onMounted as ji, resolveDynamicComponent as Ui } from "vue";
 import { useRoute as Bi, useRouter as Yi } from "vue-router";
 import { notify as z } from "@opengis/core";
-import { _ as Ne, u as $n, f as Pi, M as Hi, g as Vi, h as qi, i as Ki, j as mn, k as zi, l as Gi, m as Qi, s as hn } from "./index-4aSsUBB8.js";
-import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CKEep8BL.js";
-import { S as el, C as nl } from "./CardIcon-FxpK90rl.js";
-import { _ as jn } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-Bs7gz6Lt.js";
-import { V as Me } from "./vs-datatable-QKks38xL.js";
-import { _ as Je, m as Ze, r as xe } from "./import-utils-BbZ1gVp-.js";
+import { _ as Ne, u as $n, f as Pi, M as Hi, g as Vi, h as qi, i as Ki, j as mn, k as zi, l as Gi, m as Qi, s as hn } from "./index-CbdZv1jy.js";
+import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CTKkmXWD.js";
+import { S as el, C as nl } from "./CardIcon-ODZgA2Pb.js";
+import { _ as jn } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-D3ZPeXMw.js";
+import { V as Me } from "./vs-datatable-D_Xzh4qf.js";
+import { _ as Je, m as Ze, r as xe } from "./import-utils-CHIDSKHz.js";
 /*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
 function Un(e) {
   return typeof e > "u" || e === null;

package/dist/{vs-datatable-QKks38xL.js → vs-datatable-D_Xzh4qf.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-4aSsUBB8.js";
+import { _ as u } from "./index-CbdZv1jy.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/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.117",
+  "version": "0.2.119",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/plugins/mapnik/funcs/checkRasterFile.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { eventStream } from '@opengis/fastify-table/utils.js';
+import { config, eventStream } from '@opengis/fastify-table/utils.js';
 
 import mapnik from "./mapnik.js";
 
@@ -11,8 +11,8 @@ const {
 function sequence(arr, fn) {
     const obj = {};
     return arr.reduce(
-        (promise, relpath, idx) => promise.then(() => fn({
-            relpath, idx,
+        (promise, item, idx) => promise.then(() => fn({
+            ...item, idx,
         })).then(r => Object.assign(obj, r)),
         Promise.resolve(),
     ).then(() => obj);
@@ -20,7 +20,7 @@ function sequence(arr, fn) {
 
 const unsafe = true;
 
-export default async function checkRasterFile({ arr, reply, nocache }) {
+export default async function checkRasterFile({ rows, reply, nocache }) {
     const callback = reply ? eventStream(reply) : () => { };
 
     let
@@ -31,22 +31,23 @@ export default async function checkRasterFile({ arr, reply, nocache }) {
         renderErrorCount = 0,
         rasterInfoErrorCount = 0;
 
-    const result = await sequence((arr || []), async ({
-        relpath, idx,
+    const result = await sequence((rows || []), async ({
+        relpath, srid, idx,
     }) => {
-        callback(`${idx + 1}/${arr.length} (${relpath})`);
+        callback(`${idx + 1}/${rows.length} (${relpath})`);
+        const relpath1 = [config.mapnik?.folder, 'raster', relpath].filter(Boolean).join('/');
 
         // check raster upload status, skip for directories
-        const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath });
+        const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath1 });
 
         if (uploadStatus.exists === false) {
             fileNotFoundCount += 1;
-            callback(`file not found: ${relpath} `);
+            callback(`file not found: ${relpath1} `);
             return null;
         }
 
         // create at xml/:id with name only, always - by path
-        const resp = await CreateXML({ path: relpath, nocache }, (msg) => {
+        const resp = await CreateXML({ path: relpath1, srid, nocache }, (msg) => {
             if (typeof msg === 'string' && msg === 'XML creation complete') {
                 createdCount += 1;
             }
@@ -58,18 +59,18 @@ export default async function checkRasterFile({ arr, reply, nocache }) {
 
         if (resp.error?.message && resp.error.message.startsWith('5 NOT_FOUND')) {
             fileNotFoundCount += 1;
-            callback(`directory not found: ${relpath} `);
+            callback(`directory not found: ${relpath1} `);
             return null;
         }
 
         if (resp.error) {
             xmlErrorCount += 1;
-            callback(`create xml error: ${resp.error.toString()} (${relpath})`);
+            callback(`create xml error: ${resp.error.toString()} (${relpath1})`);
             return null;
         }
 
         const data = await RenderTile({
-            path: relpath,
+            path: relpath1,
             width: 256,
             bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
             ttl: '0',
@@ -77,23 +78,23 @@ export default async function checkRasterFile({ arr, reply, nocache }) {
 
         if (data.err) {
             renderErrorCount += 1;
-            callback(`render error: ${data.err} (${relpath})`);
+            callback(`render error: ${data.err} (${relpath1})`);
             return null;
         }
-        callback(`render ok: ${relpath} `);
+        callback(`render ok: ${relpath1} `);
 
         const { data: rasterInfo, err } = await GetRasterInfo({
-            path: relpath,
+            path: relpath1,
             ttl: '0',
         }).catch(e => ({ err: e }));
 
         if (err) {
             rasterInfoErrorCount += 1;
-            callback(`raster info error: ${err} (${relpath})`);
+            callback(`raster info error: ${err} (${relpath1})`);
             return null;
         }
 
-        return { [relpath]: rasterInfo };
+        return { [relpath1]: rasterInfo };
     });
 
     callback(`${existsCount} - xml exists`);

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

@@ -52,7 +52,17 @@ export default async function clearTiles({
         return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
     }
 
-    const relpath = [config.mapnik?.folder, carto.cartocss_id ? 'vector' : 'raster', raster.source_path || (carto.cartocss_id && carto.source_path ? carto.source_path : params.id)].filter(Boolean).join('/');
+    const getParams = () => {
+        if (carto.cartocss_id && carto.source_path) {
+            return { name: [config.mapnik?.folder, 'vector', carto.source_path].filter(Boolean).join('/') };
+        }
+        if (carto.cartocss_id) {
+            return { name: [config.mapnik?.folder, 'xml', carto.cartocss_id].filter(Boolean).join('/') };
+        }
+        return { path: [config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/') };
+    };
+
+    const { path: relpath, name } = getParams();
 
     if (query.debug) {
         const md5 = raster.source_path
@@ -71,13 +81,11 @@ export default async function clearTiles({
         };
     }
 
-    const opt = {
-        path: carto.cartocss_id ? null : relpath, // for rasters only
-        name: carto.cartocss_id ? `/data/map/${relpath}` : null, // required for cartocss
-    };
-
     try {
-        const data = await ClearTile(opt);
+        const data = await ClearTile({
+            path: relpath, // for rasters only
+            name, // for cartocss
+        });
 
         // if empty directory not found (no tiles rendered yet)
         if (data.result === 'skip') {

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

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { pgClients, eventStream } from '@opengis/fastify-table/utils.js';
+import { config, pgClients, eventStream } from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
@@ -32,10 +32,11 @@ export default async function createXml({
         return reply.status(400).send({ error: 'raster source_path not set', code: 400 });
     }
 
-    const relpath = `/map/raster/${data.source_path}`;
+    // const relpath = `/map/raster/${data.source_path}`;
+    const relpath = [config.mapnik?.folder, 'raster', data.source_path].filter(Boolean).join('/');
 
     // check raster upload status, skip for directories
-    const uploadStatus = path.extname(relpath) ? await GetRasterStatus({ path: data.source_path }) : {};
+    const uploadStatus = path.extname(data.source_path) ? await GetRasterStatus({ path: relpath }) : {};
 
     if (uploadStatus.exists === false) {
         return reply.status(400).send({ error: 'raster not uploaded', code: 400 });
@@ -51,7 +52,7 @@ export default async function createXml({
 
     // create at xml/:id with name only, always - by path
     const resp = await CreateXML({
-        path: data.source_path,
+        path: relpath,
         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

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

@@ -42,18 +42,19 @@ export default async function createXmlMulti({
         id: 'raster_id',
         relpath: 'source_path',
         table: 'gis.rasters',
+        srid: 'srid',
         query: `source_path is not null ${params.id ? ` and raster_id = '${params.id}'` : ''}`,
     }];
 
     applyHookSync('beforeCreateXmlMulti', { list, id: params.id });
 
-    const rows = await Promise.all(list.filter(el => el.id && el.table && el.relpath).map(async el => pg.query(el.q ? `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from (${el.q})q` : `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from ${el.table} where ${el.query || 'true'}`).then(e => e.rows || []))).then(e => e.flat());
+    const rows = await Promise.all(list.filter(el => el.id && el.table && el.relpath).map(async el => pg.query(el.q ? `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table from (${el.q})q` : `select ${el.id} as id, ${el.relpath} as relpath, '${el.table}' as table, ${el.srid || ''} as srid from ${el.table} where ${el.query || 'true'}`).then(e => e.rows || []))).then(e => e.flat());
 
     if (!rows.length) {
         return reply.status(404).send({ error: 'empty rows', code: 404 });
     }
 
-    const results = await checkRasterFile({ arr: rows.map(row => row.relpath), reply, nocache: query.nocache });
+    const results = await checkRasterFile({ rows, reply, nocache: query.nocache });
 
     const q = Object.keys(results || {}).filter(key => results[key] && results[key].extent).map(key => {
         const { extent } = results[key];

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

@@ -31,13 +31,13 @@ export default async function rasterInfo({
 
     const proj4 = raster.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 relpath = ['raster', config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/');
+    const relpath = [config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/');
 
-    const { data, cache } = await GetRasterInfo({
+    const { data, cache, error } = await GetRasterInfo({
         path: relpath,
         proj4,
         ttl: query.nocache ? '0' : '1h',
-    });
+    }).catch(err => ({ error: err.toString() }));
 
     if (query.debug) {
         return { data, cache, raster };
@@ -45,8 +45,9 @@ export default async function rasterInfo({
 
     return {
         time: Date.now() - time,
-        ...data,
+        ...data || {},
         ...raster,
+        error,
         cache,
         url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
     };

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

@@ -95,10 +95,10 @@ export default async function gisRtile({
 
         const getParams = () => {
             if (data.type === 'css' && data.source_path) {
-                return { name: path.posix.join('/data/map', config.mapnik?.folder || '', 'vector', data.source_path, 'map') };
+                return { name: path.posix.join(config.mapnik?.folder || '', 'vector', data.source_path) };
             }
             if (data.type === 'css') {
-                return { name: path.posix.join('/data/map', config.mapnik?.folder || '', 'xml', id) };
+                return { name: path.posix.join(config.mapnik?.folder || '', 'xml', id) };
             }
             return { path: path.posix.join(config.mapnik?.folder || '', 'raster', data.source_path) };
         };