[fix]getFeatureByBufferParameters去掉聚合参数 review by songym

luoxiao-supermap · luoxiao-supermap · commit d569db1ee0bb · 2021-03-25T11:34:46.000+08:00
diff --git a/src/common/iServer/GetFeaturesByBufferParameters.js b/src/common/iServer/GetFeaturesByBufferParameters.js
@@ -22,7 +22,6 @@ import { ServerGeometry } from './ServerGeometry';
  * @param {number} [options.toIndex=19] - 查询结果的最大索引号。
  * @param {string|number} [options.targetEpsgCode] - 动态投影的目标坐标系对应的 EPSG Code，使用此参数时，returnContent 参数需为 true。
  * @param {Object} [options.targetPrj] - 动态投影的目标坐标系。使用此参数时，returnContent 参数需为 true。 如：prjCoordSys={"epsgCode":3857}。当同时设置 targetEpsgCode 参数时，此参数不生效。
- * @param {SuperMap.MetricsAggParameter|SuperMap.GeoHashGridAggParameter} [options.aggregations] - 聚合查询参数。该参数仅支持数据来源 Elasticsearch 服务的Supermap iServer的rest数据服务。
  * @extends {SuperMap.GetFeaturesParametersBase}
  */
 export class GetFeaturesByBufferParameters extends GetFeaturesParametersBase {
@@ -113,9 +112,6 @@ export class GetFeaturesByBufferParameters extends GetFeaturesParametersBase {
         if (!params.targetEpsgCode && params.targetPrj) {
             paramsBySql.targetPrj = params.targetPrj;
         }
-        if (params.aggregations) {
-            paramsBySql.aggregations = params.aggregations;
-        }
         return Util.toJSON(paramsBySql);
     }
 }
diff --git a/test/leaflet/services/GetFeaturesByBufferSpec.js b/test/leaflet/services/GetFeaturesByBufferSpec.js
@@ -312,76 +312,4 @@ describe('leaflet_FeatureService_getFeaturesByBuffer', () => {
             done();
         });
     });
-    it('MetricsAggParameter', done => {
-        var aggregations = new SuperMap.MetricsAggParameter({ aggName: 'test', aggFieldName: 'SMID' });
-        var polygon = L.polygon([
-            [-20, 20],
-            [0, 20],
-            [0, 40],
-            [-20, 40],
-            [-20, 20]
-        ]);
-        var getFeaturesByBufferService = featureService(dataServiceURL, options);
-        var getFeaturesByBufferParams = new GetFeaturesByBufferParameters({
-            datasetNames: ['World1:Capitals'],
-            attributeFilter: 'SMID>0',
-            bufferDistance: 30,
-            geometry: polygon,
-            targetPrj: { epsgCode: 4326 },
-            aggregations: aggregations
-        });
-        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
-            var paramsObj = JSON.parse(params.replace(/'/g, '"'));
-            expect(paramsObj.aggregations.aggName).toEqual('test');
-            expect(paramsObj.aggregations.aggFieldName).toEqual('SMID');
-            expect(paramsObj.aggregations.aggType).toEqual('avg');
-            done();
-            return Promise.resolve(
-                new Response(
-                    `{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-world/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d.json"}`
-                )
-            );
-        });
-        getFeaturesByBufferService.getFeaturesByBuffer(getFeaturesByBufferParams, result => {
-            serviceResult = result;
-            getFeaturesByBufferService.destroy();
-            done();
-        });
-    });
-    it('GeoHashGridAggParameter', done => {
-        var aggregations = new SuperMap.GeoHashGridAggParameter({ aggName: 'test', aggFieldName: 'SMID' });
-        var polygon = L.polygon([
-            [-20, 20],
-            [0, 20],
-            [0, 40],
-            [-20, 40],
-            [-20, 20]
-        ]);
-        var getFeaturesByBufferService = featureService(dataServiceURL, options);
-        var getFeaturesByBufferParams = new GetFeaturesByBufferParameters({
-            datasetNames: ['World1:Capitals'],
-            attributeFilter: 'SMID>0',
-            bufferDistance: 30,
-            geometry: polygon,
-            targetPrj: { epsgCode: 4326 },
-            aggregations: aggregations
-        });
-        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
-            var paramsObj = JSON.parse(params.replace(/'/g, '"'));
-            expect(paramsObj.aggregations.aggName).toEqual('test');
-            expect(paramsObj.aggregations.aggFieldName).toEqual('SMID');
-            expect(paramsObj.aggregations.aggType).toEqual('geohash_grid');
-            done();
-            return Promise.resolve(
-                new Response(
-                    `{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-world/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d.json"}`
-                )
-            );
-        });
-        getFeaturesByBufferService.getFeaturesByBuffer(getFeaturesByBufferParams, result => {
-            serviceResult = result;
-            getFeaturesByBufferService.destroy();
-            done();
-        });
-    });
 });

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import { ServerGeometry } from './ServerGeometry';`
`22`	`22`	`* @param {number} [options.toIndex=19] - 查询结果的最大索引号。`
`23`	`23`	`* @param {string\|number} [options.targetEpsgCode] - 动态投影的目标坐标系对应的 EPSG Code，使用此参数时，returnContent 参数需为 true。`
`24`	`24`	`* @param {Object} [options.targetPrj] - 动态投影的目标坐标系。使用此参数时，returnContent 参数需为 true。如：prjCoordSys={"epsgCode":3857}。当同时设置 targetEpsgCode 参数时，此参数不生效。`
`25`		`- * @param {SuperMap.MetricsAggParameter\|SuperMap.GeoHashGridAggParameter} [options.aggregations] - 聚合查询参数。该参数仅支持数据来源 Elasticsearch 服务的Supermap iServer的rest数据服务。`
`26`	`25`	`* @extends {SuperMap.GetFeaturesParametersBase}`
`27`	`26`	`*/`
`28`	`27`	`export class GetFeaturesByBufferParameters extends GetFeaturesParametersBase {`
`@@ -113,9 +112,6 @@ export class GetFeaturesByBufferParameters extends GetFeaturesParametersBase {`
`113`	`112`	`if (!params.targetEpsgCode && params.targetPrj) {`
`114`	`113`	`paramsBySql.targetPrj = params.targetPrj;`
`115`	`114`	`}`
`116`		`- if (params.aggregations) {`
`117`		`- paramsBySql.aggregations = params.aggregations;`
`118`		`- }`
`119`	`115`	`return Util.toJSON(paramsBySql);`
`120`	`116`	`}`
`121`	`117`	`}`