Skip to content

Commit 89776fb

Browse files
liqian7liqian7
committed
【update/API/fix】 更新 leaflet 端 BuffersAnalystJobsParameter bounds 参数未可选 & fix bounds 参数为空时报错问题, 更新 vue-iclient 依赖， fix 上次 raterLayer 范例误提交 review by songym
1 parent 9ffbca8 commit 89776fb

16 files changed

+23166
-50798
lines changed

‎dist/leaflet/iclient9-leaflet-es6.js‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18686,42 +18686,40 @@ SuperMap.MappingParameters = MappingParameters_MappingParameters;
1868618686
* @class SuperMap.BuffersAnalystJobsParameter
1868718687
* @category iServer ProcessingService BufferAnalyst
1868818688
* @classdesc 缓冲区分析任务参数类。
18689-
* @param {Object} options - 参数。
18690-
* @param {string} options.datasetName - 数据集名。
18691-
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} options.bounds - 分析范围。
18692-
* @param {string} [options.distance='15'] - 缓冲距离，或缓冲区半径。
18693-
* @param {string} [options.distanceField='pickup_latitude'] - 缓冲区分析距离字段。
18694-
* @param {SuperMap.AnalystSizeUnit} [options.distanceUnit=SuperMap.AnalystSizeUnit.METER] - 缓冲距离单位单位。
18695-
* @param {SuperMap.OutputSetting} [options.output] - 输出参数设置。
18696-
* @param {SuperMap.MappingParameters} [options.mappingParameters] - 分析后结果可视化的参数类。
18689+
* @param {Object} options - 参数。
18690+
* @param {string} options.datasetName - 数据集名。
18691+
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.bounds] - 分析范围（默认为全图范围）。
18692+
* @param {string} [options.distance='15'] - 缓冲距离，或缓冲区半径。
18693+
* @param {string} [options.distanceField='pickup_latitude'] - 缓冲区分析距离字段。
18694+
* @param {SuperMap.AnalystSizeUnit} [options.distanceUnit=SuperMap.AnalystSizeUnit.METER] - 缓冲距离单位单位。
18695+
* @param {SuperMap.OutputSetting} [options.output] - 输出参数设置。
18696+
* @param {SuperMap.MappingParameters} [options.mappingParameters] - 分析后结果可视化的参数类。
1869718697
*/
1869818698
class BuffersAnalystJobsParameter_BuffersAnalystJobsParameter {
18699-
18700-
1870118699
constructor(options) {
1870218700
/**
1870318701
* @member {string} SuperMap.BuffersAnalystJobsParameter.prototype.datasetName
1870418702
* @description 数据集名。
1870518703
*/
18706-
this.datasetName = "";
18704+
this.datasetName = '';
1870718705

1870818706
/**
1870918707
* @member {(SuperMap.Bounds|L.Bounds|ol.extent)} SuperMap.BuffersAnalystJobsParameter.prototype.bounds
18710-
* @description 分析范围。
18708+
* @description 分析范围。
1871118709
*/
18712-
this.bounds = "";
18710+
this.bounds = '';
1871318711

1871418712
/**
1871518713
* @member {string} [SuperMap.BuffersAnalystJobsParameter.prototype.distance='15']
1871618714
* @description 缓冲距离，或称为缓冲区半径。当缓冲距离字段位空时，此参数有效。
1871718715
*/
18718-
this.distance = "";
18716+
this.distance = '';
1871918717

1872018718
/**
1872118719
* @member {string} [SuperMap.BuffersAnalystJobsParameter.prototype.distanceField='pickup_latitude']
1872218720
* @description 缓冲距离字段。
1872318721
*/
18724-
this.distanceField = "";
18722+
this.distanceField = '';
1872518723

1872618724
/**
1872718725
* @member {SuperMap.AnalystSizeUnit} [SuperMap.BuffersAnalystJobsParameter.prototype.distanceUnit=SuperMap.AnalystSizeUnit.METER]
@@ -18733,17 +18731,17 @@ class BuffersAnalystJobsParameter_BuffersAnalystJobsParameter {
1873318731
* @member {string} SuperMap.BuffersAnalystJobsParameter.prototype.dissolveField
1873418732
* @description 融合字段，根据字段值对缓冲区结果面对象进行融合。
1873518733
*/
18736-
this.dissolveField = "";
18734+
this.dissolveField = '';
1873718735

1873818736
/**
1873918737
* @member {SuperMap.OutputSetting} [SuperMap.BuffersAnalystJobsParameter.prototype.output]
1874018738
* @description 输出参数设置类。
1874118739
*/
1874218740
this.output = null;
18743-
18741+
1874418742
/**
1874518743
* @member {SuperMap.MappingParameters} [SuperMap.BuffersAnalystJobsParameter.prototype.mappingParameters]
18746-
* @description 分析后结果可视化的参数类。
18744+
* @description 分析后结果可视化的参数类。
1874718745
*/
1874818746
this.mappingParameters = null;
1874918747

@@ -18752,7 +18750,7 @@ class BuffersAnalystJobsParameter_BuffersAnalystJobsParameter {
1875218750
}
1875318751
Util_Util.extend(this, options);
1875418752

18755-
this.CLASS_NAME = "SuperMap.BuffersAnalystJobsParameter";
18753+
this.CLASS_NAME = 'SuperMap.BuffersAnalystJobsParameter';
1875618754
}
1875718755

1875818756
/**
@@ -18770,7 +18768,7 @@ class BuffersAnalystJobsParameter_BuffersAnalystJobsParameter {
1877018768
this.output.destroy();
1877118769
this.output = null;
1877218770
}
18773-
if (this.mappingParameters instanceof MappingParameters_MappingParameters){
18771+
if (this.mappingParameters instanceof MappingParameters_MappingParameters) {
1877418772
this.mappingParameters.destroy();
1877518773
this.mappingParameters = null;
1877618774
}
@@ -18784,33 +18782,33 @@ class BuffersAnalystJobsParameter_BuffersAnalystJobsParameter {
1878418782
*/
1878518783
static toObject(BuffersAnalystJobsParameter, tempObj) {
1878618784
for (var name in BuffersAnalystJobsParameter) {
18787-
if (name === "datasetName") {
18785+
if (name === 'datasetName') {
1878818786
tempObj['input'] = tempObj['input'] || {};
1878918787
tempObj['input'][name] = BuffersAnalystJobsParameter[name];
1879018788
continue;
1879118789
}
18792-
if (name === "output") {
18790+
if (name === 'output') {
1879318791
tempObj['output'] = tempObj['output'] || {};
1879418792
tempObj['output'] = BuffersAnalystJobsParameter[name];
1879518793
continue;
1879618794
}
1879718795

1879818796
tempObj['analyst'] = tempObj['analyst'] || {};
18799-
if (name === 'bounds') {
18797+
if (name === 'bounds' && BuffersAnalystJobsParameter[name]) {
1880018798
tempObj['analyst'][name] = BuffersAnalystJobsParameter[name].toBBOX();
1880118799
} else {
1880218800
tempObj['analyst'][name] = BuffersAnalystJobsParameter[name];
1880318801
}
18804-
if(name === 'mappingParameters'){
18802+
if (name === 'mappingParameters') {
1880518803
tempObj['analyst'][name] = tempObj['analyst'][name] || {};
1880618804
tempObj['analyst']['mappingParameters'] = BuffersAnalystJobsParameter[name];
1880718805
}
1880818806
}
1880918807
}
18810-
1881118808
}
1881218809

1881318810
SuperMap.BuffersAnalystJobsParameter = BuffersAnalystJobsParameter_BuffersAnalystJobsParameter;
18811+
1881418812
// CONCATENATED MODULE: ./src/common/iServer/ProcessingServiceBase.js
1881518813
/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
1881618814
* This program are made available under the terms of the Apache License, Version 2.0
@@ -31466,7 +31464,7 @@ SuperMap.InterpolationAnalystService = InterpolationAnalystService_Interpolation
3146631464
* @param {Object} options - 参数。
3146731465
* @param {string} options.datasetName - 数据集名。
3146831466
* @param {string} options.fields - 权重索引。
31469-
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围。
31467+
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围（默认为全图范围）。
3147031468
* @param {number} [options.resolution=80] - 分辨率。
3147131469
* @param {number} [options.method=0] - 分析方法。
3147231470
* @param {number} [options.meshType=0] - 分析类型。
@@ -35265,7 +35263,7 @@ SuperMap.SummaryAttributesJobsService = SummaryAttributesJobsService_SummaryAttr
3526535263
* @classdesc 点聚合分析任务参数类。
3526635264
* @param {Object} options - 参数。
3526735265
* @param {string} options.datasetName - 数据集名。
35268-
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围。
35266+
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围（默认为全图范围）。
3526935267
* @param {number} options.fields - 权重索引。
3527035268
* @param {number} [options.resolution=100] - 分辨率。
3527135269
* @param {SuperMap.StatisticAnalystMode} [options.statisticModes=SuperMap.StatisticAnalystMode.AVERAGE] - 分析模式。
@@ -35504,7 +35502,7 @@ SuperMap.SummaryMeshJobsService = SummaryMeshJobsService_SummaryMeshJobsService;
3550435502
* @classdesc 区域汇总分析任务参数类。
3550535503
* @param {Object} options - 参数。
3550635504
* @param {string} options.datasetName - 数据集名。
35507-
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围。
35505+
* @param {(SuperMap.Bounds|L.Bounds|ol.extent)} [options.query] - 分析范围（默认为全图范围）。
3550835506
* @param {string} [options.standardFields] - 标准属性字段名称。
3550935507
* @param {string} [options.weightedFields] - 权重字段名称。
3551035508
* @param {SuperMap.StatisticAnalystMode} [options.standardStatisticModes] - 标准属性字段的统计模式。standardSummaryFields 为 true 时必填。
@@ -93345,7 +93343,7 @@ module.exports = function(proj4){
9334593343
/* 74 */
9334693344
/***/ (function(module) {
9334793345

93348-
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"};
93346+
module.exports = {"_args":[["proj4@2.3.15","D:\\iClient-JavaScript"]],"_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","_spec":"2.3.15","_where":"D:\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"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"},"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"};
9334993347

9335093348
/***/ }),
9335193349
/* 75 */

0 commit comments

Comments
 (0)