Skip to content

Commit 4f42ff0

Browse files
author
caoxinke@supermap.com
committed
OpenLayers服务调用方式由事件驱动修改为callback回调
1 parent 23d522d commit 4f42ff0

File tree

94 files changed

+4282
-3911
lines changed

Some content is hidden

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

94 files changed

+4282
-3911
lines changed

‎build/deps.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,22 +233,17 @@ var deps = {
233233
"src": [
234234
"./src/openlayers/services/MapService.js",
235235
"./src/openlayers/services/QueryService.js",
236-
"./src/openlayers/services/ChartQueryService.js",
237-
"./src/openlayers/services/TilesetsService.js",
238-
"./src/openlayers/services/GetLayersInfoService.js",
239-
"./src/openlayers/services/ChartFeatureInfoSpecsService.js",
240-
"./src/openlayers/services/SetLayerService.js",
241-
"./src/openlayers/services/MeasureService.js"
236+
"./src/openlayers/services/LayerInfoService.js",
237+
"./src/openlayers/services/MeasureService.js",
238+
"./src/openlayers/services/ChartService.js"
242239
]
243240
},
244241
"Data": {
245242
"name": "数据服务",
246243
"src": [
247-
"./src/openlayers/services/FieldStatisticService.js",
248-
"./src/openlayers/services/GetFeaturesService.js",
249-
"./src/openlayers/services/GetFieldsService.js",
250-
"./src/openlayers/services/EditFeaturesService.js",
251-
"./src/openlayers/services/GetGridCellInfosService.js"
244+
"./src/openlayers/services/FeatureService.js",
245+
"./src/openlayers/services/FieldService.js",
246+
"./src/openlayers/services/GridCellInfosService.js"
252247
]
253248
},
254249
"Theme": {

‎dist/iclient9-leaflet.js‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9599,8 +9599,8 @@
95999599
* Class: MapService
96009600
* 地图信息服务类
96019601
* 用法：
9602-
* L.superMap.mapService(url)
9603-
* .getMapStatus(function(result){
9602+
* L.supermap.mapService(url)
9603+
* .getMapInfo(function(result){
96049604
* //doSomething
96059605
* })
96069606
*/
@@ -9754,7 +9754,7 @@
97549754

97559755
_postSimulatie: function (type, url, params, options) {
97569756
var separator = url.indexOf("?") > -1 ? "&" : "?";
9757-
url += separator + '_method= ' + type + this._appendUrlTokenParameter(url);
9757+
url += separator + '_method= ' + type;
97589758
return this.post(url, params, options);
97599759
},
97609760

@@ -9831,7 +9831,8 @@
98319831
return paramsArray.join("&");
98329832
}
98339833

9834-
}
9834+
}
9835+
module.exports = SuperMap.Request;
98359836

98369837
/***/ },
98379838
/* 22 */
@@ -10814,8 +10815,7 @@
1081410815
* 地图查询服务类
1081510816
* 提供：范围查询，SQL查询，几何查询，距离查询
1081610817
* 用法：
10817-
* L.superMap.queryService(url)
10818-
* .queryByBounds(param,function(result){
10818+
* L.supermap.queryService(url).queryByBounds(param,function(result){
1081910819
* //doSomething
1082010820
* })
1082110821
*/
@@ -12060,7 +12060,7 @@
1206012060
* Class: LayerInfoService
1206112061
* 图层信息服务类
1206212062
* 用法：
12063-
* L.superMap.layerInfoService(url).getLayersInfo(function(result){
12063+
* L.supermap.layerInfoService(url).getLayersInfo(function(result){
1206412064
* //doSomething
1206512065
* })
1206612066
*/
@@ -15163,7 +15163,7 @@
1516315163
res.graphText = SuperMap.ThemeGraphText.fromObj(obj);
1516415164
res.offset = SuperMap.ThemeOffset.fromObj(obj);
1516515165
for (var i = 0; i < len; i++) {
15166-
res.items.push(ThemeGraphItem.fromObj(itemsG[i]));
15166+
res.items.push(SuperMap.ThemeGraphItem.fromObj(itemsG[i]));
1516715167
}
1516815168
return res;
1516915169
};
@@ -17786,7 +17786,7 @@
1778617786
* Class: MeasureService
1778717787
* 量算服务服务类
1778817788
* 用法：
17789-
* L.superMap.measureService(url).measureDistance({
17789+
* L.supermap.measureService(url).measureDistance({
1779017790
* geometry:xxx
1779117791
* },function(result){
1779217792
* //doSomething
@@ -18082,7 +18082,7 @@
1808218082
* Class:ChartService
1808318083
* 海图服务
1808418084
* 用法：
18085-
* L.superMap.chartService(url)
18085+
* L.supermap.chartService(url)
1808618086
* .queryChart(param,function(result){
1808718087
* //doSomething
1808818088
* })
@@ -18270,6 +18270,7 @@
1827018270
*
1827118271
*/
1827218272
destroy: function () {
18273+
var me = this;
1827318274
SuperMap.ServiceBase.prototype.destroy.apply(this, arguments);
1827418275
me.returnContent = null;
1827518276
me.format = null;
@@ -18706,7 +18707,9 @@
1870618707
CLASS_NAME: "SuperMap.REST.ChartFeatureInfoSpecsService"
1870718708
});
1870818709

18709-
module.exports = function (url, options) {
18710+
module.exports =
18711+
18712+
function (url, options) {
1871018713
return new SuperMap.REST.ChartFeatureInfoSpecsService(url, options);
1871118714
};
1871218715

@@ -18720,7 +18723,7 @@
1872018723
* 数据集类。
1872118724
* 提供：ID查询，范围查询，SQL查询，几何查询，bounds查询，缓冲区查询，地物编辑
1872218725
* 用法：
18723-
* L.superMap.featureService(url)
18726+
* L.supermap.featureService(url)
1872418727
* .getFeaturesByIDs(param,function(result){
1872518728
* //doSomething
1872618729
* })
@@ -20447,10 +20450,7 @@
2044720450
* Class: FieldService
2044820451
* 字段服务类
2044920452
* 用法：
20450-
* L.superMap.fieldService(url)
20451-
* .on("complete",function(result){
20452-
* //doSomething
20453-
* }).on("failed",function(result){
20453+
* L.supermap.fieldService(url).getFields(function(result){
2045420454
* //doSomething
2045520455
* });
2045620456
*/
@@ -20815,7 +20815,7 @@
2081520815
* Class: GridCellInfosService
2081620816
* 数据栅格查询服务
2081720817
* 用法：
20818-
* L.superMap.gridCellInfosService(url)
20818+
* L.supermap.gridCellInfosService(url)
2081920819
* .getGridCellInfos(param,function(result){
2082020820
* //doSomething
2082120821
* })
@@ -21118,11 +21118,9 @@
2111821118
* Class: ThemeService
2111921119
* 地图信息服务类
2112021120
* 用法：
21121-
* L.superMap.themeService(url,{
21121+
* L.supermap.themeService(url,{
2112221122
* projection:projection
21123-
* }).on("complete",function(result){
21124-
* //doSomething
21125-
* }).on("failed",function(result){
21123+
* }).getThemeInfo(params,function(result){
2112621124
* //doSomething
2112721125
* });
2112821126
*/
@@ -21889,8 +21887,7 @@
2188921887
* Class: NetworkAnalystService
2189021888
* 网络分析服务类
2189121889
* 用法：
21892-
* L.superMap
21893-
* .networkAnalystService(url)
21890+
* L.supermap.networkAnalystService(url)
2189421891
* .findPath(params,function(result){
2189521892
* //doSomething
2189621893
* })
@@ -24796,8 +24793,7 @@
2479624793
* Class: NetworkAnalyst3DService
2479724794
* 3D网络分析服务类
2479824795
* 用法：
24799-
* L.superMap
24800-
* .networkAnalyst3DService(url)
24796+
* L.supermap.networkAnalyst3DService(url)
2480124797
* .sinksFacilityAnalyst(params,function(result){
2480224798
* //doSomething
2480324799
* })
@@ -25669,7 +25665,7 @@
2566925665
* 空间分析服务类。
2567025666
* 提供：地区太阳辐射、缓冲区分析、点密度分析、动态分段分析、空间关系分析、插值分析、栅格代数运算、叠加分析、路由定位、路由测量计算、表面分析、地形曲率计算、泰森多边形分析。
2567125667
* 用法：
25672-
* L.superMap.spatialAnalystService(url)
25668+
* L.supermap.spatialAnalystService(url)
2567325669
* .bufferAnalysis(params,function(result){
2567425670
* //doSomething
2567525671
* })
@@ -26105,7 +26101,7 @@
2610526101

2610626102
var parameterObject = new Object();
2610726103

26108-
if (parameter instanceof AreaSolarRadiationService) {
26104+
if (parameter instanceof SuperMap.AreaSolarRadiationParameter) {
2610926105
me.url += 'datasets/' + parameter.dataset + '/solarradiation';
2611026106
}
2611126107

@@ -31303,7 +31299,7 @@
3130331299
* Class: TrafficTransferAnalystService
3130431300
* 交通换乘分析服务类
3130531301
* 用法：
31306-
* L.superMap
31302+
* L.supermap
3130731303
* .trafficTransferAnalystService(url)
3130831304
* .queryStop(params,function(result){
3130931305
* //doSomething
@@ -32493,7 +32489,7 @@
3249332489

3249432490
me.options.url = url;
3249532491
if (url && url.indexOf("/") === (url.length - 1)) {
32496-
url = url.substr(0, str.length - 1);
32492+
url = url.substr(0, url.length - 1);
3249732493
me.options.url = url;
3249832494
}
3249932495
me._initLayerUrl();
@@ -32736,7 +32732,7 @@
3273632732
me.resolutions = me._resolutionsFromScales(me.scales);
3273732733
var len = me.resolutions.length;
3273832734
me.scales = [len];
32739-
for (i = 0; i < len; i++) {
32735+
for (var i = 0; i < len; i++) {
3274032736
me.scales[i] = SuperMap.Util.getScaleFromResolutionDpi(
3274132737
me.resolutions[i], me.dpi, me.units, me.datumAxis
3274232738
);
@@ -34037,7 +34033,7 @@
3403734033
return style;
3403834034
}
3403934035
if (type === "POINT") {
34040-
size = Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]) || 8;
34036+
var size = Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]) || 8;
3404134037
var symbolParameters = {
3404234038
"transparent": true,
3404334039
"resourceType": "SYMBOLMARKER",
@@ -34050,7 +34046,7 @@
3405034046
return style;
3405134047
}
3405234048
if (type === "TEXT") {
34053-
shader = feature.properties.textStyle || layerStyle;
34049+
shader = feature.properties.textStyle || layerInfo.layerStyle;
3405434050
//设置文本是否使用粗体
3405534051
style.fontWeight = shader.bold ? shader.fontWeight : "normal";
3405634052
//设置文本的尺寸（对应fontHeight属性）和行高，行高iserver不支持，默认5像素

0 commit comments

Comments
 (0)