fix 缓冲区分析SRID参数不可用问题

zhurc · zhurc · commit 401addb4ec79 · 2018-05-17T13:47:01.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -208,6 +208,7 @@
 - 修改 `L.supermap.mapVLayer` 在高分屏时无法选中要素的问题
 - 修改 `L.supermap.echartsLayer` 删除其他图层 `zoomend` `moveend` 事件的问题
 - 修复请求无法携带cookie问题
+- 修复缓冲区分析SRID参数不可用问题
 
 ### for OpenLayers
 
@@ -217,6 +218,7 @@
 - 修改 `ol.source.TileSuperMapRest` `ol.source.ImageSuperMapRest` 通过 `key` `token` 授权失败的问题
 - 修复 `ol.source.TileSuperMapRest` 的 `redirect` 参数默认为 `false` 但运行为 `true` 的问题
 - 修复请求无法携带cookie问题
+- 修复缓冲区分析SRID参数不可用问题
 
 ### for MapboxGL
 
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -57559,7 +57559,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
  * @param {SuperMap.BufferDistance} [options.leftDistance=100] - 左侧缓冲距离。<br>
  * @param {SuperMap.BufferDistance} [options.rightDistance=100] - 右侧缓冲距离。<br>
  * @param {number} [options.semicircleLineSegment=4] - 圆头缓冲圆弧处线段的个数。<br>
- * @param {SuperMap.BufferRadiusUnit} [options.radiusUnit=SuperMap.Unit.METER] - 缓冲半径单位。
+ * @param {SuperMap.BufferRadiusUnit} [options.radiusUnit=SuperMap.BufferRadiusUnit.METER] - 缓冲半径单位。
  */
 var BufferSetting = exports.BufferSetting = function () {
   function BufferSetting(options) {
@@ -60350,7 +60350,15 @@ var SpatialAnalystService = exports.SpatialAnalystService = _ServiceBase.Service
         }
         //支持格式：Vector Layers; GeoJson
         if (params.sourceGeometry) {
+            var SRID = null;
+            if (params.sourceGeometrySRID) {
+                SRID = params.sourceGeometrySRID;
+            }
             params.sourceGeometry = Util.toSuperMapGeometry(params.sourceGeometry);
+            if (SRID) {
+                params.sourceGeometry.SRID = SRID;
+            }
+            delete params.sourceGeometry.sourceGeometrySRID;
         }
         if (params.operateGeometry) {
             params.operateGeometry = Util.toSuperMapGeometry(params.operateGeometry);
@@ -72425,7 +72433,7 @@ module.exports = function (proj4) {
 /* 384 */
 /***/ (function(module) {
 
-module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
+module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"F:\\dev\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
 
 /***/ }),
 /* 385 */
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -56247,7 +56247,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
  * @param {SuperMap.BufferDistance} [options.leftDistance=100] - 左侧缓冲距离。<br>
  * @param {SuperMap.BufferDistance} [options.rightDistance=100] - 右侧缓冲距离。<br>
  * @param {number} [options.semicircleLineSegment=4] - 圆头缓冲圆弧处线段的个数。<br>
- * @param {SuperMap.BufferRadiusUnit} [options.radiusUnit=SuperMap.Unit.METER] - 缓冲半径单位。
+ * @param {SuperMap.BufferRadiusUnit} [options.radiusUnit=SuperMap.BufferRadiusUnit.METER] - 缓冲半径单位。
  */
 var BufferSetting = exports.BufferSetting = function () {
   function BufferSetting(options) {
@@ -59125,7 +59125,15 @@ var SpatialAnalystService = exports.SpatialAnalystService = function (_ServiceBa
             }
             //支持格式：Vector Layers; GeoJson
             if (params.sourceGeometry) {
+                var SRID = null;
+                if (params.sourceGeometrySRID) {
+                    SRID = params.sourceGeometrySRID;
+                }
                 params.sourceGeometry = this.convertGeometry(params.sourceGeometry);
+                if (SRID) {
+                    params.sourceGeometry.SRID = SRID;
+                }
+                delete params.sourceGeometry.sourceGeometrySRID;
             }
             if (params.operateGeometry) {
                 params.operateGeometry = this.convertGeometry(params.operateGeometry);
@@ -67652,7 +67660,7 @@ module.exports = function (proj4) {
 /* 345 */
 /***/ (function(module) {
 
-module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
+module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"F:\\dev\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
 
 /***/ }),
 /* 346 */
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/src/leaflet/services/SpatialAnalystService.js b/src/leaflet/services/SpatialAnalystService.js
@@ -425,7 +425,15 @@ export var SpatialAnalystService = ServiceBase.extend({
         }
         //支持格式：Vector Layers; GeoJson
         if (params.sourceGeometry) {
+            var SRID = null;
+            if (params.sourceGeometrySRID) {
+                SRID = params.sourceGeometrySRID;
+            }
             params.sourceGeometry = Util.toSuperMapGeometry(params.sourceGeometry);
+            if (SRID) {
+                params.sourceGeometry.SRID = SRID;
+            }
+            delete params.sourceGeometry.sourceGeometrySRID;
         }
         if (params.operateGeometry) {
             params.operateGeometry = Util.toSuperMapGeometry(params.operateGeometry);
diff --git a/src/openlayers/services/SpatialAnalystService.js b/src/openlayers/services/SpatialAnalystService.js
@@ -423,7 +423,15 @@ export class SpatialAnalystService extends ServiceBase {
         }
         //支持格式：Vector Layers; GeoJson
         if (params.sourceGeometry) {
+            var SRID = null;
+            if (params.sourceGeometrySRID) {
+                SRID = params.sourceGeometrySRID;
+            }
             params.sourceGeometry = this.convertGeometry(params.sourceGeometry);
+            if (SRID) {
+                params.sourceGeometry.SRID = SRID;
+            }
+            delete params.sourceGeometry.sourceGeometrySRID;
         }
         if (params.operateGeometry) {
             params.operateGeometry = this.convertGeometry(params.operateGeometry);
