Skip to content

Commit 49ee2a4

Browse files
committed
【fix】fix clipParam的clipregion解析错误的问题 review by liqian
1 parent d0c9de4 commit 49ee2a4

24 files changed

+1693
-1929
lines changed

dist/classic/iclient-classic-es6.js

Lines changed: 170 additions & 185 deletions
Large diffs are not rendered by default.

dist/classic/iclient-classic-es6.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/classic/iclient-classic.js

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,19 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
47+
/******/ Object.defineProperty(exports, name, {
48+
/******/ configurable: false,
49+
/******/ enumerable: true,
50+
/******/ get: getter
51+
/******/ });
4852
/******/ }
4953
/******/ };
5054
/******/
5155
/******/ // define __esModule on exports
5256
/******/ __webpack_require__.r = function(exports) {
53-
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54-
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55-
/******/ }
5657
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5758
/******/ };
5859
/******/
59-
/******/ // create a fake namespace object
60-
/******/ // mode & 1: value is a module id, require it
61-
/******/ // mode & 2: merge all properties of value into the ns
62-
/******/ // mode & 4: return value when already ns object
63-
/******/ // mode & 8|1: behave like require
64-
/******/ __webpack_require__.t = function(value, mode) {
65-
/******/ if(mode & 1) value = __webpack_require__(value);
66-
/******/ if(mode & 8) return value;
67-
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68-
/******/ var ns = Object.create(null);
69-
/******/ __webpack_require__.r(ns);
70-
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71-
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72-
/******/ return ns;
73-
/******/ };
74-
/******/
7560
/******/ // getDefaultExport function for compatibility with non-harmony modules
7661
/******/ __webpack_require__.n = function(module) {
7762
/******/ var getter = module && module.__esModule ?

dist/classic/iclient-classic.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19872,37 +19872,13 @@ class ClipParameter_ClipParameter {
1987219872
* @returns {string} 返回转换后的 JSON 字符串。
1987319873
*/
1987419874
toJSON() {
19875-
if (this.isClipInRegion == false) {
19876-
return null;
19877-
}
19878-
var strClipParameter = "";
19879-
var me = this;
19880-
19881-
strClipParameter += "'isClipInRegion':" + Util_Util.toJSON(me.isClipInRegion);
19882-
19883-
if (me.clipDatasetName != null) {
19884-
strClipParameter += "," + "'clipDatasetName':" + Util_Util.toJSON(me.clipDatasetName);
19885-
}
19886-
19887-
if (me.clipDatasourceName != null) {
19888-
strClipParameter += "," + "'clipDatasourceName':" + Util_Util.toJSON(me.clipDatasourceName);
19889-
}
19890-
19891-
if (me.isExactClip != null) {
19892-
strClipParameter += "," + "'isExactClip':" + Util_Util.toJSON(me.isExactClip);
19893-
}
19894-
19895-
if (me.clipRegion != null) {
19896-
var serverGeometry = ServerGeometry_ServerGeometry.fromGeometry(me.clipRegion);
19897-
if (serverGeometry) {
19898-
var pointsCount = serverGeometry.parts[0];
19899-
var point2ds = serverGeometry.points.splice(0, pointsCount);
19900-
strClipParameter += "," + "'clipRegion':" + "{\"point2Ds\":";
19901-
strClipParameter += Util_Util.toJSON(point2ds);
19902-
strClipParameter += "}";
19903-
}
19904-
}
19905-
return "{" + strClipParameter + "}";
19875+
return Util_Util.toJSON({
19876+
isClipInRegion: this.isClipInRegion,
19877+
clipDatasetName: this.clipDatasetName,
19878+
clipDatasourceName: this.clipDatasourceName,
19879+
isExactClip: this.isExactClip,
19880+
clipRegion: ServerGeometry_ServerGeometry.fromGeometry(this.clipRegion)
19881+
});
1990619882
}
1990719883

1990819884
}
@@ -84452,6 +84428,9 @@ var SpatialAnalystService_SpatialAnalystService = ServiceBase_ServiceBase.extend
8445284428
if (params.extractParameter && params.extractParameter.clipRegion) {
8445384429
params.extractParameter.clipRegion = Util_toSuperMapGeometry(params.extractParameter.clipRegion);
8445484430
}
84431+
if (params.clipParam && params.clipParam.clipRegion) {
84432+
params.clipParam.clipRegion = Util_toSuperMapGeometry(params.clipParam.clipRegion);
84433+
}
8445584434
//支持格式:Vector Layers; GeoJson
8445684435
if (params.sourceGeometry) {
8445784436
var SRID = null;
@@ -92734,7 +92713,7 @@ module.exports = function(proj4){
9273492713
/* 74 */
9273592714
/***/ (function(module) {
9273692715

92737-
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":"G:\\20190115\\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"};
92716+
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://localhost:4873/proj4/-/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"};
9273892717

9273992718
/***/ }),
9274092719
/* 75 */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy