@opengis/gis 0.2.166 → 0.2.167

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

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

@@ -2,15 +2,7 @@ import { config } from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
-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);
-}
+const { GetLogs } = mapnik();
 
 export default async function mapnikLogger({
     params,
@@ -20,21 +12,18 @@ export default async function mapnikLogger({
     }
 
     const { data, links, err } = await GetLogs({ path: params['*'] });
-    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({
+    console.log(links);
+    if (err) {
+        return reply.status(400).send(err);
+    }
+
+    if (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 sendTextOrJson(reply, 'text/plain; charset=UTF-8', data);
-}
+    return reply.headers({ "Content-type": "text/plain; charset=UTF-8" }).send(data);
+}

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

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