@opengis/gis 0.2.116 → 0.2.117

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

@@ -1,8 +1,10 @@
+import { config } from '@opengis/fastify-table/utils.js';
+
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
 const { ReadDir } = mapnik();
 
-// example: GET /api/gis-files?dir=tiles/3828667893214610450
+// example: GET /api/gis-files?dir=raster/genplan
 export default async function readDir({
     query,
 }, reply) {
@@ -11,9 +13,10 @@ export default async function readDir({
     }
 
     const { dir } = query;
+    const relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
 
     const {
         exists = false, count = 0, files = [], directories = [],
-    } = await ReadDir({ path: dir });
+    } = await ReadDir({ path: relpath });
     return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
 }

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

@@ -93,10 +93,21 @@ export default async function gisRtile({
             ? Buffer.from(data.source_path).toString('base64url')
             : undefined;
 
+        const getParams = () => {
+            if (data.type === 'css' && data.source_path) {
+                return { name: path.posix.join('/data/map', config.mapnik?.folder || '', 'vector', data.source_path, 'map') };
+            }
+            if (data.type === 'css') {
+                return { name: path.posix.join('/data/map', config.mapnik?.folder || '', 'xml', id) };
+            }
+            return { path: path.posix.join(config.mapnik?.folder || '', 'raster', data.source_path) };
+        };
+
+        const { path: rpath, name } = getParams();
+
         const param = {
-            // skipSubdir: true,
-            path: data.type === 'css' ? null : path.posix.join(config.mapnik?.folder || '', 'raster', data.source_path), // for rasters only
-            name: data.type === 'css' && data.source_path ? path.posix.join('raster', config.mapnik?.folder || '', 'vector', data.source_path) : id, // required for cartocss
+            path: rpath, // for rasters only
+            name, // required for cartocss
             width: 256,
             bbox,
             ttl,
@@ -108,6 +119,8 @@ export default async function gisRtile({
         if (query.debug) {
             return {
                 ...result,
+                name,
+                path: rpath,
                 ttl,
                 md5_path: md5,
                 base64_path: base64,

package/server/routes/mapnik/index.js

@@ -2,7 +2,6 @@ import uploadRaster from './controllers/uploadRaster.js';
 import createXml from './controllers/createXml.js';
 import rtile from './controllers/rtile.js';
 import rasterInfo from './controllers/rasterInfo.js';
-import mapnikStat from './controllers/mapnikStat.js';
 
 import createXmlMulti from './controllers/createXmlMulti.js';
 import readDir from './controllers/readDir.js';