From 39b861d4d1da53feb5ac3b84c7453aa9f6a91412 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 八月 2023 15:59:23 +0800
Subject: [PATCH] 1
---
ExportMap/up.html | 2 +-
ExportMap/cs/TerraUtils.cs | 29 +++++++++++++++++++++++------
ExportMap/export.html | 2 +-
ExportMap/Web.config | 8 +++++---
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index ca9be84..75d9bcd 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -3,6 +3,8 @@
<appSettings>
<!-- 寤婂潑鏈嶅姟 -->
<add key="lfServer" value="http://127.0.0.1:12316/server"/>
+ <!-- 鍦板舰鏈�澶х骇鍒� -->
+ <add key="terrainMaxLevel" value="14"/>
<!-- 鏈満IP -->
<add key="localIP" value="192.168.20.106"/>
<!-- 涓存椂鐩綍 -->
@@ -19,7 +21,7 @@
<!--<add key="sgDB" value="E:\soft\SGConfig\catalog.db"/>-->
<add key="sgDB" value="D:\LF\SG\catalog.db"/>
<!-- cesium-terrain-builder璺緞 -->
- <add key="ctbPath" value="E:\WebSite\Cesium\Tool\ctb_0.41" />
+ <add key="ctbPath" value="E:\WebSite\Cesium\Tool\ctb-0.41" />
<!-- 3dtiles璺緞 -->
<add key="d3tilesPath" value="E:\WebSite\Cesium\Tool\3dtiles" />
<!-- gocesiumtiler璺緞 -->
@@ -28,8 +30,8 @@
<add key="mpt" value="D:\LF\data\mpt\tb.mpt" />
<!-- PG杩炴帴 -->
<!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
- <add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
- <!--<add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
+ <!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
+ <add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
diff --git a/ExportMap/cs/TerraUtils.cs b/ExportMap/cs/TerraUtils.cs
index 3c0f599..0340cef 100644
--- a/ExportMap/cs/TerraUtils.cs
+++ b/ExportMap/cs/TerraUtils.cs
@@ -13,10 +13,27 @@
{
private static string pyFile;
+ private static int terrainMaxLevel = 0;
+
/// <summary>
- /// 榛樿鏈�澶х骇鍒�
+ /// 鍦板舰鏈�澶х骇鍒�
/// </summary>
- public static int DEFAULT_MAX_LEVEL = 16;
+ public static int TERRAIN_MAX_LEVEL
+ {
+ get
+ {
+ if (0 == terrainMaxLevel)
+ {
+ string str = Tools.GetSetting("terrainMaxLevel");
+ if (!int.TryParse(str, out terrainMaxLevel))
+ {
+ terrainMaxLevel = 14;
+ }
+ }
+
+ return terrainMaxLevel;
+ }
+ }
/// <summary>
/// 榛樿鏈�澶ф枃浠跺ぇ灏忥細5GB
@@ -170,7 +187,7 @@
else
{
//if (File.Exists(tifFile)) File.Delete(tifFile);
- //WriteText(txtFile, metas, null);
+ WriteText(txtFile, metas, null);
if (File.Exists(tifFile)) return tifFile;
}
@@ -225,7 +242,7 @@
private static int GetTerrainMaxLevel(XYZArgs args, string tifFile)
{
FileInfo fi = new FileInfo(tifFile);
- if (fi.Length > DDEFAULT_MAX_SIZE) return DEFAULT_MAX_LEVEL;
+ if (fi.Length > DDEFAULT_MAX_SIZE) return TERRAIN_MAX_LEVEL;
string ctbPath = Tools.GetSetting("ctbPath");
string dirPath = GetTerrainPath(args.dircode);
@@ -236,7 +253,7 @@
Tools.ExecCmd(new List<string>() { gdal_data, createLayer });
string layerJson = Path.Combine(dirPath, "layer.json");
- if (!File.Exists(layerJson)) return DEFAULT_MAX_LEVEL;
+ if (!File.Exists(layerJson)) return TERRAIN_MAX_LEVEL;
string[] lines = File.ReadAllLines(layerJson, Encoding.UTF8);
@@ -247,7 +264,7 @@
}
if (File.Exists(layerJson)) File.Delete(layerJson);
- return level > DEFAULT_MAX_LEVEL ? DEFAULT_MAX_LEVEL : level;
+ return level > TERRAIN_MAX_LEVEL ? TERRAIN_MAX_LEVEL : level;
}
/// <summary>
diff --git a/ExportMap/export.html b/ExportMap/export.html
index 513e498..38f8400 100644
--- a/ExportMap/export.html
+++ b/ExportMap/export.html
@@ -10,7 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="js/jquery.1.12.4.js"></script>
<script>
- var token = "ddcfdd6d-4b81-49d6-a2a1-733332b8092a";
+ var token = "50b3fd35-7f5b-471e-974c-6240da4b3855";
$(function () {
$("#token").html(token);
diff --git a/ExportMap/up.html b/ExportMap/up.html
index 738c0d1..d1afeb1 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -18,7 +18,7 @@
var path = "20230803";
var url = "http://127.0.0.1:12316/server/";
//var token = "c36e4f94-dfde-401e-9967-2c4a449f1300";
- var token = "0b9db059-1d14-4648-809d-ceba020092f6";
+ var token = "50b3fd35-7f5b-471e-974c-6240da4b3855";
$(function () {
$("#pathSpan").html(path);
--
Gitblit v1.9.3