【ICL-1511】使用数据集构建泰森多边形，传入L.Polygon | ol.geom.Polygon | GeoJSONObject等格式设置裁剪区域参数clipRegion报错 review by qiwei

Author: chenxianhuii

src/leaflet/services/SpatialAnalystService.js

@@ -336,6 +336,9 @@ export var SpatialAnalystService = ServiceBase.extend({
         if (params.clipParam && params.clipParam.clipRegion) {
             params.clipParam.clipRegion = Util.toSuperMapGeometry(params.clipParam.clipRegion);
         }
+        if (params.clipRegion) {
+            params.clipRegion = Util.toSuperMapGeometry(params.clipRegion);
+        }
         //支持格式：Vector Layers; GeoJson
         if (params.sourceGeometry) {
             var SRID = null;

src/mapboxgl/services/SpatialAnalystService.js

@@ -331,6 +331,9 @@ export class SpatialAnalystService extends ServiceBase {
         if (params.clipParam && params.clipParam.clipRegion) {
             params.clipParam.clipRegion = Util.toSuperMapGeometry(params.clipParam.clipRegion);
         }
+        if (params.clipRegion) {
+            params.clipRegion = Util.toSuperMapGeometry(params.clipRegion);
+        }
         //sourceRoute 路由对象。用于里程分析，该对象可以是用户自己生 成或在数据源中查询得到的符合标准的路由对象；geojson格式
         if (params.sourceRoute) {
             if (params.sourceRoute) {

src/maplibregl/services/SpatialAnalystService.js

@@ -332,6 +332,9 @@ export class SpatialAnalystService extends ServiceBase {
         if (params.clipParam && params.clipParam.clipRegion) {
             params.clipParam.clipRegion = Util.toSuperMapGeometry(params.clipParam.clipRegion);
         }
+        if (params.clipRegion) {
+            params.clipRegion = Util.toSuperMapGeometry(params.clipRegion);
+        }
         //sourceRoute 路由对象。用于里程分析，该对象可以是用户自己生 成或在数据源中查询得到的符合标准的路由对象；geojson格式
         if (params.sourceRoute) {
             if (params.sourceRoute) {

src/openlayers/services/SpatialAnalystService.js

@@ -337,6 +337,9 @@ export class SpatialAnalystService extends ServiceBase {
         if (params.clipParam && params.clipParam.clipRegion) {
             params.clipParam.clipRegion = this.convertGeometry(params.clipParam.clipRegion);
         }
+        if (params.clipRegion) {
+            params.clipRegion = this.convertGeometry(params.clipRegion);
+        }
         //支持格式：Vector Layers; GeoJson
         if (params.sourceGeometry) {
             var SRID = null;

test/leaflet/services/ThiessenAnalysisSpec.js

@@ -48,8 +48,16 @@ describe('leaflet_SpatialAnalystService_thiessenAnalysis', () => {
 
     it('thiessenAnalysis', (done) => {
         var dsThiessenAnalystParameters = new DatasetThiessenAnalystParameters({
-            dataset: "Factory@Changchun"
+            dataset: "Factory@Changchun",
+            clipRegion: polygon
         });
+        var polygon = L.polygon([
+          [-1000, 5000],
+          [-1000, 7000],
+          [-3000, 7000],
+          [-3000, 5000],
+          [-1000, 5000]
+        ]);
         var thiessenAnalystService = spatialAnalystService(spatialAnalystURL, options);
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe("POST");

test/mapboxgl/services/ThiessenAnalysisSpec.js

@@ -22,8 +22,19 @@ describe('mapboxgl_SpatialAnalystService_thiessenAnalysis', () => {
     //泰森多边形分析 数据集泰森多边形
     it('thiessenAnalysis_byDataset', (done) => {
         var datasetThiessenAnalystParameters = new DatasetThiessenAnalystParameters({
-            dataset: "Town_P@Jingjin"
+          dataset: "Town_P@Jingjin",
+          clipRegion: polygon
         });
+        var polygon = {
+          "type": "Polygon",
+          "coordinates": [[
+            [116, 39],
+            [117, 39],
+            [117, 38],
+            [116, 38],
+            [116, 39]
+          ]]
+        };
         var service = new SpatialAnalystService(url, options);
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe("POST");

test/maplibregl/services/ThiessenAnalysisSpec.js

@@ -22,8 +22,19 @@ describe('maplibregl_SpatialAnalystService_thiessenAnalysis', () => {
     //泰森多边形分析 数据集泰森多边形
     it('thiessenAnalysis_byDataset', (done) => {
         var datasetThiessenAnalystParameters = new DatasetThiessenAnalystParameters({
-            dataset: "Town_P@Jingjin"
+            dataset: "Town_P@Jingjin",
+            clipRegion: polygon
         });
+        var polygon = {
+          "type": "Polygon",
+          "coordinates": [[
+            [116, 39],
+            [117, 39],
+            [117, 38],
+            [116, 38],
+            [116, 39]
+          ]]
+        };
         var service = new SpatialAnalystService(url, options);
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe("POST");

test/openlayers/services/ThiessenAnalysisSpec.js

@@ -12,6 +12,7 @@ import {
 } from '../../../src/common/util/FetchRequest';
 
 import Point from 'ol/geom/Point';
+import Polygon from 'ol/geom/Polygon';
 
 var originalTimeout, serviceResults;
 var changchunServiceUrl = GlobeParameter.spatialAnalystURL_Changchun;
@@ -28,8 +29,18 @@ describe('openlayers_SpatialAnalystService_thiessenAnalysis', () => {
     //数据集泰森多边形
     it('thiessenAnalysis_datasets', (done) => {
         var dThiessenAnalystParameters = new DatasetThiessenAnalystParameters({
-            dataset: "Factory@Changchun"
+            dataset: "Factory@Changchun",
+            clipRegion: polygon
         });
+        var polygon = new Polygon([
+          [
+            [5000, -1000],
+            [7000, -1000],
+            [7000, -3000],
+            [5000, -3000],
+            [5000, -1000]
+          ]
+        ])
         var spatialAnalystService = new SpatialAnalystService(changchunServiceUrl);
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe("POST");