Commit ba826b7

committed

fix getMapBoxStyle请求携带withCredentials参数 review by xiongjj

1 parent 35f5104 commit ba826b7Copy full SHA for ba826b7

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,11 @@ export class WebMapService {`
`199`	`199`
`200`	`200`	`getMapBoxStyle(styleURL, withoutFormatSuffix = false) {`
`201`	`201`	`return new Promise((resolve, reject) => {`
`202`		`- FetchRequest.get(styleURL, {}, { withoutFormatSuffix })`
	`202`	`+ const proxy = this.handleProxy();`
	`203`	`+ FetchRequest.get(styleURL, {}, {`
	`204`	`+ withoutFormatSuffix,`
	`205`	`+ withCredentials: this.handleWithCredentials(proxy, styleURL, this.withCredentials)`
	`206`	`+ })`
`203`	`207`	`.then(response => {`
`204`	`208`	`return response.json();`
`205`	`209`	`})`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -350,14 +350,15 @@ describe('mapboxgl_WebMapV2', () => {`
`350`	`350`	`});`
`351`	`351`
`352`	`352`	`it('test baseLayer layers count maploaded', (done) => {`
`353`		`- spyOn(FetchRequest, 'get').and.callFake((url) => {`
	`353`	`+ spyOn(FetchRequest, 'get').and.callFake((url,params,options) => {`
`354`	`354`	`if (url.indexOf('portal.json') > -1) {`
`355`	`355`	`return Promise.resolve(new Response(JSON.stringify(iportal_serviceProxy)));`
`356`	`356`	`}`
`357`	`357`	`if (url.indexOf('map.json') > -1) {`
`358`	`358`	`return Promise.resolve(new Response(JSON.stringify(webmap_MAPBOXSTYLE_Tile)));`
`359`	`359`	`}`
`360`	`360`	`if (url.indexOf('maps/China_4326/style.json') > -1) {`
	`361`	`+ expect(options.withCredentials).not.toBeUndefined();`
`361`	`362`	`return Promise.resolve(new Response(styleJson));`
`362`	`363`	`}`
`363`	`364`	`if (url.indexOf('%E4%BA%AC%E6%B4%A5%E5%9C%B0%E5%8C%BA%E5%9C%B0%E5%9B%BE.json') > -1) {`

Comments

(0)