@opengis/gis 0.2.171 → 0.2.172

package/package.json

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

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

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { config, eventStream } from '@opengis/fastify-table/utils.js';
+import { config } from '@opengis/fastify-table/utils.js';
 
 import mapnik from "./mapnik.js";
 

package/server/routes/registers/functions/map.registry.js

@@ -1,19 +1,27 @@
 import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
-import { attachClassifiers } from './funcs/classifiers.js';
-const pg = pgClients.client;
 
-export default async function mapRegistry(req,reply) {
-const { params = {}, query = {} } = req;
-    const { slug, id } = params;
-    const { filter, page = 1 } = query;
+import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
 
-    if (!slug || !id) return reply.code(404).send({ message: 'Params slug and id is required', status: 404 });
+import { attachClassifiers } from './classifiers.js';
+
+export default async function mapRegistry({
+    slug, id, filter, limit: queryLimit, page = 1
+}, pg = pgClients.client) {
+    if (!slug || !id) {
+        throw BadRequestError('Params slug and id is required');
+    }
 
     const mapTemplate = await getTemplate('map', slug);
-    if (!mapTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
+
+    if (!mapTemplate) {
+        throw NotFoundError('Template not found');
+    }
 
     const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
-    if (!listWidget) return reply.code(404).send({ message: 'List widget not found', status: 404 });
+
+    if (!listWidget) {
+        throw NotFoundError('List widget not found');
+    }
 
     const {
         table,
@@ -25,7 +33,7 @@ const { params = {}, query = {} } = req;
     } = listWidget;
 
     const { columns = [], filters = [], limit: configLimit = 20 } = config;
-    const limit = query.limit || configLimit;
+    const limit = queryLimit || configLimit;
     const offset = limit * (page - 1);
     const selectColumns = columns.map(col => col.name);
 
@@ -35,7 +43,7 @@ const { params = {}, query = {} } = req;
 
 
     const { q: sqlFilter } = filter
-        ? await getFilterSQL({ table, filter, json: 1 })
+        ? await getFilterSQL({ table, filter })
         : { q: '1=1' };
 
     const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
@@ -43,7 +51,7 @@ const { params = {}, query = {} } = req;
 
     const sqlBase = `FROM ${table} ${whereClause}`;
     const sqlOrder = order ? `ORDER BY ${order}` : "";
-    const sqlLimit = `LIMIT $1 OFFSET $2`;
+    const sqlLimit = `LIMIT $1::bigint OFFSET $2::bigint`;
     const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
     ${sqlBase}`;
     const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;