From e7bc0b68e57e1f2824a71873bc4ef22eb1e65084 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Tue, 17 Nov 2020 09:52:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 config.json |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/config.json b/config.json
index 5dfb0a3..cc1d00f 100644
--- a/config.json
+++ b/config.json
@@ -267,6 +267,33 @@
     },
     "imageryProviderViewModels": [
       {
+        "name": "天地图矢量",
+        "tooltip": "天地图矢量",
+        "iconUrl": "images/basemaps/tianditushiliang.png",
+        "layers": [
+          {
+            "label": "天地图矢量",
+            "type": "wmts",
+            "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+            "layer": "vec",
+            "style": "default",
+            "format": "tiles",
+            "tileMatrixSetID": "w",
+            "maximumLevel": 17
+          },
+          {
+            "label": "天地图矢量标注",
+            "type": "wmts",
+            "url": "http://t0.tianditu.gov.cn/cva_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+            "layer": "cva",
+            "style": "default",
+            "format": "tiles",
+            "tileMatrixSetID": "w",
+            "maximumLevel": 17
+          }
+        ]
+      },
+      {
         "name": "天地图影像",
         "tooltip": "天地图全球影像地图服务(国家测绘局)",
         "iconUrl": "images/basemaps/tiandituimage.png",
@@ -293,33 +320,6 @@
           }
         ]
       },
-      {
-        "name": "天地图矢量",
-        "tooltip": "天地图矢量",
-        "iconUrl": "images/basemaps/tianditushiliang.png",
-        "layers": [
-          {
-            "label": "天地图矢量",
-            "type": "wmts",
-            "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
-            "layer": "vec",
-            "style": "default",
-            "format": "tiles",
-            "tileMatrixSetID": "w",
-            "maximumLevel": 17
-          },
-          {
-            "label": "天地图矢量标注",
-            "type": "wmts",
-            "url": "http://t0.tianditu.gov.cn/cva_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
-            "layer": "cva",
-            "style": "default",
-            "format": "tiles",
-            "tileMatrixSetID": "w",
-            "maximumLevel": 17
-          }
-        ]
-      },      
       {
         "name": "离线影像",
         "tooltip": "赣州市离线影像",
@@ -440,8 +440,27 @@
     },
     "widgets": [
       {
-        "name": "旅游路线",
+        "name": "轨迹线",
         "uri": "widgets/PathShow/Widget"
+      },
+      {
+        "name": "剖面分析",
+        "uri": "widgets/MapSection/Widget",
+        "position": {
+          "left": 20,
+          "top": 90,
+          "width": "440px",
+          "height": "320px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "鹰眼地图",
+        "uri": "widgets/HawkEyeMap/Widget"
+      },
+      {
+        "name": "图片动画",
+        "uri": "widgets/PictureAnimation/Widget"
       }
     ],
     "groups": []

--
Gitblit v1.9.3