Skip to content

Commit 7e6a9bb

Browse files
committed
更新版权信息
1 parent 59b28e3 commit 7e6a9bb

File tree

62 files changed

+1781
-1404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1781
-1404
lines changed

dist/classic/iclient-classic-es6.js

Lines changed: 56 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* iclient-classic.(http://iclient.supermap.io)
44
* Copyright© 2000 - 2018 SuperMap Software Co.Ltd
55
* license: Apache-2.0
6-
* version: v9.1.0-beta
6+
* version: v9.1.0
77
*
88
*/
99
/******/ (function(modules) { // webpackBootstrap
@@ -6131,7 +6131,11 @@ class KernelDensityJobParameter_KernelDensityJobParameter {
61316131

61326132
tempObj['analyst'] = tempObj['analyst'] || {};
61336133
if (name === 'query') {
6134-
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
6134+
if(tempObj['analyst'][name]){
6135+
tempObj['analyst'][name] = kernelDensityJobParameter[name].toBBOX();
6136+
}else{
6137+
tempObj['analyst'][name] = kernelDensityJobParameter[name];
6138+
}
61356139
} else {
61366140
tempObj['analyst'][name] = kernelDensityJobParameter[name];
61376141
}
@@ -7700,19 +7704,19 @@ class MapVLayer_MapVLayer extends SuperMap_SuperMap.Layer {
77007704
super(name, options);
77017705

77027706
/**
7703-
* @member {mapv.DataSet} - SuperMap.Layer.MapVLayer.prototype.dataSet
7707+
* @member {mapv.DataSet} SuperMap.Layer.MapVLayer.prototype.dataSet
77047708
* @description mapv dataset 对象。
77057709
*/
77067710
this.dataSet = null;
77077711

77087712
/**
7709-
* @member {Object} - SuperMap.Layer.MapVLayer.prototype.options
7713+
* @member {Object} SuperMap.Layer.MapVLayer.prototype.options
77107714
* @description mapv 绘图风格配置信息。
77117715
*/
77127716
this.options = null;
77137717

77147718
/**
7715-
* @member {boolean} - [SuperMap.Layer.MapVLayer.prototype.supported=false]
7719+
* @member {boolean} [SuperMap.Layer.MapVLayer.prototype.supported=false]
77167720
* @description 当前浏览器是否支持 canvas 绘制。决定了 MapV 图是否可用,内部判断使用。
77177721
*/
77187722
this.supported = false;
@@ -7725,7 +7729,7 @@ class MapVLayer_MapVLayer extends SuperMap_SuperMap.Layer {
77257729

77267730
/**
77277731
* @private
7728-
* @member {CanvasContext} - SuperMap.Layer.MapVLayer.prototype.canvasContext
7732+
* @member {CanvasContext} SuperMap.Layer.MapVLayer.prototype.canvasContext
77297733
* @description MapV 图主绘制对象。
77307734
*/
77317735
this.canvasContext = null;
@@ -7751,7 +7755,7 @@ class MapVLayer_MapVLayer extends SuperMap_SuperMap.Layer {
77517755
if (this.options.context == '2d') {
77527756
this.canvasContext.scale(devicePixelRatio, devicePixelRatio);
77537757
}
7754-
this.attribution = 2017 百度 <a href='http://mapv.baidu.com' target='_blank'>MapV</a> with <span>© <a target='_blank' href='http://iclient.supermap.io' " +
7758+
this.attribution = 2018 百度 <a href='http://mapv.baidu.com' target='_blank'>MapV</a> with <span>© <a target='_blank' href='http://iclient.supermap.io' " +
77557759
"style='color: #08c;text-decoration: none;'>SuperMap iClient</a></span>";
77567760

77577761
this.CLASS_NAME = "SuperMap.Layer.MapVLayer";
@@ -8951,7 +8955,7 @@ SuperMap_SuperMap.REST.AddressMatchService = services_AddressMatchService_Addres
89518955
* @param {number} options.length - 服务访问地址数组长度。
89528956
* @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型,iServer|iPortal|Online。
89538957
* @param {Object} [options.eventListeners] - 事件监听器对象。有 processCompleted 属性可传入处理完成后的回调函数。processFailed 属性传入处理失败后的回调函数。
8954-
*/
8958+
*/
89558959
class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_CommonServiceBase {
89568960

89578961
constructor(url, options) {
@@ -8985,12 +8989,18 @@ class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_Comm
89858989
*/
89868990
getJobs(url) {
89878991
var me = this;
8988-
FetchRequest.get(me._processUrl(url), null, {proxy: me.proxy}).then(function (response) {
8992+
FetchRequest.get(me._processUrl(url), null, {
8993+
proxy: me.proxy
8994+
}).then(function (response) {
89898995
return response.json();
89908996
}).then(function (result) {
8991-
me.events.triggerEvent("processCompleted", {result: result});
8997+
me.events.triggerEvent("processCompleted", {
8998+
result: result
8999+
});
89929000
}).catch(function (e) {
8993-
me.eventListeners.processFailed({error: e});
9001+
me.eventListeners.processFailed({
9002+
error: e
9003+
});
89949004
});
89959005
}
89969006

@@ -9003,14 +9013,19 @@ class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_Comm
90039013
* @param {number} seconds - 开始创建后,获取创建成功结果的时间间隔。
90049014
*/
90059015
addJob(url, params, paramType, seconds) {
9006-
var me = this, parameterObject = null;
9016+
var me = this,
9017+
parameterObject = null;
90079018
if (params && params instanceof paramType) {
90089019
parameterObject = new Object();
90099020
paramType.toObject(params, parameterObject);
90109021
}
90119022
var options = {
90129023
proxy: me.proxy,
9013-
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
9024+
headers: {
9025+
'Content-Type': 'application/x-www-form-urlencoded'
9026+
},
9027+
withCredentials: me.withCredentials,
9028+
isInTheSameDomain: me.isInTheSameDomain
90149029
};
90159030
FetchRequest.post(me._processUrl(url), JSON.stringify(parameterObject), options).then(function (response) {
90169031
return response.json();
@@ -9021,7 +9036,9 @@ class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_Comm
90219036
me.serviceProcessFailed(result);
90229037
}
90239038
}).catch(function (e) {
9024-
me.serviceProcessFailed({error: e});
9039+
me.serviceProcessFailed({
9040+
error: e
9041+
});
90259042
});
90269043
}
90279044

@@ -9031,23 +9048,35 @@ class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_Comm
90319048
var me = this;
90329049
if (result) {
90339050
var id = setInterval(function () {
9034-
FetchRequest.get(me._processUrl(result.newResourceLocation), {_t: new Date().getTime()})
9051+
FetchRequest.get(me._processUrl(result.newResourceLocation), {
9052+
_t: new Date().getTime()
9053+
})
90359054
.then(function (response) {
90369055
return response.json();
90379056
}).then(function (job) {
9038-
me.events.triggerEvent("processRunning", {id: job.id, state: job.state});
9039-
if (job.state.runState === 'LOST' || job.state.runState === 'KILLED' || job.state.runState === 'FAILED') {
9040-
clearInterval(id);
9041-
me.events.triggerEvent("processFailed", {error: job.state.errorMsg, state: job.state.runState});
9042-
}
9043-
if (job.state.runState === 'FINISHED' && job.setting.serviceInfo) {
9057+
me.events.triggerEvent("processRunning", {
9058+
id: job.id,
9059+
state: job.state
9060+
});
9061+
if (job.state.runState === 'LOST' || job.state.runState === 'KILLED' || job.state.runState === 'FAILED') {
9062+
clearInterval(id);
9063+
me.events.triggerEvent("processFailed", {
9064+
error: job.state.errorMsg,
9065+
state: job.state.runState
9066+
});
9067+
}
9068+
if (job.state.runState === 'FINISHED' && job.setting.serviceInfo) {
9069+
clearInterval(id);
9070+
me.events.triggerEvent("processCompleted", {
9071+
result: job
9072+
});
9073+
}
9074+
}).catch(function (e) {
90449075
clearInterval(id);
9045-
me.events.triggerEvent("processCompleted", {result: job});
9046-
}
9047-
}).catch(function (e) {
9048-
clearInterval(id);
9049-
me.events.triggerEvent("processFailed", {error: e});
9050-
});
9076+
me.events.triggerEvent("processFailed", {
9077+
error: e
9078+
});
9079+
});
90519080
}, seconds);
90529081
}
90539082
}
@@ -9070,7 +9099,6 @@ class ProcessingServiceBase_ProcessingServiceBase extends CommonServiceBase_Comm
90709099
}
90719100

90729101
SuperMap.ProcessingServiceBase = ProcessingServiceBase_ProcessingServiceBase;
9073-
90749102
// CONCATENATED MODULE: ./src/common/iServer/KernelDensityJobsService.js
90759103
/* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
90769104
* This program are made available under the terms of the Apache License, Version 2.0

0 commit comments

Comments
 (0)