@opengis/gis 0.2.54 → 0.2.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.54",
+  "version": "0.2.55",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

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

@@ -34,7 +34,7 @@ export default async function checkRasterFile({ arr, reply }) {
     const result = await sequence((arr || []), async ({
         relpath, idx,
     }) => {
-        callback(`${idx + 1}/${arr.length}`);
+        callback(`${idx + 1}/${arr.length} (${relpath})`);
 
         // check raster upload status, skip for directories
         const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath });
@@ -71,7 +71,6 @@ export default async function checkRasterFile({ arr, reply }) {
         const data = await RenderTile({
             path: relpath,
             width: 256,
-            height: 256,
             bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
             ttl: '0',
         }).catch(err => ({ err: err.toString() }));

package/server/routes/map/controllers/layerList.js

@@ -46,7 +46,8 @@ export default async function layerList({
   // parse service style
   rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
   // assign service url
-  rows.filter(row => row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
+  rows.filter(row => row.service && ['raster', 'cartocss'].includes(row.service)).forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/gis-rtile/${row.id}/{z}/{x}/{y}.png` }));
+  rows.filter(row => !row.url && row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
   // parse extent string to number[]
   rows.filter(row => row.extent).forEach(row => Object.assign(row, {
     extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]

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

@@ -23,7 +23,6 @@ export default async function checkCarto({
     const rtile = await RenderTile({
         name: params.id,
         width: 256,
-        height: 256,
         bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427],
         ttl: '0',
         // debug: query.debug,

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

@@ -11,7 +11,7 @@ export default async function mapnikLogger({
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
-    if (!['render', 'error', 'info', 'critical'].includes(params.type)) {
+    if (params.type && !['render', 'error', 'info', 'critical'].includes(params.type)) {
         return reply.status(400).send({ error: 'invalid params: type', code: 400 });
     }
 

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

@@ -70,7 +70,6 @@ export default async function rtile({
             path: cartoExists ? null : raster.source_path, // for rasters only
             name: id, // required for cartocss
             width: 256,
-            height: 256,
             bbox,
             ttl: query.nocache ? '0' : '1h',
             debug: query.debug,
@@ -87,7 +86,7 @@ export default async function rtile({
 
         const buffer = Buffer.from(data.base64, 'base64');
 
-        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache ? 'no-cache' : '30d' }).send(buffer);
+        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
     }
     catch (err) {
         logger.file('rtile/error', { error: err.toString(), stack: err.stack });

package/server/routes/mapnik/index.js

@@ -16,6 +16,6 @@ export default async function route(app) {
   app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
   app.get('/gis-raster/:id', publicParams, rasterInfo);
   app.get('/gis-stat/:period?', adminParams, mapnikStat);
-  app.get('/gis-logger/:type', adminParams, mapnikLogger);
+  app.get('/gis-logger/:type?', adminParams, mapnikLogger);
   app.get('/gis-css/:id', params, checkCarto);
 }

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

@@ -1,91 +0,0 @@
-import Sphericalmercator from '@mapbox/sphericalmercator';
-
-import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { RenderTile } = mapnik();
-
-const mercator = new Sphericalmercator({ size: 256 });
-
-/**
- * Формування растрового tile cartoCss
- *
- * @method GET
- * @alias rtile
- * @param {String} bbox - bbox
- * @param {Number} height - висота по координатам
- * @param {Number} width - ширина по координатам
- * @param {String} data - стилізація
- * @param {String} lang - мова
- * @param {String} z - координата z
- * @param {String} x - координата y
- * @param {String} y - координата x
- */
-
-export default async function rtileMBD({
-    pg = pgClients.client, params, query,
-}, reply) {
-    if (!RenderTile) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { id, z, y } = params;
-
-    const x = params.x.split('.')[0] - 0;
-
-    if (!id) {
-        return reply.status(400).send({ error: 'not enough params: id', code: 400 });
-    }
-
-    if (!x || !y || !z) {
-        return reply.status(400).send({ error: 'not enough params: xyz', code: 400 });
-    }
-
-    const mbd = pg.pk?.['data_mbd.mbd_existent_detail'] ? await pg.query(`
-        select
-            mbd_existent_detail_id as id, 
-            upfile
-        from data_mbd.mbd_existent_detail a
-        left join data_mbd.mbd b on a.mbd_id=b.mbd_id
-        where   material_type_id = '3245363247443870877'
-        and     upfile is not null
-        and     upfile ~ '.tif'
-        and mbd_existent_detail_id=$1
-    `, [id]).then(el => el.rows?.[0]) : [];
-
-    if (!mbd) {
-        return reply.status(404).send({ error: 'mbd not found', code: 404 });
-    }
-
-    const bbox = mercator.bbox(y, x, z, false, '900913');
-
-    try {
-        const data = await RenderTile({
-            path: mbd.upfile,
-            name: id,
-            width: 256,
-            height: 256,
-            bbox,
-            ttl: query.nocache ? '0' : '1h',
-            debug: query.debug,
-        });
-
-        if (query.debug) {
-            return data;
-        }
-
-        if (data.err) {
-            logger.file('rtile/mbd/error', { error: data.err });
-            return reply.status(500).send({ error: config.local ? data.err : 'render error', code: 500 });
-        }
-
-        const buffer = Buffer.from(data.base64, 'base64');
-
-        return reply.headers({ 'Content-Type': 'image/png' }).send(buffer);
-    }
-    catch (err) {
-        logger.file('rtile/mbd/error', { error: err.toString(), stack: err.stack });
-        return reply.status(500).send({ error: config.local ? err.toString() : 'rtile error', code: 500 });
-    }
-}