From 45fa5e3d8fb26fcb6d7861235df85e285caafe51 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 12 五月 2023 10:02:10 +0800
Subject: [PATCH] 1
---
ExportMap/cs/TerraUtils.cs | 4 ++--
ExportMap/db/PubDBHelper.cs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ExportMap/cs/TerraUtils.cs b/ExportMap/cs/TerraUtils.cs
index ef3b2d7..8208b00 100644
--- a/ExportMap/cs/TerraUtils.cs
+++ b/ExportMap/cs/TerraUtils.cs
@@ -187,8 +187,8 @@
string name = "ctb_" + ExportUtil.DateStr;
string runDocker = string.Format("docker run -id --name {0} -v \"{1}\":\"/data\" tumgis/ctb-quantized-mesh", name, dirPath);
- string createMesh = string.Format("docker exec {0} ctb-tile -f Mesh -C -N -s {1} -e {2} -o /data /data/{3}.tif", name, args.max, args.min, args.dircode);
- string createLayer = string.Format("docker exec {0} ctb-tile -f Mesh -C -N -s {1} -e {2} -l -o /data /data/{3}.tif", name, args.max, args.min, args.dircode);
+ string createMesh = string.Format("docker exec {0} ctb-tile -f Mesh -C -N -s {1} -e {2} -o /data /data/{3}.tif", name, args.max, args.min, args.dircode); // Mesh, Terrain
+ string createLayer = string.Format("docker exec {0} ctb-tile -f Mesh -C -N -s {1} -e {2} -l -o /data /data/{3}.tif", name, args.max, args.min, args.dircode); // Mesh, Terrain
string stop = string.Format("docker stop {0}", name);
string rm = string.Format("docker rm {0}", name);
diff --git a/ExportMap/db/PubDBHelper.cs b/ExportMap/db/PubDBHelper.cs
index a750624..45f4042 100644
--- a/ExportMap/db/PubDBHelper.cs
+++ b/ExportMap/db/PubDBHelper.cs
@@ -91,7 +91,7 @@
List<DbParameter> list = new List<DbParameter>();
list.Add(new NpgsqlParameter("@pid", pid));
list.Add(new NpgsqlParameter("@cnName", cnName));
- list.Add(new NpgsqlParameter("@enName", meta.name));
+ list.Add(new NpgsqlParameter("@enName", sys.dirid));
list.Add(new NpgsqlParameter("@url", sys.url));
list.Add(new NpgsqlParameter("@user", sys.create_user));
list.Add(new NpgsqlParameter("@data", data));
@@ -157,8 +157,8 @@
{
string sql = GetSelectLayerPidSql(meta);
int pid = Tools.DBHelper.GetIntScalar(sql);
+ string dirid = sys.dirid.Substring(0, 2);
- string dirid = string.IsNullOrWhiteSpace(sys.dirid) || sys.dirid.Length < 2 ? "00" : sys.dirid.Substring(0, 2);
List<DbParameter> list = new List<DbParameter>();
list.Add(new NpgsqlParameter("@pid", pid));
list.Add(new NpgsqlParameter("@en_name", dirid));
@@ -196,7 +196,7 @@
return "select id from lf.sys_layer where cn_name = '涓夌淮鍦板舰妯″瀷' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
if ("DEM".Equals(meta.type))
return "select id from lf.sys_layer where cn_name = '鏁板瓧楂樼▼妯″瀷' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
- if (imgList.Contains(meta.type))
+ if ("DOM".Equals(meta.type))
return "select id from lf.sys_layer where cn_name = '鏁板瓧姝ｅ皠褰卞儚鍥�' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
else
return "select id from lf.sys_layer where cn_name = '鍗曚綋妯″瀷' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
--
Gitblit v1.9.3