@opengis/gis 0.1.81 → 0.2.0

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/index.mjs

@@ -15,6 +15,7 @@ import addService from './services/add.service.js';
 import addGisRegistry from './registers/add.registry.js';
 import deleteGisRegistry from './registers/del.registry.js';
 import getServicesCol from './services/get.services.col.js';
+import legendAuto from './services/legend.auto.js';
 
 async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
@@ -38,6 +39,7 @@ async function route(app) {
   app.post('/gis-service/:id?', { config: { policy: ['public'] } }, addService);
   app.put('/gis-service/:id', { config: { policy: ['public'] } }, addService);
   app.delete('/gis-service/:id', { config: { policy: ['public'] } }, deleteService);
+  app.get('/legend-auto/:id', { config: { policy: ['public'] } }, legendAuto);
 }
 
 export default route;

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 = {};

package/server/routes/gis/services/add.service.js

@@ -1,5 +1,23 @@
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
 
+async function updateTemplate(client, body, name, uid, id) {
+    if (!body || !name || !id) return;
+
+    await dataDelete({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        uid,
+    });
+    const rowCount = await dataInsert({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        data: { body, name },
+        uid,
+    }).then(el => el.rowCount);
+    return rowCount;
+}
 export default async function addService({
     method, params = {}, body, pg = pgClients.client, user = {},
 }, reply) {
@@ -7,24 +25,41 @@ export default async function addService({
         return reply.status(400).send('not enough params: id');
     }
 
-    if (method === 'POST') {
-        const { rows = [] } = await dataInsert({
-            pg,
+    const { uid = '0' } = user;
+
+    const client = await pg.connect();
+    try {
+        await client.query('begin');
+
+        if (method === 'POST') {
+            const { rows = [] } = await dataInsert({
+                pg: client,
+                id: params.id,
+                table: 'gis.services',
+                data: body,
+                uid,
+            });
+            const istemplate = await updateTemplate(client, body.html, body.template, uid, rows[0]?.service_id);
+            await client.query('commit');
+            return reply.status(200).send(rows[0]);
+        }
+
+
+        const row = await dataUpdate({
+            pg: client,
             id: params.id,
             table: 'gis.services',
             data: body,
-            uid: user?.uid,
+            uid,
         });
-        return reply.status(200).send(rows[0]);
-    }
+        const istemplate = await updateTemplate(client, body.html, body.template, uid, params.id);
+        await client.query('commit');
+        return reply.status(200).send(row);
 
-    const row = await dataUpdate({
-        pg,
-        id: params.id,
-        table: 'gis.services',
-        data: body,
-        uid: user?.uid,
-    });
-
-    return reply.status(200).send(row);
+    } catch (err) {
+        await client.query('rollback');
+        return reply.status(500).send(err.toString());
+    } finally {
+        client.release();
+    }
 }

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

@@ -1,4 +1,4 @@
-import { getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
+import { dataUpdate, getMeta, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
 
 const table = 'gis.services';
 
@@ -13,20 +13,43 @@ const columnType = {
 };
 
 export default async function getServices({ params = {}, pg = pgClients.client }, reply) {
-    const { columns = [] } = await getMeta({ pg, table }) || {};
 
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
 
     const rows = await pg.query(`
         SELECT 
             service_id, service_key, name, description, keywords, category, holder, group_id, service_type, 
             source_type, service_url, source_path, query, geom_type, geometry_column, sql_list, attributes, filters, 
-            popup, style, legend, card, srid, 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 
+            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 
         FROM gis.services where ${params.id ? 'service_id=$1' : '1=1'}
     `, [params.id].filter(Boolean)).then(el => el.rows || []);
 
+    if (params.id && rows[0]?.template) {
+        const html = await pg.query('select body from admin.templates where template_id=$1', [params.id]).then(el => el.rows?.[0]?.body);
+        Object.assign(rows[0], { html });
+    }
+
+    const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
+
+    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+    const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
+
+    const centers = noCenterIds.length ? await pg.query(`SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)`, [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
+    await Promise.all(rows.filter(row => centers[row.service_id]).map(async (row) => {
+        // console.log('update service center', row.service_id, JSON.stringify(centers[row.service_id]));
+        await dataUpdate({ pg, id: row.service_id, table: 'gis.services', data: { center: centers[row.service_id] } });
+        Object.assign(row, { center: centers[row.service_id] });
+    }));
+
     rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : undefined }));
+    rows.forEach(row => Object.assign(row, { center: row.center?.coordinates }));
+    rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+        extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+            ?.replace?.(/ /g, ",")
+            ?.split?.(",")
+    }));
 
     if (params.id && !rows.length) {
         return reply.status(404).send('service not found');