ICL-1541 服务区分析时，不支持isReturnComplexArea和serviceBufferRadius参数

chenxianhuii · chenxianhuii · commit dc895a908cc5 · 2024-06-18T17:45:24.000+08:00
diff --git a/src/common/iServer/FindServiceAreasParameters.js b/src/common/iServer/FindServiceAreasParameters.js
@@ -18,6 +18,8 @@ import {TransportationAnalystParameter} from './TransportationAnalystParameter';
  * @param {boolean} [options.isAnalyzeById=false] - 是否通过节点 ID 指定路径分析的结点。
  * @param {boolean} [options.isCenterMutuallyExclusive=false] - 按照中心点的距离进行判断是否要进行互斥处理。
  * @param {boolean} [options.isFromCenter=false] - 是否从中心点开始分析。
+ * @param {boolean} [options.isReturnComplexArea=false] - 是否返回详细服务区面。
+ * @param {number} [options.serviceBufferRadius=100] - 	缓冲区半径，仅当返回详细服务区面时可用。默认为100米。
  * @param {TransportationAnalystParameter} [options.parameter] - 交通网络分析通用参数。
  * @usage
  */
@@ -57,6 +59,20 @@ export class FindServiceAreasParameters {
          */
         this.isFromCenter = false;
 
+        /**
+         * @member {boolean} [FindServiceAreasParameters.prototype.isReturnComplexArea=false]
+         * @description 是否返回详细服务区面。
+         *              详细服务区面，生成的服务区面会严格按照生成路由生成面轮廓结果，分析结果会更准确，但分析时间更长。
+         */
+        this.isReturnComplexArea = false;
+
+        /**
+         * @member {number} [FindServiceAreasParameters.prototype.serviceBufferRadius=100]
+         * @description 缓冲区半径。
+         *              仅当返回详细服务区面时可用。默认为100米。
+         */
+        this.serviceBufferRadius = 100;
+
         /**
          * APIProperty: weights
          * @member {Array.<number>} FindServiceAreasParameters.prototype.weights
diff --git a/src/common/iServer/FindServiceAreasService.js b/src/common/iServer/FindServiceAreasService.js
@@ -56,6 +56,8 @@ export class FindServiceAreasService extends NetworkAnalystServiceBase {
         var me = this, jsonObject;
         me.url = Util.urlPathAppend(me.url, 'servicearea');
         jsonObject = {
+            isReturnComplexArea: params.isReturnComplexArea,
+            serviceBufferRadius: params.serviceBufferRadius,
             isFromCenter: params.isFromCenter,
             isCenterMutuallyExclusive: params.isCenterMutuallyExclusive,
             parameter: Util.toJSON(params.parameter),
diff --git a/test/common/iServer/FindServiceAreasServiceSpec.js b/test/common/iServer/FindServiceAreasServiceSpec.js
@@ -54,6 +54,8 @@ describe('FindServiceAreasService', () => {
             weights: weightArray,
             isCenterMutuallyExclusive: false,
             isFromCenter: false,
+            isReturnComplexArea: false,
+            serviceBufferRadius: 100,
             parameter: analystParameter
         });
         var findServiceAreasServiceCompleted = (serviceSucceedEventArgsSystem) => {
@@ -75,7 +77,9 @@ describe('FindServiceAreasService', () => {
             }
         };
         var findServiceAreasService = new FindServiceAreasService(url);
-        spyOn(FetchRequest, 'get').and.callFake((url) => {
+        spyOn(FetchRequest, 'get').and.callFake((url, params) => {
+            expect(params.isReturnComplexArea).toBe(false);
+            expect(params.serviceBufferRadius).toBe(100);
             expect(url).toContain("iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun/servicearea");
             return Promise.resolve(new Response(JSON.stringify(findServiceAreasResultJson)))
         });
