@opengis/gis 0.2.49 → 0.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.49",
+  "version": "0.2.51",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
   "scripts": {
     "dump": "bun ./node_modules/@opengis/fastify-table/dist/script/dump.js",
     "migrate": "MIGRATE=true bun ./node_modules/@opengis/fastify-table/dist/script/migrate.js",
-    "start1": "bun server",
+    "start": "bun server",
     "start:kyiv-demo": "bun --env-file=.env.kyiv-demo server",
     "start:kamyanske": "bun --env-file=.env.kamyanske server",
     "start:kr": "bun --env-file=.env.kr server",

package/server/plugins/mapnik/map.proto

@@ -18,6 +18,7 @@ service MapService {
     rpc GetStat(GetStatRequest) returns (GetStatOut);
     rpc GetRender(GetRenderRequest) returns (GetRenderOut);
     rpc GetLogs(GetLogsRequest) returns (GetLogsOut);
+    rpc GetRasterInfo(GetRasterInfoRequest) returns (GetRasterInfoOut);
 }
 
 // ----------------------------
@@ -138,6 +139,37 @@ message GetLogsOut {
     repeated string result = 1;
 }
 
+message GetRasterInfoRequest {
+    string path = 1;
+    string ttl = 2;
+}
+
+message FileItem {
+  string name = 1;
+  string size = 2;
+}
+
+message GetRasterInfoData {
+    string total_size = 1;
+    string extension = 2;
+    int64 srid = 3;
+    string proj4 = 4;
+    repeated float extent = 5;
+    repeated FileItem files = 6;
+    int64 width = 7;
+    int64 height = 8;
+    int64 bands_count = 9;
+    string resolution = 10;
+    repeated string bands = 11;
+    int64 color_depth = 12;
+    string compression = 13;
+}
+
+message GetRasterInfoOut {
+    GetRasterInfoData data = 1;
+    bool cache = 2;
+}
+
 // ----------------------------
 // Job Service Messages
 // ----------------------------

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

@@ -0,0 +1,14 @@
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetLogs } = mapnik();
+
+export default async function mapnikLogger({
+    params,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+    return reply.status(200).send({ test: params });
+}

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

@@ -0,0 +1,14 @@
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetStat } = mapnik();
+
+export default async function mapnikStat({
+    params,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+    return reply.status(200).send({ test: params });
+}

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

@@ -0,0 +1,36 @@
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetRasterInfo } = mapnik();
+
+const { prefix = '/api' } = config;
+
+export default async function rtile({
+    pg = pgClients.client, params, query,
+}, reply) {
+    if (!config.mapServerAddress) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const raster = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id, source_path from gis.rasters where raster_id=$1::text', [params.id])
+            .then(el => el.rows?.[0] || {})
+        : {};
+
+    if (raster.raster_id && !raster.source_path) {
+        return reply.status(400).send({ error: 'empty source_path', code: 400 });
+    }
+
+    if (!raster.raster_id) {
+        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    const data = await GetRasterInfo({
+        path: raster.source_path,
+        ttl: query.nocache ? '0' : '1h',
+    });
+
+    return { ...data, url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png` };
+}

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

@@ -1,11 +1,10 @@
-import path from 'node:path';
 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, GetRasterStatus } = mapnik();
+const { RenderTile } = mapnik();
 
 const mercator = new Sphericalmercator({ size: 256 });
 
@@ -27,7 +26,7 @@ const mercator = new Sphericalmercator({ size: 256 });
 export default async function rtile({
     pg = pgClients.client, params, query,
 }, reply) {
-    if (!RenderTile || !GetRasterStatus) {
+    if (!RenderTile) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
     }
 
@@ -57,19 +56,10 @@ export default async function rtile({
 
     if (!raster.raster_id && !cartoExists) {
         const decodedPath = Buffer.from(id, 'base64url').toString('utf-8');
-        const uploadStatus = path.extname(decodedPath) ? await GetRasterStatus({ path: decodedPath }) : {};
-
-        if (uploadStatus.exists === false) {
-            return reply.status(400).send({ error: 'raster not uploaded', code: 400 });
-        }
-
-        if (uploadStatus.finished === false) {
-            return reply.status(400).send({ error: 'upload not finished', code: 400 });
-        }
         Object.assign(raster, { source_path: decodedPath });
     }
 
-    if (!raster && !cartoExists) {
+    if (!raster.source_path && !cartoExists) {
         return reply.status(404).send({ error: 'raster / cartocss not found', code: 404 });
     }
 

package/server/routes/mapnik/index.js

@@ -1,16 +1,19 @@
 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 mapnikLogger from './controllers/mapnikLogger.js';
 
 const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
+const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
 const params = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
 
 export default async function route(app) {
-  app.get('/raster-upload/:id', params, uploadRaster);
-  app.get('/raster-xml/:id', publicParams, createXml);
-  app.get('/raster-tile/:id/:z/:y/:x', publicParams, rtile);
-  // temporary support of old alias
-  if (!app.hasRoute({ method: 'GET', url: '/layer-rtile/:id/:z/:y/:x' })) {
-    app.get('/layer-rtile/:id/:z/:y/:x', publicParams, rtile);
-  }
+  app.get('/gis-upload-raster/:id', params, uploadRaster);
+  app.get('/gis-xml/:id', publicParams, createXml);
+  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);
 }