@opengis/gis 0.1.36 → 0.1.37

package/module/gis/cls/gis.column_view_type.json

@@ -11,6 +11,10 @@
     "id": "features",
     "text": "Опис"
   },
+  {
+    "id": "tags",
+    "text": "Ключові слова"
+  },
   {
     "id": "other",
     "text": "Інше"

package/module/gis/table/site.gis.services.table.json

@@ -15,6 +15,16 @@
     {
       "sql": "select json_agg(q) as metadata_all from (select scale, katottg,srid, region, name, purpose, source,keywords,update_frequency,year,date_created,size,access_constraints,license  from gis.metadata where layer_id=t.service_id limit 1)q ",
       "name": "metadata_list_sql"
+    },
+    {
+      "name": "is_export_sql",
+      "sql": "select jsonb_path_exists(attributes, '$[*] ? (@.is_export == true)') as is_export"
+    },
+    {
+      "ua": "Наявність колонок для експорту",
+      "name": "is_export",
+      "data": "yes_no",
+      "format": "badge"
     }
   ],
   "title": "Сервіси",
@@ -101,4 +111,4 @@
       "type": "Text"
     }
   ]
-}
+}

package/package.json

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

package/server/routes/gis/registers/funcs/get.info.js

@@ -11,9 +11,9 @@ export default async function getInfo({ finalInfo, format }, reply) {
   const exportable = columns.filter(c => c.is_export);
   const selectNames = exportable.map(c => `"${c.name}"`);
   const selectSQL = `
-    SELECT ${selectNames?.length ? selectNames.join(', ') : ''} ${format === 'geojson' || format === 'shp'? `, ST_AsGeoJSON(geom)::json as geom` : ``}
+    SELECT ${selectNames?.length ? selectNames.join(', ') : ''} ${format === 'geojson' || format === 'shp' ? `${selectNames?.length ? ',' : ''} ST_AsGeoJSON(geom)::json as geom` : ``}
     FROM ${table}
-    WHERE ${queryCondition} ${format === 'geojson' || format === 'shp'? `and geom is not null` : ``}
+    WHERE ${queryCondition} ${format === 'geojson' || format === 'shp' ? `and geom is not null` : ``}
   `;
 
   if (format === 'shp') {
@@ -23,18 +23,18 @@ export default async function getInfo({ finalInfo, format }, reply) {
       WHERE geom IS NOT NULL
     `);
     const geometryTypes = geomTypeRows.map(row => row.geom_type);
-    
+
     const sqlList = geometryTypes.map(type => {
       return {
         type,
         query: `
-          SELECT ${selectNames.join(', ')}, ST_AsGeoJSON(geom)::json as geom
+          SELECT ${selectNames.join(', ')} ${selectNames?.length ? ',' : ''}  ST_AsGeoJSON(geom)::json as geom
           FROM ${table}
           WHERE ${queryCondition} AND ST_GeometryType(geom) = '${type}' AND geom IS NOT NULL
         `,
       };
     });
-    
+
     const { rows: [{ srid }] } = await pg.query(`
       SELECT ST_SRID(geom) AS srid
       FROM ${table}
@@ -53,7 +53,7 @@ export default async function getInfo({ finalInfo, format }, reply) {
 
   const { rows } = await pg.query(selectSQL);
   if (!rows?.length) {
-      return reply.status(404).send({ message: 'Немає даних, які можна експортувати', status: 404 });
+    return reply.status(404).send({ message: 'Немає даних, які можна експортувати', status: 404 });
   }
 
   const classifiers = exportable
@@ -66,20 +66,20 @@ export default async function getInfo({ finalInfo, format }, reply) {
     const newRow = { ...row };
 
     for (const key of Object.keys(newRow)) {
-        if (key.endsWith('_data') && typeof newRow[key]?.text === 'string') {
-          const baseKey = key.replace(/_data$/, '');
-          newRow[baseKey] = newRow[key].text;
-        }
+      if (key.endsWith('_data') && typeof newRow[key]?.text === 'string') {
+        const baseKey = key.replace(/_data$/, '');
+        newRow[baseKey] = newRow[key].text;
+      }
 
-        if (key.endsWith('_text') && typeof newRow[key] === 'string') {
-          const baseKey = key.replace(/_text$/, '');
-          newRow[baseKey] = newRow[key];
-        }
+      if (key.endsWith('_text') && typeof newRow[key] === 'string') {
+        const baseKey = key.replace(/_text$/, '');
+        newRow[baseKey] = newRow[key];
       }
+    }
 
     return newRow;
   });
-  
+
   return {
     rows: simplifiedRows,
     data: rows,