Skip to content

Commit 5509533

Browse files
Yuki-ZhaoYuki-Zhao
committed
2 parents cbb83b2 + eeea0c4 commit 5509533

File tree

4,145 files changed

+979407
-702942
lines changed

Some content is hidden

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

4,145 files changed

+979407
-702942
lines changed

‎.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ src/classic/resource/*
44
src/classic/theme/*
55
src/common/style/CartoCSS.js
66
src/common/thirdparty/ai/*
7+
src/common/util/UGCWasmAll.js
8+
src/maplibregl/overlay/L7/l7-render.js
9+
src/mapboxgl/overlay/L7/l7-render.js
710
test

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/examples-test/reports
99
/web/
1010
/package-lock.json
11+
.npmrc

‎CHANGELOG.md

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,100 @@
1+
# 11.1.1 #
2+
3+
## 新特性
4+
5+
### iClient for MapLibreGL 新增支持 Web符号化制图能力
6+
7+
- 提供Web符号库列表，方便用户检索，同时提供在线制图示例
8+
- 改造地图库API支持直接传入Web符号库ID进行快速制图
9+
- 支持mapbox样式规范表达式，可以对符号进行数据驱动制图
10+
11+
### Service 相关 API 编程模式支持 ECMAScript 6 Promise，简化异步编程，使代码更优雅更易维护
12+
13+
## API changes
14+
15+
16+
### for Leaflet
17+
- `L.supermap.SpatialAnalystService` 新增 `minDistanceAnalysis` 接口，支持数据集和几何对象最近距离计算
18+
- `L.supermap.SpatialAnalystService` 新增 `terrainAspectCalculate` 接口，支持地形坡向计算
19+
- `L.supermap.SpatialAnalystService` 新增 `terrainSlopeCalculate` 接口，支持地形坡度计算
20+
- `L.supermap.SpatialAnalystService` 新增 `terrainCutFillCalculate` 接口，支持填挖方计算
21+
- `L.supermap.SpatialAnalystService` 新增 `convexHullAnalysis`接口，支持凸包运算
22+
- `L.supermap.NetworkAnalystService` 新增 `traceAnalyst` 接口，支持上/下游追踪分析
23+
- `L.supermap.NetworkAnalystService` 新增 `connectedEdgesAnalyst` 接口，支持连通性分析
24+
- `L.supermap.FeatureService` 新增 `getMetadata` 接口，支持获取地理要素元数据功能
25+
- `L.supermap.LayerInfoService` 新增 `getLayersLegendInfo` 接口，支持获取地图图例功能
26+
- 升级支持ECharts v5.x版本
27+
28+
29+
### for OpenLayers
30+
- `ol.supermap.SpatialAnalystService` 新增 `minDistanceAnalysis` 接口，支持数据集和几何对象最近距离计算
31+
- `ol.supermap.SpatialAnalystService` 新增 `terrainAspectCalculate` 接口，支持地形坡向计算
32+
- `ol.supermap.SpatialAnalystService` 新增 `terrainSlopeCalculate` 接口，支持地形坡度计算
33+
- `ol.supermap.SpatialAnalystService` 新增 `terrainCutFillCalculate` 接口，支持填挖方计算
34+
- `ol.supermap.SpatialAnalystService` 新增 `convexHullAnalysis`接口，支持凸包运算
35+
- `ol.supermap.NetworkAnalystService` 新增 `traceAnalyst` 接口，支持上/下游追踪分析
36+
- `ol.supermap.NetworkAnalystService` 新增 `connectedEdgesAnalyst` 接口，支持连通性分析
37+
- `ol.supermap.FeatureService` 新增 `getMetadata` 接口，支持获取地理要素元数据功能
38+
- `ol.supermap.LayerInfoService` 新增 `getLayersLegendInfo` 接口，支持获取地图图例功能
39+
- 升级支持ECharts v5.x版本
40+
41+
### for MapboxGL
42+
- 新增 `mapboxgl.supermap.initMap` 支持调用SuperMap iServer REST Map 服务快速创建地图，无需再设置相关参数
43+
- `mapboxgl.supermap.SpatialAnalystService` 新增 `minDistanceAnalysis` 接口，支持数据集和几何对象最近距离计算
44+
- `mapboxgl.supermap.SpatialAnalystService` 新增 `terrainAspectCalculate` 接口，支持地形坡向计算
45+
- `mapboxgl.supermap.SpatialAnalystService` 新增 `terrainSlopeCalculate` 接口，支持地形坡度计算
46+
- `mapboxgl.supermap.SpatialAnalystService` 新增 `terrainCutFillCalculate` 接口，支持填挖方计算
47+
- `mapboxgl.supermap.SpatialAnalystService` 新增 `convexHullAnalysis`接口，支持凸包运算
48+
- `mapboxgl.supermap.NetworkAnalystService` 新增 `traceAnalyst` 接口，支持上/下游追踪分析
49+
- `mapboxgl.supermap.NetworkAnalystService` 新增 `connectedEdgesAnalyst` 接口，支持连通性分析
50+
- `mapboxgl.supermap.FeatureService` 新增 `getMetadata` 接口，支持获取地理要素元数据功能
51+
- `mapboxgl.supermap.LayerInfoService` 新增 `getLayersLegendInfo` 接口，支持获取地图图例功能
52+
- 升级支持ECharts v5.x版本
53+
54+
### for MaplibreGL
55+
- 新增 `maplibregl.supermap.initMap` 支持调用SuperMap iServer REST Map 服务快速创建地图，无需再设置相关参数
56+
- `maplibregl.supermap.SpatialAnalystService` 新增 `minDistanceAnalysis` 接口，支持数据集和几何对象最近距离计算
57+
- `maplibregl.supermap.SpatialAnalystService` 新增 `terrainAspectCalculate` 接口，支持地形坡向计算
58+
- `maplibregl.supermap.SpatialAnalystService` 新增 `terrainSlopeCalculate` 接口，支持地形坡度计算
59+
- `maplibregl.supermap.SpatialAnalystService` 新增 `terrainCutFillCalculate` 接口，支持填挖方计算
60+
- `maplibregl.supermap.SpatialAnalystService` 新增 `convexHullAnalysis`接口，支持凸包运算
61+
- `maplibregl.supermap.NetworkAnalystService` 新增 `traceAnalyst` 接口，支持上/下游追踪分析
62+
- `maplibregl.supermap.NetworkAnalystService` 新增 `connectedEdgesAnalyst` 接口，支持连通性分析
63+
- `maplibregl.supermap.FeatureService` 新增 `getMetadata` 接口，支持获取地理要素元数据功能
64+
- `maplibregl.supermap.LayerInfoService` 新增 `getLayersLegendInfo` 接口，支持获取地图图例功能
65+
- 升级支持ECharts v5.x版本
66+
67+
# 11.1.0 #
68+
69+
## 新特性
70+
71+
### 提供全新地图库：iClient for MaplibreGL，可将现有Mapbox方案平滑迁移
72+
- 作为MapboxGL v1版本的开源分支，可将现有的MapboxGL方案平滑迁移
73+
- 提供iServer地图、数据、分析等服务访问API和可视化相关API
74+
![1110-1](https://iclient.supermap.io/web/img/whatsNewMaplibre.png)
75+
76+
### 支持地理知识图谱Web可视化
77+
- 提供地理知识图谱和实体关系访问的API，一句代码快速出图
78+
- 提供样式编辑和交互事件相关API
79+
![1110-2](https://iclient.supermap.io/web/img/whatsNewKnowledge.png)
80+
81+
### iClient for MapboxGL支持地理、投影全坐标系
82+
- 支持访问SuperMap iServer地图服务和OGC WMTS/WMS服务
83+
- 支持地理坐标系、投影坐标系
84+
- 支持栅格瓦片、矢量瓦片
85+
![1110-3](https://iclient.supermap.io/web/img/whatsNewCoor.png)
86+
87+
### iClient for MapboxGL提供前后端一致的Web符号化制图能力
88+
- 提供Web符号库列表，方便用户检索，同时提供在线制图示例
89+
- 改造地图库API支持直接传入Web符号库ID进行快速制图
90+
- 支持mapbox样式规范表达式，可以对符号进行数据驱动制图
91+
![1110-4](https://iclient.supermap.io/web/img/whatsNewSymbol.png)
92+
93+
### GIS数据上云访问支持，新增支持云原生矢量交换格式（FlatGeoBuf）
94+
- 支持直接访问云存储和SuperMap iServer服务返回的FlatGeoBuf格式文件，并支持流式传输和渲染
95+
- 支持全量渲染或按需渲染两种模式
96+
![1110-5](https://iclient.supermap.io/web/img/whatsNewFGB.gif)
97+
198
# 11.1.0-beta #
299

3100
## 新特性

‎README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SuperMap iClient JavaScript
22

3-
[![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.supermap%3Aiclient-javascript9&metric=coverage)](https://sonarcloud.io/dashboard?id=com.supermap%3Aiclient-javascript9)
4-
[![npm version](https://img.shields.io/npm/v/@supermap/iclient-common.svg)](https://www.npmjs.com/~supermap)
3+
[![npm version](https://img.shields.io/npm/v/@supermap/iclient-common.svg)](https://www.npmjs.com/org/supermapgis)
54
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bi.8713187.xyz%2FSuperMap%2FiClient-JavaScript.svg?type=shield)](https://app.fossa.io/projects/git%2Bi.8713187.xyz%2FSuperMap%2FiClient-JavaScript?ref=badge_shield)
65

76
## 简介 | [ENGLISH](https://github.com/SuperMap/iClient-JavaScript/blob/master/README_EN.md)
@@ -17,11 +16,6 @@ SuperMap iClient JavaScript 是一套开源开放的 WebGIS 客户端应用开
1716

1817
基于Vue 2.x的iClient UI组件库，[快速上手文档](https://iclient.supermap.io/web/apis/vue/zh/api/guide/quick-start.html)
1918

20-
## 示例
21-
[![](https://www.supermap.com/pic/anlipic/201792216859921.gif)](https://iclient.supermap.io/examples/mapboxgl/editor.html#mapvPolylineTime)
22-
23-
## 微信小程序范例
24-
![WeChatMiniApp](https://iclient.supermap.io/en/web/img/whatsNewWechat.jpg)
2519

2620
## Contributors
2721

‎README_EN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SuperMap iClient JavaScript
22

33
[![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.supermap%3Aiclient-javascript9&metric=coverage)](https://sonarcloud.io/dashboard?id=com.supermap%3Aiclient-javascript9)
4-
[![npm version](https://img.shields.io/npm/v/@supermap/iclient-common.svg)](https://www.npmjs.com/~supermap)
4+
[![npm version](https://img.shields.io/npm/v/@supermap/iclient-common.svg)](https://www.npmjs.com/org/supermapgis)
55
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bi.8713187.xyz%2FSuperMap%2FiClient-JavaScript.svg?type=shield)](https://app.fossa.io/projects/git%2Bi.8713187.xyz%2FSuperMap%2FiClient-JavaScript?ref=badge_shield)
66

77
## Introduction | [中文](https://github.com/SuperMap/iClient-JavaScript/blob/master/README.md)

‎build/jsdocs/classic/docs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"outputSourceFiles": false
6969
},
7070
"namespace": "SuperMap",
71-
"npm": "@supermap/iclient-classic",
71+
"npm": "@supermapgis/iclient-classic",
7272
"cdn": "https://iclient.supermap.io/dist/classic/iclient-classic.js"
7373
}
7474
}

‎build/jsdocs/leaflet/docs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"outputSourceFiles": false
8989
},
9090
"namespace": "L.supermap",
91-
"npm":"@supermap/iclient-leaflet",
91+
"npm":"@supermapgis/iclient-leaflet",
9292
"cdn":"https://iclient.supermap.io/dist/leaflet/iclient-leaflet.js"
9393
}
9494
}

‎build/jsdocs/mapboxgl/docs.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
"src/common/components/templates/Select",
6565
"src/common/security/KeyServiceParameter",
6666
"src/common/components/templates/TemplateBase",
67-
"src/mapboxgl/core/Util"
67+
"src/mapboxgl/core/Util",
68+
"src/mapboxgl/overlay/L7/l7-render",
69+
"src/mapboxgl/mapping/utils"
6870
]
6971
},
7072
"plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],
@@ -78,7 +80,7 @@
7880
"outputSourceFiles": false
7981
},
8082
"namespace": "mapboxgl.supermap",
81-
"npm":"@supermap/iclient-mapboxgl",
83+
"npm":"@supermapgis/iclient-mapboxgl",
8284
"cdn":"https://iclient.supermap.io/dist/mapboxgl/iclient-mapboxgl.js"
8385
}
8486
}

‎build/jsdocs/maplibregl/docs.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
"src/common/components/templates/Select",
6363
"src/common/security/KeyServiceParameter",
6464
"src/common/components/templates/TemplateBase",
65-
"src/mapboxgl/core/Util"
65+
"src/maplibregl/core/Util",
66+
"src/maplibregl/overlay/L7/l7-render"
6667
]
6768
},
6869
"plugins": ["plugins/markdown", "../plugins/usage", "../plugins/moduleCategories"],
@@ -76,7 +77,7 @@
7677
"outputSourceFiles": false
7778
},
7879
"namespace": "maplibregl.supermap",
79-
"npm": "@supermap/iclient-maplibregl",
80+
"npm": "@supermapgis/iclient-maplibregl",
8081
"cdn": "https://iclient.supermap.io/dist/maplibregl/iclient-maplibregl.js"
8182
}
8283
}

‎build/jsdocs/openlayers/docs.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@
6262
"src/common/components/templates/PopContainer",
6363
"src/common/components/templates/Select",
6464
"src/common/security/KeyServiceParameter",
65-
"src/common/components/templates/TemplateBase",
66-
67-
"src/openlayers/core/Util"
65+
"src/common/components/templates/TemplateBase"
6866
]
6967
},
7068
"plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],
@@ -78,7 +76,7 @@
7876
"outputSourceFiles": false
7977
},
8078
"namespace": "ol.supermap",
81-
"npm":"@supermap/iclient-ol",
79+
"npm":"@supermapgis/iclient-ol",
8280
"cdn":"https://iclient.supermap.io/dist/openlayers/iclient-ol.js"
8381
}
8482
}

‎build/jsdocs/plugins/moduleCategories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exports.handlers = {
2525
e.doclet.modulecategory.className = modulecategory.name;
2626
if (!modulecategory.name.startsWith('SuperMap')) {
2727
const matchTag = e.doclet.tags.find(tag => tag.title === 'browsernamespace') || {};
28-
const prefix = matchTag.value || globalParams.namespace;
28+
const prefix = matchTag.value || (globalParams && globalParams.namespace);
2929
e.doclet.modulecategory.name = `${prefix}.${modulecategory.name}`;
3030
}
3131
e.doclet.modulecategory.des = (e.doclet.classdesc || '').split('。')[0].replace('<p>', '').replace('类', '');

‎build/jsdocs/template/config.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
"name": "邻近分析",
107107
"name_en": "ThiessenPolygonAnalyst"
108108
},
109+
"MinDistanceAnalyst": {
110+
"name": "最近距离分析",
111+
"name_en": "MinDistanceAnalyst"
112+
},
109113
"GeoRelationAnalyst": {
110114
"name": "空间关系分析",
111115
"name_en": "GeoRelationAnalyst"
@@ -130,6 +134,10 @@
130134
"name": "地形分析",
131135
"name_en": "TerrainCalculation"
132136
},
137+
"ConvexHullAnalyst": {
138+
"name": "凸包运算",
139+
"name_en": "ConvexHullAnalyst"
140+
},
133141
"BatchAnalyst": {
134142
"name": "批量分析",
135143
"name_en": "BatchAnalyst"
@@ -168,6 +176,14 @@
168176
"name": "服务区分析",
169177
"name_en": "ServiceArea"
170178
},
179+
"ConnectedEdges": {
180+
"name": "连通性分析",
181+
"name_en": "ConnectedEdges"
182+
},
183+
"TraceAnalystService": {
184+
"name": "上游/下游追踪分析",
185+
"name_en": "TraceAnalystService"
186+
},
171187
"UpstreamCirticalFaclilities": {
172188
"name": "上游/下游关键设施查找",
173189
"name_en": "UpstreamCirticalFaclilities"
@@ -398,6 +414,14 @@
398414
"WebSymbol": {
399415
"name": "Web符号",
400416
"name_en": "WebSymbol"
417+
},
418+
"L7": {
419+
"name": "L7",
420+
"name_en": "L7"
421+
},
422+
"Video": {
423+
"name": "Video",
424+
"name_en": "Video"
401425
}
402426
}
403427
},
@@ -489,6 +513,10 @@
489513
"Constant": {
490514
"name": "常量",
491515
"name_en": "Constant"
516+
},
517+
"MapExtend": {
518+
"name": "地图扩展",
519+
"name_en": "MapExtend"
492520
}
493521
}
494522
}

‎build/jsdocs/template/publish.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,15 @@ function buildNav(members, view, templatePath) {
250250
for (const key in view.navMap ) {
251251
if (Object.hasOwnProperty.call(view.navMap , key)) {
252252
const element = view.navMap[key];
253-
const m = element.methods.map(e => {
254-
return e.name;
253+
if(element.scope === 'global'){
254+
element.methods = [element];
255+
}
256+
const m = element.methods.filter((e)=>{
257+
return !e.inherited
258+
}).map(e => {
259+
var commentLength = e.comment && !e.meta.range?e.comment.split('\n').length:0;
260+
var funLineNo = e.meta.lineno + commentLength;
261+
return {name:e.name,lineNo:funLineNo,version:e.version || element.version};
255262
});
256263
if(!element.fileName && m.length>0){
257264
console.log("没有文件名的类：", element.longname,element.type,m)
@@ -432,7 +439,8 @@ function buildNavMap(members,linkto) {
432439
events: find({
433440
kind: 'event',
434441
memberof: v.longname
435-
})
442+
}),
443+
...v
436444
};
437445
}
438446
navMap[v.longname] = nav;
@@ -612,7 +620,8 @@ var whiteLists = {
612620
'TimeFlowControl',
613621
'WebMachineLearning',
614622
'WebMap',
615-
'WKTFormat'
623+
'WKTFormat',
624+
'L7Layer'
616625
],
617626
maplibregl:[
618627
'KnowledgeGraphService',
@@ -646,7 +655,8 @@ var whiteLists = {
646655
'GraticuleLayer',
647656
'HeatMapLayer',
648657
'MapvLayer',
649-
'ThreeLayer'
658+
'ThreeLayer',
659+
'L7Layer'
650660
],
651661
openlayers: [
652662
'KnowledgeGraphService',
@@ -957,7 +967,7 @@ exports.publish = function (taffyData, opts, tutorials) {
957967
}
958968
function delBaseType(name) {
959969
const linkNames = getDeledLinkName(name);
960-
return linkNames && !Boolean(baseTypes.find((item) => linkNames === item));
970+
return linkNames && !baseTypes.find((item) => linkNames === item);
961971
}
962972
function setMap(type) {
963973
if (!linkToMap.has(type)) {

‎build/jsdocs/template/static/styles/jaguar.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ a:hover, a:active, a:focus{
223223
.main h4.name span.type-signature {
224224
display: inline-block;
225225
border-radius: 3px;
226-
background-color: gray;
227-
color: #fff;
226+
background-color: #c4bdbd;
227+
color: #605e5e;
228228
font-size: 0.7em;
229229
padding: 2px 4px;
230230
}
@@ -369,9 +369,9 @@ a:hover, a:active, a:focus{
369369
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
370370
}
371371

372-
.main .nameContainer h4 .type-signature.type a {
372+
/* .main .nameContainer h4 .type-signature.type a {
373373
color: #fff;
374-
}
374+
} */
375375

376376
.main pre {
377377
font-size: 11px;

‎build/jsdocs/template/tmpl/layout.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8">
55
<script src="scripts/prettify/prettify.js"></script>
66
<script src="scripts/prettify/lang-css.js"></script>
7+
<script src="scripts/css-vars-ponyfill.min.js"></script>
78
<script src="../../examples/js/utils.js"></script>
89
<script src="../../examples/js/theme/themeConfig.js"></script>
910
<script src="../../examples/js/theme/theme.js"></script>
@@ -15,7 +16,6 @@
1516
<![endif]-->
1617
<script src="scripts/jquery.min.js"></script>
1718
<script src="scripts/adminlte/app.min.js"></script>
18-
<script src="scripts/css-vars-ponyfill.min.js"></script>
1919
<link type="text/css" rel="stylesheet" href="styles/bootstrap.min.css">
2020
<link type="text/css" rel="stylesheet" href="styles/adminlte/AdminLTE.min.css">
2121
<link type="text/css" rel="stylesheet" href="styles/adminlte/skin-blue.min.css">

0 commit comments

Comments
 (0)