fix icl-1520 上下游关键设施查询服务返回结果未转换geojson review by songym

xilanhuaweidapao · xilanhuaweidapao · commit fb862b2e10c1 · 2024-03-14T14:25:02.000+08:00
diff --git a/src/common/iServer/FacilityAnalystStreamService.js b/src/common/iServer/FacilityAnalystStreamService.js
@@ -2,6 +2,7 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { Util } from '../commontypes/Util';
+import {GeoJSON} from '../format/GeoJSON';
 import { NetworkAnalystServiceBase } from './NetworkAnalystServiceBase';
 import { FacilityAnalystStreamParameters } from './FacilityAnalystStreamParameters';
 
@@ -85,4 +86,23 @@ export class FacilityAnalystStreamService extends NetworkAnalystServiceBase {
         });
     }
 
+    /**
+     * @function FacilityAnalystStreamService.prototype.toGeoJSONResult
+     * @description 将含有 geometry 的数据转换为 GeoJSON 格式。
+     * @param {Object} result - 服务器返回的结果对象。
+     */
+    toGeoJSONResult(result) {
+      if (!result) {
+        return null;
+      }
+      var geoJSONFormat = new GeoJSON();
+      if (result.edgesFeatures) {
+        result.edgesFeatures = geoJSONFormat.toGeoJSON(result.edgesFeatures);
+      }
+      if (result.nodesFeatures) {
+        result.nodesFeatures = geoJSONFormat.toGeoJSON(result.nodesFeatures);
+      }
+      return result;
+    }
+
 }
diff --git a/test/mapboxgl/services/NetworkAnalystServiceSpec.js b/test/mapboxgl/services/NetworkAnalystServiceSpec.js
@@ -668,6 +668,8 @@ describe('mapboxgl_NetworkAnalystService', () => {
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.result).not.toBeNull();
                 expect(serviceResult.type).toEqual("processCompleted");
+                expect(serviceResult.result.edgesFeatures.type).toEqual('FeatureCollection');
+                expect(Array.isArray(serviceResult.result.edgesFeatures.features)).toBeTruthy();
                 done();
             } catch (e) {
                 console.log("'streamFacilityAnalyst_test'案例失败" + e.name + ":" + e.message);
