@opengis/gis 0.1.60 → 0.1.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "type": "module",
   "author": "Softpro",
   "main": "dist/import-file.js",

package/server/routes/map/controllers/mapTiles.js

@@ -16,7 +16,7 @@ const systemColumns = ['uid', 'cdate', 'editor_id', 'editor_date', 'created_by',
 
 export default async function mapTiles({ pg = pgClients.client, params = {}, query = {}, unittest }, reply) {
     const { slug, y, z } = params;
-    const { sql, nocache, filter, pointZoom, type, layers } = query;
+    const { sql, nocache, filter, pointZoom, type, layers, layer } = query;
     const x = params.x?.split?.('.')?.[0] - 0;
 
     if (!slug) {
@@ -35,7 +35,7 @@ export default async function mapTiles({ pg = pgClients.client, params = {}, que
         'Cache-Control': nocache || sql ? 'no-cache' : 'public, max-age=86400',
     };
 
-    const hash = [filter].filter((el) => el).join();
+    const hash = [filter, layer].filter(Boolean).join();
 
     const filepath = path.join(
         rootFolder,
@@ -67,13 +67,18 @@ export default async function mapTiles({ pg = pgClients.client, params = {}, que
         return reply.status(404).send('map layers not found');
     }
 
-    if (!layers1.filter(el => el.source_path).length) {
-        return reply.status(404).send('map layers sources not provided');
+    layers1.forEach(el => Object.assign(el, { name: el.name || el.id }));
+
+    const layers2 = layers1.filter(el => el.name && el.source_path).filter(el => layers ? layers.includes(el.name) : true).filter(el => layer ? el.name === layer : true);
+
+    if (!layers2.length) {
+        return reply.status(404).send('map layers sources not provided / invalid query params');
     }
 
-    layers1.forEach(el => Object.assign(el, { name: el.name || el.id }));
+    const allFilters = loadTemplate.widgets?.filter?.(el => el.type === 'filters') || [];
+    const { filters: filterList = [], layer_id: layerId } = allFilters.find(el => layer ? el.config?.layer_id === layer : el.default)?.config || allFilters[0]?.config || {};
 
-    const q = (await Promise.all(layers1.filter(el => el.name && el.source_path).filter(el => layers ? layers.includes(el.name) : true).map(async (layer) => {
+    const q = (await Promise.all(layers2.map(async (layer) => {
         const { source_path: source, id, name, style, geometry_type: gt, query: lquery, geometry_column: gCol } = layer;
         const loadTable = await getTemplate('table', source);
 
@@ -84,7 +89,7 @@ export default async function mapTiles({ pg = pgClients.client, params = {}, que
         if (!columns?.length) return null;
 
         const pk = pg.pk?.[table] || loadTable?.key;
-        const fData = filter ? await getFilterSQL({ pg, table: source, filterList: filter }) : {};
+        const fData = filter && layerId === name ? await getFilterSQL({ pg, table: source, filterList, filter }) : {};
 
         const geomCol = parseInt(z, 10) < parseInt(pointZoom || '0', 10) || (style?.centroid && gt === 'point')
             ? `ST_Centroid(${geom})`