@opengis/gis 0.2.100 → 0.2.102

package/module/gis/form/gis.cartocss.form.json

@@ -30,6 +30,13 @@
             "type": "Switcher",
             "data": "yes_no"
         },
+        "is_static": {
+            "ua": "Чи є карта статичною?",
+            "i": "Генерація тайлів без TTL",
+            "col": 6,
+            "type": "Switcher",
+            "data": "yes_no"
+        },
         "enabled": {
             "ua": "Чи включена карта?",
             "col": 6,

package/module/test/cls/doc_status.json

@@ -1,32 +1,32 @@
-[
-    {
-        "id": "1",
-        "text": "Діючий",
-        "color": "#1ab394"
-    },
-    {
-        "id": "2",
-        "text": "Зупинений",
-        "color": "#ed82c8"
-    },
-    {
-        "id": "3",
-        "text": "Скасований",
-        "color": "#4a4a4a"
-    },
-    {
-        "id": "5",
-        "text": "Проектний",
-        "color": "#6495ed"
-    },
-    {
-        "id": "7",
-        "text": "Очікує розгляду",
-        "color": "#92b8ef"
-    },
-    {
-        "id": "10",
-        "text": "Архівний",
-        "color": "#d48428"
-    }
+[
+    {
+        "id": "1",
+        "text": "Діючий",
+        "color": "#1ab394"
+    },
+    {
+        "id": "2",
+        "text": "Зупинений",
+        "color": "#ed82c8"
+    },
+    {
+        "id": "3",
+        "text": "Скасований",
+        "color": "#4a4a4a"
+    },
+    {
+        "id": "5",
+        "text": "Проектний",
+        "color": "#6495ed"
+    },
+    {
+        "id": "7",
+        "text": "Очікує розгляду",
+        "color": "#92b8ef"
+    },
+    {
+        "id": "10",
+        "text": "Архівний",
+        "color": "#d48428"
+    }
 ]

package/module/test/select/core.user_uid.sql

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.100",
+  "version": "0.2.102",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -73,4 +73,4 @@
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/server/migrations/cartocss.sql

@@ -14,6 +14,7 @@ create table if not exists gis.cartocss(
     group_id     text constraint services_group_id_fkey references group_list,
     is_public    boolean   default false           not null,
     enabled      boolean   default true            not null,
+    is_static boolean not null default false,
     geom public.geometry
 );
 
@@ -23,3 +24,4 @@ alter table gis.cartocss add column if not exists card_auto boolean not null def
 alter table gis.cartocss add column if not exists card_html text;
 alter table gis.cartocss add column if not exists card_table text;
 alter table gis.cartocss add column if not exists card_columns text;
+alter table gis.cartocss add column if not exists is_static boolean not null default false;

package/server/routes/gis/checkXML.js

@@ -33,13 +33,13 @@ export default async function checkXML(req, reply) {
 
                 if (uploadStatus.exists === false) {
                     errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id})`);
+                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: not uploaded (raster:${row.raster_id}/${row.name})`);
                     return null;
                 }
 
                 if (uploadStatus.finished === false) {
                     errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id})`);
+                    send(`${idx}/${rasters.length} ERROR: GetRasterStatus: upload not finished (raster:${row.raster_id}/${row.name})`);
                     return null;
                 }
 
@@ -50,7 +50,7 @@ export default async function checkXML(req, reply) {
 
                 if (rasterInfo.err) {
                     errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id})`);
+                    send(`${idx}/${rasters.length} ERROR: GetRasterInfo: ${rasterInfo.err} (raster:${row.raster_id}/${row.name})`);
                     return null;
                 }
 
@@ -63,11 +63,11 @@ export default async function checkXML(req, reply) {
 
                 if (data.err) {
                     errors.raster += 1;
-                    send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id})`);
+                    send(`${idx}/${rasters.length} ERROR: RenderTile: ${data.err} (raster:${row.raster_id}/${row.name})`);
                     return null;
                 }
 
-                send(`${idx}/${rasters.length} OK: (raster:${row.raster_id})`);
+                send(`${idx}/${rasters.length} OK: (raster:${row.raster_id}/${row.name})`);
                 successCount += 1;
             }),
             Promise.resolve(),
@@ -87,11 +87,11 @@ export default async function checkXML(req, reply) {
 
                 if (data.err) {
                     errors.css += 1;
-                    send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id})`);
+                    send(`${idx}/${css.length} ERROR: RenderTile: ${data.err} (css:${row.cartocss_id}/${row.name})`);
                     return null;
                 }
 
-                send(`${idx}/${css.length} OK: (css:${row.cartocss_id})`);
+                send(`${idx}/${css.length} OK: (css:${row.cartocss_id}/${row.name})`);
                 successCount += 1;
             }),
             Promise.resolve(),

package/server/routes/gis/index.mjs

@@ -41,7 +41,7 @@ const editMetadataSchema = {
   params: {
     type: 'object',
     properties: {
-      type: { type: 'string', enum: ['raster', 'css', 'dataset'] },
+      type: { type: 'string', enum: ['raster', 'css', 'dataset', 'service'] },
       id: { type: 'string' },
     },
     required: ['type', 'id'],

package/server/routes/gis/metadata/editMetadata.js

@@ -9,7 +9,7 @@ export default async function editMetadata(req, reply) {
     raster: 'select 1 from gis.rasters where raster_id = $1',
     css: 'select 1 from gis.cartocss where cartocss_id = $1',
     dataset: 'select 1 from gis.dataset where dataset_id = $1',
-
+    service: 'select 1 from gis.services where service_id = $1',
   }[type];
 
   if (!q) {

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

@@ -6,31 +6,28 @@ import {
 const excluded = ['created_by', 'created_at', 'updated_by', 'geom', 'id', 'uid', 'updated_at', 'cdate', 'editor_date', 'editor_id'];
 
 function getLayerTableQuery({
-  el, id, point, srids, nogeom,
+  el, id, point, nogeom, radius,
 }, pg = pgClients.client) {
   const {
     gcol: geom = 'geom', table, pk = pg.pk[el.table], query: tableQuery, srid, columns,
   } = el;
-  const step = srids.length && srids.includes(srid - 0) && srid !== 4326 ? 10 : 0.001;
+  const buffer = `ST_Buffer('${point}'::geography, ${radius || 50})::geometry`;
   const q = `SELECT
   ${pk} as "id"
   ,'${el.key}' as "key"
   ${nogeom ? '' : `,st_asgeojson(${srid !== 4326 ? `st_transform(${geom}, 4326)` : geom})::json as geom`}, ${srid !== 4326 ? `st_transform(${geom}, 4326)` : geom}::box2d as box2d, ${columns ? `row_to_json(t)` : 'null'} as "data" 
   ${point ? `,st_distance(${el.srid !== 4326 ? `st_transform(${geom}, 4326)` : geom},'${point} ') as distance` : ''} 
   FROM ${table} t WHERE ${tableQuery || '1 = 1'} and st_isvalid(${geom}) and st_srid(${geom}) > 0
-and ${point ? `case
-    when ST_GeometryType(${geom}) in ('ST_Polygon','ST_MultiPolygon')
-    then st_intersects(${srid !== 4326 ? `st_transform(${geom}, 4326)` : geom},st_buffer('${point}',${step}))
-
-    when ST_GeometryType(${geom}) in ('ST_LineString','ST_MultiLineString', 'ST_MultiPoint', 'ST_Point')
-    then st_distance(${srid !== 4326 ? `st_transform(${geom}, 4326)` : geom},'${point}') < ${step}
-  else false end` : `${id ? `${pk}='${id.replace(/'/g, "")}'` : '2=2'}`
-    } ${point ? 'order by distance' : ''} limit 1`;
+  and ${point
+      ? `case when ST_GeometryType(${geom}) in ('ST_Polygon','ST_MultiPolygon', 'ST_LineString','ST_MultiLineString', 'ST_MultiPoint', 'ST_Point') then st_intersects(${srid !== 4326 ? `st_transform(${geom}, 4326)` : geom}, ${buffer}) else false end`
+      : '1=1'}
+  and ${id ? `${pk}='${id.replace(/'/g, "")}'` : '2=2'} 
+  ${point ? 'order by distance' : ''} limit 10`;
   return q;
 }
 
 async function getLayersData({
-  id, lng, lat, cartocss, nogeom,
+  id, lng, lat, cartocss, nogeom, radius,
 }, pg = pgClients.client) {
   if (!(lng && lat) && !id) {
     return { error: 'not enough params: lat / lng' };
@@ -42,14 +39,12 @@ async function getLayersData({
 
   const point = lng && lat ? `srid=4326;point(${lng} ${lat})`.replace(/'/g, "''") : null;
 
-  const srids = pg?.queryCache ? await pg.queryCache('select json_agg(srid) from public.spatial_ref_sys').then(el => el.rows?.[0]?.json_agg || []) : [];
-
   const q = cartocss.card_table
     ? getLayerTableQuery({
-      el: { key: cartocss.card_table, table: cartocss.card_table, columns: cartocss.card_columns }, id, point, srids, nogeom,
+      el: { key: cartocss.card_table, table: cartocss.card_table, columns: cartocss.card_columns }, id, point, nogeom, radius,
     }, pg)
     : cartocss.config.filter((el, idx, arr) => el.key && el.table && pg.pk?.[el.table] && arr.map(item => item.table).indexOf(el.table) === idx).map(el => getLayerTableQuery({
-      el, id, point, srids, nogeom,
+      el, id, point, nogeom, radius,
     }, pg)).join(' union all ');
 
   // console.time(q);
@@ -79,6 +74,7 @@ async function getLayersData({
     : Object.keys(rows[0] || {}).map(key => ({ name: key, format: 'text' }));
 
   return {
+    ids: rows.map(row => row.id),
     rows,
     data,
     columns,
@@ -88,7 +84,7 @@ async function getLayersData({
 }
 
 async function getTableData({
-  service, layer, id, user,
+  service, layer, id, user, nogeom,
 }, pg = pgClients.client) {
   const {
     source_path: tname, card, template,
@@ -115,7 +111,7 @@ async function getTableData({
   const filteredColumns = columnNames.filter(name => !excluded.includes(name));
 
   const rows = await pg.query(
-    `SELECT ${pk} as "id", st_asgeojson(geom)::json as geom, geom::box2d as box2d ${filteredColumns?.length > 0 ? ',' : ''}  ${filteredColumns.map((n) => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
+    `SELECT ${pk} as "id", ${!nogeom ? 'st_asgeojson(geom)::json as geom, geom::box2d as box2d' : ''} ${!nogeom && filteredColumns?.length > 0 ? ',' : ''}  ${filteredColumns.map((n) => `"${n}"`).join(', ')} FROM ${tname} WHERE ${pk} = $1`,
     [id],
   ).then(el => el.rows || []);
 
@@ -142,7 +138,7 @@ async function getTableData({
 
 export default async function mapFormat({ pg = pgClients.client, query = {}, user }, reply) {
   const {
-    layer, id, lat, lng, nogeom,
+    layer, id, lat, lng, nogeom, radius = 50,
   } = query;
 
   const t1 = Date.now();
@@ -158,7 +154,7 @@ export default async function mapFormat({ pg = pgClients.client, query = {}, use
     return reply.status(400).send({ error: 'not enough query params: id', code: 400 });
   }
 
-  if (cartocss && !cartocss.config?.length) {
+  if (cartocss && !(cartocss.config?.length || cartocss.card_table)) {
     return reply.status(400).send({ error: 'invalid layer settings: empty config', code: 400 });
   }
 
@@ -167,10 +163,10 @@ export default async function mapFormat({ pg = pgClients.client, query = {}, use
   }
 
   const {
-    rows, data, columns, classifiers, tname, template, error, code = 500, htmlTemplate,
+    ids, rows, data, columns, classifiers, tname, template, error, code = 500, htmlTemplate,
   } = cartocss
       ? await getLayersData({
-        cartocss, id, lng, lat, nogeom,
+        cartocss, id, lng, lat, radius, nogeom,
       }, pg)
       : await getTableData({
         service, layer, id, user, nogeom,
@@ -210,8 +206,9 @@ export default async function mapFormat({ pg = pgClients.client, query = {}, use
 
   const res = {
     time: Date.now() - t1,
+    ids,
     id: fullRow.id,
-    rows: fullRow,
+    data: fullRow,
     columns,
     template,
     html,

package/server/routes/map/index.mjs

@@ -47,6 +47,29 @@ const schemaInfo = {
   },
 };
 
+const mapFormatSchema = {
+  querystring: {
+    type: 'object',
+    properties: {
+      lat: {
+        type: 'number',
+        minimum: 1,
+        maximum: 90,
+      },
+      lng: {
+        type: 'number',
+        minimum: -180,
+        maximum: 180,
+      },
+      radius: {
+        type: 'number',
+        minimum: 1,
+        maximum: 1000,
+      },
+    },
+  },
+};
+
 const publicParams = { config: { policy: 'L0' }, schema: schemaInfo, package: 'gis' }; // * L0 === public
 const privilegedParams = { config: { policy: 'L1', role: 'admin' }, schema: schemaInfo, package: 'gis' }; // ? just auth or admin
 
@@ -137,6 +160,6 @@ export default async function route(app) {
   }
 
   if (!app.hasRoute({ method: 'GET', url: '/api/map-format' })) {
-    app.get('/map-format', publicParams, mapFormat);
+    app.get('/map-format', { ...publicParams, schema: mapFormatSchema }, mapFormat);
   }
 }

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

@@ -3,7 +3,7 @@ import { createHash } from 'node:crypto';
 import Sphericalmercator from '@mapbox/sphericalmercator';
 
 import {
-    config, logger, pgClients, dataUpdate,
+    config, logger, pgClients,
 } from '@opengis/fastify-table/utils.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
@@ -54,7 +54,7 @@ export default async function rtile({
         : {};
 
     const carto = pg.pk?.['gis.cartocss']
-        ? await pg.queryCache('select cartocss_id, source_path, is_public from gis.cartocss where cartocss_id=$1::text', { args: [id], table: 'gis.cartocss' }).then(el => el.rows?.[0] || {})
+        ? await pg.queryCache('select cartocss_id, source_path, is_public, is_static from gis.cartocss where cartocss_id=$1::text', { args: [id], table: 'gis.cartocss' }).then(el => el.rows?.[0] || {})
         : {};
 
     if (carto.cartocss_id) {
@@ -62,6 +62,7 @@ export default async function rtile({
             id: carto.cartocss_id,
             source_path: carto.source_path,
             is_public: carto.is_public,
+            is_static: carto.is_static,
             type: 'css',
         });
     }
@@ -82,7 +83,7 @@ export default async function rtile({
 
     try {
         const ttl = (query.nocache ? '0' : null)
-            || (data.type === 'css' ? '1h' : null);
+            || (data.type === 'css' && !data.is_static ? '1w' : null);
 
         const md5 = data.source_path
             ? createHash('md5').update(data.source_path).digest('hex')
@@ -110,6 +111,7 @@ export default async function rtile({
                 base64_path: base64,
                 raster: !!data.id,
                 carto: data.type === 'css',
+                is_static: data.type === 'css' ? data.is_static : true,
             };
         }