@opengis/gis 0.2.5 → 0.2.6

package/module/gis/form/gis.ogc_service.form.json

@@ -31,6 +31,11 @@
             "type": "Text",
             "ua": "Посилання",
             "col": 8
+        },
+        "html": {
+            "type": "Textarea",
+            "ua": "Шаблон",
+            "col": 12
         }
     }
 }

package/module/test/map/main.json

@@ -7,14 +7,7 @@
   ],
   "zoom": 11,
   "widgets": [
-    {
-      "type": "info",
-      "position": "top-left",
-      "config": {
-        "title": "Містобудівна документація",
-        "content": "<p style='font-size: 14px; color: #34495E;'>Затверджені текстові і графічні матеріали, якими регулюється планування, забудова та інше використання територій.</p>"
-      }        
-    },
+   
     {
       "type": "catalog",
       "position": "top-left"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@opengis/core": "^0.0.23",
     "@opengis/fastify-table": "^2.0.32",
-    "@opengis/filter": "^0.1.7",
+    "@opengis/filter": "^0.1.11",
     "@opengis/form": "^0.0.48",
     "@opengis/table": "^0.0.27",
     "@vitejs/plugin-vue": "^5.2.3",

package/server/routes/gis/index.mjs

@@ -23,10 +23,10 @@ const mapInfoPointSchema = {
       x: { type: 'number' },
       y: { type: 'number' },
       layers: { type: 'string' },
-      index: { type: 'number', minimum: 0 }
+      index: { type: 'number', minimum: 0 },
     },
-    required: ['x', 'y', 'layers']
-  }
+    required: ['x', 'y', 'layers'],
+  },
 };
 
 async function route(app) {
@@ -56,4 +56,4 @@ async function route(app) {
   app.get('/map-info-point', { config: { policy: ['public'] }, schema: mapInfoPointSchema }, mapInfoPoint);
 }
 
-export default route;
+export default route;

package/server/routes/gis/ogc/map.info.point.js

@@ -1,120 +1,124 @@
-import { pgClients, handlebars, getMeta, getTemplate, getFilterSQL } from "@opengis/fastify-table/utils.js";
+import {
+  pgClients, handlebars, getMeta, getTemplate, getFilterSQL,
+} from '@opengis/fastify-table/utils.js';
 
 const columnType = {
-    text: 'text',
-    date: 'date',
-    bool: 'yes/no',
-    numeric: 'number',
-    integer: 'number',
-    'timestamp without time zone': 'date',
-    'timestamp with time zone': 'date',
+  text: 'text',
+  date: 'date',
+  bool: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
 };
 
 export default async function mapInfoPoint(req, reply) {
-    const { pg = pgClients.client, query = {} } = req;
-    const { x, y, layers, index = 0 } = query;
-    const time = Date.now();
-
-    if (!x || !y || !layers) {
-        return reply.status(400).send('not enough query params: x, y, layers are required');
-    }
-
-    const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query(`select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)`, [layers.split(',')]).then(el => el.rows || []) : [];
-
-    if (!rows.length) {
-        return reply.status(404).send('layers not found');
-    }
-
-    const point = `srid=4326;point(${x} ${y})`; // 30, 50
-
-    const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
-
-    await Promise.all(rows.map(async (layer, idx) => {
-        const { table_name: source, ogc_service_id: layerId } = layer;
-        const loadTable = await getTemplate('table', source);
-        const meta = await getMeta({ pg, table: loadTable?.table || source });
-        const { geom = 'geom' } = meta || {};
-        const { table = source, columns = meta?.columns } = loadTable || {};
-        const { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
-
-        const cls = columns
-            ?.filter(el => el.name && el.data)
-            ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-        const pk = pg.pk?.[table] || loadTable?.key;
-
-        const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
-
-        Object.assign(layer, {
-            layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
-            table,
-            pk,
-            cls,
-            geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
-            optimizedSQL,
-            srid,
-            step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
-        });
-    }));
-
-    const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
-
-    const qList = unique.map((el) => ({
-        query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
+  const { pg = pgClients.client, query = {} } = req;
+  const {
+    x, y, layers, index = 0,
+  } = query;
+  const time = Date.now();
+
+  if (!x || !y || !layers) {
+    return reply.status(400).send('not enough query params: x, y, layers are required');
+  }
+
+  const rows = pg?.pk?.['gis.ogc_service'] ? await pg.query('select * from gis.ogc_service WHERE enabled and table_name is not null and ogc_service_id = any($1)', [layers.split(',')]).then(el => el.rows || []) : [];
+
+  if (!rows.length) {
+    return reply.status(404).send('layers not found');
+  }
+
+  const point = `srid=4326;point(${x} ${y})`; // 30, 50
+
+  const srids = pg.queryCache ? await pg.queryCache('select json_agg(srid) as srids from spatial_ref_sys').then(el => el.rows?.[0]?.srids || {}) : {};
+
+  await Promise.all(rows.map(async (layer, idx) => {
+    const { table_name: source, ogc_service_id: layerId } = layer;
+    const loadTable = await getTemplate('table', source);
+    const meta = await getMeta({ pg, table: loadTable?.table || source });
+    const { geom = 'geom' } = meta || {};
+    const { table = source, columns = meta?.columns } = loadTable || {};
+    const { srid, x } = await pg.query(`select st_srid(${geom}) as srid, st_x(st_pointonsurface(${geom})) as x from ${table} where geom is not null limit 1`).then(el => el.rows?.[0] || {});
+
+    const cls = columns
+      ?.filter(el => el.name && el.data)
+      ?.reduce?.((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+    const pk = pg.pk?.[table] || loadTable?.key;
+
+    const { optimizedSQL } = await getFilterSQL({ pg, table: source, query: layer?.query });
+
+    Object.assign(layer, {
+      layer: (layerId || idx.toString())?.replace?.(/'/g, "''"),
+      table,
+      pk,
+      cls,
+      geomColumn: srid === 4326 ? geom : `st_transform(${geom},4326)`,
+      optimizedSQL,
+      srid,
+      step: srids?.includes?.(srid - 0) && srid !== 4326 && x > 100 ? 10 : 0.0002,
+    });
+  }));
+
+  const unique = rows.filter((el, idx, arr) => el.table && arr.map((item) => item.table).indexOf(el.table) === idx);
+
+  const qList = unique.map((el) => ({
+    query: `select ${el.pk}::text as pk, '${el.layer}' as layer, '${el.table}' as table,
     row_to_json(t) as data, 
     st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') as distance,
     st_asgeojson(${el.geomColumn})::json as geom from (${el.optimizedSQL}) t 
     where 1=1`,
-        queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
-        /*where: `case
+    queryCount: `select 1 from (${el.optimizedSQL})t where 1=1`,
+    /* where: `case
                     when ST_GeometryType(${el.geomColumn}) in ('ST_Polygon','ST_MultiPolygon')
                     then st_intersects(${el.geomColumn},st_buffer('${point.replace(/'/g, "''")}',${el.step}))
-                
+
                     when ST_GeometryType(${el.geomColumn}) in ('ST_Line','ST_MultiLineString', 'ST_MultiPoint', 'ST_Point')
                     then st_distance(${el.geomColumn},'${point.replace(/'/g, "''")}') < ${el.step}
                     else false
-                end`,*/
-        where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`
-    }));
+                end`, */
+    where: `${el.geomColumn} && '${point.replace(/'/g, "''")}'`,
+  }));
 
-    const q = qList.map(el => el.query + ' and ' + el.where).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
+  const q = qList.map(el => `${el.query} and ${el.where}`).join(' union all ').concat(` order by distance limit 1 offset ${Math.max(+index || 0, 0)}`);
 
-    const qCount = qList.map(el => el.queryCount + ' and ' + el.where).join(' union all ');
+  const qCount = qList.map(el => `${el.queryCount} and ${el.where}`).join(' union all ');
 
-    if (query.sql === '1') return q;
-    if (query.sql === '2') return qCount;
+  if (query.sql === '1') return q;
+  if (query.sql === '2') return qCount;
 
-    const count = await pg.query(qCount).then(el => el.rowCount);
+  const count = await pg.query(qCount).then(el => el.rowCount);
 
-    const row = await pg.query(q).then(el => el.rows?.[0]);
+  const row = await pg.query(q).then(el => el.rows?.[0]);
 
-    if (!row) {
-        return reply.status(404).send('object not found');
-    }
+  if (!row) {
+    return reply.status(404).send('object not found');
+  }
 
-    const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+  const { columns = [] } = await getMeta({ pg, table: row.table }) || {};
+  const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
 
-    const htmlTemplate = pg?.pk?.['admin.template'] && row.layer && false
-        ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
-        : rows.find(el => el.ogc_service_id === row.layer)?.html;
+  const htmlTemplate = pg?.pk?.['admin.templates'] && row.layer && false
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [row.layer]).then(el => el.rows?.[0]?.body)
+    : rows.find(el => el.ogc_service_id === row.layer)?.html;
 
-    const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
+  const html = await handlebars.compile(htmlTemplate || 'template not found')(row.data);
 
-    const res = {
-        time: Date.now() - time,
-        index,
-        count,
-        data: {
-            layer: row.layer,
-            geom: row.geom,
-            id: row.pk,
-            distance: row.distance,
-            data: row.data,
-        },
-        fields,
-        html
-    };
+  const res = {
+    time: Date.now() - time,
+    index,
+    count,
+    data: {
+      layer: row.layer,
+      geom: row.geom,
+      id: row.pk,
+      distance: row.distance,
+      data: row.data,
+    },
+    fields,
+    html,
+  };
 
-    return res;
+  return res;
 }

package/server/routes/gis/services/get.services.js

@@ -18,7 +18,7 @@ export default async function getServices({ params = {}, pg = pgClients.client }
   if (!pg.tlist.includes('gis.services')) return { status: 404, message: 'not found' };
   const rows = await pg.query(`
         SELECT 
-            service_id, service_key, name, description, keywords, category, holder, group_id, b.group_name, service_type, 
+            service_id, service_key, name, description, keywords, category, holder, group_id, b.group_name, service_type, card_mode,
             source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
             popup, style, legend, card, srid, bbox::box2d as extent, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, is_active as enabled, is_public, is_active, is_downloadable, metadata, 
             metadata_url, thumbnail_url, created_by, updated_by, updated_at, created_at, template 

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

@@ -59,15 +59,13 @@ export default async function mapFormat(req, reply) {
         </div>`);
   }
 
-  const htmlTemplate = pg?.pk?.['admin.template']
-    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || id]).then(el => el.rows?.[0]?.body)
+  const htmlTemplate = pg?.pk?.['admin.templates'] && service.card_mode === 'html'
+    ? await pg.query('select body from admin.templates where name=$1 limit 1', [template || layer]).then(el => el.rows?.[0]?.body)
     : null;
 
-  const html1 = await handlebars.compile(htmlTemplate || 'template not found')(fullRow);
+  const html1 = htmlTemplate ? await handlebars.compile(htmlTemplate)(fullRow) : null;
 
-  const html = template
-    ? html1
-    : `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
+  const html = html1 || `<dl class="divide-y divide-gray-100 py-[5px]">${result.join('')}</dl>`;
 
   const res = {
     time: Date.now() - time,

package/server/routes/map/vtile1.js

@@ -44,8 +44,10 @@ export default async function vtile({
   const { pk: pkey, columns } = metaTable;
 
   // props
+
   const props = !query.all ? (data.popup || []).concat(data.card || []) : columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
-  const cache = layer + (query.all ? '-all' : '');
+
+  const cache = layer + (query.all ? '-all' : '') + JSON.stringify(data.popup || []).length;
   const propsWithCls = propsCache[cache] ?? await Promise.all(props.map(async (col, idx) => {
     const key = col.name;
     const select = data.popup?.find(el => el.name === key);