@opengis/gis 0.2.20 → 0.2.22

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/plugins/mapnik/funcs/mapnik.js

@@ -1,106 +1,106 @@
-/* eslint-disable consistent-return */
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-
-export const __filename = fileURLToPath(import.meta.url)
-export const __dirname = path.dirname(__filename)
-
-import grpc from '@grpc/grpc-js';
-import protoLoader from '@grpc/proto-loader';
-
-import { config, logger } from '@opengis/fastify-table/utils.js';
-
-config.ready = config.ready || {};
-
-const { mapServerAddress } = config || {};
-const funcs1 =[]
-if (!mapServerAddress) {
-  console.log("\x1b[34m%s\x1b[0m",'mapServerAddress not set in config');
-} else {
-
-  const PROTO_PATH = path.join(__dirname, 'map.proto')
-
-  const proto = grpc.loadPackageDefinition(
-    protoLoader.loadSync(PROTO_PATH, {
-      keepCase: true,
-      longs: String,
-      enums: String,
-      defaults: true,
-      oneofs: true,
-    }),
-  );
-
-  const mapClient = mapServerAddress ? new proto.Map(
-    mapServerAddress,
-    grpc.credentials.createInsecure(),
-  ) : null;
-
-  mapClient.waitForReady(Date.now() + 5000, (err) => {
-    if (err) {
-      config.ready.mapnik = false;
-      console.error('Mapnik client connection timeout or failure:', err);
-    }
-    else {
-      config.ready.mapnik = true;
-      console.log('Mapnik client connected successfully.');
-      // You can now make RPC calls safely
-    }
-  });
-
-  const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
-
-  [
-    'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
-    'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
-    'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
-  ].forEach(el => {
-    // eslint-disable-next-line no-param-reassign
-    funcs1[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
-      const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
-      // eslint-disable-next-line no-param-reassign
-      if (data) {
-        if (data?.path && data.path?.[0] !== '"') {
-          // eslint-disable-next-line no-param-reassign
-          data.path = `"${data.path}"`;
-        }
-      }
-
-      if (el === 'downloadFile') {
-        const downloadBuffer = [];
-        const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
-          if (err || data1?.result?.startsWith?.('Usage:')) {
-            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
-            if (!config.ready.mapnik) {
-              return rej(new Error('no grpc mapnik connection'));
-            }
-            return rej(err || data1?.result);
-          }
-          res(data1);
-        });
-        download.on('data', (resp) => {
-          downloadBuffer.push(...resp.chunk_data);
-        });
-        download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
-      }
-      else {
-        mapClient[capitalized].call(mapClient, data, (err, data1) => {
-          if (err || data1?.result?.startsWith?.('Usage:')) {
-            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
-            if (!config.ready.mapnik) {
-              return rej(new Error('no grpc mapnik connection'));
-            }
-            return rej(err || data1?.result);
-          }
-          res(data1);
-        });
-      }
-    }) : null;    
-  });
-}
-
-const getMapnik = () => ({
-  ...funcs1,
-  mapServerAddress,
-});
-
-export default getMapnik;
+/* eslint-disable consistent-return */
+import { fileURLToPath } from 'node:url'
+import path from 'node:path'
+
+export const __filename = fileURLToPath(import.meta.url)
+export const __dirname = path.dirname(__filename)
+
+import grpc from '@grpc/grpc-js';
+import protoLoader from '@grpc/proto-loader';
+
+import { config, logger } from '@opengis/fastify-table/utils.js';
+
+config.ready = config.ready || {};
+
+const { mapServerAddress } = config || {};
+const funcs1 =[]
+if (!mapServerAddress) {
+  console.log("\x1b[34m%s\x1b[0m",'mapServerAddress not set in config');
+} else {
+
+  const PROTO_PATH = path.join(__dirname, 'map.proto')
+
+  const proto = grpc.loadPackageDefinition(
+    protoLoader.loadSync(PROTO_PATH, {
+      keepCase: true,
+      longs: String,
+      enums: String,
+      defaults: true,
+      oneofs: true,
+    }),
+  );
+
+  const mapClient = mapServerAddress ? new proto.Map(
+    mapServerAddress,
+    grpc.credentials.createInsecure(),
+  ) : null;
+
+  mapClient.waitForReady(Date.now() + 5000, (err) => {
+    if (err) {
+      config.ready.mapnik = false;
+      console.error('Mapnik client connection timeout or failure:', err);
+    }
+    else {
+      config.ready.mapnik = true;
+      console.log('Mapnik client connected successfully.');
+      // You can now make RPC calls safely
+    }
+  });
+
+  const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
+
+  [
+    'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
+    'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
+    'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
+  ].forEach(el => {
+    // eslint-disable-next-line no-param-reassign
+    funcs1[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
+      const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
+      // eslint-disable-next-line no-param-reassign
+      if (data) {
+        if (data?.path && data.path?.[0] !== '"') {
+          // eslint-disable-next-line no-param-reassign
+          data.path = `"${data.path}"`;
+        }
+      }
+
+      if (el === 'downloadFile') {
+        const downloadBuffer = [];
+        const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
+          if (err || data1?.result?.startsWith?.('Usage:')) {
+            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+            if (!config.ready.mapnik) {
+              return rej(new Error('no grpc mapnik connection'));
+            }
+            return rej(err || data1?.result);
+          }
+          res(data1);
+        });
+        download.on('data', (resp) => {
+          downloadBuffer.push(...resp.chunk_data);
+        });
+        download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
+      }
+      else {
+        mapClient[capitalized].call(mapClient, data, (err, data1) => {
+          if (err || data1?.result?.startsWith?.('Usage:')) {
+            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+            if (!config.ready.mapnik) {
+              return rej(new Error('no grpc mapnik connection'));
+            }
+            return rej(err || data1?.result);
+          }
+          res(data1);
+        });
+      }
+    }) : null;    
+  });
+}
+
+const getMapnik = () => ({
+  ...funcs1,
+  mapServerAddress,
+});
+
+export default getMapnik;