Skip to content

Commit 72ef785

Browse files
songyumengsongyumeng
committed
【fix】test
1 parent 6c450ce commit 72ef785

File tree

10 files changed

+59
-64
lines changed

10 files changed

+59
-64
lines changed

‎src/openlayers/mapping/ImageSuperMapRest.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export class ImageSuperMapRest extends TileImage {
124124
if (options.rasterfunction) {
125125
params['rasterfunction'] = JSON.stringify(options.rasterfunction);
126126
}
127-
layerUrl = CommonUtil.urlAppend(layerUrl, CommonUtil.getParameterString(params));
127+
layerUrl = CommonUtil.urlAppend(encodeURI(layerUrl), CommonUtil.getParameterString(params));
128128
super({
129129
attributions: options.attributions,
130130
cacheSize: options.cacheSize,
@@ -190,27 +190,28 @@ export class ImageSuperMapRest extends TileImage {
190190
}
191191
var tileExtent = this.tileGrid.getTileCoordExtent(tileCoord, this.tmpExtent_);
192192
var tileSize = olSize.toSize(this.tileGrid.getTileSize(tileCoord[0]), this.tmpSize);
193-
var url = encodeURI(
194-
layerUrl +
195-
'&width=' +
196-
tileSize[0] +
197-
'&height=' +
198-
tileSize[1] +
199-
'&viewBounds=' +
200-
'{"leftBottom" : {"x":' +
201-
tileExtent[0] +
202-
',"y":' +
203-
tileExtent[1] +
204-
'},"rightTop" : {"x":' +
205-
tileExtent[2] +
206-
',"y":' +
207-
tileExtent[3] +
208-
'}}'
209-
);
193+
var url =
194+
layerUrl +
195+
encodeURI(
196+
'&width=' +
197+
tileSize[0] +
198+
'&height=' +
199+
tileSize[1] +
200+
'&viewBounds=' +
201+
'{"leftBottom" : {"x":' +
202+
tileExtent[0] +
203+
',"y":' +
204+
tileExtent[1] +
205+
'},"rightTop" : {"x":' +
206+
tileExtent[2] +
207+
',"y":' +
208+
tileExtent[3] +
209+
'}}'
210+
);
210211

211212
//支持代理
212213
if (me.tileProxy) {
213-
url = me.tileProxy + encodeURIComponent(url);
214+
url = me.tileProxy + encodeURIComponent(url);
214215
}
215216
//不启用缓存时启用时间戳
216217
if (!me.cacheEnabled) {

‎src/openlayers/services/LayerInfoService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class LayerInfoService extends ServiceBase {
7272
if (!resourceID || !tempLayerName) {
7373
return;
7474
}
75-
var url = CommonUtil.urlPathAppend(url, "tempLayersSet/" + resourceID + "/" + tempLayerName);
75+
var url = CommonUtil.urlPathAppend(me.url, "tempLayersSet/" + resourceID + "/" + tempLayerName);
7676
var setLayerInfoService = new SetLayerInfoService(url, {
7777
proxy: me.options.proxy,
7878
withCredentials: me.options.withCredentials,

‎test/leaflet/services/GridCellInfosServiceSpec.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ describe('leaflet_GridCellInfosService', () => {
3030
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3131
expect(method).toBe("GET");
3232
expect(options).not.toBeNull();
33+
if (testUrl.indexOf("imageValue") > 0) {
34+
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
35+
}
3336
if (testUrl.indexOf("WorldEarth") > 0) {
3437
return Promise.resolve(new Response(getDatasetInfoEcapedJson));
35-
} else {
36-
if (testUrl.indexOf("imageValue") > 0) {
37-
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
38-
}
3938
}
4039
return null;
4140
});

‎test/mapboxgl/services/GridCellInfosServiceSpec.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ describe('mapboxgl_GridCellInfosService', () => {
2828
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
2929
expect(method).toBe("GET");
3030
expect(options).not.toBeNull();
31+
if (testUrl.indexOf("imageValue") > 0) {
32+
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
33+
}
3134
if (testUrl.indexOf("WorldEarth") > 0) {
3235
return Promise.resolve(new Response(getDatasetInfoEcapedJson));
33-
} else {
34-
if (testUrl.indexOf("imageValue") > 0) {
35-
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
36-
}
37-
};
36+
}
3837
return null;
3938
});
4039

‎test/mapboxgl/services/LayerInfoServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ describe('mapboxgl_LayerInfoService', () => {
190190
});
191191
var service = new LayerInfoService(url);
192192
spyOn(FetchRequest, 'put').and.callFake((testUrl) => {
193-
expect(testUrl).toContain("continent_T@World.1@@World.json");
193+
expect(testUrl).toContain("continent_T@World.1@@World");
194194
expect(options).not.toBeNull();
195195
return Promise.resolve(new Response(`{"succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World Map/tempLayersSet/c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d/continent_T@World.1@@World"}`));
196196
});

‎test/openlayers/core/StyleUtilsSpec.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('openlayers_StyleUtils', () => {
2828

2929
//测试从图层信息中获取style
3030
it('getValidStyleFromLayerInfo_point', (done) => {
31-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=420&y=195&width=256&height=256&scale=8.653637486605572e-7";
31+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=420&y=195&width=256&height=256&scale=8.653637486605572e-7";
3232
var request = requestFeature(tileFeatureUrl);
3333
request.then((features) => {
3434
try {
@@ -56,7 +56,7 @@ describe('openlayers_StyleUtils', () => {
5656

5757
//测试从图层信息中获取style
5858
it('getValidStyleFromLayerInfo_polyLine', (done) => {
59-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=420&y=193&width=256&height=256&scale=8.653637486605572e-7";
59+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=420&y=193&width=256&height=256&scale=8.653637486605572e-7";
6060
var request = requestFeature(tileFeatureUrl);
6161
request.then((features) => {
6262
try {
@@ -85,7 +85,7 @@ describe('openlayers_StyleUtils', () => {
8585

8686
//测试从图层信息中获取style
8787
it('getValidStyleFromLayerInfo_polygon', (done) => {
88-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=1686&y=775&width=256&height=256&scale=0.00000346145499464224";
88+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=1686&y=775&width=256&height=256&scale=0.00000346145499464224";
8989
var request = requestFeature(tileFeatureUrl);
9090
request.then((features) => {
9191
try {
@@ -118,7 +118,7 @@ describe('openlayers_StyleUtils', () => {
118118

119119
//测试从图层信息中获取style
120120
it('getValidStyleFromLayerInfo_text1', (done) => {
121-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=1689&y=775&width=256&height=256&scale=0.00000346145499464224";
121+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=1689&y=775&width=256&height=256&scale=0.00000346145499464224";
122122
var request = requestFeature(tileFeatureUrl);
123123
request.then((features) => {
124124
try {
@@ -147,7 +147,7 @@ describe('openlayers_StyleUtils', () => {
147147

148148
//测试从图层信息中获取style
149149
it('getValidStyleFromLayerInfo_text2', (done) => {
150-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=28&y=13&width=256&height=256&scale=5.408523429128511e-8";
150+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=28&y=13&width=256&height=256&scale=5.408523429128511e-8";
151151
var request = requestFeature(tileFeatureUrl);
152152
request.then((features) => {
153153
try {
@@ -176,7 +176,7 @@ describe('openlayers_StyleUtils', () => {
176176

177177
//测试从CartoCSS中获取style
178178
it('getStyleFromCarto_point1', (done) => {
179-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=420&y=195&width=256&height=256&scale=8.653637486605572e-7";
179+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=420&y=195&width=256&height=256&scale=8.653637486605572e-7";
180180
var request = requestFeature(tileFeatureUrl);
181181
request.then((features) => {
182182
try {
@@ -204,7 +204,7 @@ describe('openlayers_StyleUtils', () => {
204204

205205
//测试从CartoCSS中获取style
206206
it('getStyleFromCarto_point2', (done) => {
207-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=1687&y=774&width=256&height=256&scale=0.00000346145499464224";
207+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=1687&y=774&width=256&height=256&scale=0.00000346145499464224";
208208
var request = requestFeature(tileFeatureUrl);
209209
request.then((features) => {
210210
try {
@@ -232,7 +232,7 @@ describe('openlayers_StyleUtils', () => {
232232

233233
//测试从CartoCSS中获取style
234234
it('getStyleFromCarto_polyLine', (done) => {
235-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=420&y=193&width=256&height=256&scale=8.653637486605572e-7";
235+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=420&y=193&width=256&height=256&scale=8.653637486605572e-7";
236236
var request = requestFeature(tileFeatureUrl);
237237
request.then((features) => {
238238
try {
@@ -261,7 +261,7 @@ describe('openlayers_StyleUtils', () => {
261261

262262
//测试从CartoCSS中获取style
263263
it('getStyleFromCarto_polygon', (done) => {
264-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=1686&y=775&width=256&height=256&scale=0.00000346145499464224";
264+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=1686&y=775&width=256&height=256&scale=0.00000346145499464224";
265265
var request = requestFeature(tileFeatureUrl);
266266
request.then((features) => {
267267
try {
@@ -291,7 +291,7 @@ describe('openlayers_StyleUtils', () => {
291291

292292
//测试从CartoCSS中获取style
293293
it('getStyleFromCarto_text', (done) => {
294-
var tileFeatureUrl = mapUrl + "/tileFeature?returnAttributes=true&x=1689&y=775&width=256&height=256&scale=0.00000346145499464224";
294+
var tileFeatureUrl = mapUrl + "/tileFeature.json?returnAttributes=true&x=1689&y=775&width=256&height=256&scale=0.00000346145499464224";
295295
var request = requestFeature(tileFeatureUrl);
296296
request.then((features) => {
297297
try {
@@ -512,7 +512,4 @@ var requestFeature = (url) => {
512512
features = tileFormat.readFeatures(Util.toGeoJSON(features));
513513
return features;
514514
});
515-
}
516-
517-
518-
515+
}

‎test/openlayers/mapping/ImageSuperMapRestSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe('openlayers_ImageSuperMapRest', () => {
8181
var tileUrl = imageTileSource.tileUrlFunction(coords, pixelRatio, tempOptions);
8282
expect(tileUrl).toBe(
8383
GlobeParameter.mapServiceURL +
84-
'%E4%B8%96%E7%95%8C%E5%9C%B0%E5%9B%BE_Day/image.png?&transparent=true&cacheEnabled=true&redirect=false&width=256&height=256&viewBounds=%7B%22leftBottom%22%20:%20%7B%22x%22:NaN,%22y%22:NaN%7D,%22rightTop%22%20:%20%7B%22x%22:NaN,%22y%22:NaN%7D%7D'
84+
'%E4%B8%96%E7%95%8C%E5%9C%B0%E5%9B%BE_Day/image.png?transparent=true&cacheEnabled=true&redirect=false&width=256&height=256&viewBounds=%7B%22leftBottom%22%20:%20%7B%22x%22:NaN,%22y%22:NaN%7D,%22rightTop%22%20:%20%7B%22x%22:NaN,%22y%22:NaN%7D%7D'
8585
);
8686
expect(imageTileSource.getTileGrid().getTileSize()).toEqual(256);
8787
});

‎test/openlayers/mapping/WebMapSpec.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('openlayers_WebMap', () => {
2525
var server = "http://127.0.0.1:8090/iportal/";
2626
var defaultServer = "https://www.supermapol.com/";
2727
var defaultServeRequest = 'https://www.supermapol.com/web/maps/1788054202/map';
28-
var proxy = `${server}apps/viewer/getUrlResource?url=`;
28+
var proxy = `${server}apps/viewer/getUrlResource.json?url=`;
2929
var id = 1788054202;
3030
beforeEach(() => {
3131
testDiv = window.document.createElement("div");
@@ -296,7 +296,7 @@ describe('openlayers_WebMap', () => {
296296
successCallback: function () {},
297297
errorCallback: function () {}
298298
};
299-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content?pageSize=9999999&currentPage=1`)}`;
299+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content.json?pageSize=9999999&currentPage=1`)}`;
300300
spyOn(FetchRequest, 'get').and.callFake((url) => {
301301
if (url.indexOf('map.json') > -1) {
302302
var mapJson = datavizWebMap_Theme_base;
@@ -333,7 +333,7 @@ describe('openlayers_WebMap', () => {
333333
successCallback: function () {},
334334
errorCallback: function () {}
335335
};
336-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/374284777/content?pageSize=9999999&currentPage=1`)}`;
336+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/374284777/content.json?pageSize=9999999&currentPage=1`)}`;
337337
spyOn(FetchRequest, 'get').and.callFake((url) => {
338338
if (url.indexOf('map.json') > -1) {
339339
var mapJson = datavizWebMap_Theme_base_Line;
@@ -370,7 +370,7 @@ describe('openlayers_WebMap', () => {
370370
successCallback: function () {},
371371
errorCallback: function () {}
372372
};
373-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content?pageSize=9999999&currentPage=1`)}`;
373+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content.json?pageSize=9999999&currentPage=1`)}`;
374374
spyOn(FetchRequest, 'get').and.callFake((url) => {
375375
if (url.indexOf('map.json') > -1) {
376376
var mapJson = datavizWebMap_Image;
@@ -403,7 +403,7 @@ describe('openlayers_WebMap', () => {
403403
successCallback: function () {},
404404
errorCallback: function () {}
405405
};
406-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/1782454383/content?pageSize=9999999&currentPage=1`)}`;
406+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/1782454383/content.json?pageSize=9999999&currentPage=1`)}`;
407407
spyOn(FetchRequest, 'get').and.callFake((url) => {
408408
if (url.indexOf('map.json') > -1) {
409409
var mapJson = datavizWebMap_SVG;
@@ -438,7 +438,7 @@ describe('openlayers_WebMap', () => {
438438
successCallback: function () {},
439439
errorCallback: function () {}
440440
};
441-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/658963918/content?pageSize=9999999&currentPage=1`)}`;
441+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/658963918/content.json?pageSize=9999999&currentPage=1`)}`;
442442
spyOn(FetchRequest, 'get').and.callFake((url) => {
443443
if (url.indexOf('map.json') > -1) {
444444
var mapJson = datavizWebMap_Unique;
@@ -476,7 +476,7 @@ describe('openlayers_WebMap', () => {
476476
successCallback: function () {},
477477
errorCallback: function () {}
478478
};
479-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/1236941499/content?pageSize=9999999&currentPage=1`)}`;
479+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/1236941499/content.json?pageSize=9999999&currentPage=1`)}`;
480480
spyOn(FetchRequest, 'get').and.callFake((url) => {
481481
if (url.indexOf('map.json') > -1) {
482482
var mapJson = datavizWebMap_Range;
@@ -514,7 +514,7 @@ describe('openlayers_WebMap', () => {
514514
successCallback: function () {},
515515
errorCallback: function () {}
516516
};
517-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content?pageSize=9999999&currentPage=1`)}`;
517+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/675746998/content.json?pageSize=9999999&currentPage=1`)}`;
518518
spyOn(FetchRequest, 'get').and.callFake((url) => {
519519
if (url.indexOf('map.json') > -1) {
520520
var mapJson = datavizWebMap_Heat;
@@ -547,7 +547,7 @@ describe('openlayers_WebMap', () => {
547547
successCallback: function () {},
548548
errorCallback: function () {}
549549
};
550-
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/579431262/content?pageSize=9999999&currentPage=1`)}`;
550+
let requestUrl = `${proxy}${encodeURIComponent(`${server}web/datas/579431262/content.json?pageSize=9999999&currentPage=1`)}`;
551551
spyOn(FetchRequest, 'get').and.callFake((url) => {
552552
if (url.indexOf('map.json') > -1) {
553553
var mapJson = datavizWebMap_Marker;
@@ -875,7 +875,7 @@ describe('openlayers_WebMap', () => {
875875

876876
it('getWmtsInfo', (done) => {
877877
spyOn(FetchRequest, 'get').and.callFake((url) => {
878-
let requestUrl = `https://www.supermapol.com/apps/viewer/getUrlResource?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`;
878+
let requestUrl = `https://www.supermapol.com/apps/viewer/getUrlResource.json?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`;
879879
if (url === requestUrl) {
880880
var mapJson = datavizWebMap_WMTS;
881881
return Promise.resolve(new Response(mapJson));
@@ -901,7 +901,7 @@ describe('openlayers_WebMap', () => {
901901

902902
it('isValidResponse', (done) => {
903903
spyOn(FetchRequest, 'get').and.callFake((url) => {
904-
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
904+
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource.json?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
905905
var mapJson = datavizWebMap_WMTS;
906906
return Promise.resolve(new Response(mapJson));
907907
}
@@ -916,7 +916,7 @@ describe('openlayers_WebMap', () => {
916916

917917
it('getReslutionsFromScales', (done) => {
918918
spyOn(FetchRequest, 'get').and.callFake((url) => {
919-
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
919+
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource.json?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
920920
var mapJson = datavizWebMap_WMTS;
921921
return Promise.resolve(new Response(mapJson));
922922
}
@@ -935,7 +935,7 @@ describe('openlayers_WebMap', () => {
935935

936936
it('getRangeStyleGroup', (done) => {
937937
spyOn(FetchRequest, 'get').and.callFake((url) => {
938-
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
938+
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource.json?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
939939
var mapJson = datavizWebMap_WMTS;
940940
return Promise.resolve(new Response(mapJson));
941941
}
@@ -960,7 +960,7 @@ describe('openlayers_WebMap', () => {
960960

961961
it('getRangeStyleGroup1', (done) => {
962962
spyOn(FetchRequest, 'get').and.callFake((url) => {
963-
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
963+
if (url === `https://www.supermapol.com/apps/viewer/getUrlResource.json?url=${encodeURIComponent(`${defaultServeRequest}.json`)}`) {
964964
var mapJson = datavizWebMap_WMTS;
965965
return Promise.resolve(new Response(mapJson));
966966
}

‎test/openlayers/services/GridCellInfosServiceSpec.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ describe('openlayers_GridCellInfosService', () => {
2828
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
2929
expect(method).toBe("GET");
3030
expect(options).not.toBeNull();
31+
if (testUrl.indexOf("imageValue") > 0) {
32+
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
33+
}
3134
if (testUrl.indexOf("WorldEarth") > 0) {
3235
return Promise.resolve(new Response(getDatasetInfoEcapedJson));
33-
} else {
34-
if (testUrl.indexOf("imageValue") > 0) {
35-
return Promise.resolve(new Response(getGridCellInfosEcapedJson));
36-
}
3736
}
3837
return null;
3938
});

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy