Skip to content

Commit 0e959f5

Browse files
songyumengsongyumeng
committed
修改 ol.source.TileSuperMapRest ol.source.ImageSuperMapRest 通过 key token 授权失败的问题
1 parent d1256d1 commit 0e959f5

File tree

11 files changed

+516
-117
lines changed

11 files changed

+516
-117
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@
8080
### for Leaflet
8181

8282
- 修复客户端专题图无法加载 `L.Polygon` 的问题
83-
- 修改 `L.superMap.imageMapLayer` 的出图方式为整张image出图
83+
- 修改 `L.supermap.imageMapLayer` 的出图方式为整张image出图
8484
- 修改矢量瓦片字体默认粗体的问题
85+
- 修改 `L.supermap.imageMapLayer` `L.supermap.tiledMapLayer` 通过 `key` `token` 授权失败的问题
8586

8687
### for OpenLayers
8788

8889
- 修复 `ol.source.DataFlow` 修改传入父类参数无效的问题
8990
- 修复 `ol.source.DataFlow` 的 `dataUpdated` 事件返回参数为空的问题
9091
- 修复 `ol.source.Graphic` 在高分辨率屏下显示错位的问题
92+
- 修改 `ol.source.TileSuperMapRest` `ol.source.ImageSuperMapRest` 通过 `key` `token` 授权失败的问题
9193

9294
### for MapboxGL
9395

‎dist/iclient9-openlayers.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.js‎

Lines changed: 485 additions & 84 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/common/iServer/MapService.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ export class MapService extends CommonServiceBase {
3838
}
3939
var me = this;
4040

41-
me.url += ".json";
42-
4341
if (me.projection) {
4442
var arr = me.projection.split(":");
4543
if (arr instanceof Array) {

‎src/common/overlay/feature/ShapeFactory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {Util} from '../../commontypes/Util';
4242
*
4343
*
4444
* 用于符号专题图：
45-
* 圆形 - 参数对象：<Supermap.Feature.ShapeParameters.Cilcle>
45+
* 圆形 - 参数对象：<SuperMap.Feature.ShapeParameters.Cilcle>
4646
*/
4747
export class ShapeFactory {
4848

‎src/mapboxgl/services/GridCellInfosService.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {GetGridCellInfosService} from '@supermap/iclient-common';
99
* @classdesc 数据栅格查询服务
1010
* @extends mapboxgl.supermap.ServiceBase
1111
* @example
12-
* new mapboxgl.superMap.GridCellInfosService(url)
12+
* new mapboxgl.supermap.GridCellInfosService(url)
1313
* .getGridCellInfos(param,function(result){
1414
* //doSomething
1515
* })

‎src/openlayers/mapping/ImageSuperMapRest.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class ImageSuperMapRest extends ol.source.TileImage {
4242
var layerUrl = options.url + "/image.png?";
4343
options.serverType = options.serverType || ServerType.ISERVER;
4444
//为url添加安全认证信息片段
45-
layerUrl = appendCredential(layerUrl, options.serverType);
45+
layerUrl = appendCredential(options.url,layerUrl, options.serverType);
4646

4747
/*
4848
* @function ol.source.ImageSuperMapRest.prototype.appendCredential
@@ -51,24 +51,24 @@ export class ImageSuperMapRest extends ol.source.TileImage {
5151
* @param serverType - {Object} 服务类型
5252
* @return {string} 添加生成后的新地址
5353
*/
54-
function appendCredential(url, serverType) {
54+
function appendCredential(id,url, serverType) {
5555
var newUrl = url, credential, value;
5656
switch (serverType) {
5757
case ServerType.IPORTAL:
58-
value = SecurityManager.getToken(url);
58+
value = SecurityManager.getToken(id);
5959
credential = value ? new Credential(value, "token") : null;
6060
if (!credential) {
61-
value = SecurityManager.getKey(url);
61+
value = SecurityManager.getKey(id);
6262
credential = value ? new Credential(value, "key") : null;
6363
}
6464
break;
6565
case ServerType.ONLINE:
66-
value = SecurityManager.getKey(url);
66+
value = SecurityManager.getKey(id);
6767
credential = value ? new Credential(value, "key") : null;
6868
break;
6969
default:
7070
//iserver or others
71-
value = SecurityManager.getToken(url);
71+
value = SecurityManager.getToken(id);
7272
credential = value ? new Credential(value, "token") : null;
7373
break;
7474
}

‎src/openlayers/mapping/TileSuperMapRest.js‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
CommonUtil,
88
ServerGeometry
99
} from '@supermap/iclient-common';
10-
import {Util} from '../core/Util';
10+
import { Util } from '../core/Util';
1111

1212
/**
1313
* @class ol.source.TileSuperMapRest
@@ -72,25 +72,25 @@ export class TileSuperMapRest extends ol.source.TileImage {
7272
//当前切片在切片集中的index
7373
this.tileSetsIndex = -1;
7474
this.tempIndex = -1;
75-
75+
var me = this;
7676
function appendCredential(url, serverType) {
7777
var newUrl = url, credential, value;
7878
switch (serverType) {
7979
case ServerType.IPORTAL:
80-
value = SecurityManager.getToken(url);
80+
value = SecurityManager.getToken(me._url);
8181
credential = value ? new Credential(value, "token") : null;
8282
if (!credential) {
83-
value = SecurityManager.getKey(url);
83+
value = SecurityManager.getKey(me._url);
8484
credential = value ? new Credential(value, "key") : null;
8585
}
8686
break;
8787
case ServerType.ONLINE:
88-
value = SecurityManager.getKey(url);
88+
value = SecurityManager.getKey(me._url);
8989
credential = value ? new Credential(value, "key") : null;
9090
break;
9191
default:
9292
//iserver or others
93-
value = SecurityManager.getToken(url);
93+
value = SecurityManager.getToken(me._url);
9494
credential = value ? new Credential(value, "token") : null;
9595
break;
9696
}
@@ -115,7 +115,7 @@ export class TileSuperMapRest extends ol.source.TileImage {
115115

116116
//设置切片原点
117117
if (this.origin) {
118-
params["origin"] = JSON.stringify({x: this.origin[0], y: this.origin[1]});
118+
params["origin"] = JSON.stringify({ x: this.origin[0], y: this.origin[1] });
119119
}
120120

121121
if (options.prjCoordSys) {
@@ -187,8 +187,6 @@ export class TileSuperMapRest extends ol.source.TileImage {
187187
return params.join('&');
188188
}
189189

190-
var me = this;
191-
192190
function tileUrlFunction(tileCoord, pixelRatio, projection) {
193191
if (!me.tileGrid) {
194192
if (me.extent) {
@@ -223,7 +221,7 @@ export class TileSuperMapRest extends ol.source.TileImage {
223221
var scale = Util.resolutionToScale(resolution, dpi, unit);
224222
var tileSize = ol.size.toSize(me.tileGrid.getTileSize(z, me.tmpSize));
225223
var layerUrl = getFullRequestUrl.call(me);
226-
var url = layerUrl +encodeURI( "&x=" + x + "&y=" + y + "&width=" + tileSize[0] + "&height=" + tileSize[1] + "&scale=" + scale);
224+
var url = layerUrl + encodeURI("&x=" + x + "&y=" + y + "&width=" + tileSize[0] + "&height=" + tileSize[1] + "&scale=" + scale);
227225
//支持代理
228226
if (me.tileProxy) {
229227
url = me.tileProxy + encodeURIComponent(url);
@@ -247,7 +245,7 @@ export class TileSuperMapRest extends ol.source.TileImage {
247245
if (!this.tileSets) {
248246
return;
249247
}
250-
this.dispatchEvent({type: 'tilesetsinfoloaded', value: {tileVersions: this.tileSets.tileVersions}});
248+
this.dispatchEvent({ type: 'tilesetsinfoloaded', value: { tileVersions: this.tileSets.tileVersions } });
251249
this.changeTilesVersion();
252250
}
253251

@@ -289,7 +287,7 @@ export class TileSuperMapRest extends ol.source.TileImage {
289287
var result = me.mergeTileVersionParam(name);
290288
if (result) {
291289
me.tileSetsIndex = me.tempIndex;
292-
me.dispatchEvent({type: 'tileversionschanged', value: {tileVersion: tileVersions[me.tempIndex]}});
290+
me.dispatchEvent({ type: 'tileversionschanged', value: { tileVersion: tileVersions[me.tempIndex] } });
293291
}
294292
}
295293
}
@@ -390,12 +388,12 @@ export class TileSuperMapRest extends ol.source.TileImage {
390388
tileSize: tileSize
391389
});
392390
return new ol.tilegrid.TileGrid({
393-
extent: extent,
394-
minZoom: minZoom,
395-
origin: origin,
396-
resolutions: tilegrid.getResolutions(),
397-
tileSize: tilegrid.getTileSize()
398-
}
391+
extent: extent,
392+
minZoom: minZoom,
393+
origin: origin,
394+
resolutions: tilegrid.getResolutions(),
395+
tileSize: tilegrid.getTileSize()
396+
}
399397
);
400398
}
401399
}

0 commit comments

Comments
 (0)