【fix】修复 几何查询用mapbox坐标或bounds查询时带上prjCoordSys 4326 review by songym

xilanhuaweidapao · xilanhuaweidapao · commit 4c778f1b0e6c · 2021-09-14T15:00:05.000+08:00
diff --git a/src/mapboxgl/services/FeatureService.js b/src/mapboxgl/services/FeatureService.js
@@ -216,10 +216,12 @@ export class FeatureService extends ServiceBase {
         if (params.geometry) {
             if (params.geometry instanceof mapboxgl.LngLatBounds) {
                 params.geometry = Util.toSuperMapPolygon(params.geometry);
+                params.geometry.SRID = 4326;
             } else if (params.geometry instanceof mapboxgl.Point) {
                 params.geometry = new GeometryPoint(params.geometry.x, params.geometry.y);
             } else if (params.geometry instanceof mapboxgl.LngLat) {
                 params.geometry = new GeometryPoint(params.geometry.lng, params.geometry.lat);
+                params.geometry.SRID = 4326;
             } else if (!(params.geometry instanceof Geometry)) {
                 params.geometry = Util.toSuperMapGeometry(params.geometry);
             }
diff --git a/test/mapboxgl/services/GetFeaturesByGeometrySpec.js b/test/mapboxgl/services/GetFeaturesByGeometrySpec.js
@@ -1,6 +1,7 @@
 import { FeatureService } from '../../../src/mapboxgl/services/FeatureService';
 import { GetFeaturesByGeometryParameters } from '../../../src/common/iServer/GetFeaturesByGeometryParameters';
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
+import mapboxgl from 'mapbox-gl';
 
 var url = GlobeParameter.dataServiceURL;
 describe('mapboxgl_FeatureService_getFeaturesByGeometry', () => {
@@ -203,4 +204,26 @@ describe('mapboxgl_FeatureService_getFeaturesByGeometry', () => {
             done();
         });
     });
+    it('GetFeaturesByGeometryParameters:prjCoordSys', (done) => {
+      var sw = new mapboxgl.LngLat(-20, -20);
+      var ne = new mapboxgl.LngLat(20, 20);
+      var lngLatBounds = new mapboxgl.LngLatBounds(sw, ne);
+      var geometryParam = new GetFeaturesByGeometryParameters({
+          datasetNames: ['World:Countries'],
+          geometry: lngLatBounds,
+          spatialQueryMode: 'INTERSECT',
+      });
+      var service = new FeatureService(url);
+
+      spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+          var paramsObj = JSON.parse(params.replace(/'/g, '"'));
+          expect(paramsObj.geometry.prjCoordSys.epsgCode).toEqual(4326);
+          return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
+      });
+      service.getFeaturesByGeometry(geometryParam, (result) => {
+          serviceResult = result;
+          geometryParam.destroy();
+          done();
+      });
+  });
 });
