@opengis/gis 0.2.125 → 0.2.127

package/package.json

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

package/server/plugins/mapnik/map.proto

@@ -31,6 +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;
 }
 

package/server/routes/gis/checkXML.js

@@ -45,7 +45,6 @@ export default async function checkXML(req, reply) {
 
                 const rasterInfo = await GetRasterInfo({
                     path: row.source_path,
-                    ttl: '0',
                 }).catch(err => ({ err }));
 
                 if (rasterInfo.err) {

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

@@ -53,7 +53,7 @@ export default async function createXml({
     // create at xml/:id with name only, always - by path
     const resp = await CreateXML({
         path: relpath,
-        name: id, // create additional xml named as primary key at xml directory
+        name: [config.mapnik?.folder, id].filter(Boolean).join('/'), // create additional xml named as primary key at xml directory
         previewZoom: data.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
         // srid: data.srid, // auto detected if not supplied
         proj4,

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

@@ -5,7 +5,7 @@ import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 const { GetStat } = mapnik();
 
 export default async function mapnikStat({
-    params, query,
+    params,
 }, reply) {
     if (!config.mapnik?.server) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
@@ -13,7 +13,6 @@ export default async function mapnikStat({
 
     const stat = await GetStat({
         period: params.period,
-        ttl: query.nocache ? '0' : undefined,
     });
 
     return reply.status(200).send(stat);

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

@@ -36,7 +36,6 @@ export default async function rasterInfo({
     const { data, cache, error } = await GetRasterInfo({
         path: relpath,
         proj4,
-        ttl: query.nocache ? '0' : '1h',
     }).catch(err => ({ error: err.toString() }));
 
     if (query.debug) {

package/server/routes/mapnik/functions/uploadXML.js

@@ -1,5 +1,6 @@
 import carto from 'carto';
 
+import { config } from '@opengis/fastify-table/utils.js';
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
 const { UploadXML } = mapnik();
@@ -98,8 +99,8 @@ export default async function uploadXML({
         throw new Error('xml generation error');
     }
     const { status, error } = await UploadXML({
-        path: relpath ? `vector/${relpath}` : null,
-        name: relpath ? null : id,
+        path: relpath ? ['vector', config.mapnik?.folder || '', relpath].filter(Boolean).join('/') : null,
+        name: relpath ? null : [config.mapnik?.folder, id].filter(Boolean).join('/'),
         xml: xmlFileText,
     }).catch((err) => ({ error: err.toString() }));