Skip to content

Commit b2fd86e

Browse files
hhyu1hhyu1
committed
2 parents d4a5711 + 5c2cb46 commit b2fd86e

File tree

10 files changed

+257
-24
lines changed

10 files changed

+257
-24
lines changed

‎src/common/iServer/LayerInfoService.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export class LayerInfoService {
5252

5353
/**
5454
* @function LayerInfoService.prototype.getLayersLegendInfo
55+
* @version 11.1.1
5556
* @description 获取地图的图例信息。
5657
* @param {RequestCallback} callback - 回调函数。
5758
*/

‎test/leaflet/services/ConvexHullAnalysisSpec.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import {SpatialAnalystService} from '../../../src/leaflet/services/SpatialAnalystService';
2+
import {ConvexHullAnalystParameters} from '../../../src/common/iServer/ConvexHullAnalystParameters';
3+
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
4+
5+
6+
var url = GlobeParameter.spatialAnalystURL;
7+
var options = {
8+
9+
};
10+
describe('leaflet_SpatialAnalystService_terrainCutFillCalculate', () => {
11+
var serviceResult;
12+
var originalTimeout;
13+
beforeEach(() => {
14+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
15+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
16+
serviceResult = null;
17+
});
18+
afterEach(() => {
19+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
20+
});
21+
22+
// 凸包运算
23+
it('convexHullAnalysis', (done) => {
24+
var terrainCutFillCalculationParameters = new ConvexHullAnalystParameters({
25+
model:{
26+
"type":"GEOMODEL3D",
27+
"modelUrl":"http://supermapiserver:8090/SampleData/AirPlane.s3m",
28+
"position":{"x":120.2, "y":40.2, "z":10}
29+
}
30+
});
31+
var service = new SpatialAnalystService(url, options);
32+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
33+
expect(method).toBe("POST");
34+
expect(testUrl).toBe(url + "/geometry/3d/convexhull?returnContent=true");
35+
return Promise.resolve(new Response(`{
36+
"streamBytes":null,
37+
"volume":0,
38+
"dataContent":null,
39+
"succeed":false,
40+
"position":null,
41+
"message":"can not download file."
42+
}
43+
`));
44+
});
45+
service.convexHullAnalysis(terrainCutFillCalculationParameters, (result) => {
46+
serviceResult = result;
47+
try {
48+
expect(serviceResult).not.toBeNull();
49+
done();
50+
} catch (e) {
51+
console.log("'convexHullAnalysis'案例失败" + e.name + ":" + e.message);
52+
expect(false).toBeTruthy();
53+
done();
54+
}
55+
});
56+
});
57+
});

‎test/mapboxgl/services/ConvexHullAnalysisSpec.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import {SpatialAnalystService} from '../../../src/mapboxgl/services/SpatialAnalystService';
2+
import {ConvexHullAnalystParameters} from '../../../src/common/iServer/ConvexHullAnalystParameters';
3+
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
4+
5+
6+
var url = GlobeParameter.spatialAnalystURL;
7+
var options = {
8+
9+
};
10+
describe('mapboxgl_SpatialAnalystService_terrainCutFillCalculate', () => {
11+
var serviceResult;
12+
var originalTimeout;
13+
beforeEach(() => {
14+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
15+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
16+
serviceResult = null;
17+
});
18+
afterEach(() => {
19+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
20+
});
21+
22+
// 凸包运算
23+
it('convexHullAnalysis', (done) => {
24+
var terrainCutFillCalculationParameters = new ConvexHullAnalystParameters({
25+
model:{
26+
"type":"GEOMODEL3D",
27+
"modelUrl":"http://supermapiserver:8090/SampleData/AirPlane.s3m",
28+
"position":{"x":120.2, "y":40.2, "z":10}
29+
}
30+
});
31+
var service = new SpatialAnalystService(url, options);
32+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
33+
expect(method).toBe("POST");
34+
expect(testUrl).toBe(url + "/geometry/3d/convexhull?returnContent=true");
35+
return Promise.resolve(new Response(`{
36+
"streamBytes":null,
37+
"volume":0,
38+
"dataContent":null,
39+
"succeed":false,
40+
"position":null,
41+
"message":"can not download file."
42+
}
43+
`));
44+
});
45+
service.convexHullAnalysis(terrainCutFillCalculationParameters, (result) => {
46+
serviceResult = result;
47+
try {
48+
expect(serviceResult).not.toBeNull();
49+
done();
50+
} catch (e) {
51+
console.log("'convexHullAnalysis'案例失败" + e.name + ":" + e.message);
52+
expect(false).toBeTruthy();
53+
done();
54+
}
55+
});
56+
});
57+
});

‎test/maplibregl/services/ConvexHullAnalysisSpec.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import {SpatialAnalystService} from '../../../src/maplibregl/services/SpatialAnalystService';
2+
import {ConvexHullAnalystParameters} from '../../../src/common/iServer/ConvexHullAnalystParameters';
3+
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
4+
5+
6+
var url = GlobeParameter.spatialAnalystURL;
7+
var options = {
8+
9+
};
10+
describe('maplibregl_SpatialAnalystService_terrainCutFillCalculate', () => {
11+
var serviceResult;
12+
var originalTimeout;
13+
beforeEach(() => {
14+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
15+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
16+
serviceResult = null;
17+
});
18+
afterEach(() => {
19+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
20+
});
21+
22+
// 凸包运算
23+
it('convexHullAnalysis', (done) => {
24+
var terrainCutFillCalculationParameters = new ConvexHullAnalystParameters({
25+
model:{
26+
"type":"GEOMODEL3D",
27+
"modelUrl":"http://supermapiserver:8090/SampleData/AirPlane.s3m",
28+
"position":{"x":120.2, "y":40.2, "z":10}
29+
}
30+
});
31+
var service = new SpatialAnalystService(url, options);
32+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
33+
expect(method).toBe("POST");
34+
expect(testUrl).toBe(url + "/geometry/3d/convexhull?returnContent=true");
35+
return Promise.resolve(new Response(`{
36+
"streamBytes":null,
37+
"volume":0,
38+
"dataContent":null,
39+
"succeed":false,
40+
"position":null,
41+
"message":"can not download file."
42+
}
43+
`));
44+
});
45+
service.convexHullAnalysis(terrainCutFillCalculationParameters, (result) => {
46+
serviceResult = result;
47+
try {
48+
expect(serviceResult).not.toBeNull();
49+
done();
50+
} catch (e) {
51+
console.log("'convexHullAnalysis'案例失败" + e.name + ":" + e.message);
52+
expect(false).toBeTruthy();
53+
done();
54+
}
55+
});
56+
});
57+
});

‎test/openlayers/services/ConvexHullAnalysisSpec.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import {SpatialAnalystService} from '../../../src/openlayers/services/SpatialAnalystService';
2+
import {ConvexHullAnalystParameters} from '../../../src/common/iServer/ConvexHullAnalystParameters';
3+
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
4+
5+
6+
var url = GlobeParameter.spatialAnalystURL;
7+
var options = {
8+
9+
};
10+
describe('openlayers_SpatialAnalystService_terrainCutFillCalculate', () => {
11+
var serviceResult;
12+
var originalTimeout;
13+
beforeEach(() => {
14+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
15+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
16+
serviceResult = null;
17+
});
18+
afterEach(() => {
19+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
20+
});
21+
22+
// 凸包运算
23+
it('convexHullAnalysis', (done) => {
24+
var terrainCutFillCalculationParameters = new ConvexHullAnalystParameters({
25+
model:{
26+
"type":"GEOMODEL3D",
27+
"modelUrl":"http://supermapiserver:8090/SampleData/AirPlane.s3m",
28+
"position":{"x":120.2, "y":40.2, "z":10}
29+
}
30+
});
31+
var service = new SpatialAnalystService(url, options);
32+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
33+
expect(method).toBe("POST");
34+
expect(testUrl).toBe(url + "/geometry/3d/convexhull?returnContent=true");
35+
return Promise.resolve(new Response(`{
36+
"streamBytes":null,
37+
"volume":0,
38+
"dataContent":null,
39+
"succeed":false,
40+
"position":null,
41+
"message":"can not download file."
42+
}
43+
`));
44+
});
45+
service.convexHullAnalysis(terrainCutFillCalculationParameters, (result) => {
46+
serviceResult = result;
47+
try {
48+
expect(serviceResult).not.toBeNull();
49+
done();
50+
} catch (e) {
51+
console.log("'convexHullAnalysis'案例失败" + e.name + ":" + e.message);
52+
expect(false).toBeTruthy();
53+
done();
54+
}
55+
});
56+
});
57+
});

‎test/openlayers/services/LayerInfoServiceSpec.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -231,30 +231,30 @@ describe('openlayers_LayerInfoService', () => {
231231

232232
// 获取图例
233233
it('getLayersLegend', (done) => {
234-
var layerService = new LayerInfoService(url);
235-
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl) => {
236-
expect(method).toBe("GET");
237-
expect(testUrl).toBe(url+"/legend");
238-
return Promise.resolve(new Response(JSON.stringify(legendInfo)));
239-
});
240-
var getLayersLegendInfoParams = new GetLayersLegendInfoParameters({
241-
bbox: "-180,90,180,90",
242-
width: 18,
243-
height: 18
244-
})
245-
layerService.getLayersLegendInfo(getLayersLegendInfoParams, (serviceResult) => {
246-
try {
247-
expect(serviceResult).not.toBeNull();
248-
expect(serviceResult.type).toEqual("processCompleted");
249-
expect(serviceResult.result.succeed).toEqual(true);
250-
expect(serviceResult.result.layerLegends[0].legends[0].url).not.toBeUndefined();
251-
done();
252-
} catch (e) {
253-
console.log("'getLayersLegend'案例失败" + e.name + ":" + e.message);
254-
service.destroy();
255-
expect(false).toBeTruthy();
256-
done();
257-
}
234+
var layerService = new LayerInfoService(url);
235+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl) => {
236+
expect(method).toBe("GET");
237+
expect(testUrl).toBe(url+"/legend");
238+
return Promise.resolve(new Response(JSON.stringify(legendInfo)));
239+
});
240+
var getLayersLegendInfoParams = new GetLayersLegendInfoParameters({
241+
bbox: "-180,90,180,90",
242+
width: 18,
243+
height: 18
258244
})
245+
layerService.getLayersLegendInfo(getLayersLegendInfoParams, (serviceResult) => {
246+
try {
247+
expect(serviceResult).not.toBeNull();
248+
expect(serviceResult.type).toEqual("processCompleted");
249+
expect(serviceResult.result.succeed).toEqual(true);
250+
expect(serviceResult.result.layerLegends[0].legends[0].url).not.toBeUndefined();
251+
done();
252+
} catch (e) {
253+
console.log("'getLayersLegend'案例失败" + e.name + ":" + e.message);
254+
service.destroy();
255+
expect(false).toBeTruthy();
256+
done();
257+
}
258+
})
259259
})
260260
});

‎test/test-main-leaflet.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import './leaflet/services/TerrainAspectCalculateSpec.js';
7575
import './leaflet/services/TerrainSlopeCalculateSpec.js';
7676
import './leaflet/services/TerrainCutFillCalculateSpec.js';
7777
import './leaflet/services/MinDistanceAnalysisSpec.js';
78+
import './leaflet/services/ConvexHullAnalysisSpec.js';
7879
import './leaflet/services/ThemeServiceSpec.js';
7980
import './leaflet/services/ThiessenAnalysisSpec.js';
8081
import './leaflet/services/TrafficTransferAnalystServiceSpec.js';

‎test/test-main-mapboxgl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import './mapboxgl/services/TerrainAspectCalculateSpec.js';
6161
import './mapboxgl/services/TerrainSlopeCalculateSpec.js';
6262
import './mapboxgl/services/TerrainCutFillCalculateSpec.js';
6363
import './mapboxgl/services/MinDistanceAnalysisSpec.js';
64+
import './mapboxgl/services/ConvexHullAnalysisSpec.js';
6465
import './mapboxgl/services/ThemeServiceSpec.js';
6566
import './mapboxgl/services/ThiessenAnalysisSpec.js';
6667
import './mapboxgl/services/TrafficTransferAnalystServiceSpec.js';

‎test/test-main-maplibregl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import './maplibregl/services/TerrainAspectCalculateSpec.js';
3333
import './maplibregl/services/TerrainSlopeCalculateSpec.js';
3434
import './maplibregl/services/TerrainCutFillCalculateSpec.js';
3535
import './maplibregl/services/MinDistanceAnalysisSpec.js';
36+
import './maplibregl/services/ConvexHullAnalysisSpec.js';
3637
import './maplibregl/services/ThemeServiceSpec.js';
3738
import './maplibregl/services/ThiessenAnalysisSpec.js';
3839
import './maplibregl/services/TrafficTransferAnalystServiceSpec.js';

‎test/test-main-openlayers.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import './openlayers/services/TerrainAspectCalculateSpec.js';
6969
import './openlayers/services/TerrainSlopeCalculateSpec.js';
7070
import './openlayers/services/TerrainCutFillCalculateSpec.js';
7171
import './openlayers/services/MinDistanceAnalysisSpec.js';
72+
import './openlayers/services/ConvexHullAnalysisSpec.js';
7273
import './openlayers/services/ThemeServiceSpec.js';
7374
import './openlayers/services/ThiessenAnalysisSpec.js';
7475
import './openlayers/services/TrafficTransferAnalystServiceSpec.js';

0 commit comments

Comments
 (0)