@opengis/gis 0.2.164 → 0.2.166

package/dist/{raster-DVJiO4HK.js → raster-DFD-dtui.js}

@@ -1,9 +1,9 @@
 import { defineComponent as te, resolveDirective as We, openBlock as u, createElementBlock as m, createElementVNode as n, Fragment as W, renderList as X, toDisplayString as d, withDirectives as we, createTextVNode as Xe, normalizeClass as ae, ref as $, watch as S, computed as h, vModelText as Ke, onMounted as Ye, onBeforeUnmount as Ze, createCommentVNode as q, createVNode as B, withCtx as He, createBlock as F, resolveDynamicComponent as Je } from "vue";
 import { useRouter as et, useRoute as tt } from "vue-router";
 import { TooltipDirective as st, notify as M } from "@opengis/core";
-import { _ as nt, u as lt, f as rt, M as ot, i as it, j as be, F as at } from "./index-lWiWUrDa.js";
-import { _ as ut, a as ct, b as dt, c as ft } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CmDKSALB.js";
-import { _ as he } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-D82X-z0q.js";
+import { _ as nt, u as lt, f as rt, M as ot, i as it, j as be, F as at } from "./index-ClqqnPEd.js";
+import { _ as ut, a as ct, b as dt, c as ft } from "./HeaderActions.vue_vue_type_script_setup_true_lang-D3oMTMO0.js";
+import { _ as he } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-L9BfGfUU.js";
 const mt = { class: "flex-1 overflow-y-auto p-4 sm:p-6" }, pt = { class: "space-y-3" }, gt = { class: "bg-white p-3 rounded-xl border border-gray-200 shadow-sm" }, yt = { class: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2" }, vt = { class: "text-xs text-gray-500 mb-1" }, xt = {
   key: 0,
   class: "text-base text-md font-semibold text-gray-900"

package/dist/{register-D1q_RREp.js → register-DMJ_OnzW.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-BmISto2b.js";
-import { _ as z, n as R, m as E, r as H } from "./import-utils-gA0dsRhG.js";
-import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-lWiWUrDa.js";
+import { V as N } from "./vs-datatable-C27Dlfo3.js";
+import { _ as z, n as R, m as E, r as H } from "./import-utils-HEL359RU.js";
+import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-ClqqnPEd.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-BnT0jfPh.js → service-FcW2Gvt4.js}

@@ -4,12 +4,12 @@ var L = (e, n, t) => pi(e, typeof n != "symbol" ? n + "" : n, t);
 import { openBlock as _, createElementBlock as M, createElementVNode as g, defineComponent as ae, ref as E, watch as $, createTextVNode as mi, createVNode as D, createBlock as P, createCommentVNode as W, defineAsyncComponent as hi, unref as ze, withCtx as bn, withDirectives as fn, vModelText as dn, normalizeClass as _e, Fragment as kt, renderList as At, toDisplayString as fe, getCurrentInstance as Ct, onBeforeUnmount as wt, toRef as gi, computed as ve, onMounted as yi, resolveDynamicComponent as vi } from "vue";
 import { useRoute as bi, useRouter as xi } from "vue-router";
 import { notify as X } from "@opengis/core";
-import { _ as Xe, u as Ge, f as Si, M as ki, g as Ai, h as Ci, i as wi, j as tt, k as Ti, l as _i, m as Ei, s as it, n as Ii } from "./index-lWiWUrDa.js";
-import { _ as Ni, a as $i, b as Li, c as Fi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-CmDKSALB.js";
-import { S as Oi, C as Ri } from "./CardIcon-BZoV9hHZ.js";
+import { _ as Xe, u as Ge, f as Si, M as ki, g as Ai, h as Ci, i as wi, j as tt, k as Ti, l as _i, m as Ei, s as it, n as Ii } from "./index-ClqqnPEd.js";
+import { _ as Ni, a as $i, b as Li, c as Fi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-D3oMTMO0.js";
+import { S as Oi, C as Ri } from "./CardIcon-B-HKyoDs.js";
 import { _ as Tt } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-D3ZPeXMw.js";
-import { V as Ze } from "./vs-datatable-BmISto2b.js";
-import { _ as Nn, m as $n, r as $e } from "./import-utils-gA0dsRhG.js";
+import { V as Ze } from "./vs-datatable-C27Dlfo3.js";
+import { _ as Nn, m as $n, r as $e } from "./import-utils-HEL359RU.js";
 /*! js-yaml 5.2.1 https://github.com/nodeca/js-yaml @license MIT */
 var T = Symbol("NOT_RESOLVED"), Ln = Symbol("MERGE_KEY");
 function U(e, n) {

package/dist/{vs-datatable-BmISto2b.js → vs-datatable-C27Dlfo3.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-lWiWUrDa.js";
+import { _ as u } from "./index-ClqqnPEd.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,7 +1,8 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.164",
+  "version": "0.2.166",
   "type": "module",
+  
   "author": "Softpro",
   "main": "./dist/index.js",
   "files": [

package/server/routes/map/controllers/gis.icon.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import * as solidIcons from '@fortawesome/free-solid-svg-icons';
 import sharp from 'sharp';
 
-const iconFilenamePattern = /^([a-z][a-z0-9]*)-(s|m|l|xl)-fa-([a-z0-9-]+)\+([a-f0-9]{3,8})\.(png|svg)$/i;
+const iconFilenamePattern = /^([a-z][a-z0-9]*)-(s|m|l|xl)-(fa|ar)-([a-z0-9-]+)\+([a-f0-9]{3,8})\.(png|svg)$/i;
 const validColorLengths = new Set([3, 4, 6, 8]);
 
 const iconSizeByCode = {
@@ -56,14 +56,17 @@ function parseIconFilename(filename) {
   const match = iconFilenamePattern.exec(filename);
   if (!match) return null;
 
-  const [, pinName, sizeCode, iconName, hexColor, format] = match;
+  const [, pinName, sizeCode, iconType, iconValue, hexColor, format] = match;
   if (!validColorLengths.has(hexColor.length)) return null;
 
   return {
     filename: filename.toLowerCase(),
     pinName: pinName.toLowerCase(),
     size: iconSizeByCode[sizeCode.toLowerCase()],
-    iconName: iconName.toLowerCase(),
+    iconType: iconType.toLowerCase(),
+    iconValue: iconType.toLowerCase() === 'fa'
+      ? iconValue.toLowerCase()
+      : iconValue.toUpperCase(),
     color: `#${hexColor}`,
     format: format.toLowerCase(),
   };
@@ -103,7 +106,7 @@ function getPinPlacement(pinName, width, height) {
   };
 }
 
-function createForegroundSvg(icon, placement, color) {
+function createFontAwesomeSvg(icon, placement, color) {
   const [width, height, , , pathData] = icon.icon;
   const paths = Array.isArray(pathData) ? pathData : [pathData];
   const x = placement.x - placement.iconSize / 2;
@@ -114,6 +117,21 @@ function createForegroundSvg(icon, placement, color) {
     </svg>`;
 }
 
+function createSymbolSvg(symbol, placement, color) {
+  const fontSize = Math.round(placement.iconSize * 0.75);
+
+  return `<text data-gis-icon-layer="foreground" x="${placement.x}" y="${placement.y}" fill="${color}" font-family="Arial, sans-serif" font-size="${fontSize}" font-weight="700" text-anchor="middle" dominant-baseline="middle">${symbol}</text>`;
+}
+
+function createForegroundSvg(options, placement) {
+  if (options.iconType === 'ar') {
+    return createSymbolSvg(options.iconValue, placement, options.color);
+  }
+
+  const icon = findIcon(options.iconValue);
+  return icon ? createFontAwesomeSvg(icon, placement, options.color) : null;
+}
+
 function setSvgViewport(svg, size, width, height) {
   return svg.replace(/<svg\b([^>]*)>/i, (_, attributes) => {
     const rootAttributes = attributes
@@ -129,7 +147,7 @@ async function createPinSvg({
   pinName,
   size,
   color,
-  icon,
+  ...iconOptions
 }) {
   const templatePath = path.join(pinDirectory, `${pinName}.svg`);
   const template = await readFileIfExists(templatePath, 'utf8');
@@ -142,18 +160,15 @@ async function createPinSvg({
     ? template.replace(/#ff0000/gi, color)
     : template;
   const svg = setSvgViewport(coloredTemplate, size, width, height);
-  const foreground = createForegroundSvg(icon, placement, color);
+  const foreground = createForegroundSvg({ ...iconOptions, color }, placement);
+  if (!foreground) return null;
 
   return svg.replace(/<\/svg>\s*$/, `${foreground}</svg>`);
 }
 
 async function createIcon(options) {
-  const icon = findIcon(options.iconName);
-  if (!icon) return null;
-
   const svg = await createPinSvg({
     ...options,
-    icon,
   });
   if (!svg) return null;
   if (options.format === 'svg') return Buffer.from(svg);
@@ -161,12 +176,14 @@ async function createIcon(options) {
   return sharp(Buffer.from(svg)).png().toBuffer();
 }
 
-async function getOrCreateIcon(options) {
+async function getIcon(options, nocache = false) {
   await iconDirectoryReady;
 
   const iconPath = path.join(iconDirectory, options.filename);
-  const cachedIcon = await readFileIfExists(iconPath);
-  if (cachedIcon) return cachedIcon;
+  if (!nocache) {
+    const cachedIcon = await readFileIfExists(iconPath);
+    if (cachedIcon) return cachedIcon;
+  }
 
   const icon = await createIcon(options);
   if (!icon) return null;
@@ -179,11 +196,12 @@ export default async function gisIconApi(req, reply) {
   const options = parseIconFilename(req.params?.['*'] || '');
   if (!options) return reply.status(400).send('invalid icon name');
 
-  const image = await getOrCreateIcon(options);
+  const nocache = !!req.query?.nocache;
+  const image = await getIcon(options, nocache);
   if (!image) return reply.status(404).send('icon not found');
 
   return reply
     .type(contentTypeByFormat[options.format])
-    .header('Cache-Control', 'public, max-age=31536000, immutable')
+    .header('Cache-Control', nocache ? 'no-cache' : 'public, max-age=31536000, immutable')
     .send(image);
 }

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

@@ -2,7 +2,15 @@ import { config } from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
-const { GetLogs } = mapnik();
+const { GetLogs } = mapnik();
+
+function sendTextOrJson(reply, contentType, payload) {
+    if (typeof payload === 'string' || Buffer.isBuffer(payload)) {
+        return reply.type(contentType).send(payload);
+    }
+
+    return reply.type('application/json').send(payload);
+}
 
 export default async function mapnikLogger({
     params,
@@ -12,18 +20,21 @@ export default async function mapnikLogger({
     }
 
     const { data, links, err } = await GetLogs({ path: params['*'] });
-    console.log(links);
-    if (err) {
-        return reply.status(400).send(err);
-    }
-
-    if (links) {
-        return reply.headers({
+    if (err) {
+        return reply.status(400).send(err);
+    }
+
+    if (links) {
+        if (typeof links !== 'string') {
+            return sendTextOrJson(reply, 'text/html; charset=UTF-8', links);
+        }
+
+        return reply.headers({
             "Content-Type": "text/html; charset=UTF-8",
             "Content-Security-Policy": "default-src 'none'",
             "X-Content-Type-Options": "nosniff",
         }).send(links.replace(/\/api\/gis-logger/g, '/logger-gis'));
     }
 
-    return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);
-}
+    return sendTextOrJson(reply, 'text/plain; charset=UTF-8', data);
+}

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

@@ -9,9 +9,13 @@ import {
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
-const { RenderTile } = mapnik();
-
-const mercator = new SphericalMercator({ size: 256 });
+const { RenderTile } = mapnik();
+
+const mercator = new SphericalMercator({ size: 256 });
+
+function isTrue(value) {
+    return value === true || value === 'true' || value === '1';
+}
 
 /**
  * Формування растрового tile cartoCss
@@ -28,14 +32,16 @@ const mercator = new SphericalMercator({ size: 256 });
  * @param {String} y - координата x
  */
 
-export default async function gisRtile({
-    pg = pgClients.client, params, query, user,
-}, reply) {
+export default async function gisRtile({
+    pg = pgClients.client, params, query, user,
+}, reply) {
     if (!RenderTile) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
-    const { id, z, y } = params;
+    const { id, z, y } = params;
+    const nocache = isTrue(query.nocache);
+    const nottl = isTrue(query.nottl);
 
     const x = params.x.split('.')[0] - 0;
 
@@ -85,8 +91,10 @@ export default async function gisRtile({
     const meta = config?.mapnik?.meta ? true : false;
 
     try {
-        const ttl = (query.nocache ? '0' : null)
-            || (data.type === 'css' && !data.is_static ? '1w' : null);
+        // ttl: '0' tells the Mapnik service to skip its tile cache and render again.
+        const ttl = nocache
+            ? '0'
+            : (data.type === 'css' && !data.is_static ? '1w' : null);
 
         const md5 = data.source_path
             ? createHash('md5').update(data.source_path).digest('hex')
@@ -132,10 +140,18 @@ export default async function gisRtile({
             const accelPath = result.tile_path?.startsWith('/') ? result.tile_path : `/${result.tile_path}`;
             const metaHeaders = {
                 'Content-Type': 'image/webp',
-                'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000',
+                'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000',
                 'X-Accel-Redirect': accelPath,
             };
-            if (query.debug) return reply.send({ ...metaHeaders, base64: result.base64, z, x, y });
+            if (query.debug) {
+                return reply.type('application/json').send({
+                    ...metaHeaders,
+                    base64: result.base64,
+                    z,
+                    x,
+                    y,
+                });
+            }
             reply.headers(metaHeaders);
             return reply.code(204).send();
         }
@@ -156,7 +172,7 @@ export default async function gisRtile({
 
         const buffer = result.data || Buffer.from(result.base64, 'base64');
 
-        return reply.headers({ 'Content-Type': 'image/webp', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
+        return reply.headers({ 'Content-Type': 'image/webp', 'Cache-Control': nocache || nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
     }
     catch (err) {
         logger.file('rtile/error', {