@opengis/gis 0.2.26 → 0.2.28

package/server/plugins/mapnik/utils/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/vite.js

@@ -1,74 +1,74 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { createServer } from 'vite';
-
-import { config } from '@opengis/fastify-table/utils.js';
-
-const isProduction = process.env.NODE_ENV === 'production' || config.production;
-
-console.log({ isProduction });
-
-async function plugin(fastify, opts) {
-  const viteServer = !isProduction ? await createServer({
-    root: 'admin',
-    server: {
-      middlewareMode: true,
-    },
-  }) : null;
-
-  if (!isProduction) {
-    const dir1 = process.cwd();
-    viteServer.watcher.add(dir1);
-    viteServer.watcher.on('all', (d, t) => {
-      if (!t.includes('module')) return;
-      console.log(d, t);
-      viteServer.ws.send({ type: 'full-reload' });
-    });
-
-    // this is middleware for vite's dev server
-    fastify.addHook('onRequest', async (req, reply) => {
-      const { user } = req.session?.passport || {};
-      // console.log(req.url);
-
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-
-      await next();
-    });
-  }
-
-  async function staticFile(req, reply) {
-    const assetsDir = 'admin/dist';
-
-    const filePathDist = path.join(assetsDir, req.url.replace('/public/', '/'));
-    const filePathAssets = path.join('assets', req.url.replace('/assets', ''));
-
-    const filePath = fs.existsSync(filePathDist) ? filePathDist : filePathAssets; // check dist or assets
-    const ext = path.extname(filePath);
-
-    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
-    }[ext];
-    reply.headers({ 'Cache-control': 'max-age=3600, public', 'Content-Encoding': 'identity' });
-
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-  }
-  fastify.get('/assets/*', staticFile);
-  fastify.get('/public/*', staticFile);
-
-  fastify.get('*', async (req, reply) => {
-    const { user } = req.session?.passport || {};
-    // console.log(req.url);
-    if (!user && req.url !== '/login') {
-      return reply.redirect('/login');
-    }
-    if (!isProduction) return null; // admin vite
-    const stream = fs.createReadStream('admin/dist/index.html');
-    return reply.type('text/html').send(stream);
-  });
-}
-
-export default plugin;
+import fs from 'node:fs';
+import path from 'node:path';
+import { createServer } from 'vite';
+
+import { config } from '@opengis/fastify-table/utils.js';
+
+const isProduction = process.env.NODE_ENV === 'production' || config.production;
+
+console.log({ isProduction });
+
+async function plugin(fastify, opts) {
+  const viteServer = !isProduction ? await createServer({
+    root: 'admin',
+    server: {
+      middlewareMode: true,
+    },
+  }) : null;
+
+  if (!isProduction) {
+    const dir1 = process.cwd();
+    viteServer.watcher.add(dir1);
+    viteServer.watcher.on('all', (d, t) => {
+      if (!t.includes('module')) return;
+      console.log(d, t);
+      viteServer.ws.send({ type: 'full-reload' });
+    });
+
+    // this is middleware for vite's dev server
+    fastify.addHook('onRequest', async (req, reply) => {
+      const { user } = req.session?.passport || {};
+      // console.log(req.url);
+
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+
+      await next();
+    });
+  }
+
+  async function staticFile(req, reply) {
+    const assetsDir = 'admin/dist';
+
+    const filePathDist = path.join(assetsDir, req.url.replace('/public/', '/'));
+    const filePathAssets = path.join('assets', req.url.replace('/assets', ''));
+
+    const filePath = fs.existsSync(filePathDist) ? filePathDist : filePathAssets; // check dist or assets
+    const ext = path.extname(filePath);
+
+    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' };
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
+    }[ext];
+    reply.headers({ 'Cache-control': 'max-age=3600, public', 'Content-Encoding': 'identity' });
+
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+  }
+  fastify.get('/assets/*', staticFile);
+  fastify.get('/public/*', staticFile);
+
+  fastify.get('*', async (req, reply) => {
+    const { user } = req.session?.passport || {};
+    // console.log(req.url);
+    if (!user && req.url !== '/login') {
+      return reply.redirect('/login');
+    }
+    if (!isProduction) return null; // admin vite
+    const stream = fs.createReadStream('admin/dist/index.html');
+    return reply.type('text/html').send(stream);
+  });
+}
+
+export default plugin;

package/server/routes/gis/cartocss/add.cartocss.js

@@ -1,18 +1,18 @@
-export default async function addCartocss(req, reply) {
-  const { pg, body, params } = req;
-
-  const { id } = params;
-  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
-
-  const { config, style } = body;
-  if (!config && !style) return reply.status(400).send({ message: 'config, style is empty', status: 400 });
-
-  const selectCartocss = `select cartocss_id from gis.cartocss where cartocss_id='${id}'`;
-  const { cartocss } = await pg.one(selectCartocss);
-  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
-
-  const updateCartocss = `update gis.cartocss set config='${config}', style='${style}' where cartocss_id='${id}'`;
-  await pg.query(updateCartocss);
-
-  return reply.status(200).send({ message: 'cartocss updated', status: 200 });
-}
+export default async function addCartocss(req, reply) {
+  const { pg, body, params } = req;
+
+  const { id } = params;
+  if (!id) return reply.status(400).send({ message: 'id is empty', status: 400 });
+
+  const { config, style } = body;
+  if (!config && !style) return reply.status(400).send({ message: 'config, style is empty', status: 400 });
+
+  const selectCartocss = `select cartocss_id from gis.cartocss where cartocss_id='${id}'`;
+  const { cartocss } = await pg.one(selectCartocss);
+  if (!cartocss) return reply.status(404).send({ message: 'cartocss not found', status: 404 });
+
+  const updateCartocss = `update gis.cartocss set config='${config}', style='${style}' where cartocss_id='${id}'`;
+  await pg.query(updateCartocss);
+
+  return reply.status(200).send({ message: 'cartocss updated', status: 200 });
+}