@opengis/gis 0.2.174 → 0.2.176

package/server/routes/map/functions/geojson.js

@@ -1,187 +1,187 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { createHash } from 'node:crypto';
-import {
-    readFile, stat, mkdir, writeFile,
-} from 'node:fs/promises';
-
-import {
-    pgClients, getMeta,
-} from '@opengis/fastify-table/utils.js';
-
-import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
-import { BadRequestError, NotFoundError } from '@opengis/fastify-table/errors.js';
-
-const systemColumns = ['uid', 'cdate', 'editor_id', 'editor_date', 'created_by', 'created_at', 'updated_by', 'updated_at'];
-
-const unittest = process.env.NODE_ENV === 'test' || process.env.VITEST;
-
-/**
- * Повертає GeoJSON для сервісу на основі налаштувань з gis.services
- * 
- * @method GET
- * @param {string} params.layer - service_id
- * @param {string} query.sql - повернути SQL запит замість даних
- * @param {boolean} query.nocache - не використовувати кеш
- */
-
-export default async function geojson({
-    layer, sql, nocache, srid, type, extent,
-}, pg = pgClients.client) {
-    if (!layer) {
-        throw BadRequestError('not enough params: layer (service_id)');
-    }
-
-    const serviceId = layer.replace('.json', '');
-
-    if (!pg.pk?.['gis.services']) {
-        throw NotFoundError('services table not found');
-    }
-
-    const service = await pg.query(
-        `select 
-            source_path, 
-            query, 
-            geometry_column, 
-            attributes,
-            srid,
-            is_public,
-            is_active,
-            geom_type
-        from gis.services 
-        where service_id = $1 and is_active = true and is_public = true`,
-        [serviceId],
-    ).then(r => r.rows?.[0]);
-
-    if (!service) {
-        throw NotFoundError('service not found or not available');
-    }
-
-    const {
-        source_path: source,
-        query: serviceQuery,
-        geometry_column: gc,
-        attributes,
-        srid: serviceSrid,
-        geom_type: geomType,
-    } = service;
-
-    if (!source) {
-        throw BadRequestError('invalid service source path');
-    }
-
-    if (!pg.pk?.[source]?.length) {
-        throw NotFoundError('layer table not found');
-    }
-
-    const { columns = [], geom: metaGeom } = await getMeta({ pg, table: source }) || {};
-
-    const geom = gc || metaGeom || 'geom';
-    const pk = pg.pk?.[source] || columns[0]?.name;
-
-    let attributeColumns = [];
-    if (attributes && Array.isArray(attributes)) {
-        attributeColumns = attributes
-            .filter(attr => attr.name && !systemColumns.includes(attr.name))
-            .map(attr => attr.name);
-    }
-
-    const columnsFiltered = attributeColumns.length > 0
-        ? columns.filter(col => attributeColumns.includes(col.name) && !systemColumns.includes(col.name))
-        : [];
-
-    const props = columnsFiltered.map(el =>
-        `"${el.name}"${['int4'].includes(el.type) ? '::text' : ''}`
-    ).join(', ');
-
-    const geometryType = (geomType || 'point').toLowerCase();
-    const limit = geometryType === 'point' ? 40000 : 2500;
-    const cacheHash = createHash('md5')
-        .update([serviceId, serviceQuery, srid, type, extent].filter(el => el).join('-'))
-        .digest('hex');
-
-    const today = new Date().toISOString().split('T')[0];
-    const filepath = path.join(
-        rootFolder,
-        `/geojson/${serviceId}/${today}/${cacheHash}.json`,
-    );
-
-    if (existsSync(filepath) && !nocache && !sql && !unittest) {
-        const { birthtimeMs = Date.now() } = await stat(filepath);
-        const ageInMs = Date.now() - birthtimeMs;
-        if (ageInMs < 86400000) {
-            const content = await readFile(filepath, 'utf8');
-
-            return {
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Cache-Control': 'public, max-age=86400',
-                },
-                data: content
-            }
-        }
-    }
-
-    const targetSrid = srid || serviceSrid || 4326;
-    const useCentroid = type === 'centroid';
-
-    let geomExpression = geom;
-
-    if (useCentroid) {
-        geomExpression = `st_centroid(${geomExpression})`;
-    }
-
-    if (targetSrid !== 4326) {
-        geomExpression = `st_transform(${geomExpression}, 4326)`;
-    } else if (serviceSrid && serviceSrid !== 4326) {
-        geomExpression = `st_transform(${geomExpression}, 4326)`;
-    }
-
-    const quotedTable = source.split('.').map(el => `"${el}"`).join('.');
-    const quotedGeom = `"${geom}"`;
-
-    const geomFinal = `st_force2d(${geomExpression.replace(new RegExp(`(\\b)${geom}(\\b)`, 'g'), `$1${quotedGeom}$2`)})`;
-    const q = `
-        SELECT 'FeatureCollection' As type, 
-               json_agg(f) As features
-        FROM (
-            SELECT 'Feature' As type,
-                   row_number() over() as id,
-                   st_asgeojson(${geomFinal}, 6, 0)::json as geometry,
-                   (select row_to_json(tc) from (
-                       select "${pk}" as id ${props ? ', ' + props : ''}
-                   ) tc) as properties
-            FROM ${quotedTable}
-            WHERE ${serviceQuery || '1=1'}
-              AND ${quotedGeom} is not null
-              AND st_srid(${quotedGeom}) > 0
-              ${extent ? `AND ${quotedGeom} && 'BOX(${extent.split(',').reduce((p, el, i) => p + el + (i % 2 ? ',' : ' '), '')})'::box2d` : ''}
-            LIMIT ${limit}
-        ) f
-    `;
-
-    if (sql === 1) return q;
-    if (sql === 2) return filepath.replace(/\\/g, '/');
-
-
-    const geojsonData = await pg.query(q)
-        .then(r => r.rows?.[0] || { type: 'FeatureCollection', features: [] });
-
-    geojsonData.service_id = serviceId;
-    geojsonData.count = geojsonData.features?.length || 0;
-
-    const jsonString = JSON.stringify(geojsonData);
-
-    if (!nocache && !unittest) {
-        await mkdir(path.dirname(filepath), { recursive: true });
-        await writeFile(filepath, jsonString, 'utf8');
-    }
-
-    return {
-        headers: {
-            'Content-Type': 'application/json',
-            'Cache-Control': nocache ? 'no-cache' : 'public, max-age=86400',
-        },
-        data: jsonString
-    }
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import {
+    readFile, stat, mkdir, writeFile,
+} from 'node:fs/promises';
+
+import {
+    pgClients, getMeta,
+} from '@opengis/fastify-table/utils.js';
+
+import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
+import { BadRequestError, NotFoundError } from '@opengis/fastify-table/errors.js';
+
+const systemColumns = ['uid', 'cdate', 'editor_id', 'editor_date', 'created_by', 'created_at', 'updated_by', 'updated_at'];
+
+const unittest = process.env.NODE_ENV === 'test' || process.env.VITEST;
+
+/**
+ * Повертає GeoJSON для сервісу на основі налаштувань з gis.services
+ * 
+ * @method GET
+ * @param {string} params.layer - service_id
+ * @param {string} query.sql - повернути SQL запит замість даних
+ * @param {boolean} query.nocache - не використовувати кеш
+ */
+
+export default async function geojson({
+    layer, sql, nocache, srid, type, extent,
+}, pg = pgClients.client) {
+    if (!layer) {
+        throw BadRequestError('not enough params: layer (service_id)');
+    }
+
+    const serviceId = layer.replace('.json', '');
+
+    if (!pg.pk?.['gis.services']) {
+        throw NotFoundError('services table not found');
+    }
+
+    const service = await pg.query(
+        `select 
+            source_path, 
+            query, 
+            geometry_column, 
+            attributes,
+            srid,
+            is_public,
+            is_active,
+            geom_type
+        from gis.services 
+        where service_id = $1 and is_active = true and is_public = true`,
+        [serviceId],
+    ).then(r => r.rows?.[0]);
+
+    if (!service) {
+        throw NotFoundError('service not found or not available');
+    }
+
+    const {
+        source_path: source,
+        query: serviceQuery,
+        geometry_column: gc,
+        attributes,
+        srid: serviceSrid,
+        geom_type: geomType,
+    } = service;
+
+    if (!source) {
+        throw BadRequestError('invalid service source path');
+    }
+
+    if (!pg.pk?.[source]?.length) {
+        throw NotFoundError('layer table not found');
+    }
+
+    const { columns = [], geom: metaGeom } = await getMeta({ pg, table: source }) || {};
+
+    const geom = gc || metaGeom || 'geom';
+    const pk = pg.pk?.[source] || columns[0]?.name;
+
+    let attributeColumns = [];
+    if (attributes && Array.isArray(attributes)) {
+        attributeColumns = attributes
+            .filter(attr => attr.name && !systemColumns.includes(attr.name))
+            .map(attr => attr.name);
+    }
+
+    const columnsFiltered = attributeColumns.length > 0
+        ? columns.filter(col => attributeColumns.includes(col.name) && !systemColumns.includes(col.name))
+        : [];
+
+    const props = columnsFiltered.map(el =>
+        `"${el.name}"${['int4'].includes(el.type) ? '::text' : ''}`
+    ).join(', ');
+
+    const geometryType = (geomType || 'point').toLowerCase();
+    const limit = geometryType === 'point' ? 40000 : 2500;
+    const cacheHash = createHash('md5')
+        .update([serviceId, serviceQuery, srid, type, extent].filter(el => el).join('-'))
+        .digest('hex');
+
+    const today = new Date().toISOString().split('T')[0];
+    const filepath = path.join(
+        rootFolder,
+        `/geojson/${serviceId}/${today}/${cacheHash}.json`,
+    );
+
+    if (existsSync(filepath) && !nocache && !sql && !unittest) {
+        const { birthtimeMs = Date.now() } = await stat(filepath);
+        const ageInMs = Date.now() - birthtimeMs;
+        if (ageInMs < 86400000) {
+            const content = await readFile(filepath, 'utf8');
+
+            return {
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Cache-Control': 'public, max-age=86400',
+                },
+                data: content
+            }
+        }
+    }
+
+    const targetSrid = srid || serviceSrid || 4326;
+    const useCentroid = type === 'centroid';
+
+    let geomExpression = geom;
+
+    if (useCentroid) {
+        geomExpression = `st_centroid(${geomExpression})`;
+    }
+
+    if (targetSrid !== 4326) {
+        geomExpression = `st_transform(${geomExpression}, 4326)`;
+    } else if (serviceSrid && serviceSrid !== 4326) {
+        geomExpression = `st_transform(${geomExpression}, 4326)`;
+    }
+
+    const quotedTable = source.split('.').map(el => `"${el}"`).join('.');
+    const quotedGeom = `"${geom}"`;
+
+    const geomFinal = `st_force2d(${geomExpression.replace(new RegExp(`(\\b)${geom}(\\b)`, 'g'), `$1${quotedGeom}$2`)})`;
+    const q = `
+        SELECT 'FeatureCollection' As type, 
+               json_agg(f) As features
+        FROM (
+            SELECT 'Feature' As type,
+                   row_number() over() as id,
+                   st_asgeojson(${geomFinal}, 6, 0)::json as geometry,
+                   (select row_to_json(tc) from (
+                       select "${pk}" as id ${props ? ', ' + props : ''}
+                   ) tc) as properties
+            FROM ${quotedTable}
+            WHERE ${serviceQuery || '1=1'}
+              AND ${quotedGeom} is not null
+              AND st_srid(${quotedGeom}) > 0
+              ${extent ? `AND ${quotedGeom} && 'BOX(${extent.split(',').reduce((p, el, i) => p + el + (i % 2 ? ',' : ' '), '')})'::box2d` : ''}
+            LIMIT ${limit}
+        ) f
+    `;
+
+    if (sql === 1) return q;
+    if (sql === 2) return filepath.replace(/\\/g, '/');
+
+
+    const geojsonData = await pg.query(q)
+        .then(r => r.rows?.[0] || { type: 'FeatureCollection', features: [] });
+
+    geojsonData.service_id = serviceId;
+    geojsonData.count = geojsonData.features?.length || 0;
+
+    const jsonString = JSON.stringify(geojsonData);
+
+    if (!nocache && !unittest) {
+        await mkdir(path.dirname(filepath), { recursive: true });
+        await writeFile(filepath, jsonString, 'utf8');
+    }
+
+    return {
+        headers: {
+            'Content-Type': 'application/json',
+            'Cache-Control': nocache ? 'no-cache' : 'public, max-age=86400',
+        },
+        data: jsonString
+    }
+}

package/server/routes/map/functions/gis.convert.js

@@ -1,65 +1,65 @@
-import path from "node:path";
-
-import { downloadFile } from "@opengis/fastify-table/utils.js";
-import { BadRequestError, ConflictError, NotFoundError } from "@opengis/fastify-table/errors.js";
-
-import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
-
-const { ConvertVector } = mapnik();
-
-const ALLOWED_FORMAT = new Set(["zip", "shp", "kml", "gml", "geojson", "json"]);
-
-function resolveExtension(filename) {
-  return path.extname(filename || "").replace(".", "").toLowerCase();
-}
-
-/**
- * Конвертує векторний файл у GeoJSON через mapnik ConvertVector.
- *
- * @method POST /gis-convert
- * @body {string}  [file]     - base64 вміст файлу
- * @body {string}  [filename] - ім'я файлу (обов'язкове з file)
- * @body {string}  [filepath] - шлях до файлу на сервері (legacy)
- * @body {number}  [srid=4326] - цільовий EPSG код
- */
-export default async function gisConvert({ file, filename, filepath, encoding }) {
-  let data;
-  let sourceName;
-
-  if (typeof file === "string" && file) {
-    if (!filename || typeof filename !== "string") {
-      throw BadRequestError("Потрібен параметр filename разом з file");
-    }
-
-    data = Buffer.from(file, "base64");
-    sourceName = path.basename(filename);
-  } else if (typeof filepath === "string" && filepath) {
-    const filepath1 = filepath.replace(/%2e/g, ".").replace(/%2E/g, ".");
-    if (filepath1.includes('..')) {
-      throw ConflictError('path traversals are not allowed');
-    }
-    data = await downloadFile(filepath, { buffer: true });
-    if (!data) {
-      throw NotFoundError(`Файл не знайдено: ${filepath}`);
-    }
-    sourceName = path.basename(filepath);
-  } else {
-    throw BadRequestError("Потрібен параметр file (base64) або filepath");
-  }
-
-  const ext = resolveExtension(sourceName);
-
-  if (!ALLOWED_FORMAT.has(ext)) {
-    throw BadRequestError(`Непідтримуване розширення: .${ext}. Підтримується: ${[...ALLOWED_FORMAT].join(", ")}`);
-  }
-
-  const res = await ConvertVector({
-    data,
-    format: ext,
-    // srs: +srid, // target srs, 4326 by default
-    encoding,
-    filename: sourceName,
-  });
-
-  return JSON.parse(res.geojson);
-}
+import path from "node:path";
+
+import { downloadFile } from "@opengis/fastify-table/utils.js";
+import { BadRequestError, ConflictError, NotFoundError } from "@opengis/fastify-table/errors.js";
+
+import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
+
+const { ConvertVector } = mapnik();
+
+const ALLOWED_FORMAT = new Set(["zip", "shp", "kml", "gml", "geojson", "json"]);
+
+function resolveExtension(filename) {
+  return path.extname(filename || "").replace(".", "").toLowerCase();
+}
+
+/**
+ * Конвертує векторний файл у GeoJSON через mapnik ConvertVector.
+ *
+ * @method POST /gis-convert
+ * @body {string}  [file]     - base64 вміст файлу
+ * @body {string}  [filename] - ім'я файлу (обов'язкове з file)
+ * @body {string}  [filepath] - шлях до файлу на сервері (legacy)
+ * @body {number}  [srid=4326] - цільовий EPSG код
+ */
+export default async function gisConvert({ file, filename, filepath, encoding }) {
+  let data;
+  let sourceName;
+
+  if (typeof file === "string" && file) {
+    if (!filename || typeof filename !== "string") {
+      throw BadRequestError("Потрібен параметр filename разом з file");
+    }
+
+    data = Buffer.from(file, "base64");
+    sourceName = path.basename(filename);
+  } else if (typeof filepath === "string" && filepath) {
+    const filepath1 = filepath.replace(/%2e/g, ".").replace(/%2E/g, ".");
+    if (filepath1.includes('..')) {
+      throw ConflictError('path traversals are not allowed');
+    }
+    data = await downloadFile(filepath, { buffer: true });
+    if (!data) {
+      throw NotFoundError(`Файл не знайдено: ${filepath}`);
+    }
+    sourceName = path.basename(filepath);
+  } else {
+    throw BadRequestError("Потрібен параметр file (base64) або filepath");
+  }
+
+  const ext = resolveExtension(sourceName);
+
+  if (!ALLOWED_FORMAT.has(ext)) {
+    throw BadRequestError(`Непідтримуване розширення: .${ext}. Підтримується: ${[...ALLOWED_FORMAT].join(", ")}`);
+  }
+
+  const res = await ConvertVector({
+    data,
+    format: ext,
+    // srs: +srid, // target srs, 4326 by default
+    encoding,
+    filename: sourceName,
+  });
+
+  return JSON.parse(res.geojson);
+}