Skip to content

Commit 048371d

Browse files
committed
同步代码
1 parent e50bd25 commit 048371d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+43
-27
lines changed

public/config/config.json

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"pid": 10,
161161
"name": "百度影像",
162162
"type": "group",
163-
"icon": "./img/thumbnail/basemap/bd-img.png",
163+
"icon": "./img/thumbnail/basemap/bd_img.png",
164164
"layers": [
165165
{
166166
"name": "底图",
@@ -177,7 +177,7 @@
177177
{
178178
"pid": 10,
179179
"name": "百度电子",
180-
"icon": "./img/thumbnail/basemap/bd-vec.png",
180+
"icon": "./img/thumbnail/basemap/bd_vec.png",
181181
"type": "baidu",
182182
"layer": "vec"
183183
},
@@ -206,26 +206,11 @@
206206
"type": "tencent",
207207
"layer": "vec"
208208
},
209-
{
210-
"pid": 10,
211-
"name": "ArcGIS影像",
212-
"icon": "./img/thumbnail/basemap/esriWorldImagery.png",
213-
"type": "xyz",
214-
"url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
215-
"enablePickFeatures": false
216-
},
217-
{
218-
"pid": 10,
219-
"name": "微软影像",
220-
"icon": "./img/thumbnail/basemap/bingAerial.png",
221-
"type": "bing",
222-
"layer": "Aerial"
223-
},
224209
{
225210
"id": 2017,
226211
"pid": 10,
227212
"name": "蓝色底图",
228-
"icon": "./img/thumbnail/basemap/bd-c-midnight.png",
213+
"icon": "./img/thumbnail/basemap/my_blue.png",
229214
"type": "gaode",
230215
"layer": "vec",
231216
"chinaCRS": "GCJ02",
@@ -237,10 +222,25 @@
237222
"hue": 1,
238223
"saturation": 0
239224
},
225+
{
226+
"pid": 10,
227+
"name": "绿色底图",
228+
"icon": "./img/thumbnail/basemap/my_green.png",
229+
"type": "gaode",
230+
"layer": "vec",
231+
"chinaCRS": "GCJ02",
232+
"invertColor": true,
233+
"filterColor": "rgba(12, 238, 230)",
234+
"brightness": 1,
235+
"contrast": 1.0,
236+
"gamma": 0.2,
237+
"hue": 1,
238+
"saturation": 0
239+
},
240240
{
241241
"pid": 10,
242242
"name": "黑色底图",
243-
"icon": "./img/thumbnail/basemap/bd-c-dark.png",
243+
"icon": "./img/thumbnail/basemap/my_dark.png",
244244
"type": "gaode",
245245
"layer": "vec",
246246
"chinaCRS": "GCJ02",
@@ -252,6 +252,22 @@
252252
"hue": 1,
253253
"saturation": 0
254254
},
255+
256+
{
257+
"pid": 10,
258+
"name": "ArcGIS影像",
259+
"icon": "./img/thumbnail/basemap/arcgis_img.png",
260+
"type": "xyz",
261+
"url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
262+
"enablePickFeatures": false
263+
},
264+
{
265+
"pid": 10,
266+
"name": "微软影像",
267+
"icon": "./img/thumbnail/basemap/bing_img.png",
268+
"type": "bing",
269+
"layer": "Aerial"
270+
},
255271
{
256272
"pid": 10,
257273
"name": "离线影像地图 (供参考)",
@@ -263,7 +279,7 @@
263279
},
264280
{
265281
"pid": 10,
266-
"name": "单张图片 (本地离线)",
282+
"name": "单张图片",
267283
"icon": "./img/thumbnail/basemap/offline.png",
268284
"type": "image",
269285
"url": "https://data.mars3d.cn/img/map/world/world.jpg"
@@ -789,7 +805,7 @@
789805
"url": "{mars3d_data}/file/geojson/xizangyakou.json",
790806
"symbol": {
791807
"styleOptions": {
792-
"image": "./img/marker/mark-red.png",
808+
"image": "/img/marker/mark-red.png",
793809
"scaleByDistance": true,
794810
"scaleByDistance_far": 5000000,
795811
"scaleByDistance_farValue": 0.5,
@@ -840,7 +856,7 @@
840856
"url": "{mars3d_data}/file/geojson/hfty-point.json",
841857
"symbol": {
842858
"styleOptions": {
843-
"image": "./img/marker/mark-red.png",
859+
"image": "/img/marker/mark-red.png",
844860
"scale": 1,
845861
"scaleByDistance": true,
846862
"scaleByDistance_far": 20000,
@@ -1020,7 +1036,7 @@
10201036
"symbol": {
10211037
"type": "billboardP",
10221038
"styleOptions": {
1023-
"image": "./img/marker/mark-red.png",
1039+
"image": "/img/marker/mark-red.png",
10241040
"scaleByDistance": true,
10251041
"scaleByDistance_far": 20000,
10261042
"scaleByDistance_farValue": 0.6,
@@ -1072,7 +1088,7 @@
10721088
"symbol": {
10731089
"type": "billboardP",
10741090
"styleOptions": {
1075-
"image": "./img/marker/mark-blue.png",
1091+
"image": "/img/marker/mark-blue.png",
10761092
"scaleByDistance": true,
10771093
"scaleByDistance_far": 20000,
10781094
"scaleByDistance_farValue": 0.6,
@@ -1094,13 +1110,13 @@
10941110
"styleField": "address",
10951111
"styleFieldOptions": {
10961112
"AB03": {
1097-
"image": "./img/marker/mark-red.png"
1113+
"image": "/img/marker/mark-red.png"
10981114
},
10991115
"A980": {
1100-
"image": "./img/marker/mark-blue.png"
1116+
"image": "/img/marker/mark-blue.png"
11011117
},
11021118
"A900": {
1103-
"image": "./img/marker/mark-green.png"
1119+
"image": "/img/marker/mark-green.png"
11041120
}
11051121
}
11061122
},
-2.5 KB
-9.88 KB
Binary file not shown.
10.1 KB
8.03 KB
-11.7 KB
Binary file not shown.
-9.92 KB
Binary file not shown.
-11.7 KB
Binary file not shown.
-11.3 KB
Binary file not shown.
-11.7 KB
Binary file not shown.
-6.27 KB
Binary file not shown.
-11.8 KB
Binary file not shown.
-11 KB
Binary file not shown.
-11.5 KB
Binary file not shown.
-11.4 KB
Binary file not shown.
-11.9 KB
Binary file not shown.
-13.1 KB
Binary file not shown.
-11.5 KB
Binary file not shown.
-7.92 KB
Binary file not shown.
10.2 KB
10.8 KB
8.51 KB
-12.4 KB
Binary file not shown.
-12.9 KB
Binary file not shown.
-10.6 KB
Binary file not shown.
10.2 KB
-11.5 KB
Binary file not shown.
Binary file not shown.
-12.5 KB
Binary file not shown.
Binary file not shown.
1.55 KB
-1.48 KB
-9.32 KB
Binary file not shown.
8.57 KB
440 Bytes
-468 Bytes
-1.29 KB
Binary file not shown.
-11.4 KB
Binary file not shown.
-9.42 KB
Binary file not shown.
-10.7 KB
Binary file not shown.
8.03 KB
6.78 KB
7.75 KB
-9.05 KB
Binary file not shown.

public/img/thumbnail/basemap/null.png

114 Bytes
-3.39 KB

public/img/thumbnail/basemap/osm.png

3.77 KB

public/img/thumbnail/basemap/sea.png

-1.03 KB
-5.32 KB
Binary file not shown.
-11.7 KB
Binary file not shown.
-2.12 KB
1.1 KB
-3.26 KB
-665 Bytes
1.71 KB
824 Bytes

0 commit comments

Comments
 (0)