@opengis/gis 0.2.123 → 0.2.125

package/dist/{raster-DoQovQ7a.js → raster-fgKYYXVI.js}

@@ -1,9 +1,9 @@
 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 re, F as Fe } from "./index-CwIzZDGO.js";
-import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-BqqrcSzn.js";
-import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DK04uTt0.js";
+import { _ as qe, u as Be, f as Te, M as De, i as Pe, j as re, F as Fe } from "./index-DWGGabsq.js";
+import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-K7A_UX_L.js";
+import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DbJh2Fwh.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-1HxNw096.js → register-C-I3igBi.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-BdV3ZjCU.js";
-import { _ as z, n as R, m as E, r as H } from "./import-utils-CdFxhsAY.js";
-import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-CwIzZDGO.js";
+import { V as N } from "./vs-datatable-BKFXZaVJ.js";
+import { _ as z, n as R, m as E, r as H } from "./import-utils-CGjOAbEq.js";
+import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-DWGGabsq.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-DXsnWnlW.js → service-dErle1NR.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-CwIzZDGO.js";
-import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-BqqrcSzn.js";
-import { S as el, C as nl } from "./CardIcon-B803CYEy.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-DWGGabsq.js";
+import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-K7A_UX_L.js";
+import { S as el, C as nl } from "./CardIcon-BLMtCXLH.js";
 import { _ as jn } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-D3ZPeXMw.js";
-import { V as Me } from "./vs-datatable-BdV3ZjCU.js";
-import { _ as Je, m as Ze, r as xe } from "./import-utils-CdFxhsAY.js";
+import { V as Me } from "./vs-datatable-BKFXZaVJ.js";
+import { _ as Je, m as Ze, r as xe } from "./import-utils-CGjOAbEq.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-BdV3ZjCU.js → vs-datatable-BKFXZaVJ.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-CwIzZDGO.js";
+import { _ as u } from "./index-DWGGabsq.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.123",
+  "version": "0.2.125",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

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

@@ -35,7 +35,7 @@ export default async function checkRasterFile({ rows, reply, nocache }) {
         relpath, srid, idx,
     }) => {
         callback(`${idx + 1}/${rows.length} (${relpath})`);
-        const relpath1 = [config.mapnik?.folder, 'raster', relpath].filter(Boolean).join('/');
+        const relpath1 = ['raster', config.mapnik?.folder, relpath].filter(Boolean).join('/');
 
         // check raster upload status, skip for directories
         const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath1 });

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

@@ -12,6 +12,11 @@ const dirname = path.dirname(filepath);
 const PROTO_PATH = path.join(dirname, '../', 'map.proto');
 // const PROTO_PATH = config.mapServerAddress && config.mapServerAddress.startsWith('127.0.0.1') ? path.join(dirname, '../../../../../../service/mapnikp/map.proto') : path.join(dirname, '../', 'map.proto');
 
+// temporary support of old style environment variables
+if (!config.mapnik?.server) {
+  config.mapnik = { server: config.mapServerAddress };
+}
+
 const { mapnik } = config;
 
 if (!mapnik?.server) {

package/server/plugins/mapnik/map.proto

@@ -31,9 +31,7 @@ message RenderTileRequest {
     string path = 2;
     repeated double bbox = 3;  // [minx, miny, maxx, maxy]
     int32 width = 4;
-    string ttl = 5; // "5m", "1h", "1d" or "0"
     string debug = 6;
-    optional bool skipSubdir = 7;
 }
 
 message RenderTileOut {
@@ -115,7 +113,6 @@ message CreateXMLRequest {
     string debug = 7;
     string nocache = 8;
     string proj4 = 9;
-    bool skipSubdir = 10;
 }
 
 message UploadXMLRequest {
@@ -156,7 +153,6 @@ message GetStatusOut {
 
 message GetStatRequest {
     string period = 1;  // "5m", "1h", "1d"
-    string ttl = 2; // "0"
 }
 
 message GetStatOut {
@@ -184,10 +180,8 @@ message GetLogsOut {
 
 message GetRasterInfoRequest {
     string path = 1;
-    string ttl = 2;
     int64 srid = 3;
     string proj4 = 4;
-    bool skipSubdir = 5;
 }
 
 message FileItem {

package/server/routes/map/maps/get.map.js

@@ -20,7 +20,7 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
   const fields = columns.map(({ name, dataTypeID, title }) => ({
     name,
     type: columnType[pg.pgType?.[dataTypeID] || 'text'],
-    label: title || name
+    label: title || name,
   }));
 
   const mapList = getTemplates('map').map(el => el[0]);
@@ -50,7 +50,7 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
       ...(Array.isArray(obj?.layers) ? obj.layers : []),
       ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
       ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
-      ...(Array.isArray(obj?.rasters) ? obj.rasters : [])
+      ...(Array.isArray(obj?.rasters) ? obj.rasters : []),
     ];
     const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
 
@@ -58,17 +58,17 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
 
     if (layerIds.length > 0) {
       const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
-        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/vtile/'||service_id||'/ua/{z}/{x}/{y}.vmt',null) as url FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
         pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds])
+        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/gis-rtile/'||raster_id||'/{z}/{x}/{y}.png',null) as url FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox, coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds]),
       ]);
 
       const allFetchedLayers = [
         ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
         ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
         ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
-        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' }))
+        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' })),
       ];
 
       const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
@@ -91,7 +91,8 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
         if (layerData.style && typeof layerData.style === 'string') {
           if (layerData.type === 'cartocss') {
             layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
-          } else if (layerData.type !== 'ogc') {
+          }
+          else if (layerData.type !== 'ogc') {
             layerData.style = yml2json(layerData.style);
           }
         }
@@ -110,4 +111,4 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
   }
 
   return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
-}
+}

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

@@ -54,12 +54,12 @@ export default async function clearTiles({
 
     const getParams = () => {
         if (carto.cartocss_id && carto.source_path) {
-            return { name: [config.mapnik?.folder, 'vector', carto.source_path].filter(Boolean).join('/') };
+            return { name: ['vector', config.mapnik?.folder, carto.source_path].filter(Boolean).join('/') };
         }
         if (carto.cartocss_id) {
-            return { name: [config.mapnik?.folder, 'xml', carto.cartocss_id].filter(Boolean).join('/') };
+            return { name: ['xml', config.mapnik?.folder, carto.cartocss_id].filter(Boolean).join('/') };
         }
-        return { path: [config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/') };
+        return { path: ['raster', config.mapnik?.folder, raster.source_path].filter(Boolean).join('/') };
     };
 
     const { path: relpath, name } = getParams();

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

@@ -33,7 +33,7 @@ export default async function createXml({
     }
 
     // const relpath = `/map/raster/${data.source_path}`;
-    const relpath = [config.mapnik?.folder, 'raster', data.source_path].filter(Boolean).join('/');
+    const relpath = ['raster', config.mapnik?.folder, data.source_path].filter(Boolean).join('/');
 
     // check raster upload status, skip for directories
     const uploadStatus = path.extname(data.source_path) ? await GetRasterStatus({ path: relpath }) : {};

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

@@ -31,7 +31,7 @@ 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 = [config.mapnik?.folder, 'raster', raster.source_path].filter(Boolean).join('/');
+    const relpath = ['raster', config.mapnik?.folder, raster.source_path].filter(Boolean).join('/');
 
     const { data, cache, error } = await GetRasterInfo({
         path: relpath,

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

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