From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 config.json |  133 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 107 insertions(+), 26 deletions(-)

diff --git a/config.json b/config.json
index a709529..20bf8b7 100644
--- a/config.json
+++ b/config.json
@@ -35,7 +35,7 @@
       {
         "uri": "widgets/Tool/Widget",
         "position": {
-          "right": 82,
+          "right": 262,
           "top": 20,
           "height": "36px",
           "width": "86px",
@@ -45,7 +45,7 @@
       {
         "uri": "widgets/Basemap/Widget",
         "position": {
-          "right": 10,
+          "right": 190,
           "top": 20,
           "height": "36px",
           "width": "72px",
@@ -93,11 +93,21 @@
         }
       },
       {
+        "uri": "widgets/ShowPosition/Widget",
+        "position": {
+          "right": 0,
+          "bottom": 0,
+          "width": "100%",
+          "height": "25px",
+          "relativeTo": "map"
+        }
+      },
+      {
         "name": "图上量算",
         "uri": "widgets/Measurement/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "350px",
           "height": "320px",
           "relativeTo": "map"
@@ -107,34 +117,30 @@
         "name": "飞行路线",
         "uri": "widgets/FlyRoute/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "260px",
           "height": "64%",
           "relativeTo": "map"
         }
       },
       {
-        "name": "查询定位",
-        "uri": "widgets/Location/Widget"
-      },
-      {
         "name": "卷帘对比",
         "uri": "widgets/Rolling/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "472px",
           "height": "50px",
           "relativeTo": "map"
         }
       },
       {
-        "name": "地图打印",
+        "name": "场景快照",
         "uri": "widgets/MapPrinting/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "200px",
           "height": "40px",
           "relativeTo": "map"
@@ -144,8 +150,8 @@
         "name": "坐标定位",
         "uri": "widgets/CoorPosition/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "217px",
           "height": "180px",
           "relativeTo": "map"
@@ -155,8 +161,8 @@
         "name": "路线导航",
         "uri": "widgets/RouteNavigate/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "300px",
           "height": "780px",
           "relativeTo": "map"
@@ -166,8 +172,8 @@
         "name": "我的标记",
         "uri": "widgets/Sign/Widget",
         "position": {
-          "right": 10,
-          "top": 96,
+          "right": 60,
+          "top": 72,
           "width": "320px",
           "height": "360px",
           "relativeTo": "map"
@@ -183,7 +189,14 @@
       },
       {
         "name": "视角底部按钮",
-        "uri": "widgets/visualAngle/Widget"
+        "uri": "widgets/visualAngle/Widget",
+        "position": {
+          "right": 348,
+          "top": 20,
+          "height": "36px",
+          "width": "142px",
+          "relativeTo": "map"
+        }
       },
       {
         "name": "图例",
@@ -213,8 +226,76 @@
         "uri": "widgets/searchTabaPopup/Widget"
       },
       {
+        "name": "图层管理",
+        "uri": "widgets/Layermanagement/Widget"
+      },
+      {
+        "name": "空间分析",
+        "uri": "widgets/spatialAnalysis/Widget"
+      },
+      {
         "name": "可视化分析",
         "uri": "widgets/visibleArea/Widget"
+      },
+      {
+        "name": "坡度坡向分析",
+        "uri": "widgets/slope/Widget"
+      },
+      {
+        "name": "剖面分析",
+        "uri": "widgets/profileAnalysis/Widget"
+      },
+      {
+        "name": "模型gif",
+        "uri": "widgets/modelDiagram/Widget"
+      },
+      {
+        "name": "SQL查询",
+        "uri": "widgets/SQLQuery/Widget"
+      },
+      {
+        "name": "地形开挖",
+        "uri": "widgets/digTheEarth/Widget"
+      },
+      {
+        "name": "方量分析",
+        "uri": "widgets/volumeAnalysis/Widget"
+      },
+      {
+        "name": "空间查询",
+        "uri": "widgets/spatialQuery/Widget"
+      },
+      {
+        "name": "多边形裁剪",
+        "uri": "widgets/polygonClipping/Widget"
+      },
+      {
+        "name": "通视分析",
+        "uri": "widgets/throughSee/Widget"
+      },
+      {
+        "name": "平面裁剪",
+        "uri": "widgets/clippingPlanes/Widget"
+      },
+      {
+        "name": "BOX裁剪",
+        "uri": "widgets/BOXTailoring/Widget"
+      },
+      {
+        "name": "开敞度分析",
+        "uri": "widgets/openAnalysis/Widget"
+      },
+      {
+        "name": "BOX交互裁剪",
+        "uri": "widgets/BOXInteractive/Widget"
+      },
+      {
+        "name": "Cross裁剪",
+        "uri": "widgets/crossTailoring/Widget"
+      },
+      {
+        "name": "飞行",
+        "uri": "widgets/filyL/Widget"
       }
     ],
     "groups": [],
@@ -387,10 +468,10 @@
     ],
     "mapOptions": {
       "positionInfo": {
-        "xmin": 111.807347,
-        "ymin": 30.840173,
-        "xmax": 120.020036,
-        "ymax": 27.215672
+        "xmin": 114.017758,
+        "ymin": 29.805021,
+        "xmax": 118.100216,
+        "ymax": 28.141914
       },
       "animation": false,
       "baseLayerPicker": true,

--
Gitblit v1.9.3