diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index b0612ad..72baff4 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -1376,7 +1376,6 @@
             initLayout();
             loadData();
 
-
             double x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]);
             double y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]);
             double z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]);

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index b0612ad..72baff4 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -1376,7 +1376,6 @@
             initLayout();
             loadData();
 
-
             double x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]);
             double y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]);
             double z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]);
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index c666db2..66f3d81 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>release</user>
+  <user>test</user>
   <database>szhtdb2</database>
-  <dbserver>192.168.0.203</dbserver>
-  <dbpassword>release</dbpassword>
+  <dbserver>192.168.0.101</dbserver>
+  <dbpassword>test</dbpassword>
   <locaserverip>192.168.0.203</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://192.168.0.203/images/</rooturl>
@@ -63,7 +63,7 @@
   <queryfield label="通信工井">
 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注
 </queryfield>
-  <location label="defaultLocation">120.610963, 31.190621,3000</location>
+  <location label="defaultLocation">116.600963, 28.237621,3000</location>
 
   <pipelineCode label="热力">6000,6100</pipelineCode>
   <pipelineCode label="排水">4000,4100,4200</pipelineCode>

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index b0612ad..72baff4 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -1376,7 +1376,6 @@
             initLayout();
             loadData();
 
-
             double x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]);
             double y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]);
             double z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]);
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index c666db2..66f3d81 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>release</user>
+  <user>test</user>
   <database>szhtdb2</database>
-  <dbserver>192.168.0.203</dbserver>
-  <dbpassword>release</dbpassword>
+  <dbserver>192.168.0.101</dbserver>
+  <dbpassword>test</dbpassword>
   <locaserverip>192.168.0.203</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://192.168.0.203/images/</rooturl>
@@ -63,7 +63,7 @@
   <queryfield label="通信工井">
 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注
 </queryfield>
-  <location label="defaultLocation">120.610963, 31.190621,3000</location>
+  <location label="defaultLocation">116.600963, 28.237621,3000</location>
 
   <pipelineCode label="热力">6000,6100</pipelineCode>
   <pipelineCode label="排水">4000,4100,4200</pipelineCode>
diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml
index a96ad2e..8572b25 100644
--- a/bin/x86/Debug/Location.xml
+++ b/bin/x86/Debug/Location.xml
@@ -1,34 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
-<location name="绿岛" x="120.610963" y="31.190621" z="3000"></location>
-     <location name="泽山路" x="120.5847833" y="31.18260833" z="400"></location>
-	 <location name="连柱山路" x="120.5756139" y="31.18031667" z="400"></location>
-	 <location name="五湖路" x="120.5845833" y="31.18234722" z="400"></location>
-	 <location name="翠凤街" x="120.5532278" y="31.19485556" z="400"></location>
-	 <location name="开甫路" x="120.5704556" y="31.18631944" z="400"></location>
-	 <location name="子文街" x="120.5700167" y="31.18456667" z="400"></location>
-	 <location name="仙玩街" x="120.5709833" y="31.18449722" z="400"></location>
-	 <location name="霆威街" x="120.579475" y="31.17700278" z="400"></location>
-	 <location name="引黛街" x="120.5874806" y="31.17702778" z="400"></location>
-	 <location name="移舟街" x="120.5823306" y="31.17786111" z="400"></location>
-	 <location name="流丹街" x="120.58995" y="31.18613056" z="400"></location>
-	 <location name="君益路" x="120.5912806" y="31.18944444" z="400"></location>
-	 <location name="渔浦街" x="120.5993278" y="31.18118056" z="400"></location>
-	 <location name="天颜路" x="120.60055" y="31.18048611" z="400"></location>
-	 <location name="芙蕖街" x="120.6133167" y="31.18681111" z="400"></location>
-	 <location name="金碧街" x="120.6087028" y="31.18738611" z="400"></location>
-	 <location name="原博街" x="120.6109" y="31.18931389" z="400"></location>
-	 <location name="挹紫街" x="120.5876278" y="31.18773056" z="400"></location>
-	 <location name="橘林街" x="120.5939833" y="31.18637778" z="400"></location>
-	 <location name="溪霞街" x="120.6014639" y="31.18406667" z="400"></location>
-	 <location name="雷山路" x="120.6045694" y="31.18722778" z="400"></location>
-	 <location name="苏州大道" x="120.6067972" y="31.18653611" z="400"></location>
-	 <location name="塔韵路" x="120.5965583" y="31.18647222" z="400"></location>
-	 <location name="景周街" x="120.5921944" y="31.18159722" z="400"></location>
-	 <location name="箭浮山路" x="120.5684056" y="31.180075" z="400"></location>
-	 <location name="永旺路" x="120.6110111" y="31.18774722" z="400"></location>
-	 <location name="天鹅荡路" x="120.5776194" y="31.19174167" z="400"></location>
-	 <location name="龙翔路" x="120.578975" y="31.18153889" z="400"></location>
-	 <location name="东太湖路" x="120.5916972" y="31.18620556" z="400"></location>
-	 <location name="旺山路" x="120.5628056" y="31.17015556" z="400"></location>
+<location name="东乡" x="116.600963" y="28.237621" z="3000"></location>
 </Params>
\ No newline at end of file

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index b0612ad..72baff4 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -1376,7 +1376,6 @@
             initLayout();
             loadData();
 
-
             double x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]);
             double y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]);
             double z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]);
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index c666db2..66f3d81 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>release</user>
+  <user>test</user>
   <database>szhtdb2</database>
-  <dbserver>192.168.0.203</dbserver>
-  <dbpassword>release</dbpassword>
+  <dbserver>192.168.0.101</dbserver>
+  <dbpassword>test</dbpassword>
   <locaserverip>192.168.0.203</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://192.168.0.203/images/</rooturl>
@@ -63,7 +63,7 @@
   <queryfield label="通信工井">
 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注
 </queryfield>
-  <location label="defaultLocation">120.610963, 31.190621,3000</location>
+  <location label="defaultLocation">116.600963, 28.237621,3000</location>
 
   <pipelineCode label="热力">6000,6100</pipelineCode>
   <pipelineCode label="排水">4000,4100,4200</pipelineCode>
diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml
index a96ad2e..8572b25 100644
--- a/bin/x86/Debug/Location.xml
+++ b/bin/x86/Debug/Location.xml
@@ -1,34 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
-<location name="绿岛" x="120.610963" y="31.190621" z="3000"></location>
-     <location name="泽山路" x="120.5847833" y="31.18260833" z="400"></location>
-	 <location name="连柱山路" x="120.5756139" y="31.18031667" z="400"></location>
-	 <location name="五湖路" x="120.5845833" y="31.18234722" z="400"></location>
-	 <location name="翠凤街" x="120.5532278" y="31.19485556" z="400"></location>
-	 <location name="开甫路" x="120.5704556" y="31.18631944" z="400"></location>
-	 <location name="子文街" x="120.5700167" y="31.18456667" z="400"></location>
-	 <location name="仙玩街" x="120.5709833" y="31.18449722" z="400"></location>
-	 <location name="霆威街" x="120.579475" y="31.17700278" z="400"></location>
-	 <location name="引黛街" x="120.5874806" y="31.17702778" z="400"></location>
-	 <location name="移舟街" x="120.5823306" y="31.17786111" z="400"></location>
-	 <location name="流丹街" x="120.58995" y="31.18613056" z="400"></location>
-	 <location name="君益路" x="120.5912806" y="31.18944444" z="400"></location>
-	 <location name="渔浦街" x="120.5993278" y="31.18118056" z="400"></location>
-	 <location name="天颜路" x="120.60055" y="31.18048611" z="400"></location>
-	 <location name="芙蕖街" x="120.6133167" y="31.18681111" z="400"></location>
-	 <location name="金碧街" x="120.6087028" y="31.18738611" z="400"></location>
-	 <location name="原博街" x="120.6109" y="31.18931389" z="400"></location>
-	 <location name="挹紫街" x="120.5876278" y="31.18773056" z="400"></location>
-	 <location name="橘林街" x="120.5939833" y="31.18637778" z="400"></location>
-	 <location name="溪霞街" x="120.6014639" y="31.18406667" z="400"></location>
-	 <location name="雷山路" x="120.6045694" y="31.18722778" z="400"></location>
-	 <location name="苏州大道" x="120.6067972" y="31.18653611" z="400"></location>
-	 <location name="塔韵路" x="120.5965583" y="31.18647222" z="400"></location>
-	 <location name="景周街" x="120.5921944" y="31.18159722" z="400"></location>
-	 <location name="箭浮山路" x="120.5684056" y="31.180075" z="400"></location>
-	 <location name="永旺路" x="120.6110111" y="31.18774722" z="400"></location>
-	 <location name="天鹅荡路" x="120.5776194" y="31.19174167" z="400"></location>
-	 <location name="龙翔路" x="120.578975" y="31.18153889" z="400"></location>
-	 <location name="东太湖路" x="120.5916972" y="31.18620556" z="400"></location>
-	 <location name="旺山路" x="120.5628056" y="31.17015556" z="400"></location>
+<location name="东乡" x="116.600963" y="28.237621" z="3000"></location>
 </Params>
\ No newline at end of file
diff --git a/bin/x86/Debug/layerConfig.xml b/bin/x86/Debug/layerConfig.xml
index 9266e1f..0f14f8d 100644
--- a/bin/x86/Debug/layerConfig.xml
+++ b/bin/x86/Debug/layerConfig.xml
@@ -9,24 +9,13 @@
                         <layer label="道路" layersrc="locaserver" layer="180fd" flag="road" />
                     </layers>
                 </layertype>
+				<!--
                 <layertype label="标识器">
                     <layers>
                         <layer label="标识器" layersrc="db" layer="标识器" flag="access" />
                     </layers>
                 </layertype>
-                <layertype label="交越点">
-                    <layers>
-                        <layer label="交叉穿越点" layersrc="db" layer="交叉穿越点" flag="access" />
-                        <layer label="交叉穿越点三层及以上" layersrc="db" layer="交叉穿越点三层及以上" flag="access" />
-                    </layers>
-                </layertype>
-                <layertype label="不明">
-                    <layers>
-                        <layer label="不明管线" layersrc="db" layer="不明管线" flag="pipeLine" />
-                        <layer label="不明管线附属物" layersrc="db" layer="不明管线附属物" flag="access" />
-                        <layer label="不明管线特征管点" layersrc="db" layer="不明管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
+				-->
                 <layertype label="污水">
                     <layers>
                         <layer label="污水管线" layersrc="db" layer="污水管线" flag="pipeLine" />
@@ -45,7 +34,6 @@
                     <layers>
                         <layer label="给水管线" layersrc="db" layer="给水管线" flag="pipeLine" />
                         <layer label="给水管线附属物" layersrc="db" layer="给水管线附属物" flag="access" />
-                        <layer label="给水阀门" layersrc="db" layer="给水阀门" flag="access" />
                         <layer label="给水管线特征管点" layersrc="db" layer="给水管线特征管点" flag="character" />
                     </layers>
                 </layertype>
@@ -53,7 +41,6 @@
                     <layers>
                         <layer label="天然气管线" layersrc="db" layer="天然气管线" flag="pipeLine" />
                         <layer label="天然气管线附属物" layersrc="db" layer="天然气管线附属物" flag="access" />
-                        <layer label="天然气阀门" layersrc="db" layer="天然气阀门" flag="access" />
                         <layer label="天然气管线特征管点" layersrc="db" layer="天然气管线特征管点" flag="character" />
                     </layers>
                 </layertype>
@@ -64,41 +51,6 @@
                         <layer label="电信管线特征管点" layersrc="db" layer="电信管线特征管点" flag="character" />
                     </layers>
                 </layertype>
-                <layertype label="移动">
-                    <layers>
-                        <layer label="移动管线" layersrc="db" layer="移动管线" flag="pipeLine" />
-                        <layer label="移动管线附属物" layersrc="db" layer="移动管线附属物" flag="access" />
-                        <layer label="移动管线特征管点" layersrc="db" layer="移动管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="联通">
-                    <layers>
-                        <layer label="联通管线" layersrc="db" layer="联通管线" flag="pipeLine" />
-                        <layer label="联通管线附属物" layersrc="db" layer="联通管线附属物" flag="access" />
-                        <layer label="联通管线特征管点" layersrc="db" layer="联通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="网通">
-                    <layers>
-                        <layer label="网通管线" layersrc="db" layer="网通管线" flag="pipeLine" />
-                        <layer label="网通管线附属物" layersrc="db" layer="网通管线附属物" flag="access" />
-                        <layer label="网通管线特征管点" layersrc="db" layer="网通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="共通">
-                    <layers>
-                        <layer label="共通管线" layersrc="db" layer="共通管线" flag="pipeLine" />
-                        <layer label="共通管线附属物" layersrc="db" layer="共通管线附属物" flag="access" />
-                        <layer label="共通管线特征管点" layersrc="db" layer="共通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="电通">
-                    <layers>
-                        <layer label="电通管线" layersrc="db" layer="电通管线" flag="pipeLine" />
-                        <layer label="电通管线附属物" layersrc="db" layer="电通管线附属物" flag="access" />
-                        <layer label="电通管线特征管点" layersrc="db" layer="电通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
                 <layertype label="供电">
                     <layers>
                         <layer label="供电管线" layersrc="db" layer="供电管线" flag="pipeLine" />
@@ -106,13 +58,6 @@
                         <layer label="供电管线特征管点" layersrc="db" layer="供电管线特征管点" flag="character" />
                     </layers>
                 </layertype>
-                <layertype label="有线电视">
-                    <layers>
-                        <layer label="有线电视管线" layersrc="db" layer="有线电视管线" flag="pipeLine" />
-                        <layer label="有线电视管线附属物" layersrc="db" layer="有线电视管线附属物" flag="access" />
-                        <layer label="有线电视管线特征管点" layersrc="db" layer="有线电视管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
                 <layertype label="监控">
                     <layers>
                         <layer label="监控管线" layersrc="db" layer="监控管线" flag="pipeLine" />
@@ -127,6 +72,13 @@
                         <layer label="交通信号管线特征管点" layersrc="db" layer="交通信号管线特征管点" flag="character" />
                     </layers>
                 </layertype>
+                <layertype label="联通">
+                    <layers>
+                        <layer label="联通管线" layersrc="db" layer="联通管线" flag="pipeLine" />
+                        <layer label="联通管线附属物" layersrc="db" layer="联通管线附属物" flag="access" />
+                        <layer label="联通管线特征管点" layersrc="db" layer="联通管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
                 <layertype label="路灯">
                     <layers>
                         <layer label="路灯管线" layersrc="db" layer="路灯管线" flag="pipeLine" />
@@ -134,6 +86,34 @@
                         <layer label="路灯管线特征管点" layersrc="db" layer="路灯管线特征管点" flag="character" />
                     </layers>
                 </layertype>
+                <layertype label="移动">
+                    <layers>
+                        <layer label="移动管线" layersrc="db" layer="移动管线" flag="pipeLine" />
+                        <layer label="移动管线附属物" layersrc="db" layer="移动管线附属物" flag="access" />
+                        <layer label="移动管线特征管点" layersrc="db" layer="移动管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="有线电视">
+                    <layers>
+                        <layer label="有线电视管线" layersrc="db" layer="有线电视管线" flag="pipeLine" />
+                        <layer label="有线电视管线附属物" layersrc="db" layer="有线电视管线附属物" flag="access" />
+                        <layer label="有线电视管线特征管点" layersrc="db" layer="有线电视管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="雨污合流">
+                    <layers>
+                        <layer label="雨污合流管线" layersrc="db" layer="雨污合流管线" flag="pipeLine" />
+                        <layer label="雨污合流管线附属物" layersrc="db" layer="雨污合流管线附属物" flag="access" />
+                        <layer label="雨污合流管线特征管点" layersrc="db" layer="雨污合流管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="中水">
+                    <layers>
+                        <layer label="中水管线" layersrc="db" layer="中水管线" flag="pipeLine" />
+                        <layer label="中水管线附属物" layersrc="db" layer="中水管线附属物" flag="access" />
+                        <layer label="中水管线特征管点" layersrc="db" layer="中水管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
             </layertypes>
         </datasrc> 
         <datasrc label="施工数据">

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 2bb8ad3..3f99d3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index b0612ad..72baff4 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -1376,7 +1376,6 @@
             initLayout();
             loadData();
 
-
             double x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]);
             double y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]);
             double z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]);
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index c666db2..66f3d81 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>release</user>
+  <user>test</user>
   <database>szhtdb2</database>
-  <dbserver>192.168.0.203</dbserver>
-  <dbpassword>release</dbpassword>
+  <dbserver>192.168.0.101</dbserver>
+  <dbpassword>test</dbpassword>
   <locaserverip>192.168.0.203</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://192.168.0.203/images/</rooturl>
@@ -63,7 +63,7 @@
   <queryfield label="通信工井">
 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注
 </queryfield>
-  <location label="defaultLocation">120.610963, 31.190621,3000</location>
+  <location label="defaultLocation">116.600963, 28.237621,3000</location>
 
   <pipelineCode label="热力">6000,6100</pipelineCode>
   <pipelineCode label="排水">4000,4100,4200</pipelineCode>
diff --git a/bin/x86/Debug/Location.xml b/bin/x86/Debug/Location.xml
index a96ad2e..8572b25 100644
--- a/bin/x86/Debug/Location.xml
+++ b/bin/x86/Debug/Location.xml
@@ -1,34 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
-<location name="绿岛" x="120.610963" y="31.190621" z="3000"></location>
-     <location name="泽山路" x="120.5847833" y="31.18260833" z="400"></location>
-	 <location name="连柱山路" x="120.5756139" y="31.18031667" z="400"></location>
-	 <location name="五湖路" x="120.5845833" y="31.18234722" z="400"></location>
-	 <location name="翠凤街" x="120.5532278" y="31.19485556" z="400"></location>
-	 <location name="开甫路" x="120.5704556" y="31.18631944" z="400"></location>
-	 <location name="子文街" x="120.5700167" y="31.18456667" z="400"></location>
-	 <location name="仙玩街" x="120.5709833" y="31.18449722" z="400"></location>
-	 <location name="霆威街" x="120.579475" y="31.17700278" z="400"></location>
-	 <location name="引黛街" x="120.5874806" y="31.17702778" z="400"></location>
-	 <location name="移舟街" x="120.5823306" y="31.17786111" z="400"></location>
-	 <location name="流丹街" x="120.58995" y="31.18613056" z="400"></location>
-	 <location name="君益路" x="120.5912806" y="31.18944444" z="400"></location>
-	 <location name="渔浦街" x="120.5993278" y="31.18118056" z="400"></location>
-	 <location name="天颜路" x="120.60055" y="31.18048611" z="400"></location>
-	 <location name="芙蕖街" x="120.6133167" y="31.18681111" z="400"></location>
-	 <location name="金碧街" x="120.6087028" y="31.18738611" z="400"></location>
-	 <location name="原博街" x="120.6109" y="31.18931389" z="400"></location>
-	 <location name="挹紫街" x="120.5876278" y="31.18773056" z="400"></location>
-	 <location name="橘林街" x="120.5939833" y="31.18637778" z="400"></location>
-	 <location name="溪霞街" x="120.6014639" y="31.18406667" z="400"></location>
-	 <location name="雷山路" x="120.6045694" y="31.18722778" z="400"></location>
-	 <location name="苏州大道" x="120.6067972" y="31.18653611" z="400"></location>
-	 <location name="塔韵路" x="120.5965583" y="31.18647222" z="400"></location>
-	 <location name="景周街" x="120.5921944" y="31.18159722" z="400"></location>
-	 <location name="箭浮山路" x="120.5684056" y="31.180075" z="400"></location>
-	 <location name="永旺路" x="120.6110111" y="31.18774722" z="400"></location>
-	 <location name="天鹅荡路" x="120.5776194" y="31.19174167" z="400"></location>
-	 <location name="龙翔路" x="120.578975" y="31.18153889" z="400"></location>
-	 <location name="东太湖路" x="120.5916972" y="31.18620556" z="400"></location>
-	 <location name="旺山路" x="120.5628056" y="31.17015556" z="400"></location>
+<location name="东乡" x="116.600963" y="28.237621" z="3000"></location>
 </Params>
\ No newline at end of file
diff --git a/bin/x86/Debug/layerConfig.xml b/bin/x86/Debug/layerConfig.xml
index 9266e1f..0f14f8d 100644
--- a/bin/x86/Debug/layerConfig.xml
+++ b/bin/x86/Debug/layerConfig.xml
@@ -9,24 +9,13 @@
                         <layer label="道路" layersrc="locaserver" layer="180fd" flag="road" />
                     </layers>
                 </layertype>
+				<!--
                 <layertype label="标识器">
                     <layers>
                         <layer label="标识器" layersrc="db" layer="标识器" flag="access" />
                     </layers>
                 </layertype>
-                <layertype label="交越点">
-                    <layers>
-                        <layer label="交叉穿越点" layersrc="db" layer="交叉穿越点" flag="access" />
-                        <layer label="交叉穿越点三层及以上" layersrc="db" layer="交叉穿越点三层及以上" flag="access" />
-                    </layers>
-                </layertype>
-                <layertype label="不明">
-                    <layers>
-                        <layer label="不明管线" layersrc="db" layer="不明管线" flag="pipeLine" />
-                        <layer label="不明管线附属物" layersrc="db" layer="不明管线附属物" flag="access" />
-                        <layer label="不明管线特征管点" layersrc="db" layer="不明管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
+				-->
                 <layertype label="污水">
                     <layers>
                         <layer label="污水管线" layersrc="db" layer="污水管线" flag="pipeLine" />
@@ -45,7 +34,6 @@
                     <layers>
                         <layer label="给水管线" layersrc="db" layer="给水管线" flag="pipeLine" />
                         <layer label="给水管线附属物" layersrc="db" layer="给水管线附属物" flag="access" />
-                        <layer label="给水阀门" layersrc="db" layer="给水阀门" flag="access" />
                         <layer label="给水管线特征管点" layersrc="db" layer="给水管线特征管点" flag="character" />
                     </layers>
                 </layertype>
@@ -53,7 +41,6 @@
                     <layers>
                         <layer label="天然气管线" layersrc="db" layer="天然气管线" flag="pipeLine" />
                         <layer label="天然气管线附属物" layersrc="db" layer="天然气管线附属物" flag="access" />
-                        <layer label="天然气阀门" layersrc="db" layer="天然气阀门" flag="access" />
                         <layer label="天然气管线特征管点" layersrc="db" layer="天然气管线特征管点" flag="character" />
                     </layers>
                 </layertype>
@@ -64,41 +51,6 @@
                         <layer label="电信管线特征管点" layersrc="db" layer="电信管线特征管点" flag="character" />
                     </layers>
                 </layertype>
-                <layertype label="移动">
-                    <layers>
-                        <layer label="移动管线" layersrc="db" layer="移动管线" flag="pipeLine" />
-                        <layer label="移动管线附属物" layersrc="db" layer="移动管线附属物" flag="access" />
-                        <layer label="移动管线特征管点" layersrc="db" layer="移动管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="联通">
-                    <layers>
-                        <layer label="联通管线" layersrc="db" layer="联通管线" flag="pipeLine" />
-                        <layer label="联通管线附属物" layersrc="db" layer="联通管线附属物" flag="access" />
-                        <layer label="联通管线特征管点" layersrc="db" layer="联通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="网通">
-                    <layers>
-                        <layer label="网通管线" layersrc="db" layer="网通管线" flag="pipeLine" />
-                        <layer label="网通管线附属物" layersrc="db" layer="网通管线附属物" flag="access" />
-                        <layer label="网通管线特征管点" layersrc="db" layer="网通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="共通">
-                    <layers>
-                        <layer label="共通管线" layersrc="db" layer="共通管线" flag="pipeLine" />
-                        <layer label="共通管线附属物" layersrc="db" layer="共通管线附属物" flag="access" />
-                        <layer label="共通管线特征管点" layersrc="db" layer="共通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
-                <layertype label="电通">
-                    <layers>
-                        <layer label="电通管线" layersrc="db" layer="电通管线" flag="pipeLine" />
-                        <layer label="电通管线附属物" layersrc="db" layer="电通管线附属物" flag="access" />
-                        <layer label="电通管线特征管点" layersrc="db" layer="电通管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
                 <layertype label="供电">
                     <layers>
                         <layer label="供电管线" layersrc="db" layer="供电管线" flag="pipeLine" />
@@ -106,13 +58,6 @@
                         <layer label="供电管线特征管点" layersrc="db" layer="供电管线特征管点" flag="character" />
                     </layers>
                 </layertype>
-                <layertype label="有线电视">
-                    <layers>
-                        <layer label="有线电视管线" layersrc="db" layer="有线电视管线" flag="pipeLine" />
-                        <layer label="有线电视管线附属物" layersrc="db" layer="有线电视管线附属物" flag="access" />
-                        <layer label="有线电视管线特征管点" layersrc="db" layer="有线电视管线特征管点" flag="character" />
-                    </layers>
-                </layertype>
                 <layertype label="监控">
                     <layers>
                         <layer label="监控管线" layersrc="db" layer="监控管线" flag="pipeLine" />
@@ -127,6 +72,13 @@
                         <layer label="交通信号管线特征管点" layersrc="db" layer="交通信号管线特征管点" flag="character" />
                     </layers>
                 </layertype>
+                <layertype label="联通">
+                    <layers>
+                        <layer label="联通管线" layersrc="db" layer="联通管线" flag="pipeLine" />
+                        <layer label="联通管线附属物" layersrc="db" layer="联通管线附属物" flag="access" />
+                        <layer label="联通管线特征管点" layersrc="db" layer="联通管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
                 <layertype label="路灯">
                     <layers>
                         <layer label="路灯管线" layersrc="db" layer="路灯管线" flag="pipeLine" />
@@ -134,6 +86,34 @@
                         <layer label="路灯管线特征管点" layersrc="db" layer="路灯管线特征管点" flag="character" />
                     </layers>
                 </layertype>
+                <layertype label="移动">
+                    <layers>
+                        <layer label="移动管线" layersrc="db" layer="移动管线" flag="pipeLine" />
+                        <layer label="移动管线附属物" layersrc="db" layer="移动管线附属物" flag="access" />
+                        <layer label="移动管线特征管点" layersrc="db" layer="移动管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="有线电视">
+                    <layers>
+                        <layer label="有线电视管线" layersrc="db" layer="有线电视管线" flag="pipeLine" />
+                        <layer label="有线电视管线附属物" layersrc="db" layer="有线电视管线附属物" flag="access" />
+                        <layer label="有线电视管线特征管点" layersrc="db" layer="有线电视管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="雨污合流">
+                    <layers>
+                        <layer label="雨污合流管线" layersrc="db" layer="雨污合流管线" flag="pipeLine" />
+                        <layer label="雨污合流管线附属物" layersrc="db" layer="雨污合流管线附属物" flag="access" />
+                        <layer label="雨污合流管线特征管点" layersrc="db" layer="雨污合流管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
+                <layertype label="中水">
+                    <layers>
+                        <layer label="中水管线" layersrc="db" layer="中水管线" flag="pipeLine" />
+                        <layer label="中水管线附属物" layersrc="db" layer="中水管线附属物" flag="access" />
+                        <layer label="中水管线特征管点" layersrc="db" layer="中水管线特征管点" flag="character" />
+                    </layers>
+                </layertype>
             </layertypes>
         </datasrc> 
         <datasrc label="施工数据">
diff --git a/bin/x86/Debug/position.xml b/bin/x86/Debug/position.xml
index cf5c3df..bf00293 100644
--- a/bin/x86/Debug/position.xml
+++ b/bin/x86/Debug/position.xml
@@ -1,5 +1,5 @@
 <position>
-	<Longitude>110.543539572804</Longitude>
-	<Latitude>32.5654697313339</Latitude>
+	<Longitude>116.600963</Longitude>
+	<Latitude>28.237621</Latitude>
 	<Altitude>12756274</Altitude>
 </position>
\ No newline at end of file