@opengis/gis 0.1.51 → 0.1.53

package/module/gis/form/gis.maps.form.json

@@ -48,12 +48,12 @@
     "is_public": {
       "ua": "Чи публічна карта?",
       "col": 4,
-      "type": "Radio",
+      "type": "Switcher",
       "data": "yes_no",
-      "view": "buttons",
       "validators": [
         "required"
-      ]
+      ],
+      "default": "true"
     },
     "image": {
       "ua": "Фото",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "type": "module",
   "author": "Softpro",
   "main": "dist/import-file.js",
@@ -28,20 +28,14 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.13.4",
-    "@grpc/proto-loader": "0.7.15",
     "@mapbox/sphericalmercator": "1.2.0",
-    "@opengis/fastify-auth": "1.1.0",
-    "@opengis/fastify-file": "1.1.2",
-    "@opengis/fastify-table": "1.4.23",
+    "@opengis/fastify-auth": "1.1.1",
+    "@opengis/fastify-table": "1.4.29",
     "@opengis/v3-core": "^0.3.196",
     "@opengis/v3-filter": "^0.1.28",
     "@turf/turf": "7.2.0",
     "axios": "1.9.0",
     "carto": "0.16.3",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "handlebars": "4.7.8",
     "lucide-vue-next": "^0.514.0",
     "maplibre-gl": "5.5.0",
     "marked": "15.0.12",
@@ -49,7 +43,6 @@
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0",
-    "dotenv": "^16.5.0",
     "yaml": "^2.8.0"
   },
   "devDependencies": {

package/server/routes/gis/registers/gis.export.js

@@ -1,11 +1,11 @@
-import { createReadStream } from 'fs';
+import { createReadStream } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
-import path from 'path';
-import { config, getMeta, getFolder } from '@opengis/fastify-table/utils.js';
-import { grpc } from '@opengis/fastify-file/utils.js';
-import convertJSONToCSV from '@opengis/fastify-file/server/routes/file/controllers/utils/convertJSONToCSV.js';
+import path from 'node:path';
+import { grpc, config, getMeta, getFolder, jsonToCsv } from '@opengis/fastify-table/utils.js';
+
 import getInfo from './funcs/get.info.js';
 import ContentType from './funcs/content.type.js';
+
 const { jsonToXls, geojsonToShp } = grpc();
 const rootDir = getFolder(config, 'local');
 
@@ -25,16 +25,16 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
     }
     if (!slug) return reply.code(401).send({ message: 'slug is not defined', status: 404 });
     if (!type) return reply.code(401).send({ message: 'type is not defined', status: 404 });
-    
+
     let registerInfo;
     let serviceInfo;
 
-    if (type === 'register') { 
+    if (type === 'register') {
         registerInfo = await pg.query(
             `SELECT table_name, columns, query
             FROM gis.registers
             WHERE register_key = $1`,
-        [slug]
+            [slug]
         );
     }
     if (type === 'service') {
@@ -75,7 +75,7 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
             json: JSON.stringify(rows),
             colmodel: JSON.stringify(colmodel),
         });
-    
+
         await mkdir(path.dirname(filePath), { recursive: true });
         await writeFile(filePath, result, 'base64');
     }
@@ -83,55 +83,55 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
     if (format === 'csv') {
         await mkdir(path.dirname(filePathJSON), { recursive: true });
         await writeFile(filePathJSON, JSON.stringify(rows));
-        
-        await convertJSONToCSV({
+
+        await jsonToCsv({
             filePath: filePathJSON, colmodel, columnList: colmodel.map(c => c.name),
         });
     }
 
-    if (['shp', 'geojson'].includes(format)) { 
+    if (['shp', 'geojson'].includes(format)) {
         if (format === 'geojson') {
-            const geojson = {
-            type: 'FeatureCollection',
-            features: rows.map((row) => ({
-                type: 'Feature',
-                geometry: row.geom,
-                properties: Object.fromEntries(Object.entries(row).filter(([key]) => key !== 'geom')),
-            })),
-        };
-        filePath = filePathJSON.replace('.json', '.geojson');
-        await mkdir(path.dirname(filePath), { recursive: true });
-        await writeFile(filePath, JSON.stringify(geojson));
-    }
-        
-    if (format === 'shp') {
-        const proj = `EPSG:${srid || 4326}`;
-        for (const { type, query } of sqlList) {
-            const { rows } = await pg.query(query);
-            if (!rows.length) continue;
-
             const geojson = {
                 type: 'FeatureCollection',
-                features: rows.map(row => ({
+                features: rows.map((row) => ({
                     type: 'Feature',
                     geometry: row.geom,
-                    properties: Object.fromEntries(Object.entries(row).filter(([k]) => k !== 'geom')),
+                    properties: Object.fromEntries(Object.entries(row).filter(([key]) => key !== 'geom')),
                 })),
             };
-            const geomShort = type.toLowerCase().replace('st_', '');
-            const typedPath = filePath.replace('.zip', `_${geomShort}.zip`);
-            
-            const filePathTyped = filePath.replace('.zip', `_${type.toLowerCase().replace('st_', '')}.zip`);
-            const { result: shpZipBuffer } = await geojsonToShp({
-                geojson: JSON.stringify(geojson),
-                proj,
-            });
-
-            await mkdir(path.dirname(filePathTyped), { recursive: true });
-            await writeFile(filePathTyped, Buffer.from(shpZipBuffer, 'base64'));
-
-            exportedZipPaths.push(typedPath);
+            filePath = filePathJSON.replace('.json', '.geojson');
+            await mkdir(path.dirname(filePath), { recursive: true });
+            await writeFile(filePath, JSON.stringify(geojson));
         }
+
+        if (format === 'shp') {
+            const proj = `EPSG:${srid || 4326}`;
+            for (const { type, query } of sqlList) {
+                const { rows } = await pg.query(query);
+                if (!rows.length) continue;
+
+                const geojson = {
+                    type: 'FeatureCollection',
+                    features: rows.map(row => ({
+                        type: 'Feature',
+                        geometry: row.geom,
+                        properties: Object.fromEntries(Object.entries(row).filter(([k]) => k !== 'geom')),
+                    })),
+                };
+                const geomShort = type.toLowerCase().replace('st_', '');
+                const typedPath = filePath.replace('.zip', `_${geomShort}.zip`);
+
+                const filePathTyped = filePath.replace('.zip', `_${type.toLowerCase().replace('st_', '')}.zip`);
+                const { result: shpZipBuffer } = await geojsonToShp({
+                    geojson: JSON.stringify(geojson),
+                    proj,
+                });
+
+                await mkdir(path.dirname(filePathTyped), { recursive: true });
+                await writeFile(filePathTyped, Buffer.from(shpZipBuffer, 'base64'));
+
+                exportedZipPaths.push(typedPath);
+            }
         }
     }
 
@@ -140,7 +140,7 @@ export default async function gisExport({ pg, query = {}, params = {} }, reply)
     if (format === 'shp' && exportedZipPaths?.length > 0) {
         exportFilePath = exportedZipPaths[0];
     }
-    
+
     reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(exportFilePath))}`);
     reply.header('Content-Type', ContentType[format]);