【fix】修复mapboxgl getfeaturebybuffer geometry传入SuperMap.point不能执行的问题 review by luoxiao

Author: songyumeng

src/mapboxgl/services/FeatureService.js

@@ -7,6 +7,8 @@ import { Util } from '../core/Util';
 import { ServiceBase } from './ServiceBase';
 import {
     DataFormat,
+    Geometry,
+    GeometryPoint,
     GetFeaturesByIDsService,
     GetFeaturesBySQLService,
     GetFeaturesByBoundsService,
@@ -174,7 +176,7 @@ export class FeatureService extends ServiceBase {
             dataSourceName = params.dataSourceName,
             dataSetName = params.dataSetName;
 
-        url = CommonUtil.urlPathAppend(url, "datasources/" + dataSourceName + "/datasets/" + dataSetName);
+        url = CommonUtil.urlPathAppend(url, 'datasources/' + dataSourceName + '/datasets/' + dataSetName);
         var editFeatureService = new EditFeaturesService(url, {
             proxy: me.options.proxy,
             withCredentials: me.options.withCredentials,
@@ -214,15 +216,19 @@ export class FeatureService extends ServiceBase {
         if (params.geometry) {
             if (params.geometry instanceof mapboxgl.LngLatBounds) {
                 params.geometry = Util.toSuperMapPolygon(params.geometry);
-            } else {
+            } 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);
+            } else if (!(params.geometry instanceof Geometry)) {
                 params.geometry = Util.toSuperMapGeometry(params.geometry);
             }
         }
         //editFeature服务参数转换,传入单独得对象或对象数组
         if (params.features) {
             var features = [];
             if (Util.isArray(params.features)) {
-                params.features.map(function(feature) {
+                params.features.map(function (feature) {
                     features.push(me._createServerFeature(feature));
                     return features;
                 });

test/mapboxgl/services/GetFeaturesByBufferSpec.js

@@ -1,3 +1,4 @@
+import mapboxgl from 'mapbox-gl';
 import { FeatureService } from '../../../src/mapboxgl/services/FeatureService';
 import { GetFeaturesByBufferParameters } from '../../../src/common/iServer/GetFeaturesByBufferParameters';
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
@@ -135,4 +136,66 @@ describe('mapboxgl_FeatureService_getFeaturesByBuffer', () => {
             done();
         });
     });
+    it('getFeaturesByBuffer_geometry_mapboxglPoint', done => {
+        var queryBufferGeometry = new mapboxgl.Point(-77, 38);
+        var bufferParam = new GetFeaturesByBufferParameters({
+            datasetNames: ['World:Capitals'],
+            bufferDistance: 10,
+            geometry: queryBufferGeometry,
+            fromIndex: 1,
+            toIndex: 3
+        });
+        var service = new FeatureService(url);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe('POST');
+            expect(testUrl).toBe(url + '/featureResults?returnContent=true&fromIndex=1&toIndex=3');
+            var paramsObj = JSON.parse(params.replace(/'/g, '"'));
+            expect(paramsObj.geometry).not.toBeFalsy();
+            expect(paramsObj.geometry.points.length).toBe(1);
+            expect(paramsObj.geometry.points[0].x).toBe(-77)
+            expect(paramsObj.geometry.points[0].y).toBe(38)
+            return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
+        });
+        service.getFeaturesByBuffer(bufferParam, testResult => {
+            serviceResult = testResult;
+            var result = serviceResult.result;
+            expect(result.succeed).toBe(true);
+            expect(result.featureCount).toEqual(1);
+            expect(result.totalCount).toEqual(1);
+            expect(serviceResult.result.features.type).toEqual('FeatureCollection');
+            bufferParam.destroy();
+            done();
+        });
+    });
+    it('getFeaturesByBuffer_geometry_mapboxglLatlng', done => {
+        var queryBufferGeometry = new mapboxgl.LngLat(-77, 38);
+        var bufferParam = new GetFeaturesByBufferParameters({
+            datasetNames: ['World:Capitals'],
+            bufferDistance: 10,
+            geometry: queryBufferGeometry,
+            fromIndex: 1,
+            toIndex: 3
+        });
+        var service = new FeatureService(url);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe('POST');
+            expect(testUrl).toBe(url + '/featureResults?returnContent=true&fromIndex=1&toIndex=3');
+            var paramsObj = JSON.parse(params.replace(/'/g, '"'));
+            expect(paramsObj.geometry).not.toBeFalsy();
+            expect(paramsObj.geometry.points.length).toBe(1);
+            expect(paramsObj.geometry.points[0].x).toBe(-77);
+            expect(paramsObj.geometry.points[0].y).toBe(38);
+            return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
+        });
+        service.getFeaturesByBuffer(bufferParam, testResult => {
+            serviceResult = testResult;
+            var result = serviceResult.result;
+            expect(result.succeed).toBe(true);
+            expect(result.featureCount).toEqual(1);
+            expect(result.totalCount).toEqual(1);
+            expect(serviceResult.result.features.type).toEqual('FeatureCollection');
+            bufferParam.destroy();
+            done();
+        });
+    });
 });