Skip to content

Commit d687a42

Browse files
songyumengsongyumeng
committed
add FieldParameters
1 parent 753c24a commit d687a42

File tree

13 files changed

+2036
-1849
lines changed

13 files changed

+2036
-1849
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1498 additions & 1440 deletions
Large diffs are not rendered by default.

‎dist/iclient9-leaflet.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/iclient9-openlayers.js‎

Lines changed: 417 additions & 330 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.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.

‎examples/leaflet/02_fieldStatistics.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
2121
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
2222
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
23-
<script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
23+
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
2424
<script type="text/javascript">
2525
var map, currentData, layersName = [], info, fieldService,
2626
mapURL = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World",
@@ -103,10 +103,11 @@
103103
if (dataInfo.layerName == name) {
104104
//设置数据集，数据源，查询fields信息
105105
currentData = dataInfo;
106-
L.supermap.fieldService(dataURL, {
107-
dataSourceName: dataInfo.dataSourceName,
108-
dataSetName: dataInfo.dataSetName
109-
}).getFields(function (serviceResult) {
106+
var param = new SuperMap.FieldParameters({
107+
datasource: currentData.dataSourceName,
108+
dataset: currentData.dataSetName,
109+
});
110+
L.supermap.fieldService(dataURL).getFields(param,function (serviceResult) {
110111
if (serviceResult.result && serviceResult.result.fieldNames) {
111112
fieldStatistic(serviceResult.result.fieldNames[0]);
112113
}
@@ -117,23 +118,22 @@
117118

118119
//统计结果
119120
function fieldStatistic(fieldName) {
120-
var param = new SuperMap.FieldStatisticsParameters({
121-
fieldName: fieldName,
122-
statisticMode: [
123-
SuperMap.StatisticMode.MAX,
124-
SuperMap.StatisticMode.MIN,
125-
SuperMap.StatisticMode.SUM,
126-
SuperMap.StatisticMode.AVERAGE,
127-
SuperMap.StatisticMode.STDDEVIATION,
128-
SuperMap.StatisticMode.VARIANCE
129-
]
130-
});
121+
131122
if (currentData) {
132-
L.supermap.fieldService(dataURL, {
133-
dataSourceName: currentData.dataSourceName,
134-
dataSetName: currentData.dataSetName,
135-
fieldName: fieldName
136-
}).getFieldStatisticsInfo(param, function (serviceResult) {
123+
var param = new SuperMap.FieldStatisticsParameters({
124+
datasource: currentData.dataSourceName,
125+
dataset: currentData.dataSetName,
126+
fieldName: fieldName,
127+
statisticMode: [
128+
SuperMap.StatisticMode.MAX,
129+
SuperMap.StatisticMode.MIN,
130+
SuperMap.StatisticMode.SUM,
131+
SuperMap.StatisticMode.AVERAGE,
132+
SuperMap.StatisticMode.STDDEVIATION,
133+
SuperMap.StatisticMode.VARIANCE
134+
]
135+
});
136+
L.supermap.fieldService(dataURL).getFieldStatisticsInfo(param, function (serviceResult) {
137137
info.update(serviceResult.result);
138138
});
139139
}

‎examples/leaflet/02_fieldsService.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1111
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
1212
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
13-
<script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
13+
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1414
<script type="text/javascript">
1515
var map, infoWin,
1616
baseUrl = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World",
@@ -26,10 +26,11 @@
2626
fieldsService();
2727

2828
function fieldsService() {
29-
L.supermap.fieldService(url, {
30-
dataSourceName: "World",
31-
dataSetName: "continent_T"
32-
}).getFields(function (serviceResult) {
29+
var param = new SuperMap.FieldParameters({
30+
datasource: "World",
31+
dataset: "continent_T"
32+
});
33+
L.supermap.fieldService(url).getFields(param,function (serviceResult) {
3334
var innerHTML = serviceResult.result.fieldNames.join(', ');
3435
infoWin = L.popup({maxWidth: 420})
3536
.setLatLng(map.getCenter())

‎examples/openlayers/02_fieldStatistics.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,11 @@
9494
if (dataInfo.layerName == name) {
9595
//设置数据集，数据源，查询fields信息
9696
currentData = dataInfo;
97-
new ol.supermap.FieldService(dataURL, {
98-
dataSourceName: dataInfo.dataSourceName, dataSetName: dataInfo.dataSetName
99-
}).getFields(function (serviceResult) {
97+
var param = new SuperMap.FieldParameters({
98+
datasource: dataInfo.dataSourceName,
99+
dataset: dataInfo.dataSetName
100+
});
101+
new ol.supermap.FieldService(dataURL).getFields(param,function (serviceResult) {
100102
fieldStatistic();
101103
});
102104
}
@@ -106,6 +108,8 @@
106108
function fieldStatistic() {
107109
var fieldName = 'SmID';
108110
var param = new SuperMap.FieldStatisticsParameters({
111+
datasource: currentData.dataSourceName,
112+
dataset: currentData.dataSetName,
109113
fieldName: fieldName,
110114
statisticMode: [
111115
SuperMap.StatisticMode.MAX,
@@ -117,11 +121,7 @@
117121
]
118122
});
119123
if (currentData) {
120-
new ol.supermap.FieldService(dataURL, {
121-
dataSourceName: currentData.dataSourceName,
122-
dataSetName: currentData.dataSetName,
123-
fieldName: fieldName
124-
}).getFieldStatisticsInfo(param, function (serviceResult) {
124+
new ol.supermap.FieldService(dataURL).getFieldStatisticsInfo(param, function (serviceResult) {
125125
showResult(serviceResult.result);
126126
});
127127
}

‎examples/openlayers/02_fieldsService.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@
8787
mapService();
8888

8989
function mapService() {
90-
new ol.supermap.FieldService(url, {
91-
dataSourceName: "World",
92-
dataSetName: "continent_T"
93-
}).getFields(function (serviceResult) {
90+
var param = new SuperMap.FieldParameters({
91+
datasource: "World",
92+
dataset: "continent_T"
93+
});
94+
new ol.supermap.FieldService(url).getFields(param,function (serviceResult) {
9495
content.innerHTML = serviceResult.result.fieldNames.join(', ');
9596
overlay.setPosition([0, 0]);
9697
});

‎src/common/iServer/FieldParameters.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import SuperMap from '../SuperMap';
2+
/**
3+
* @class SuperMap.FieldParameters
4+
* @classdesc 字段信息查询参数类。
5+
* @param options - {Object} 参数。如：<br>
6+
* datasource - {string} 数据源名称。<br>
7+
* dataset -{string} 数据集名称。
8+
*/
9+
export default class FieldParameters {
10+
/**
11+
* @member SuperMap.FieldParameters.prototype.datasource -{string}
12+
* @description 要查询的数据集所在的数据源名称。
13+
*/
14+
datasource = null;
15+
16+
/**
17+
* @member SuperMap.FieldParameters.prototype.dataset -{string}
18+
* @description 要查询的数据集名称。
19+
*/
20+
dataset = null;
21+
22+
23+
constructor(options) {
24+
if (options) {
25+
SuperMap.Util.extend(this, options);
26+
}
27+
}
28+
29+
/**
30+
* @function SuperMap.FieldParameters.prototype.destroy
31+
* @description 释放资源，将引用资源的属性置空。
32+
*/
33+
destroy() {
34+
var me = this;
35+
me.datasource = null;
36+
me.dataset = null;
37+
}
38+
39+
40+
CLASS_NAME = "SuperMap.FieldParameters"
41+
}
42+
43+
SuperMap.FieldParameters = FieldParameters;

‎src/common/iServer/FieldStatisticsParameters.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import SuperMap from '../SuperMap';
2+
import FieldParameters from './FieldParameters';
3+
24
/**
35
* @class SuperMap.FieldStatisticsParameters
46
* @classdesc 字段统计信息查询参数类。
57
* @param options - {Object} 参数。如：<br>
8+
* datasource - {string} 数据源名称。<br>
9+
* dataset -{string} 数据集名称。
610
* fieldName - {string} 字段名。<br>
711
* statisticMode -{String<SuperMap.StatisticMode>}|{Array<String<SuperMap.StatisticMode>>} 字段统计方法类型。
12+
* @extends SuperMap.FieldParameters
813
*/
9-
export default class FieldStatisticsParameters {
14+
export default class FieldStatisticsParameters extends FieldParameters{
1015
/**
1116
* @member SuperMap.FieldStatisticsParameters.prototype.fieldName -{string}
1217
* @description 字段名
@@ -20,6 +25,7 @@ export default class FieldStatisticsParameters {
2025
statisticMode = null;
2126

2227
constructor(options) {
28+
super(options);
2329
if (options) {
2430
SuperMap.Util.extend(this, options);
2531
}

0 commit comments

Comments
 (0)