@opengis/gis 0.2.145 → 0.2.146

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

@@ -1,109 +1,109 @@
-import path from 'node:path';
-
-import { config, eventStream } from '@opengis/fastify-table/utils.js';
-
-import mapnik from "./mapnik.js";
-
-const {
-    GetRasterStatus, CreateXML, RenderTile, GetRasterInfo,
-} = mapnik();
-
-function sequence(arr, fn) {
-    const obj = {};
-    return arr.reduce(
-        (promise, item, idx) => promise.then(() => fn({
-            ...item, idx,
-        })).then(r => Object.assign(obj, r)),
-        Promise.resolve(),
-    ).then(() => obj);
-}
-
-const unsafe = true;
-
-export default async function checkRasterFile({ rows, reply, nocache }) {
-    const callback = reply ? eventStream(reply) : () => { };
-
-    let
-        createdCount = 0,
-        existsCount = 0,
-        fileNotFoundCount = 0,
-        xmlErrorCount = 0,
-        renderErrorCount = 0,
-        rasterInfoErrorCount = 0;
-
-    const result = await sequence((rows || []), async ({
-        relpath, srid, idx,
-    }) => {
-        callback(`${idx + 1}/${rows.length} (${relpath})`);
-        const relpath1 = ['raster', config.mapnik?.folder, relpath].filter(Boolean).join('/');
-
-        // check raster upload status, skip for directories
-        const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath1 });
-
-        if (uploadStatus.exists === false) {
-            fileNotFoundCount += 1;
-            callback(`file not found: ${relpath1} `);
-            return null;
-        }
-
-        // create at xml/:id with name only, always - by path
-        const resp = await CreateXML({ path: relpath1, srid, nocache }, (msg) => {
-            if (typeof msg === 'string' && msg === 'XML creation complete') {
-                createdCount += 1;
-            }
-            if (typeof msg === 'string' && msg.startsWith('XML already exists')) {
-                existsCount += 1;
-            }
-            callback(msg);
-        }, unsafe).catch(err => ({ error: err }));
-
-        if (resp.error?.message && resp.error.message.startsWith('5 NOT_FOUND')) {
-            fileNotFoundCount += 1;
-            callback(`directory not found: ${relpath1} `);
-            return null;
-        }
-
-        if (resp.error) {
-            xmlErrorCount += 1;
-            callback(`create xml error: ${resp.error.toString()} (${relpath1})`);
-            return null;
-        }
-
-        const data = await RenderTile({
-            path: relpath1,
-            width: 256,
-            bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
-            ttl: '0',
-        }).catch(err => ({ err: err.toString() }));
-
-        if (data.err) {
-            renderErrorCount += 1;
-            callback(`render error: ${data.err} (${relpath1})`);
-            return null;
-        }
-        callback(`render ok: ${relpath1} `);
-
-        const { data: rasterInfo, err } = await GetRasterInfo({
-            path: relpath1,
-            ttl: '0',
-        }).catch(e => ({ err: e }));
-
-        if (err) {
-            rasterInfoErrorCount += 1;
-            callback(`raster info error: ${err} (${relpath1})`);
-            return null;
-        }
-
-        return { [relpath1]: rasterInfo };
-    });
-
-    callback(`${existsCount} - xml exists`);
-    callback(`${createdCount} - xml created`);
-    callback(`${fileNotFoundCount} - file not found`);
-    callback(`${xmlErrorCount} - xml errors`);
-    callback(`${renderErrorCount} - render errors`);
-    callback(`${rasterInfoErrorCount} - raster info errors`);
-
-    callback('finish', 1);
-    return result;
-}
+import path from 'node:path';
+
+import { config, eventStream } from '@opengis/fastify-table/utils.js';
+
+import mapnik from "./mapnik.js";
+
+const {
+    GetRasterStatus, CreateXML, RenderTile, GetRasterInfo,
+} = mapnik();
+
+function sequence(arr, fn) {
+    const obj = {};
+    return arr.reduce(
+        (promise, item, idx) => promise.then(() => fn({
+            ...item, idx,
+        })).then(r => Object.assign(obj, r)),
+        Promise.resolve(),
+    ).then(() => obj);
+}
+
+const unsafe = true;
+
+export default async function checkRasterFile({ rows, reply, nocache }) {
+    const callback = reply ? eventStream(reply) : () => { };
+
+    let
+        createdCount = 0,
+        existsCount = 0,
+        fileNotFoundCount = 0,
+        xmlErrorCount = 0,
+        renderErrorCount = 0,
+        rasterInfoErrorCount = 0;
+
+    const result = await sequence((rows || []), async ({
+        relpath, srid, idx,
+    }) => {
+        callback(`${idx + 1}/${rows.length} (${relpath})`);
+        const relpath1 = ['raster', config.mapnik?.folder, relpath].filter(Boolean).join('/');
+
+        // check raster upload status, skip for directories
+        const uploadStatus = !path.extname(relpath) ? {} : await GetRasterStatus({ path: relpath1 });
+
+        if (uploadStatus.exists === false) {
+            fileNotFoundCount += 1;
+            callback(`file not found: ${relpath1} `);
+            return null;
+        }
+
+        // create at xml/:id with name only, always - by path
+        const resp = await CreateXML({ path: relpath1, srid, nocache }, (msg) => {
+            if (typeof msg === 'string' && msg === 'XML creation complete') {
+                createdCount += 1;
+            }
+            if (typeof msg === 'string' && msg.startsWith('XML already exists')) {
+                existsCount += 1;
+            }
+            callback(msg);
+        }, unsafe).catch(err => ({ error: err }));
+
+        if (resp.error?.message && resp.error.message.startsWith('5 NOT_FOUND')) {
+            fileNotFoundCount += 1;
+            callback(`directory not found: ${relpath1} `);
+            return null;
+        }
+
+        if (resp.error) {
+            xmlErrorCount += 1;
+            callback(`create xml error: ${resp.error.toString()} (${relpath1})`);
+            return null;
+        }
+
+        const data = await RenderTile({
+            path: relpath1,
+            width: 256,
+            bbox: [3713463.7081504324, 6088362.176970857, 3713616.5822070027, 6088515.051027427], // /:id/18/155363/91245.png
+            ttl: '0',
+        }).catch(err => ({ err: err.toString() }));
+
+        if (data.err) {
+            renderErrorCount += 1;
+            callback(`render error: ${data.err} (${relpath1})`);
+            return null;
+        }
+        callback(`render ok: ${relpath1} `);
+
+        const { data: rasterInfo, err } = await GetRasterInfo({
+            path: relpath1,
+            ttl: '0',
+        }).catch(e => ({ err: e }));
+
+        if (err) {
+            rasterInfoErrorCount += 1;
+            callback(`raster info error: ${err} (${relpath1})`);
+            return null;
+        }
+
+        return { [relpath1]: rasterInfo };
+    });
+
+    callback(`${existsCount} - xml exists`);
+    callback(`${createdCount} - xml created`);
+    callback(`${fileNotFoundCount} - file not found`);
+    callback(`${xmlErrorCount} - xml errors`);
+    callback(`${renderErrorCount} - render errors`);
+    callback(`${rasterInfoErrorCount} - raster info errors`);
+
+    callback('finish', 1);
+    return result;
+}

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

@@ -1,151 +1,151 @@
-import path from "node:path";
-import { fileURLToPath } from 'node:url';
-
-import grpc from "@grpc/grpc-js";
-import protoLoader from "@grpc/proto-loader";
-
-import { config } from "@opengis/fastify-table/utils.js";
-
-const filepath = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filepath);
-
-const PROTO_PATH = path.join(dirname, '../', 'map.proto');
-// const PROTO_PATH = config.mapServerAddress && config.mapServerAddress.startsWith('127.0.0.1') ? path.join(dirname, '../../../../../../service/mapnikp/map.proto') : path.join(dirname, '../', 'map.proto');
-
-// temporary support of old style environment variables
-if (!config.mapnik?.server) {
-  config.mapnik = { server: config.mapServerAddress };
-}
-
-const { mapnik } = config;
-
-if (!mapnik?.server) {
-  throw new Error("Mapnik server address is not defined in the configuration.");
-}
-
-const proto = grpc.loadPackageDefinition(
-  protoLoader.loadSync(
-    PROTO_PATH,
-    {
-      keepCase: true,
-      longs: String,
-      enums: String,
-      defaults: true,
-      oneofs: true,
-    },
-  ),
-);
-
-const mapClient = new proto.map.MapService(
-  mapnik.server,
-  grpc.credentials.createInsecure(),
-);
-
-mapClient.waitForReady(Date.now() + 5000, (err) => {
-  if (err) {
-    config.ready.mapnik = false;
-    console.error("Mapnik client connection timeout or failure:", err);
-  }
-  else {
-    config.ready.mapnik = true;
-    console.log("Mapnik client connected successfully.");
-  }
-});
-
-/*
-[
-  'ClearTile',
-  'CreateXML',
-  'GetLogs',
-  'GetRender',
-  'GetStat',
-  'ReadDir',
-  'RenderTile',
-  'UploadRaster',
-  'UploadXML',
-  'GetRasterStatus', // for resumable upload support
-]
-*/
-
-function formatObject(obj1) {
-  return Object.keys(obj1 || {}).reduce((acc1, key) => {
-    const { kind } = obj1[key];
-    const value = obj1[key][kind];
-    if (key === 'timestamp') {
-      Object.assign(acc1, { [key]: new Date(value * 1000).toISOString() });
-    }
-    else if (kind === 'structValue') {
-      Object.assign(acc1, { [key]: formatObject(value.fields) });
-    }
-    else {
-      Object.assign(acc1, { [key]: value });
-    }
-    return acc1;
-  }, {});
-}
-
-const grpcMethods = Object.getOwnPropertyNames(
-  Object.getPrototypeOf(mapClient),
-)
-  .filter(key => key.slice(0, 1).toUpperCase() === key.slice(0, 1))
-  .reduce((acc, curr) => ({
-    ...acc,
-    [curr]: async (inputData, callback, unsafe) => new Promise((res, rej) => {
-      if (curr === "CreateXML" && typeof callback === 'function') {
-        const stream = mapClient[curr].call(
-          mapClient,
-          inputData,
-          (err, data) => {
-            if (err) {
-              return rej(err);
-            }
-            return res(data);
-          },
-        );
-        stream.on("error", (err) => {
-          // unsafe=true prevents from sequence termination etc
-          callback(err?.message || err, unsafe ? null : 1);
-          rej(err);
-        });
-        stream.on("data", (resp) => {
-          callback(resp?.message || resp?.error || JSON.stringify(resp));
-        });
-        stream.on("end", () => res('finish'));
-      }
-      else if (curr === 'GetStat') {
-        mapClient[curr].call(
-          mapClient,
-          inputData,
-          (err, data) => {
-            if (err) {
-              return rej(err || 'invalid response');
-            }
-
-            const { fields } = data?.result || {};
-            // google.protobuf.Struct to js object
-            const obj = formatObject(fields);
-            return res(obj);
-          },
-        );
-      }
-      else {
-        mapClient[curr].call(
-          mapClient,
-          inputData,
-          (err, data) => {
-            if (err) {
-              return rej(err);
-            }
-            return res(data);
-          },
-        );
-      }
-    }),
-  }), {});
-
-const getMapnik = () => ({
-  ...grpcMethods,
-  mapServerAddress: mapnik?.server,
-});
-
-export default getMapnik;
+import path from "node:path";
+import { fileURLToPath } from 'node:url';
+
+import grpc from "@grpc/grpc-js";
+import protoLoader from "@grpc/proto-loader";
+
+import { config } from "@opengis/fastify-table/utils.js";
+
+const filepath = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filepath);
+
+const PROTO_PATH = path.join(dirname, '../', 'map.proto');
+// const PROTO_PATH = config.mapServerAddress && config.mapServerAddress.startsWith('127.0.0.1') ? path.join(dirname, '../../../../../../service/mapnikp/map.proto') : path.join(dirname, '../', 'map.proto');
+
+// temporary support of old style environment variables
+if (!config.mapnik?.server) {
+  config.mapnik = { server: config.mapServerAddress };
+}
+
+const { mapnik } = config;
+
+if (!mapnik?.server) {
+  throw new Error("Mapnik server address is not defined in the configuration.");
+}
+
+const proto = grpc.loadPackageDefinition(
+  protoLoader.loadSync(
+    PROTO_PATH,
+    {
+      keepCase: true,
+      longs: String,
+      enums: String,
+      defaults: true,
+      oneofs: true,
+    },
+  ),
+);
+
+const mapClient = new proto.map.MapService(
+  mapnik.server,
+  grpc.credentials.createInsecure(),
+);
+
+mapClient.waitForReady(Date.now() + 5000, (err) => {
+  if (err) {
+    config.ready.mapnik = false;
+    console.error("Mapnik client connection timeout or failure:", err);
+  }
+  else {
+    config.ready.mapnik = true;
+    console.log("Mapnik client connected successfully.");
+  }
+});
+
+/*
+[
+  'ClearTile',
+  'CreateXML',
+  'GetLogs',
+  'GetRender',
+  'GetStat',
+  'ReadDir',
+  'RenderTile',
+  'UploadRaster',
+  'UploadXML',
+  'GetRasterStatus', // for resumable upload support
+]
+*/
+
+function formatObject(obj1) {
+  return Object.keys(obj1 || {}).reduce((acc1, key) => {
+    const { kind } = obj1[key];
+    const value = obj1[key][kind];
+    if (key === 'timestamp') {
+      Object.assign(acc1, { [key]: new Date(value * 1000).toISOString() });
+    }
+    else if (kind === 'structValue') {
+      Object.assign(acc1, { [key]: formatObject(value.fields) });
+    }
+    else {
+      Object.assign(acc1, { [key]: value });
+    }
+    return acc1;
+  }, {});
+}
+
+const grpcMethods = Object.getOwnPropertyNames(
+  Object.getPrototypeOf(mapClient),
+)
+  .filter(key => key.slice(0, 1).toUpperCase() === key.slice(0, 1))
+  .reduce((acc, curr) => ({
+    ...acc,
+    [curr]: async (inputData, callback, unsafe) => new Promise((res, rej) => {
+      if (curr === "CreateXML" && typeof callback === 'function') {
+        const stream = mapClient[curr].call(
+          mapClient,
+          inputData,
+          (err, data) => {
+            if (err) {
+              return rej(err);
+            }
+            return res(data);
+          },
+        );
+        stream.on("error", (err) => {
+          // unsafe=true prevents from sequence termination etc
+          callback(err?.message || err, unsafe ? null : 1);
+          rej(err);
+        });
+        stream.on("data", (resp) => {
+          callback(resp?.message || resp?.error || JSON.stringify(resp));
+        });
+        stream.on("end", () => res('finish'));
+      }
+      else if (curr === 'GetStat') {
+        mapClient[curr].call(
+          mapClient,
+          inputData,
+          (err, data) => {
+            if (err) {
+              return rej(err || 'invalid response');
+            }
+
+            const { fields } = data?.result || {};
+            // google.protobuf.Struct to js object
+            const obj = formatObject(fields);
+            return res(obj);
+          },
+        );
+      }
+      else {
+        mapClient[curr].call(
+          mapClient,
+          inputData,
+          (err, data) => {
+            if (err) {
+              return rej(err);
+            }
+            return res(data);
+          },
+        );
+      }
+    }),
+  }), {});
+
+const getMapnik = () => ({
+  ...grpcMethods,
+  mapServerAddress: mapnik?.server,
+});
+
+export default getMapnik;

package/server/plugins/mapnik/funcs/rootFolder.mjs

@@ -1,8 +1,8 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config } from '@opengis/fastify-table/utils.js';
-
-const root = config.temp || (existsSync('/data/local') ? '/data/local/kamianske' : process.cwd());
-
-export default path.join(root, 'log/map').replace(/\\/g, '/');
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { config } from '@opengis/fastify-table/utils.js';
+
+const root = config.temp || (existsSync('/data/local') ? '/data/local/kamianske' : process.cwd());
+
+export default path.join(root, 'log/map').replace(/\\/g, '/');