Skip to content

Commit 104a887

Browse files
author
chenguanglin
committed
2 parents 2f67f90 + 8b154d9 commit 104a887

File tree

11 files changed

+68
-67
lines changed

11 files changed

+68
-67
lines changed

‎build/jsdocs/leaflet/index.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
88
<th width="33.3%">SuperMap 云 GIS</th><th width="33.3%"></th><th width="33.3%"></th>
99
</tr><tr>
1010
<td><p>API for SuperMap iServer / iEdge / iPortal / Online</p>
11-
[L.supermap.mapService](L.supermap.mapService.html)<br>
12-
[L.supermap.featureService](L.supermap.featureService.html)<br>
13-
[L.supermap.spatialAnalystService](L.supermap.spatialAnalystService.html)<br>
14-
[L.supermap.networkAnalystService](L.supermap.networkAnalystService.html)<br>
15-
[L.supermap.trafficTransferAnalystService](L.supermap.trafficTransferAnalystService.html)<br>
16-
[L.supermap.addressMatchService](L.supermap.addressMatchService.html)</td>
11+
<a href="L.supermap.mapService.html">L.supermap.mapService</a><br>
12+
<a href="L.supermap.featureService.html">L.supermap.featureService</a><br>
13+
<a href="L.supermap.spatialAnalystService.html">L.supermap.spatialAnalystService</a><br>
14+
<a href="L.supermap.networkAnalystService.html">L.supermap.networkAnalystService</a><br>
15+
<a href="L.supermap.trafficTransferAnalystService.html">L.supermap.trafficTransferAnalystService</a><br>
16+
<a href="L.supermap.addressMatchService.html">L.supermap.addressMatchService</a></td>
1717
<td>
1818
<br>
19-
[L.supermap.processingService](L.supermap.processingService.html)<br>
20-
[L.supermap.dataFlowService](L.supermap.dataFlowService.html)<br>
21-
[L.supermap.webmap](L.supermap.webmap.html)<br>
22-
[SuperMap.iPortal](SuperMap.iPortal.html)<br>
23-
[SuperMap.Online](SuperMap.Online.html)<br>
19+
<a href="L.supermap.processingService.html">L.supermap.processingService</a><br>
20+
<a href="L.supermap.dataFlowService.html">L.supermap.dataFlowService</a><br>
21+
<a href="L.supermap.webmap.html">L.supermap.webmap</a><br>
22+
<a href="SuperMap.iPortal.html">SuperMap.iPortal</a><br>
23+
<a href="SuperMap.Online.html">SuperMap.Online</a><br>
2424
......</td>
2525
<td><p> </p></td>
2626
</tr></table>
2727
<table><tr>
2828
<th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%">投影</th>
2929
</tr><tr>
3030
<td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
31-
[L.supermap.tiledVectorLayer](L.supermap.tiledVectorLayer.html)<br>
32-
[L.supermap.graphicLayer](L.supermap.graphicLayer.html)<br>
33-
[L.supermap.dataFlowLayer](L.supermap.dataFlowLayer.html)<br>
34-
[L.supermap.rangeThemeLayer](L.supermap.rangeThemeLayer.html)<br>
35-
[L.supermap.echartsLayer](L.supermap.echartsLayer.html)<br>
36-
[L.supermap.mapVLayer](L.supermap.mapVLayer.html)<br>
31+
<a href="L.supermap.tiledVectorLayer.html">L.supermap.tiledVectorLayer</a><br>
32+
<a href="L.supermap.graphicLayer.html">L.supermap.graphicLayer</a><br>
33+
<a href="L.supermap.dataFlowLayer.html">L.supermap.dataFlowLayer</a><br>
34+
<a href="L.supermap.rangeThemeLayer.html">L.supermap.rangeThemeLayer</a><br>
35+
<a href="L.supermap.echartsLayer.html">L.supermap.echartsLayer</a><br>
36+
<a href="L.supermap.mapVLayer.html">L.supermap.mapVLayer</a><br>
3737
......</td>
3838
<td><p>丰富地图，iSevrer REST MAP、互联网地图、OGC服务</p>
39-
[L.supermap.tiledMapLayer](L.supermap.tiledMapLayer.html)<br>
40-
[L.supermap.imageMapLayer](L.supermap.imageMapLayer.html)<br>
41-
[L.supermap.baiduTileLayer](L.supermap.baiduTileLayer.html)<br>
42-
[L.supermap.tiandituTileLayer](L.supermap.tiandituTileLayer.html)<br>
43-
[L.supermap.wmtsLayer](L.supermap.wmtsLayer.html)<br>
39+
<a href="L.supermap.tiledMapLayer.html">L.supermap.tiledMapLayer</a><br>
40+
<a href="L.supermap.imageMapLayer.html">L.supermap.imageMapLayer</a><br>
41+
<a href="L.supermap.baiduTileLayer.html">L.supermap.baiduTileLayer</a><br>
42+
<a href="L.supermap.tiandituTileLayer.html">L.supermap.tiandituTileLayer</a><br>
43+
<a href="L.supermap.wmtsLayer.html">L.supermap.wmtsLayer</a><br>
4444
......</td>
4545
<td><p>扩展Leaflet投影，更易用</p>
46-
[L.Proj.CRS](L.Proj.CRS.html)<br>
47-
[L.CRS.NonEarthCRS](L.CRS.NonEarthCRS.html)<br>
46+
<a href="L.Proj.CRS.html">L.Proj.CRS</a><br>
47+
<a href="L.CRS.NonEarthCRS.html">L.CRS.NonEarthCRS</a><br>
4848
</tr></table>
4949

5050
## 参考API

‎build/jsdocs/openlayers/index.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,38 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
88
<th width="33.3%">SuperMap 云 GIS</th><th width="33.3%"></th><th width="33.3%"></th>
99
</tr><tr>
1010
<td><p>API for SuperMap iServer / iEdge / iPortal / Online</p>
11-
[ol.supermap.MapService](ol.supermap.MapService.html)<br>
12-
[ol.supermap.FeatureService](ol.supermap.FeatureService.html)<br>
13-
[ol.supermap.SpatialAnalystService](ol.supermap.SpatialAnalystService.html)<br>
14-
[ol.supermap.NetworkAnalystService](ol.supermap.NetworkAnalystService.html)<br>
15-
[ol.supermap.TrafficTransferAnalystService](ol.supermap.TrafficTransferAnalystService.html)<br>
16-
[ol.supermap.AddressMatchService](ol.supermap.AddressMatchService.html)</td>
11+
<a href="ol.supermap.MapService.html">ol.supermap.MapService</a><br>
12+
<a href="ol.supermap.FeatureService.html">ol.supermap.FeatureService</a><br>
13+
<a href="ol.supermap.SpatialAnalystService.html">ol.supermap.SpatialAnalystService</a><br>
14+
<a href="ol.supermap.NetworkAnalystService.html">ol.supermap.NetworkAnalystService</a><br>
15+
<a href="ol.supermap.TrafficTransferAnalystService.html">ol.supermap.TrafficTransferAnalystService</a><br>
16+
<a href="ol.supermap.AddressMatchService.html">ol.supermap.AddressMatchService</a></td>
1717
<td>
1818
<br>
19-
[ol.supermap.ProcessingService](ol.supermap.ProcessingService.html)<br>
20-
[ol.supermap.DataFlowService](ol.supermap.DataFlowService.html)<br>
21-
[ol.supermap.WebMap](ol.supermap.WebMap.html)<br>
22-
[SuperMap.iPortal](SuperMap.iPortal.html)<br>
23-
[SuperMap.Online](SuperMap.Online.html)<br>
19+
<a href="ol.supermap.ProcessingService.html">ol.supermap.ProcessingService</a><br>
20+
<a href="ol.supermap.DataFlowService.html">ol.supermap.DataFlowService</a><br>
21+
<a href="ol.supermap.WebMap.html">ol.supermap.WebMap</a><br>
22+
<a href="SuperMap.iPortal.html">SuperMap.iPortal</a><br>
23+
<a href="SuperMap.Online.html">SuperMap.Online</a><br>
2424
......</td>
2525
<td><p> </p></td>
2626
</tr></table>
2727
<table><tr>
2828
<th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%"></th>
2929
</tr><tr>
3030
<td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
31-
[ol.source.VectorTileSuperMapRest](ol.source.VectorTileSuperMapRest.html)<br>
32-
[ol.source.Graphic](ol.source.Graphic.html)<br>
33-
[ol.source.DataFlow](ol.source.DataFlow.html)<br>
34-
[ol.source.Range](ol.source.Range.html)<br>
35-
[ol.source.Unique](ol.source.Unique.html)<br>
36-
[ol.source.Mapv](ol.source.Mapv.html)<br>
31+
<a href="ol.source.VectorTileSuperMapRest.html">ol.source.VectorTileSuperMapRest</a><br>
32+
<a href="ol.source.Graphic.html">ol.source.Graphic</a><br>
33+
<a href="ol.source.DataFlow.html">ol.source.DataFlow</a><br>
34+
<a href="ol.source.Range.html">ol.source.Range</a><br>
35+
<a href="ol.source.Unique.html">ol.source.Unique</a><br>
36+
<a href="ol.source.Mapv.html">ol.source.Mapv</a><br>
3737
......</td>
3838
<td><p>丰富地图，iSevrer REST MAP、互联网地图</p>
39-
[ol.source.TileSuperMapRest](ol.source.TileSuperMapRest.html)<br>
40-
[ol.source.ImageSuperMapRest](ol.source.ImageSuperMapRest.html)<br>
41-
[ol.source.BaiduMap](ol.source.BaiduMap.html)<br>
42-
[ol.source.Tianditu](ol.source.Tianditu.html)<br>
39+
<a href="ol.source.TileSuperMapRest.html">ol.source.TileSuperMapRest</a><br>
40+
<a href="ol.source.ImageSuperMapRest.html">ol.source.ImageSuperMapRest</a><br>
41+
<a href="ol.source.BaiduMap.html">ol.source.BaiduMap</a><br>
42+
<a href="ol.source.Tianditu.html">ol.source.Tianditu</a><br>
4343
......</td>
4444
<td><p></p>
4545
</tr></table>

‎src/common/commontypes/Util.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ SuperMap.Util.getParameterString = function (params) {
300300
SuperMap.Util.urlAppend = function (url, paramStr) {
301301
var newUrl = url;
302302
if (paramStr) {
303-
if(paramStr.startsWith('?')){
303+
if(paramStr.indexOf('?') === 0){
304304
paramStr = paramStr.substring(1);
305305
}
306306
var parts = (url + " ").split(/[?&]/);
@@ -322,11 +322,11 @@ SuperMap.Util.urlPathAppend = function (url, pathStr) {
322322
if (!pathStr) {
323323
return newUrl;
324324
}
325-
if (pathStr.startsWith('/')) {
325+
if (pathStr.indexOf('/') === 0) {
326326
pathStr = pathStr.substring(1);
327327
}
328328
const parts = url.split('?');
329-
if(!parts[0].endsWith('/')){
329+
if(parts[0].indexOf('/', parts[0].length - 1) < 0){
330330
parts[0] += '/'
331331
}
332332
newUrl = `${parts[0]}${pathStr}${parts.length > 1 ? `?${parts[1]}` : ''}`;

‎src/common/format/Format.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ export class Format {
6363
}
6464
}
6565

66-
SuperMap.Format = Format;
66+
SuperMap.Format = SuperMap.Format || Format;

‎src/mapboxgl/mapping/WebMap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ export class WebMap extends mapboxgl.Evented {
452452
tileMatrixSet[i]['ows:Identifier'] &&
453453
tileMatrixSet[i]['ows:Identifier']['_text'] === mapInfo.tileMatrixSet
454454
) {
455-
if (DEFAULT_WELLKNOWNSCALESET.includes(tileMatrixSet[i]['WellKnownScaleSet']['_text'])) {
455+
if (DEFAULT_WELLKNOWNSCALESET.indexOf(tileMatrixSet[i]['WellKnownScaleSet']['_text']) > -1) {
456456
isMatched = true;
457457
} else if (
458458
tileMatrixSet[i]['WellKnownScaleSet'] &&

‎src/openlayers/core/StyleUtils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ export class StyleUtils {
953953
index === 3 ? rgb += color : rgb += color + ',';
954954
});
955955
}
956+
rgb += ")"
956957
return rgb;
957958
}
958959

‎src/openlayers/mapping/BaiduMap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class BaiduMap extends TileImage {
5353
var tempUrl = url.replace("{z}", tileCoord[0].toString())
5454
.replace("{x}", tileCoord[1].toString())
5555
.replace("{y}", function () {
56-
var y = ['4', '5'].includes(Util.getOlVersion()) ? tileCoord[2] : - tileCoord[2] - 1;
56+
var y = ['4', '5'].indexOf(Util.getOlVersion()) > -1 ? tileCoord[2] : - tileCoord[2] - 1;
5757
return y.toString();
5858
})
5959
.replace("{-y}", function () {

‎src/openlayers/mapping/TileSuperMapRest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export class TileSuperMapRest extends TileImage {
219219
me.origin = me.tileGrid.getOrigin(0);
220220
var z = tileCoord[0];
221221
var x = tileCoord[1];
222-
var y = ['4', '5'].includes(Util.getOlVersion()) ? - tileCoord[2] - 1 : tileCoord[2];
222+
var y = ['4', '5'].indexOf(Util.getOlVersion()) > -1 ? - tileCoord[2] - 1 : tileCoord[2];
223223
var resolution = me.tileGrid.getResolution(z);
224224
var dpi = 96;
225225
var unit = projection.getUnits() || Unit.DEGREE;

‎src/openlayers/mapping/WebMap.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ export class WebMap extends Observable {
428428
zoom: 0,
429429
projection: proj
430430
}
431-
if(!['4', '5'].includes(Util.getOlVersion())) { // 兼容 ol 4，5，6
431+
if(['4', '5'].indexOf(Util.getOlVersion()) < 0) { // 兼容 ol 4，5，6
432432
viewOptions.multiWorld = true;
433433
}
434434
let view = new View(viewOptions);
@@ -645,7 +645,7 @@ export class WebMap extends Observable {
645645
if((baseLayer.visibleScales && baseLayer.visibleScales.length > 0) || (baseLayer.scales && baseLayer.scales.length >0)) {
646646
//底图有固定比例尺，就直接获取。不用view计算
647647
this.getScales(baseLayer);
648-
} else if(options.baseLayer && ['TILE', 'VECTOR_TILE'].includes(options.baseLayer.layerType) && extent && extent.length === 4){
648+
} else if(options.baseLayer && ['TILE', 'VECTOR_TILE'].indexOf(options.baseLayer.layerType) > -1 && extent && extent.length === 4){
649649
let width = extent[2] - extent[0];
650650
let height = extent[3] - extent[1];
651651
let maxResolution1 = width / 512;
@@ -673,7 +673,7 @@ export class WebMap extends Observable {
673673
this.getScales(baseLayer);
674674
}
675675
}
676-
if(!['4', '5'].includes(Util.getOlVersion())){ // 兼容 ol 4，5，6
676+
if(['4', '5'].indexOf(Util.getOlVersion()) < 0){ // 兼容 ol 4，5，6
677677
viewOptions.multiWorld = true;
678678
viewOptions.showFullExtent = true;
679679
viewOptions.enableRotation = false;
@@ -1272,7 +1272,7 @@ export class WebMap extends Observable {
12721272
}
12731273
//bug wmts出图需要加上origin，否则会出现出图不正确的情况。偏移或者瓦片出不了
12741274
let origin = tileMatrixSet[i].TileMatrix[0].TopLeftCorner;
1275-
layerInfo.origin = ["EPSG:4326", "EPSG:4490"].includes(wmtsLayerEpsg) ? [origin[1], origin[0]] : origin;
1275+
layerInfo.origin = ["EPSG:4326", "EPSG:4490"].indexOf(wmtsLayerEpsg) > -1 ? [origin[1], origin[0]] : origin;
12761276
break;
12771277
}
12781278
}
@@ -1961,7 +1961,7 @@ export class WebMap extends Observable {
19611961
let field = colTitles[j];
19621962
if (field === undefined || field === null) {continue;}
19631963
field = field.trim();
1964-
if(Object.keys(attributes).includes(field)) {
1964+
if(Object.keys(attributes).indexOf(field) > -1) {
19651965
//说明前面有个一模一样的字段
19661966
const newField = field + '_1';
19671967
attributes[newField] = rowDatas[j];
@@ -2402,10 +2402,10 @@ export class WebMap extends Observable {
24022402
lineDash: 'solid',
24032403
type: "BASIC_POINT"
24042404
};
2405-
if(["LINE", "LINESTRING", "MULTILINESTRING"].includes(featureType)){
2405+
if(["LINE", "LINESTRING", "MULTILINESTRING"].indexOf(featureType) > -1){
24062406
styleParameters.strokeColor = '#4CC8A3';
24072407
styleParameters.strokeWidth = 2;
2408-
}else if(["REGION", "POLYGON", "MULTIPOLYGON"].includes(featureType)){
2408+
}else if(["REGION", "POLYGON", "MULTIPOLYGON"].indexOf(featureType) > -1){
24092409
styleParameters.fillColor = '#826DBA';
24102410
}
24112411
return styleParameters;

‎src/openlayers/overlay/VectorTileSuperMapRest.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class VectorTileSuperMapRest extends VectorTile {
4848
options.attributions =
4949
options.attributions ||
5050
"Tile Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>";
51-
if (!['4', '5'].includes(Util.getOlVersion())) {
51+
if (['4', '5'].indexOf(Util.getOlVersion()) < 0) {
5252
options.tileSize = options.format instanceof MVT && options.style ? 512 : 256;
5353
}
5454
super({
@@ -73,7 +73,7 @@ export class VectorTileSuperMapRest extends VectorTile {
7373
urls: options.urls,
7474
wrapX: options.wrapX !== undefined ? options.wrapX : false,
7575
tileSize: options.tileSize || null,
76-
zDirection: ['4', '5'].includes(Util.getOlVersion()) ? null : 0
76+
zDirection: ['4', '5'].indexOf(Util.getOlVersion()) > -1 ? null : 0
7777
});
7878
var me = this;
7979
me.withCredentials = options.withCredentials;
@@ -102,7 +102,7 @@ export class VectorTileSuperMapRest extends VectorTile {
102102
var params = '';
103103
var z = tileCoord[0];
104104
var x = tileCoord[1];
105-
var y = ['4', '5'].includes(Util.getOlVersion()) ? -tileCoord[2] - 1 : tileCoord[2];
105+
var y = ['4', '5'].indexOf(Util.getOlVersion()) > -1 ? -tileCoord[2] - 1 : tileCoord[2];
106106
if (me.tileType === 'ZXY') {
107107
params = '&width=' + tileSize[0] + '&height=' + tileSize[1] + '&x=' + x + '&y=' + y + '&z=' + z;
108108
} else if (me.tileType === 'ViewBounds') {
@@ -161,7 +161,7 @@ export class VectorTileSuperMapRest extends VectorTile {
161161
.replace(zRegEx, tileCoord[0].toString())
162162
.replace(xRegEx, tileCoord[1].toString())
163163
.replace(yRegEx, function () {
164-
var y = ['4', '5'].includes(Util.getOlVersion()) ? -tileCoord[2] - 1 : tileCoord[2];
164+
var y = ['4', '5'].indexOf(Util.getOlVersion()) > -1 ? -tileCoord[2] - 1 : tileCoord[2];
165165
return y.toString();
166166
})
167167
.replace(dashYRegEx, function () {
@@ -232,7 +232,7 @@ export class VectorTileSuperMapRest extends VectorTile {
232232
units: 'tile-pixels'
233233
});
234234

235-
if (['4', '5'].includes(Util.getOlVersion())) {
235+
if (['4', '5'].indexOf(Util.getOlVersion()) > -1) {
236236
tile.setExtent([0, 0, width, height]);
237237
tile.setProjection(dataProjection);
238238
features = tile.getFormat().readFeatures(Util.toGeoJSON(features));
@@ -285,7 +285,7 @@ export class VectorTileSuperMapRest extends VectorTile {
285285
source = xhr.response;
286286
}
287287
if (source) {
288-
if (['4', '5'].includes(Util.getOlVersion())) {
288+
if (['4', '5'].indexOf(Util.getOlVersion()) > -1) {
289289
success.call(
290290
this,
291291
format.readFeatures(source, { featureProjection: projection }),

‎src/openlayers/overlay/theme/Theme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ export class Theme extends ImageCanvasSource {
9393
canvas.height = mapHeight;
9494
canvas.style.width = mapWidth + "px";
9595
canvas.style.height = mapHeight + "px";
96-
this.context.drawImage(this.themeCanvas, 0, 0, mapWidth, mapHeight, 0, 0, mapWidth, mapHeight);
97-
this.context.drawImage(copyHighLightContext.canvas, 0, 0, mapWidth, mapHeight, 0, 0, mapWidth, mapHeight);
96+
this.context.drawImage(this.themeCanvas, 0, 0);
97+
this.context.drawImage(copyHighLightContext.canvas, 0, 0);
9898
return this.context.canvas;
9999
}
100100

0 commit comments

Comments
 (0)