Skip to content

Commit 4d37bf5

Browse files
author
潘卓然ParnDeedlit
committed
【升级】【版本】【合并dev分支代码到master分支】
2 parents 908be9e + 9780343 commit 4d37bf5

File tree

18 files changed

+326
-336
lines changed

18 files changed

+326
-336
lines changed

‎.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// 'extends': ['airbnb', 'plugin:prettier/recommended'],
1414

1515
{
16-
"extends": ["airbnb", "plugin:prettier/recommended"],
16+
/* "extends": ["airbnb", "plugin:prettier/recommended"], */
1717
// 默认情况下，ESLint 会在所有父级目录里寻找配置文件，一直到根目录。如果你想要你所有项目都遵循一个特定的约定时，这将会很有用，
1818
// 但有时候会导致意想不到的结果。为了将 ESLint 限制到一个特定的项目，在你项目根目录下的 package.json 文件或者 .eslintrc.* 文件里的
1919
// eslintConfig 字段下设置 "root": true。ESLint 一旦发现配置文件中有 "root": true，它就会停止在父级目录中寻找。

‎src/mapboxgl/theme/GeoFeatureThemeLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class GeoFeatureThemeLayer extends ThemeLayer {
106106
attrs['FID'] = feature.FID;
107107
}
108108
feature.attributes = attrs;
109-
feature.LabelDot = LabelDots[i];
109+
LabelDots && LabelDots[j] && (feature.LabelDot = LabelDots[j]);
110110
me.features.push(feature);
111111
}
112112
}

‎src/mapboxgl/theme/GraphThemeLayer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class GraphThemeLayer extends ThemeLayer {
6969

7070
if (features instanceof FeatureSet) {
7171
var attrs = null;
72-
72+
var LabelDots = features.LabelDots;
7373
var attstruct = features.AttStruct;
7474
var feaArr = features.SFEleArray;
7575
if (feaArr != null && feaArr.length > 0) {
@@ -83,6 +83,7 @@ class GraphThemeLayer extends ThemeLayer {
8383
attrs["FID"] = feature.FID;
8484
}
8585
feature.attributes = attrs;
86+
LabelDots && LabelDots[j] && (feature.LabelDot = LabelDots[j]);
8687
me.features.push(feature);
8788
}
8889
}

‎src/mapboxgl/theme/Theme3DLayer.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,11 @@ class Theme3DLayer {
205205
var ring = rings[j];
206206
if (ring != null && ring.length > 0) {
207207
for (var k = 0; k < ring.length; k++) {
208+
let coordinate = new mapboxgl.LngLat(ring[k][0], ring[k][1]);
209+
let tempPoint = map.project(coordinate);
208210
data.features[i].geometry.coordinates[j][
209211
k
210-
] = this.WebMercator2lonLat(ring[k][0], ring[k][1]);
212+
] = [tempPoint.x, tempPoint.y];
211213
}
212214
}
213215
}
@@ -220,9 +222,11 @@ class Theme3DLayer {
220222
var ring = polygon[j];
221223
if (ring != null && ring.length > 0) {
222224
for (var k = 0; k < ring.length; k++) {
225+
let coordinate = new mapboxgl.LngLat(ring[k][0], ring[k][1]);
226+
let tempPoint = map.project(coordinate);
223227
data.features[i].geometry.coordinates[m][j][
224228
k
225-
] = this.WebMercator2lonLat(ring[k][0], ring[k][1]);
229+
] = [tempPoint.x, tempPoint.y];
226230
}
227231
}
228232
}

‎website/public/static/demo/config/config-headers.json‎

Lines changed: 37 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
"menus": [
66
{
77
"title": "概述",
8-
"icon": "iconico",
8+
"icon": "icongaishu",
99
"links": [["核心服务", "详细服务", "调用方式", "四大引擎选择", "下载"]],
1010
"hightlights": [[false, false, false, false, false]],
1111
"routes": [["/total/core", "/total/detail", "/total/use", "/total/select", "/total/download"]]
1212
},
1313
{
1414
"title": "插件",
15-
"icon": "iconchajian1",
15+
"icon": "iconchajian",
1616
"links": [["插件列表", "详细图表", "插件标签", "提交bug", "其他"]],
1717
"hightlights": [[false, false, false, false, false]],
1818
"routes": [["/total/plugins", "/total/detailChart", "/total/pluginTags", "/total/bugCommit", "/total/other"]]
1919
},
2020
{
2121
"title": "协议",
22-
"icon": "iconxieyiqueren",
22+
"icon": "iconxieyi",
2323
"links": [["epsg", "geojson"]],
2424
"hightlights": [[false, false]],
2525
"routes": [["/standard/epsg", "/standard/geojson"]]
@@ -32,8 +32,8 @@
3232
"menus": [
3333
{
3434
"title": "产品",
35-
"icon": "icon3chanpin",
36-
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
35+
"icon": "iconchanpinjieshao",
36+
"links": [["产品介绍"]],
3737
"hightlights": [[true, false, false, false, false, false, false, false, false]],
3838
"routes": [
3939
[
@@ -51,29 +51,18 @@
5151
},
5252
{
5353
"title": "开发指南",
54-
"icon": "iconicon_zhinan",
54+
"icon": "iconkaifazhinan",
5555
"links": [
5656
[
57-
"准备",
58-
"数据准备",
59-
"数据处理",
60-
"数据发布",
61-
"新建网站",
62-
"引入开发包",
63-
"数据可视化",
64-
"视图设置",
65-
"标题添加",
66-
"量算分析",
67-
"数据查询",
68-
"可视化效果"
57+
"开发指南"
6958
]
7059
],
7160
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
7261
"routes": [["/guide/component/development_component", "", "", "", "", "", "", "", "", "", "", ""]]
7362
},
7463
{
75-
"title": "在线示例",
76-
"icon": "iconkaifashili",
64+
"title": "开发示例",
65+
"icon": "iconzaixianshili",
7766
"links": [
7867
[
7968
"Cesium示例",
@@ -85,8 +74,8 @@
8574
"routes": [["/gallery/vue-cesium#raster", "/gallery/vue-mapboxgl#vue-layer", "/storybook/index.html"]]
8675
},
8776
{
88-
"title": "在线API",
89-
"icon": "iconAPIwendang",
77+
"title": "开发API",
78+
"icon": "iconsanfangAPI",
9079
"links": [["Cesium-API", "MapboxGL-API"]],
9180
"hightlights": [[false, false]],
9281
"routes": [["http://120.78.82.242:8891", "http://120.78.82.242:8892"]]
@@ -99,8 +88,8 @@
9988
"menus": [
10089
{
10190
"title": "产品",
102-
"icon": "icon3chanpin",
103-
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
91+
"icon": "iconchanpinjieshao",
92+
"links": [["产品介绍"]],
10493
"hightlights": [[true, false, false, false, false, false, false, false, false]],
10594
"routes": [
10695
[
@@ -118,29 +107,18 @@
118107
},
119108
{
120109
"title": "开发指南",
121-
"icon": "iconicon_zhinan",
110+
"icon": "iconkaifazhinan",
122111
"links": [
123112
[
124-
"准备",
125-
"数据准备",
126-
"数据处理",
127-
"数据发布",
128-
"新建网站",
129-
"引入开发包",
130-
"数据可视化",
131-
"视图设置",
132-
"标题添加",
133-
"量算分析",
134-
"数据查询",
135-
"可视化效果"
113+
"开发指南"
136114
]
137115
],
138116
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
139117
"routes": [["/guide/cesium/development_cesium", "", "", "", "", "", "", "", "", "", "", ""]]
140118
},
141119
{
142120
"title": "常见问题",
143-
"icon": "iconwentidan",
121+
"icon": "iconchangjianwenti",
144122
"hightlights": [[false, true, true, true]],
145123
"links": [["OGC-WMTS", "Vue-基本引入", "Vue-内存溢出", "Vue-路由切换"]],
146124
"routes": [
@@ -155,7 +133,7 @@
155133
},
156134
{
157135
"title": "开发示例",
158-
"icon": "iconkaifashili",
136+
"icon": "iconzaixianshili",
159137
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false, false, false]],
160138
"links": [
161139
[
@@ -196,7 +174,7 @@
196174
},
197175
{
198176
"title": "开发API",
199-
"icon": "iconAPIwendang",
177+
"icon": "iconsanfangAPI",
200178
"links": [
201179
["客户端数据服务", "客户端可视化", "客户端渲染", "客户端事件管理", "客户端公共方法", "客户端视图管理", "客户端可视化分析"],
202180
["Cesium", "TurfJs"]
@@ -226,8 +204,8 @@
226204
"menus": [
227205
{
228206
"title": "产品",
229-
"icon": "icon3chanpin",
230-
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
207+
"icon": "iconchanpinjieshao",
208+
"links": [["产品介绍"]],
231209
"hightlights": [[true, false, false, false, false, false, false, false, false]],
232210
"routes": [
233211
[
@@ -245,29 +223,18 @@
245223
},
246224
{
247225
"title": "开发指南",
248-
"icon": "iconicon_zhinan",
226+
"icon": "iconkaifazhinan",
249227
"links": [
250228
[
251-
"准备",
252-
"数据准备",
253-
"数据处理",
254-
"数据发布",
255-
"新建网站",
256-
"引入开发包",
257-
"数据可视化",
258-
"视图设置",
259-
"标题添加",
260-
"量算分析",
261-
"数据查询",
262-
"可视化效果"
229+
"开发指南"
263230
]
264231
],
265232
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
266233
"routes": [["/guide/mapboxgl/development_mapboxgl", "", "", "", "", "", "", "", "", "", "", ""]]
267234
},
268235
{
269236
"title": "常见问题",
270-
"icon": "iconwentidan",
237+
"icon": "iconchangjianwenti",
271238
"hightlights": [[true, true, true, true, true, true, true]],
272239
"links": [
273240
["OGC-WMTS", "ArcServer-WMS", "ArcServer-要素图层", "矢量瓦片-介绍", "矢量瓦片-离线部署", "矢量瓦片-几何&符号", "Vue-基本引入"]
@@ -287,7 +254,7 @@
287254
},
288255
{
289256
"title": "开发示例",
290-
"icon": "iconkaifashili",
257+
"icon": "iconzaixianshili",
291258
"hightlights": [[false, false, true, false, false, false, false, false, false, false, true, true]],
292259
"links": [
293260
[
@@ -324,7 +291,7 @@
324291
},
325292
{
326293
"title": "开发API",
327-
"icon": "iconAPIwendang",
294+
"icon": "iconsanfangAPI",
328295
"hightlights": [[false, false, false, false, false, false, false, false], [false]],
329296
"links": [["地图服务", "OGC服务", "目录服务", "要素服务", "量算服务", "专题图服务", "分析服务", "客户端可视化"], ["Mapbox-GL"]],
330297
"routes": [
@@ -349,8 +316,8 @@
349316
"menus": [
350317
{
351318
"title": "产品",
352-
"icon": "icon3chanpin",
353-
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
319+
"icon": "iconchanpinjieshao",
320+
"links": [["产品介绍"]],
354321
"hightlights": [[true, false, false, false, false, false, false, false, false]],
355322
"routes": [
356323
[
@@ -368,29 +335,18 @@
368335
},
369336
{
370337
"title": "开发指南",
371-
"icon": "iconicon_zhinan",
338+
"icon": "iconkaifazhinan",
372339
"links": [
373340
[
374-
"准备",
375-
"数据准备",
376-
"数据处理",
377-
"数据发布",
378-
"新建网站",
379-
"引入开发包",
380-
"数据可视化",
381-
"视图设置",
382-
"标题添加",
383-
"量算分析",
384-
"数据查询",
385-
"可视化效果"
341+
"开发指南"
386342
]
387343
],
388344
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
389345
"routes": [["/guide/leaflet/development_leaflet", "", "", "", "", "", "", "", "", "", "", ""]]
390346
},
391347
{
392348
"title": "开发示例",
393-
"icon": "iconkaifashili",
349+
"icon": "iconzaixianshili",
394350
"links": [["互联网地图", "OGC服务", "地图", "要素", "量算", "专题图", "空间分析", "客户端可视化", "客户端空间分析", "ElasticSearch"]],
395351
"hightlights": [[false, false, false, false, false, false, false, false, false, false]],
396352
"routes": [
@@ -410,7 +366,7 @@
410366
},
411367
{
412368
"title": "开发API",
413-
"icon": "iconAPIwendang",
369+
"icon": "iconsanfangAPI",
414370
"links": [["地图服务", "OGC服务", "目录服务", "要素服务", "量算服务", "专题图服务", "分析服务", "客户端可视化"], ["Leaflet"]],
415371
"hightlights": [[false, false, false, false, false, false, false, false], [false]],
416372
"routes": [
@@ -435,8 +391,8 @@
435391
"menus": [
436392
{
437393
"title": "产品",
438-
"icon": "icon3chanpin",
439-
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
394+
"icon": "iconchanpinjieshao",
395+
"links": [["产品介绍"]],
440396
"hightlights": [[true, false, false, false, false, false, false, false, false]],
441397
"routes": [
442398
[
@@ -454,29 +410,18 @@
454410
},
455411
{
456412
"title": "开发指南",
457-
"icon": "iconicon_zhinan",
413+
"icon": "iconkaifazhinan",
458414
"links": [
459415
[
460-
"准备",
461-
"数据准备",
462-
"数据处理",
463-
"数据发布",
464-
"新建网站",
465-
"引入开发包",
466-
"数据可视化",
467-
"视图设置",
468-
"标题添加",
469-
"量算分析",
470-
"数据查询",
471-
"可视化效果"
416+
"开发指南"
472417
]
473418
],
474419
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
475420
"routes": [["/guide/openlayers/development_ol", "", "", "", "", "", "", "", "", "", "", ""]]
476421
},
477422
{
478423
"title": "开发示例",
479-
"icon": "iconkaifashili",
424+
"icon": "iconzaixianshili",
480425
"links": [
481426
[
482427
"地图控件",
@@ -528,7 +473,7 @@
528473
},
529474
{
530475
"title": "开发API",
531-
"icon": "iconAPIwendang",
476+
"icon": "iconsanfangAPI",
532477
"links": [["地图服务", "OGC服务", "目录服务", "要素服务", "量算服务", "专题图服务", "分析服务", "客户端可视化"], ["OpenLayers"]],
533478
"hightlights": [[false, false, false, false, false, false, false, false], [false]],
534479
"routes": [

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/grade-symbol.htm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
var { protocol, ip, port } = window.webclient;
2121
var ip = `${ip}`;
2222
var port = `${port}`;
23-
var docName = 'Hubei3857';
23+
var docName = 'Hubei4326';
2424

2525
/** 初始化地图显示*/
2626
function init() {
2727
map = new mapboxgl.Map({
2828
//地图容器div的id
29+
crs: "EPSG:4326",
2930
container: 'map',
3031
center: [112.247175, 30.152892],
3132
zoom: 6,

0 commit comments

Comments
 (0)