Commit 80081e6

committed

[fix]webmap returnFeaturesOnly

1 parent af11251 commit 80081e6Copy full SHA for 80081e6

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1208,7 +1208,8 @@ export class WebMapService {`
`1208`	`1208`	`fromIndex: 0,`
`1209`	`1209`	`toIndex: -1,`
`1210`	`1210`	`maxFeatures: -1,`
`1211`		`- returnContent: true`
	`1211`	`+ returnContent: true,`
	`1212`	`+ returnFeaturesOnly: true`
`1212`	`1213`	`});`
`1213`	`1214`	`if (baseProjection && baseProjection !== 'EPSG:4326') {`
`1214`	`1215`	`getFeatureBySQLParams.targetEpsgCode = 4326;`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,8 @@ describe('WebMapServiceSpec.js', () => {`
`880`	`880`	`let getFeatureBySQLParams;`
`881`	`881`	`spyOn(FetchRequest, 'post').and.callFake((url, options) => {`
`882`	`882`	`getFeatureBySQLParams = options;`
`883`		`- return Promise.resolve(new Response(JSON.stringify(REST_DATA_SQL_RESULT)));`
	`883`	`+ expect(url.includes('returnFeaturesOnly=true')).toBeTruthy()`
	`884`	`+ return Promise.resolve(new Response(JSON.stringify(REST_DATA_SQL_RESULT.features)));`
`884`	`885`	`});`
`885`	`886`	`const type = 'rest_data';`
`886`	`887`	`const layer = {`
`@@ -894,13 +895,14 @@ describe('WebMapServiceSpec.js', () => {`
`894`	`895`	`const baseProjection = 'EPSG:3857';`
`895`	`896`	`const service = new WebMapService(mapId, options);`
`896`	`897`	`const spy = spyOn(service, '_getFeatureBySQL').and.callThrough();;`
`897`		`- service.getLayerFeatures(type, layer, baseProjection).then(() => {`
	`898`	`+ service.getLayerFeatures(type, layer, baseProjection).then((res) => {`
`898`	`899`	`const params = spy.calls.allArgs()[0];`
`899`	`900`	`expect(params[0]).toBe(layer.dataSource.url);`
`900`	`901`	`expect(params[1]).toEqual(["中国矢量数据:飞机场"]);`
`901`	`902`	`expect(params[4]).toEqual(baseProjection);`
`902`	`903`	`expect(typeof getFeatureBySQLParams).toBe('string');`
`903`	`904`	expect(getFeatureBySQLParams).toContain(`'targetEpsgCode':4326`);
	`905`	`+ expect(res.features instanceof Array).toBeTruthy();`
`904`	`906`	`done();`
`905`	`907`	`});`
`906`	`908`	`});`

Comments

(0)