@opengis/gis 0.2.165 → 0.2.166

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.165",
+  "version": "0.2.166",
   "type": "module",
+  
   "author": "Softpro",
   "main": "./dist/index.js",
   "files": [

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

@@ -176,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;
@@ -194,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', {