@opengis/gis 0.2.78 → 0.2.80

package/module/gis/select/admin.cls.name.sql

@@ -1,3 +1,3 @@
-select name as id, name  from admin.cls 
+select distinct name as id, name  from admin.cls 
 where parent is null 
 order by name

package/module/gis/table/gis.group_list.table.json

@@ -18,19 +18,42 @@
       "export",
       "add"
    ],
+   "sql": [
+      {
+         "sql": "select sum(count) as count from ( select count(*) from gis.cartocss where group_id=t.group_id union all select count(*) from gis.ogc_service where group_id=t.group_id union all select count(*) from gis.rasters where group_id=t.group_id union all select count(*) from gis.services where group_id=t.group_id )q",
+         "name": "count_sql"
+      }
+   ],
    "form": "gis.group_list.form",
    "columns": [
       {
          "ua": "Назва",
          "name": "group_name",
-         "width": 200,
          "format": "text"
       },
       {
-         "ua": "Тип сервісу",
+         "ua": "Кількість георесурсів",
+         "name": "count",
+         "format": "text"
+      },
+      {
+         "ua": "Вкл/Викл",
          "name": "enabled",
          "format": "boolean",
          "edit": true
       }
+   ],
+   "filters": [
+      {
+         "name": "group_name",
+         "ua": "Назва",
+         "type": "Text"
+      },
+      {
+         "name": "enabled",
+         "ua": "Вкл/Викл",
+         "data": "yes_no",
+         "type": "Check"
+      }
    ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.78",
+  "version": "0.2.80",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.132",
+    "@opengis/fastify-table": "^2.0.135",
     "@opengis/filter": "0.1.31",
     "@opengis/form": "^0.0.103",
     "@opengis/table": "^0.0.27",
@@ -63,7 +63,7 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-vue": "^9.33.0",
     "@vue/eslint-config-typescript": "^12.0.0",
-    "vue-eslint-parser": "^10.2.0",
+    "vue-eslint-parser": "^10.4.0",
     "lucide-vue-next": "^0.514.0",
     "sass-embedded": "1.86.3",
     "typescript": "^5.9.3",

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

@@ -41,7 +41,7 @@ export default async function layerList({
     from gis.rasters s where is_active and ${!user.uid ? 'is_public' : '1=1'}
     union all 
     select cartocss_id as id, name, null as category, style, geom::box2d as bbox, st_asgeojson(geom)::json as geom,
-     coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png?nottl=1',null) as url, 'cartocss' as service, group_id,
+     coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url, 'cartocss' as service, group_id,
         null as popup, null as card, null as filters, source_path
     from gis.cartocss where enabled and ${!user.uid ? 'is_public' : '1=1'}
     `;

package/server/routes/map/maps/get.map.js

@@ -17,49 +17,89 @@ const columnType = {
 export default async function getMap({ params = {}, pg = pgClients.client }, reply) {
   const { columns = [] } = await getMeta({ pg, table }) || {};
 
-  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+  const fields = columns.map(({ name, dataTypeID, title }) => ({
+    name,
+    type: columnType[pg.pgType?.[dataTypeID] || 'text'],
+    label: title || name
+  }));
+
   const mapList = getTemplates('map').map(el => el[0]);
 
   const rows = pg.pk?.['gis.maps'] ? await pg.query(
-    `SELECT map_id as id, *  FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
+    `SELECT map_id as id, * FROM gis.maps where ${params.id ? '$1 in (map_id,map_key)' : '1=1'}`,
     [params.id].filter(Boolean),
   ).then(el => el.rows || []) : [];
 
   if (params.id && !mapList?.includes(params.id) && !rows[0]) {
-    return { status: 404, message: 'map not found' };
+    return reply.status(404).send({ status: 404, message: 'map not found' });
   }
 
   const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
     .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
   const maps = pg.pk?.['gis.maps'] ? await pg.query(
-    'SELECT map_id as id, map_key as slug, name  FROM gis.maps where is_active and is_public order by name',
+    'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
   ).then(el => el.rows || []) : [];
 
   if (params.id) {
     const map = rows[0] || {};
     const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
-
     const obj = loadTemplate || map;
 
-    const layers = [];
-
-    if (Array.isArray(obj?.ogc) && obj.ogc.length && ['string', 'number'].includes(typeof obj.ogc[0])) {
-      await Promise.all(obj.ogc.map(async (layer) => {
-        const ogcData = await pg.query('select ogc_service_id as id, url as service_url, * from gis.ogc_service where ogc_service_id=$1', [layer]).then(el => el.rows?.[0]);
-        layers.push({
-          ...(ogcData || {}), id: layer, /* center: [], bbox: null, filters: [], style: { color: 'red' }, */ visible: !!ogcData, type: 'ogc',
-        });
+    const rawIds = [
+      ...(Array.isArray(obj?.layers) ? obj.layers : []),
+      ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
+      ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
+      ...(Array.isArray(obj?.rasters) ? obj.rasters : [])
+    ];
+    const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
+
+    let layers = [];
+
+    if (layerIds.length > 0) {
+      const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
+        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND isadmin = false AND ogc_service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center FROM gis.rasters WHERE is_active = true AND ispublic = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds])
+      ]);
+
+      const allFetchedLayers = [
+        ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
+        ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
+        ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
+        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' }))
+      ];
+
+      const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
+
+      const layersResults = await Promise.all(layerIds.map(async (id) => {
+        const idStr = String(id);
+
+        if (!dbLayersMap.has(idStr)) {
+          return null;
+        }
+
+        const dbData = dbLayersMap.get(idStr);
+        const templateData = await getTemplate('layer', idStr);
+
+        const layerData = { ...dbData, ...(templateData || {}) };
+
+        layerData.count = totals[layerData.source_path || ''] || 0;
+        layerData.visible = true;
+
+        if (layerData.style && typeof layerData.style === 'string') {
+          if (layerData.type === 'cartocss') {
+            layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
+          } else if (layerData.type !== 'ogc') {
+            layerData.style = yml2json(layerData.style);
+          }
+        }
+
+        return layerData;
       }));
-    }
 
-    if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
-      await Promise.all(obj.layers.map(async (layer) => {
-        const layerData = await getTemplate('layer', layer);
-        const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
-        Object.assign(serviceData || {}, { count: totals[serviceData?.source_path || ''] || 0 });
-        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yml2json(serviceData.style); }
-        layers.push({ ...(serviceData || {}), id: layer, visible: !!serviceData });
-      }));
+      layers = layersResults.filter(Boolean);
     }
 
     return reply.status(200).send({ maps, ...obj, layers });
@@ -69,12 +109,5 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
     return reply.status(404).send('map not found');
   }
 
-  if (params.id) {
-    return reply.status(200).send({ ...rows[0], fields });
-  }
-
-  return reply.status(200).send({
-    rows,
-    fields,
-  });
-}
+  return reply.status(200).send(params.id ? { ...rows[0], fields } : { rows, fields });
+}

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

@@ -6,7 +6,7 @@ const { GetRasterInfo } = mapnik();
 
 const { prefix = '/api' } = config;
 
-export default async function rtile({
+export default async function rasterInfo({
     pg = pgClients.client, params, query,
 }, reply) {
     if (!config.mapServerAddress) {