From 8274f20d8093486dc3d54e074d25b6e412f4e4c7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Nov 2020 15:20:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
config.json | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/config.json b/config.json
index 493a384..6f21fb5 100644
--- a/config.json
+++ b/config.json
@@ -182,17 +182,6 @@
}
},
{
- "name": "测试",
- "uri": "widgets/cs/Widget",
- "position": {
- "right": 10,
- "top": 96,
- "width": "350px",
- "height": "320px",
- "relativeTo": "map"
- }
- },
- {
"name": "卷帘对比",
"uri": "widgets/Rolling/Widget",
"position": {
@@ -213,9 +202,51 @@
"height": "50px",
"relativeTo": "map"
}
+ },
+ {
+ "name": "我的标记",
+ "uri": "widgets/Sign/Widget",
+ "position": {
+ "right": 10,
+ "top": 96,
+ "width": "320px",
+ "height": "360px",
+ "relativeTo": "map"
+ }
+ },
+ {
+ "name": "坐标定位",
+ "uri": "widgets/CoorPosition/Widget",
+ "position": {
+ "right": 10,
+ "top": 96,
+ "width": "217px",
+ "height": "180px",
+ "relativeTo": "map"
+ }
+ },
+ {
+ "name": "场景快照",
+ "uri": "widgets/MapPrinting/Widget",
+ "position": {
+ "right": 10,
+ "top": 96,
+ "width": "200px",
+ "height": "40px",
+ "relativeTo": "map"
+ }
+ },
+ {
+ "name": "路线导航",
+ "uri": "widgets/RouteNavigate/Widget",
+ "position": {
+ "right": 10,
+ "top": 96,
+ "width": "300px",
+ "height": "780px",
+ "relativeTo": "map"
+ }
}
-
-
],
"groups": [],
"panel": {
@@ -263,23 +294,6 @@
]
},
{
- "name": "赣州电子地图",
- "tooltip": "赣州电子地图",
- "iconUrl": "images/basemaps/tianditushiliang.png",
- "layers": [
- {
- "label": "赣州电子地图",
- "type": "wmts",
- "url": "http://sw797.com:6080/arcgis/rest/services/GZHS/MapServer/WMTS",
- "layer": "GZHS",
- "style": "default",
- "format": "image/jpgpng",
- "tileMatrixSetID": "default028mm",
- "maximumLevel": 17
- }
- ]
- },
- {
"name": "天地图矢量",
"tooltip": "天地图矢量",
"iconUrl": "images/basemaps/tianditushiliang.png",
@@ -321,7 +335,7 @@
{
"name": "谷歌",
"tooltip": "谷歌",
- "iconUrl": "images/basemaps/tiandituimage.png",
+ "iconUrl": "images/basemaps/guge.jpg",
"layers": [
{
"label": "谷歌",
@@ -332,7 +346,7 @@
{
"name": "百度",
"tooltip": "百度",
- "iconUrl": "images/basemaps/tiandituimage.png",
+ "iconUrl": "images/basemaps/baiduimage.png",
"layers": [
{
"label": "百度",
@@ -344,7 +358,7 @@
{
"name": "高德",
"tooltip": "高德",
- "iconUrl": "images/basemaps/tianditushiliang.png",
+ "iconUrl": "images/basemaps/gaod.jpg",
"layers": [
{
"label": "高德",
@@ -355,7 +369,7 @@
{
"name": "腾讯",
"tooltip": "腾讯",
- "iconUrl": "images/basemaps/tiandituimage.png",
+ "iconUrl": "images/basemaps/tenx.jpg",
"layers": [
{
"label": "腾讯",
@@ -368,7 +382,7 @@
{
"name": "Gis",
"tooltip": "Gis",
- "iconUrl": "images/basemaps/tianditushiliang.png",
+ "iconUrl": "images/basemaps/gis.jpg",
"layers": [
{
"type": "gis"
@@ -378,7 +392,7 @@
{
"name": "mapbox",
"tooltip": "mapbox",
- "iconUrl": "images/basemaps/tiandituimage.png",
+ "iconUrl": "images/basemaps/mapbox.jpg",
"layers": [
{
"type": "mapbox"
--
Gitblit v1.9.3