Skip to content

Commit 7e61910

Browse files
chenxianhuiichenxianhuii
committed
update：S102水深查询不用手动指定数据源
1 parent af596e8 commit 7e61910

File tree

11 files changed

+14
-36
lines changed

11 files changed

+14
-36
lines changed

‎examples/leaflet/01_chartService.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ <h5 class='panel-title text-center'>
372372
var url = "https://iserver.supermap.io/iserver/services/map-chart/rest/maps/GB4X0000_52000";
373373
// var url = "http://localhost:8090/iserver/services/map-WorkSpace1-2/rest/maps/S104S102_1";
374374
var dataUrl = "http://localhost:8090/iserver/services/data-WorkSpace1-2/rest/data";
375-
var s102dataSourceName = 'nanbaoS102v3003f';
376375
var s104dataSource = 'nanbaoS104v200';
377376
var s104dataSet = 'S104Position4326';
378377
var s104dataSetWaterLevel = 'S104WaterLevel';
@@ -906,16 +905,15 @@ <h5 class='panel-title text-center'>
906905

907906
function S102GridQueryDebounceFun(X, Y) {
908907
var chartWaterDepthParameter = new L.supermap.ChartWaterDepthParameter({
909-
dataSource: s102dataSourceName,
910908
X: X,
911909
Y: Y
912910
})
913911
chartService.getChartWaterDepth(chartWaterDepthParameter).then(function (res) {
914912
const topDatasetQuery = res.depth;
915913
if (topDatasetQuery) {
916914
var content = topDatasetQuery.result;
917-
var datasetName = topDatasetQuery.options.scope.datasetName;
918-
var innerHTML = resources.text_Datasources + '：' + s102dataSourceName + "<br/>";
915+
var { datasetName, dataSourceName } = topDatasetQuery.options.scope;
916+
var innerHTML = resources.text_Datasources + '：' + dataSourceName + "<br/>";
919917
innerHTML += resources.text_dataset + '：' + datasetName + "<br/>";
920918
innerHTML += resources.text_x_field + '：' + X + "<br/>";
921919
innerHTML += resources.text_y_field + '：' + Y + "<br/>";

‎examples/mapboxgl/01_chartService.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ <h5 class='panel-title text-center'>
379379
var url = "https://iserver.supermap.io/iserver/services/map-chart/rest/maps/GB4X0000_52000";
380380
// var url = "http://localhost:8090/iserver/services/map-WorkSpace1-2/rest/maps/S104S102_1";
381381
var dataUrl = "http://localhost:8090/iserver/services/data-WorkSpace1-2/rest/data";
382-
var s102dataSourceName = 'nanbaoS102v3003f';
383382
var s104dataSource = 'nanbaoS104v200';
384383
var s104dataSet = 'S104Position4326';
385384
var s104dataSetWaterLevel = 'S104WaterLevel';
@@ -991,16 +990,15 @@ <h5 class='panel-title text-center'>
991990

992991
function S102GridQueryDebounceFun(X, Y) {
993992
var chartWaterDepthParameter = new mapboxgl.supermap.ChartWaterDepthParameter({
994-
dataSource: s102dataSourceName,
995993
X: X,
996994
Y: Y
997995
})
998996
chartService.getChartWaterDepth(chartWaterDepthParameter).then(function (res) {
999997
const topDatasetQuery = res.depth;
1000998
if (topDatasetQuery) {
1001999
var content = topDatasetQuery.result;
1002-
var datasetName = topDatasetQuery.options.scope.datasetName;
1003-
var innerHTML = resources.text_Datasources + '：' + s102dataSourceName + "<br/>";
1000+
var { datasetName, dataSourceName } = topDatasetQuery.options.scope;
1001+
var innerHTML = resources.text_Datasources + '：' + dataSourceName + "<br/>";
10041002
innerHTML += resources.text_dataset + '：' + datasetName + "<br/>";
10051003
innerHTML += resources.text_x_field + '：' + X + "<br/>";
10061004
innerHTML += resources.text_y_field + '：' + Y + "<br/>";

‎examples/maplibregl/01_chartService.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ <h5 class='panel-title text-center'>
379379
var url = "https://iserver.supermap.io/iserver/services/map-chart/rest/maps/GB4X0000_52000";
380380
// var url = "http://localhost:8090/iserver/services/map-WorkSpace1-2/rest/maps/S104S102_1";
381381
var dataUrl = "http://localhost:8090/iserver/services/data-WorkSpace1-2/rest/data";
382-
var s102dataSourceName = 'nanbaoS102v3003f';
383382
var s104dataSource = 'nanbaoS104v200';
384383
var s104dataSet = 'S104Position4326';
385384
var s104dataSetWaterLevel = 'S104WaterLevel';
@@ -991,16 +990,15 @@ <h5 class='panel-title text-center'>
991990

992991
function S102GridQueryDebounceFun(X, Y) {
993992
var chartWaterDepthParameter = new maplibregl.supermap.ChartWaterDepthParameter({
994-
dataSource: s102dataSourceName,
995993
X: X,
996994
Y: Y
997995
})
998996
chartService.getChartWaterDepth(chartWaterDepthParameter).then(function (res) {
999997
const topDatasetQuery = res.depth;
1000998
if (topDatasetQuery) {
1001999
var content = topDatasetQuery.result;
1002-
var datasetName = topDatasetQuery.options.scope.datasetName;
1003-
var innerHTML = resources.text_Datasources + '：' + s102dataSourceName + "<br/>";
1000+
var { datasetName, dataSourceName } = topDatasetQuery.options.scope;
1001+
var innerHTML = resources.text_Datasources + '：' + dataSourceName + "<br/>";
10041002
innerHTML += resources.text_dataset + '：' + datasetName + "<br/>";
10051003
innerHTML += resources.text_x_field + '：' + X + "<br/>";
10061004
innerHTML += resources.text_y_field + '：' + Y + "<br/>";

‎examples/openlayers/01_chartService.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ <h5 class='panel-title text-center'>
416416
var url = "https://iserver.supermap.io/iserver/services/map-chart/rest/maps/GB4X0000_52000";
417417
// var url = "http://localhost:8090/iserver/services/map-WorkSpace1-2/rest/maps/S104S102_1";
418418
var dataUrl = "http://localhost:8090/iserver/services/data-WorkSpace1-2/rest/data";
419-
var s102dataSourceName = 'nanbaoS102v3003f';
420419
var s104dataSource = 'nanbaoS104v200';
421420
var s104dataSet = 'S104Position4326';
422421
var s104dataSetWaterLevel = 'S104WaterLevel';
@@ -445,7 +444,7 @@ <h5 class='panel-title text-center'>
445444
link: "https://iclient.supermap.io"
446445
})]),
447446
view: new ol.View({
448-
center: [61.0, -32.51],
447+
center: [113.6, 22.7],
449448
zoom: 13,
450449
projection: 'EPSG:4326',
451450
multiWorld: true
@@ -1004,16 +1003,15 @@ <h5 class='panel-title text-center'>
10041003

10051004
function S102GridQueryDebounceFun(X, Y) {
10061005
var chartWaterDepthParameter = new ol.supermap.ChartWaterDepthParameter({
1007-
dataSource: s102dataSourceName,
10081006
X: X,
10091007
Y: Y
10101008
})
10111009
chartService.getChartWaterDepth(chartWaterDepthParameter).then(function (res) {
10121010
const topDatasetQuery = res.depth;
10131011
if (topDatasetQuery) {
10141012
var content = topDatasetQuery.result;
1015-
var datasetName = topDatasetQuery.options.scope.datasetName;
1016-
var innerHTML = resources.text_Datasources + '：' + s102dataSourceName + "<br/>";
1013+
var { datasetName, dataSourceName } = topDatasetQuery.options.scope;
1014+
var innerHTML = resources.text_Datasources + '：' + dataSourceName + "<br/>";
10171015
innerHTML += resources.text_dataset + '：' + datasetName + "<br/>";
10181016
innerHTML += resources.text_x_field + '：' + X + "<br/>";
10191017
innerHTML += resources.text_y_field + '：' + Y + "<br/>";

‎src/common/iServer/ChartService.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121

122122
layers.forEach(layer => {
123123
if (layer.datasetInfo && layer.datasetInfo.type === 'GRID') {
124-
datasetNames.push(layer.datasetInfo.name);
124+
datasetNames.push([layer.datasetInfo.dataSourceName, layer.datasetInfo.name]);
125125
}
126126

127127
if (layer.subLayers && Array.isArray(layer.subLayers.layers)) {
@@ -146,15 +146,15 @@
146146
console.error('dataUrl is required');
147147
return null;
148148
}
149-
var { dataSource, X, Y } = params;
149+
var { X, Y } = params;
150150
var queryPromises = [];
151151
return new LayerInfoService(me.url).getLayersInfo().then(function (serviceResult) {
152152
const datasetNames = me._getDatasetNameByLayers(serviceResult.result.subLayers.layers);
153153
datasetNames.forEach(function (datasetName) {
154154
// 栅格查询
155155
var getGridCellInfosParam = new GetGridCellInfosParameters({
156-
dataSourceName: dataSource,
157-
datasetName: datasetName,
156+
dataSourceName: datasetName[0],
157+
datasetName: datasetName[1],
158158
X: X,
159159
Y: Y
160160
});
@@ -180,7 +180,7 @@
180180
});
181181
// 如果某一处有多个图层，从datasetNames找到第一个，代表最顶层的
182182
for (var j = 0; j < datasetNames.length; j++) {
183-
const name = datasetNames[j];
183+
const name = datasetNames[j][1];
184184
if (!datasetMap.hasOwnProperty(name)) {
185185
continue;
186186
}

‎src/common/iServer/ChartWaterDepthParameter.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ import { Util } from '../commontypes/Util';
99
* @category iServer Map Chart
1010
* @classdesc 海图水深查询参数类
1111
* @param {Object} options - 参数。
12-
* @param {Object} options.dataSource - 数据源名称。
1312
* @param {number} options.X - 地理位置 X 轴。
1413
* @param {number} options.Y - 地理位置 Y 轴。
1514
* @usage
1615
*/
1716
export class ChartWaterDepthParameter {
1817
constructor(options) {
19-
/**
20-
* @member {string} [ChartWaterDepthParameter.prototype.dataSource]
21-
* @description 数据源名称。
22-
*/
23-
this.dataSource = null;
2418

2519
/**
2620
* @member {number} [ChartWaterDepthParameter.prototype.X]
@@ -45,7 +39,6 @@ export class ChartWaterDepthParameter {
4539
*/
4640
destroy() {
4741
var me = this;
48-
me.dataSource = null;
4942
me.X = null;
5043
me.Y = null;
5144
}

‎test/common/iServer/ChartWaterDepthParameterSpec.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@ import { ChartWaterDepthParameter } from '@supermapgis/iclient-common/iServer/Ch
33
describe('ChartWaterDepthParameter', () => {
44
it('constructor, destroy', () => {
55
var options = {
6-
dataSource: 'datasrouce',
76
X: 100,
87
Y: 20
98
};
109
var parameter = new ChartWaterDepthParameter(options);
1110
expect(parameter).not.toBeNull();
12-
expect(parameter.dataSource).toBe('datasrouce');
1311
expect(parameter.X).toBe(100);
1412
expect(parameter.Y).toBe(20);
1513
parameter.destroy();
16-
expect(parameter.dataSource).toBeNull();
1714
expect(parameter.X).toBeNull();
1815
expect(parameter.Y).toBeNull();
1916
});

‎test/leaflet/services/ChartServiceSpec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ describe('leaflet_ChartService', () => {
9999
it('getChartWaterDepth', (done) => {
100100
var service = chartService(url, dataUrl, options);
101101
var parms = new ChartWaterDepthParameter({
102-
dataSource: 'testDataSrouce1',
103102
X:113.62145767211913,
104103
Y:22.775788497924808
105104
});

‎test/mapboxgl/services/ChartServiceSpec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ describe('mapboxgl_ChartService', () => {
9999
it('getChartWaterDepth', (done) => {
100100
var service = new ChartService(url, dataUrl, options);
101101
var parms = new ChartWaterDepthParameter({
102-
dataSource: 'testDataSrouce1',
103102
X:113.62145767211913,
104103
Y:22.775788497924808
105104
});

‎test/maplibregl/services/ChartServiceSpec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ describe('maplibregl_ChartService', () => {
9898
it('getChartWaterDepth', (done) => {
9999
var service = new ChartService(url, dataUrl, options);
100100
var parms = new ChartWaterDepthParameter({
101-
dataSource: 'testDataSrouce1',
102101
X:113.62145767211913,
103102
Y:22.775788497924808
104103
});

0 commit comments

Comments
 (0)