@opengis/gis 0.1.80 → 0.1.82

package/package.json

@@ -1,59 +1,61 @@
-{
-  "name": "@opengis/gis",
-  "version": "0.1.80",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "files": [
-    "dist/*",
-    "module/*",
-    "server/*",
-    "plugin.js",
-    "utils.js",
-    "config.js",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "patch": "npm version patch && git push && npm publish",
-    "dev": "node server",
-    "front": "vite dev",
-    "build-lib": "vite build",
-    "build:admin": "vite build admin",
-    "build": "vite build",
-    "preview": "vite preview",
-    "prod": "NODE_ENV=production  node server",
-    "docs:install": "npm install --prefix ./docs",
-    "docs:dev": "npm run --prefix ./docs docs:dev",
-    "docs:build": "npm run --prefix ./docs docs:build",
-    "docs:preview": "npm run --prefix ./docs docs:preview",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "@mapbox/sphericalmercator": "1.2.0",
-    "carto": "0.16.3"
-  },
-  "peerDependencies": {
-    "@opengis/fastify-table": "^1.5.4"
-  },
-  "devDependencies": {
-    "yaml": "2.8.1",
-    "@opengis/form": "^0.0.28",
-    "@opengis/core": "^0.0.23",
-    "@opengis/fastify-auth": "^1.1.22",
-    "@opengis/fastify-table": "^1.5.4",
-    "@opengis/filter": "^0.1.7",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "axios": "^1.11.0",
-    "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4",
-    "lucide-vue-next": "^0.514.0",
-    "sass-embedded": "1.86.3",
-    "vite": "^6.3.5",
-    "vue": "^3.5.13",
-    "vue-router": "4.5.1",
-    "vuedraggable": "^4.1.0",
-    "typescript": "^5.9.2",
-    "@opengis/table": "^0.0.27"
-  }
-}
+{
+  "name": "@opengis/gis",
+  "version": "0.1.82",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "files": [
+    "dist/*",
+    "module/*",
+    "server/*",
+    "plugin.js",
+    "utils.js",
+    "config.js",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "patch": "npm version patch && git push && npm publish",
+    "dev": "node server",
+    "front": "vite dev",
+    "build-lib": "vite build",
+    "build:admin": "vite build admin",
+    "build": "vite build",
+    "preview": "vite preview",
+    "prod": "NODE_ENV=production  node server",
+    "docs:install": "npm install --prefix ./docs",
+    "docs:dev": "npm run --prefix ./docs docs:dev",
+    "docs:build": "npm run --prefix ./docs docs:build",
+    "docs:preview": "npm run --prefix ./docs docs:preview",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@mapbox/sphericalmercator": "1.2.0",
+    "carto": "0.16.3"
+  },
+  "peerDependencies": {
+    "@opengis/fastify-table": "^2.0.13"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "yaml": "2.8.1",
+    "@opengis/form": "^0.0.28",
+    "@opengis/core": "^0.0.23",
+    "@opengis/fastify-table": "^2.0.13",
+    "@opengis/filter": "^0.1.7",
+    "@vitejs/plugin-vue": "^5.2.3",
+    "axios": "^1.11.0",
+    "eslint": "8.49.0",
+    "eslint-config-airbnb": "19.0.4",
+    "lucide-vue-next": "^0.514.0",
+    "sass-embedded": "1.86.3",
+    "vite": "^6.3.5",
+    "vue": "^3.5.13",
+    "vue-router": "4.5.1",
+    "vuedraggable": "^4.1.0",
+    "typescript": "^5.9.2",
+    "@opengis/table": "^0.0.27"
+  }
+}

package/server/migrations/services.sql

@@ -49,6 +49,9 @@ CREATE TABLE if not exists gis.services
       REFERENCES gis.group_list (group_id)
 );
 
+alter table gis.services add column if not exists template text;
+comment on column gis.services.template is 'Назва шаблону';
+
 DROP INDEX if exists gis.gis_services_category_gin_idx;
 
 CREATE INDEX gis_services_category_gin_idx

package/server/plugins/mapnik/funcs/map.proto

@@ -1,241 +1,241 @@
-syntax = "proto3";
-
-
-message render_in {
-	string path = 1;
-	string name = 2;
-	repeated double bbox = 3 [packed=true];
-	string tile = 4;
-	string xml = 5;
-	int32 width = 6;
-	int32 height = 7;
-}
-
-
-message render_out {
-	string err = 1;
-	string base64 = 2;
-	string tile = 3;
-}
-
-message xml_in {
-	string path = 1;
-	string name = 2;
-	string xml = 3;
-	bool reload = 4;
-}
-
-message xml_out {
-	string err = 1;
-	bool is_ok = 2;
-}
-
-message cmd_in {
-	string cmd = 1;
-	string svg = 2;
-	string filename = 3;
-}
-
-message cmd_out {
-	string err = 1;
-	string base64 = 2;
-}
-
-message gdal_in {
-	string name = 1;
-	string path = 2;
-	string out = 3;
-	string params = 4;
-}
-message gdal_out {
-	string result = 1;
-	string err = 2;
-}
-
-message clear_tiles_in {
-	string path = 1;
-}
-
-message clear_tiles_out {
-	oneof clear_message {
-		bool ok = 1;
-		string err = 2;
-	}
-}
-
-message empty {}
-
-message statusRenderInfo {
-	string name = 1;
-	bool isActive = 2;
-	float workTime = 3;
-}
-
-message statusInfo {
-	repeated statusRenderInfo info = 1;
-}
-
-message printMapOut {
-	string map = 1;
-	string err = 2;
-}
-
-message xyz {
-	float x = 1;
-	float y = 2;
-	float z = 3;
-}
-
-message printMapIn {
-	string baseurl = 1;
-	string baseImg = 2;
-	repeated string xml = 3;
-	string overlayXml = 4;
-	string overlay = 5;
-	int32 width = 6;
-	int32 height = 7;
-	repeated double bbox = 8;
-	xyz pos = 9;
-	string geojsonSettings = 10;
-}
-
-message log_in {
-	uint32 rows = 1;
-	string level = 2;
-}
-
-message log_out {
-	repeated string logs = 1;
-}
-
-message sqlToShpIn {
-  string db = 1;
-  string host = 2;
-  string port = 3;
-  string sql = 4;
-  string savePath = 5;
-	string shpName = 6;
-}
-
-message shapeOut {
-  string zipPath = 1;
-}
-
-message fileIn {
-	bytes fileBytes = 1;
-	string relativeFilepath = 2;
-}
-
-message deleteFileIn {
-	string dir = 1;
-	repeated string objectList = 2;
-}
-
-message fileManagerOut {
-	bool status = 1;
-	string operation = 2;
-}
-
-message checkFilesDir {
-	string dir = 1;
-	repeated string filesSearch = 2;
-}
-
-enum status {
-	LOADING = 0;
-	OK = 1;
-}
-
-message filesStatus {
-	status fileLoadingStatus = 1;
-}
-
-message fileListIn {
-	string dir = 1;
-}
-
-message fileInfo {
-	repeated fileInfoL fileInfoList = 1;
-}
-
-message fileInfoL {
-	oneof fileInfo {
-		fileInfoObj file = 1;
-		dirInfoObj dir = 2;
-	}
-}
-
-message fileInfoObj {
-	string type = 1;
-	string birthtime = 2;
-	string name = 3;
-	uint64 size = 4;
-	string ext = 5;
-	string server = 6;
-}
-
-message dirInfoObj {
-	string type = 1;
-	string birthtime = 2;
-	string name = 3;
-	uint64 size = 4;
-	uint64 count = 5;
-	string server = 6;
-}
-
-message deleteOut {
-	repeated deleteObjSuccess success = 1;
-	repeated deleteObjError error = 2;
-
-}
-
-message deleteObjSuccess {
-	string object = 1;
-	string type = 2;
-	string status = 3;
-}
-
-message deleteObjError {
-	string object = 1;
-	string fullPath = 2;
-	string result = 3;
-}
-
-message readDirIn {
-	string dir = 1;
-	repeated string filter = 2;
-	string fullPath = 3;
-}
-
-message readDirOut {
-	repeated string res = 1;
-
-}
-
-message downloadFileIn {
-	string filePath = 1;
-}
-
-message downloadFileOut {
-	bytes chunk_data = 1;
-}
-
-
-service Map {
-	rpc Render(render_in) returns (render_out) {}	
-	rpc RenderXML(render_in) returns (render_out) {}	
-	rpc LoadXML(xml_in) returns (xml_out) {}	
-	rpc MarkerIcon(cmd_in) returns (cmd_out) {}
-	rpc Gdal(gdal_in) returns (gdal_out) {}
-	rpc ClearTiles(clear_tiles_in) returns (clear_tiles_out) {}
-	rpc RenderStatus(empty) returns (statusInfo) {}
-	rpc PrintMap(printMapIn) returns (printMapOut) {}
-	rpc Log(log_in) returns (log_out) {}
-	rpc SqlToShp(sqlToShpIn) returns (shapeOut) {}
-	rpc uploadFile(fileIn) returns (fileManagerOut) {}
-	rpc deleteFiles(deleteFileIn) returns (deleteOut) {}
-	rpc checkFiles(checkFilesDir) returns (filesStatus) {}
-	rpc fileList(fileListIn) returns (fileInfo) {}
-	rpc readDir(readDirIn) returns (readDirOut) {}
-	rpc downloadFile(downloadFileIn) returns (stream downloadFileOut) {}
-}
+syntax = "proto3";
+
+
+message render_in {
+	string path = 1;
+	string name = 2;
+	repeated double bbox = 3 [packed=true];
+	string tile = 4;
+	string xml = 5;
+	int32 width = 6;
+	int32 height = 7;
+}
+
+
+message render_out {
+	string err = 1;
+	string base64 = 2;
+	string tile = 3;
+}
+
+message xml_in {
+	string path = 1;
+	string name = 2;
+	string xml = 3;
+	bool reload = 4;
+}
+
+message xml_out {
+	string err = 1;
+	bool is_ok = 2;
+}
+
+message cmd_in {
+	string cmd = 1;
+	string svg = 2;
+	string filename = 3;
+}
+
+message cmd_out {
+	string err = 1;
+	string base64 = 2;
+}
+
+message gdal_in {
+	string name = 1;
+	string path = 2;
+	string out = 3;
+	string params = 4;
+}
+message gdal_out {
+	string result = 1;
+	string err = 2;
+}
+
+message clear_tiles_in {
+	string path = 1;
+}
+
+message clear_tiles_out {
+	oneof clear_message {
+		bool ok = 1;
+		string err = 2;
+	}
+}
+
+message empty {}
+
+message statusRenderInfo {
+	string name = 1;
+	bool isActive = 2;
+	float workTime = 3;
+}
+
+message statusInfo {
+	repeated statusRenderInfo info = 1;
+}
+
+message printMapOut {
+	string map = 1;
+	string err = 2;
+}
+
+message xyz {
+	float x = 1;
+	float y = 2;
+	float z = 3;
+}
+
+message printMapIn {
+	string baseurl = 1;
+	string baseImg = 2;
+	repeated string xml = 3;
+	string overlayXml = 4;
+	string overlay = 5;
+	int32 width = 6;
+	int32 height = 7;
+	repeated double bbox = 8;
+	xyz pos = 9;
+	string geojsonSettings = 10;
+}
+
+message log_in {
+	uint32 rows = 1;
+	string level = 2;
+}
+
+message log_out {
+	repeated string logs = 1;
+}
+
+message sqlToShpIn {
+  string db = 1;
+  string host = 2;
+  string port = 3;
+  string sql = 4;
+  string savePath = 5;
+	string shpName = 6;
+}
+
+message shapeOut {
+  string zipPath = 1;
+}
+
+message fileIn {
+	bytes fileBytes = 1;
+	string relativeFilepath = 2;
+}
+
+message deleteFileIn {
+	string dir = 1;
+	repeated string objectList = 2;
+}
+
+message fileManagerOut {
+	bool status = 1;
+	string operation = 2;
+}
+
+message checkFilesDir {
+	string dir = 1;
+	repeated string filesSearch = 2;
+}
+
+enum status {
+	LOADING = 0;
+	OK = 1;
+}
+
+message filesStatus {
+	status fileLoadingStatus = 1;
+}
+
+message fileListIn {
+	string dir = 1;
+}
+
+message fileInfo {
+	repeated fileInfoL fileInfoList = 1;
+}
+
+message fileInfoL {
+	oneof fileInfo {
+		fileInfoObj file = 1;
+		dirInfoObj dir = 2;
+	}
+}
+
+message fileInfoObj {
+	string type = 1;
+	string birthtime = 2;
+	string name = 3;
+	uint64 size = 4;
+	string ext = 5;
+	string server = 6;
+}
+
+message dirInfoObj {
+	string type = 1;
+	string birthtime = 2;
+	string name = 3;
+	uint64 size = 4;
+	uint64 count = 5;
+	string server = 6;
+}
+
+message deleteOut {
+	repeated deleteObjSuccess success = 1;
+	repeated deleteObjError error = 2;
+
+}
+
+message deleteObjSuccess {
+	string object = 1;
+	string type = 2;
+	string status = 3;
+}
+
+message deleteObjError {
+	string object = 1;
+	string fullPath = 2;
+	string result = 3;
+}
+
+message readDirIn {
+	string dir = 1;
+	repeated string filter = 2;
+	string fullPath = 3;
+}
+
+message readDirOut {
+	repeated string res = 1;
+
+}
+
+message downloadFileIn {
+	string filePath = 1;
+}
+
+message downloadFileOut {
+	bytes chunk_data = 1;
+}
+
+
+service Map {
+	rpc Render(render_in) returns (render_out) {}	
+	rpc RenderXML(render_in) returns (render_out) {}	
+	rpc LoadXML(xml_in) returns (xml_out) {}	
+	rpc MarkerIcon(cmd_in) returns (cmd_out) {}
+	rpc Gdal(gdal_in) returns (gdal_out) {}
+	rpc ClearTiles(clear_tiles_in) returns (clear_tiles_out) {}
+	rpc RenderStatus(empty) returns (statusInfo) {}
+	rpc PrintMap(printMapIn) returns (printMapOut) {}
+	rpc Log(log_in) returns (log_out) {}
+	rpc SqlToShp(sqlToShpIn) returns (shapeOut) {}
+	rpc uploadFile(fileIn) returns (fileManagerOut) {}
+	rpc deleteFiles(deleteFileIn) returns (deleteOut) {}
+	rpc checkFiles(checkFilesDir) returns (filesStatus) {}
+	rpc fileList(fileListIn) returns (fileInfo) {}
+	rpc readDir(readDirIn) returns (readDirOut) {}
+	rpc downloadFile(downloadFileIn) returns (stream downloadFileOut) {}
+}

package/server/routes/gis/registers/funcs/classifiers.js

@@ -1,10 +1,25 @@
-import { getSelectVal, getSelect } from '@opengis/fastify-table/utils.js';
+import { getSelectVal, getSelect, getTemplates } from '@opengis/fastify-table/utils.js';
 
-export async function attachClassifiers(rowOrRows, classifiers = []) {
+export async function attachClassifiers(rowOrRows, classifiers, table) {
     const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
 
+    const list = getTemplates(['cls', 'select']);
+
+    if (table) {
+        await Promise.all(rows.map(async row => {
+            await Promise.all(Object.keys(row).filter(key => list.map(el => el[0]).includes(`${table}.${key}`)).map(async key => {
+                const arr = await getSelectVal({ name: `${table}.${key}`, values: [row[key]], ar: true });
+                const val = arr?.find?.(el => el.id === row[key]);
+                if (val?.text) { row[`${key}_data`] = val; }
+                row[key] = val?.text || val || row[key]; // for frontend
+                row[`${key}_text`] = val?.text || val || row[key]; // legacy?
+            }));
+        }));
+        return rowOrRows;
+    }
+
     await Promise.all(rows.map(async row => {
-        classifiers.filter(item => item.classifier && item.name && row[item.name]).map(async ({ name, classifier }) => {
+        (classifiers || []).filter(item => item.classifier && item.name && row[item.name]).map(async ({ name, classifier }) => {
             const arr = await getSelectVal({ name: classifier, values: [row[name]], ar: true });
             const val = arr?.find?.(el => el.id === row[name]);
             if (val?.text) { row[`${name}_data`] = val; }

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -49,10 +49,12 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
         //if (!row) return reply.code(404).send({ message: 'Object not found', status: 404 });
         if (!row) throw new Error('Object not found');
 
-        await attachClassifiers(row, classifiers);
+        await attachClassifiers(row, classifiers, table_name);
 
         return {
             row,
+            card,
+            d: 1,
             columns: visibleColumns,
             register_id,
             name,
@@ -86,7 +88,7 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
         pg.query(totalQuery),
     ]);
 
-    const rows = await attachClassifiers(dataRes.rows, classifiers);
+    const rows = await attachClassifiers(dataRes.rows, classifiers, table_name);
     const total = parseInt(countRes.rows[0]?.count || 0, 10);
 
     const listConfig = {};