From 4dd5bff4cd51da0dc6d2420c30f7c759013be7b0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 10 Jun 2021 11:56:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 config.json |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/config.json b/config.json
index c96838d..74a6cc3 100644
--- a/config.json
+++ b/config.json
@@ -50,7 +50,7 @@
         }
       },
 
-    
+
       {
         "uri": "widgets/HomeButton/Widget",
         "position": {
@@ -172,7 +172,7 @@
       }, {
         "name": "分屏对比",
         "uri": "widgets/SplitScreen/Widget"
-      },{
+      }, {
         "name": "搜索栏",
         "uri": "widgets/searchL/Widget"
       }, {
@@ -197,7 +197,7 @@
           "height": "800px",
           "relativeTo": "map"
         }
-      },{
+      }, {
         "name": "搜索弹窗表格各项弹窗",
         "uri": "widgets/searchTabaPopup/Widget"
       }
@@ -219,13 +219,11 @@
       "right": 0,
       "bottom": 0
     },
-    "imageryProviderViewModels": [
-      {
+    "imageryProviderViewModels": [{
         "name": "天地图矢量",
         "tooltip": "天地图矢量",
         "iconUrl": "images/basemaps/tianditushiliang.png",
-        "layers": [
-          {
+        "layers": [{
             "label": "天地图矢量",
             "type": "wmts",
             "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
@@ -251,8 +249,7 @@
         "name": "天地图影像",
         "tooltip": "天地图全球影像地图服务(国家测绘局)",
         "iconUrl": "images/basemaps/tiandituimage.png",
-        "layers": [
-          {
+        "layers": [{
             "label": "天地图影像",
             "type": "wmts",
             "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
@@ -273,22 +270,46 @@
             "maximumLevel": 17
           }
         ]
-      }
-    ],
-    "terrainProviderViewModels": [
+      },
       {
-        "name": "无地形",
-        "tooltip": "WGS84标准球体",
-        "iconUrl": "images/basemaps/TerrainEllipsoid.png",
-        "url": ""
+        "name": "高德地图影像",
+        "tooltip": "高德地图全球影像服务",
+        "iconUrl": "images/basemaps/tianditushiliang.png",
+        "layers": [{
+            "label": "高德地图影像",
+            "type": "url",
+            "url": "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
+            "layer": "tdtVecBasicLayer",
+            "style": "default",
+            "format": "image/png",
+            "tileMatrixSetID": "GoogleMapsCompatible",
+            "show": false
+          },
+          {
+            "label": "高德地图标注",
+            "type": "url",
+            "url": "http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}",
+            "layer": "tdtVecBasicLayer",
+            "style": "default",
+            "format": "image/png",
+            "tileMatrixSetID": "GoogleMapsCompatible",
+            "show": false
+          }
+        ]
       }
     ],
+    "terrainProviderViewModels": [{
+      "name": "无地形",
+      "tooltip": "WGS84标准球体",
+      "iconUrl": "images/basemaps/TerrainEllipsoid.png",
+      "url": ""
+    }],
     "mapOptions": {
       "positionInfo": {
-        "xmin": 115.547800,
-        "ymin": 28.820504,
-        "xmax": 115.926573,
-        "ymax": 28.671158
+        "xmin": 114.079032,
+        "ymin": 30.223379,
+        "xmax": 118.791967,
+        "ymax": 28.127233
       },
       "animation": false,
       "baseLayerPicker": true,

--
Gitblit v1.9.3