Skip to content

Commit cbb83b2

Browse files
Yuki-ZhaoYuki-Zhao
committed
2 parents 0ae6e67 + 251e58d commit cbb83b2

22 files changed

+360
-52
lines changed

‎examples-test/leaflet/06_trafficTransferAnalystServiceIT.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = {
3737
/*判断初始交互控件*/
3838
browser.waitForElementPresent('.panel.panel-primary.leaflet-control', 10000);
3939
/*单击'9路'，判断path是否有变化*/
40-
browser.useXpath().click('//*[@id="trafficRes"]/tr[2]/td[2]/a[1]', function () {
40+
browser.useXpath().click('//*[@id="trafficRes"]/tr[2]/td[1]/a[1]', function () {
4141
browser.pause(1500);
4242
browser.elements('tag name', 'path', function (result) {
4343
browser.assert.equal(result.value.length, 2, "expect Number of trafficTransferAnalystService path after click '9路' to be 2, actual is " + result.value.length);
@@ -47,7 +47,7 @@ module.exports = {
4747
/*选择方案2中的'抚松路'，判断marker是否有变化*/
4848
browser.useXpath().click('//*[@id="transferSolution-1"]');
4949
browser.pause(1500);
50-
browser.useXpath().click('//*[@id="trafficRes"]/tr[3]/td[2]/a[2]', function () {
50+
browser.useXpath().click('//*[@id="trafficRes"]/tr[3]/td[1]/a[2]', function () {
5151
browser.pause(1500);
5252
browser.elements('css selector', '.leaflet-marker-icon', function (result) {
5353
browser.assert.equal(result.value.length, 3, "expect Number of marker after click '抚松路' in '方案2' to be 3, actual is " + result.value.length);
@@ -59,4 +59,4 @@ module.exports = {
5959
// browser.pause(1000);
6060
// browser.end();
6161
}
62-
};
62+
};

‎examples/classic/analysis_trafficTransfer.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,15 +542,13 @@
542542

543543
var table = $("<table id='trafficRes' class='table table-bordered'></table>");
544544
var startStop = $("<tr></tr>");
545-
$("<td class='start_transfer' ></td>").appendTo(startStop);
546545
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[0].startPosition.x + "," + transGuide.items[0].startPosition.y + "</span>" + transGuide.items[0].startStopName + "</span></td>").appendTo(startStop);
547546
startStop.appendTo(table);
548547
var indexY = 0;
549548
for (var iiii = 0, iiiiLen = transGuide.items.length; iiii < iiiiLen; iiii++) {
550549
var item = transGuide.items[iiii];
551550
var tr2 = $("<tr></tr>");
552551
if (item.isWalking) {
553-
$("<td class='step_transfer' ></td>").appendTo(tr2);
554552
$("<td>" + resources.text_walkTO + "<a class='busLink'><span style='display:none'>" + item.endPosition.x + "," + item.endPosition.y + "</span>" + item.endStopName + "</a></td>").appendTo(tr2);
555553
$("<td>" + parseInt(item.distance) + resources.msg_m + "</td>").appendTo(tr2);
556554
} else {
@@ -566,7 +564,6 @@
566564
}
567565
}
568566
}
569-
$("<td class='bus_transfer'></td>").appendTo(tr2);
570567
var points = item.route.components, pointStr = "";
571568
for (var i = 0; i < points.length; i++) {
572569
pointStr += points[i].x + " " + points[i].y;
@@ -582,7 +579,6 @@
582579
}
583580
var endStop = $("<tr></tr>");
584581
endStop.appendTo(table);
585-
$("<td class='end_transfer' ></td>").appendTo(endStop);
586582
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[transGuide.items.length - 1].endPosition.x + "," + transGuide.items[transGuide.items.length - 1].endPosition.y + "</span>" + transGuide.items[transGuide.items.length - 1].endStopName + "</span></td>").appendTo(endStop);
587583

588584
return table;

‎examples/leaflet/06_trafficTransferAnalystService.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,13 @@
174174
}
175175
var table = $("<table id='trafficRes' border='1'></table>");
176176
var startStop = $("<tr></tr>");
177-
$("<td class='start_transfer' width='10px'></td>").appendTo(startStop);
178177
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[0].startPosition.x + "," + transGuide.items[0].startPosition.y + "</span>" + transGuide.items[0].startStopName + "</span></td>").appendTo(startStop);
179178
startStop.appendTo(table);
180179
var indexY = 0;
181180
for (var iiii = 0, iiiiLen = transGuide.items.length; iiii < iiiiLen; iiii++) {
182181
var item = transGuide.items[iiii];
183182
var tr2 = $("<tr></tr>");
184183
if (item.isWalking) {
185-
$("<td class='step_transfer' ></td>").appendTo(tr2);
186184
$("<td>" + resources.text_walkTO + "<a class='busLink'><span style='display:none'>" + item.endPosition.x + "," + item.endPosition.y + "</span>" + item.endStopName + "</a></td>").appendTo(tr2);
187185
$("<td>" + parseInt(item.distance) + resources.msg_m + "</td>").appendTo(tr2);
188186
} else {
@@ -198,7 +196,6 @@
198196
}
199197
}
200198
}
201-
$("<td class='bus_transfer'></td>").appendTo(tr2);
202199
var points = item.route.points, pointStr = "";
203200
for (var i = 0; i < points.length; i++) {
204201
pointStr += points[i].x + " " + points[i].y;
@@ -214,7 +211,6 @@
214211
}
215212
var endStop = $("<tr></tr>");
216213
endStop.appendTo(table);
217-
$("<td class='end_transfer' width='10px'></td>").appendTo(endStop);
218214
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[transGuide.items.length - 1].endPosition.x + "," + transGuide.items[transGuide.items.length - 1].endPosition.y + "</span>" + transGuide.items[transGuide.items.length - 1].endStopName + "</span></td>").appendTo(endStop);
219215
return table;
220216
}

‎examples/openlayers/06_trafficTransferAnalystService.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,13 @@
214214
}
215215
var table = $("<table id='trafficRes' border='1'></table>");
216216
var startStop = $("<tr></tr>");
217-
$("<td class='start_transfer' width='10px'></td>").appendTo(startStop);
218217
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[0].startPosition.x + "," + transGuide.items[0].startPosition.y + "</span>" + transGuide.items[0].startStopName + "</span></td>").appendTo(startStop);
219218
startStop.appendTo(table);
220219
var indexY = 0;
221220
for (var m = 0, mLen = transGuide.items.length; m < mLen; m++) {
222221
var item = transGuide.items[m];
223222
var tr2 = $("<tr></tr>");
224223
if (item.isWalking) {
225-
$("<td class='step_transfer' ></td>").appendTo(tr2);
226224
$("<td>" + resources.text_walkTO + "<a class='busLink'><span style='display:none'>" + item.endPosition.x + "," + item.endPosition.y + "</span>" + item.endStopName + "</a></td>").appendTo(tr2);
227225
$("<td>" + parseInt(item.distance) + resources.msg_m + "</td>").appendTo(tr2);
228226
} else {
@@ -238,7 +236,6 @@
238236
}
239237
}
240238
}
241-
$("<td class='bus_transfer'></td>").appendTo(tr2);
242239
var points = item.route.points, pointStr = "";
243240
for (var i = 0; i < points.length; i++) {
244241
pointStr += points[i].x + " " + points[i].y;
@@ -254,7 +251,6 @@
254251
}
255252
var endStop = $("<tr></tr>");
256253
endStop.appendTo(table);
257-
$("<td class='end_transfer' width='10px'></td>").appendTo(endStop);
258254
$("<td colspan='2'><span class='busLink bgSpan'><span style='display:none'>" + transGuide.items[transGuide.items.length - 1].endPosition.x + "," + transGuide.items[transGuide.items.length - 1].endPosition.y + "</span>" + transGuide.items[transGuide.items.length - 1].endStopName + "</span></td>").appendTo(endStop);
259255
return table;
260256
}

‎src/common/iServer/AddressMatchService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ export class AddressMatchService extends CommonServiceBase {
7171
if (eventId === result.result.eventId && callback) {
7272
delete result.result.eventId;
7373
callback(result);
74-
this.events.un(eventListeners);
74+
this.events && this.events.un(eventListeners);
7575
return false;
7676
}
7777
},
7878
processFailed: function(result) {
7979
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
8080
callback(result);
81-
this.events.un(eventListeners);
81+
this.events && this.events.un(eventListeners);
8282
return false;
8383
}
8484
}

‎src/common/iServer/DatasetService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ export class DatasetService extends CommonServiceBase {
103103
if (eventId === result.result.eventId && callback) {
104104
delete result.result.eventId;
105105
callback(result);
106-
this.events.un(eventListeners);
106+
this.events && this.events.un(eventListeners);
107107
return false;
108108
}
109109
},
110110
processFailed: function(result) {
111111
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
112112
callback(result);
113-
this.events.un(eventListeners);
113+
this.events && this.events.un(eventListeners);
114114
return false;
115115
}
116116
}

‎src/common/iServer/DatasourceService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ export class DatasourceService extends CommonServiceBase {
8080
if (eventId === result.result.eventId && callback) {
8181
delete result.result.eventId;
8282
callback(result);
83-
this.events.un(eventListeners);
83+
this.events && this.events.un(eventListeners);
8484
return false;
8585
}
8686
},
8787
processFailed: function(result) {
8888
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
8989
callback(result);
90-
this.events.un(eventListeners);
90+
this.events && this.events.un(eventListeners);
9191
return false;
9292
}
9393
}

‎src/common/iServer/GeoprocessingService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ export class GeoprocessingService extends CommonServiceBase {
165165
if (eventId === result.result.eventId && callback) {
166166
delete result.result.eventId;
167167
callback(result);
168-
this.events.un(eventListeners);
168+
this.events && this.events.un(eventListeners);
169169
return false;
170170
}
171171
},
172172
processFailed: function(result) {
173173
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
174174
callback(result);
175-
this.events.un(eventListeners);
175+
this.events && this.events.un(eventListeners);
176176
return false;
177177
}
178178
}

‎src/common/iServer/GetGridCellInfosService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ export class GetGridCellInfosService extends CommonServiceBase {
109109
if (eventId === result.result.eventId && callback) {
110110
delete result.result.eventId;
111111
callback(result);
112-
this.events.un(eventListeners);
112+
this.events && this.events.un(eventListeners);
113113
return false;
114114
}
115115
},
116116
processFailed: function(result) {
117117
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
118118
callback(result);
119-
this.events.un(eventListeners);
119+
this.events && this.events.un(eventListeners);
120120
return false;
121121
}
122122
}

‎src/common/iServer/ImageCollectionService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ export default class ImageCollectionService extends CommonServiceBase {
123123
if (eventId === result.result.eventId && callback) {
124124
delete result.result.eventId;
125125
callback(result);
126-
this.events.un(eventListeners);
126+
this.events && this.events.un(eventListeners);
127127
return false;
128128
}
129129
},
130130
processFailed: function(result) {
131131
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
132132
callback(result);
133-
this.events.un(eventListeners);
133+
this.events && this.events.un(eventListeners);
134134
return false;
135135
}
136136
}

‎src/common/iServer/ImageService.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,16 @@ export default class ImageService extends CommonServiceBase {
8383
scope: this,
8484
processCompleted: function (result) {
8585
if (eventId === result.result.eventId && callback) {
86+
delete result.result.eventId;
8687
callback(result);
87-
this.events.un(eventListeners);
88+
this.events && this.events.un(eventListeners);
8889
return false;
8990
}
9091
},
9192
processFailed: function (result) {
9293
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
9394
callback(result);
94-
this.events.un(eventListeners);
95+
this.events && this.events.un(eventListeners);
9596
return false;
9697
}
9798
}

‎src/common/iServer/KnowledgeGraphService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,15 @@ export class KnowledgeGraphService extends CommonServiceBase {
220220
if (eventId === result.result.eventId && callback) {
221221
delete result.result.eventId;
222222
callback(result);
223-
this.events.un(eventListeners);
223+
this.events && this.events.un(eventListeners);
224224
return false;
225225
}
226226
},
227227
processFailed: function (result) {
228228
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
229229
delete result.eventId;
230230
callback(result);
231-
this.events.un(eventListeners);
231+
this.events && this.events.un(eventListeners);
232232
return false;
233233
}
234234
}

‎src/common/iServer/MapService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ export class MapService extends CommonServiceBase {
8585
if (eventId === result.result.eventId && callback) {
8686
delete result.result.eventId;
8787
callback(result);
88-
this.events.un(eventListeners);
88+
this.events && this.events.un(eventListeners);
8989
return false;
9090
}
9191
},
9292
processFailed: function(result) {
9393
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
9494
callback(result);
95-
this.events.un(eventListeners);
95+
this.events && this.events.un(eventListeners);
9696
return false;
9797
}
9898
}

‎src/common/iServer/MeasureService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ export class MeasureService extends CommonServiceBase {
7373
if (eventId === result.result.eventId && callback) {
7474
delete result.result.eventId;
7575
callback(result);
76-
this.events.un(eventListeners);
76+
this.events && this.events.un(eventListeners);
7777
return false;
7878
}
7979
},
8080
processFailed: function(result) {
8181
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
8282
callback(result);
83-
this.events.un(eventListeners);
83+
this.events && this.events.un(eventListeners);
8484
return false;
8585
}
8686
}

‎src/common/iServer/ThemeService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ export class ThemeService extends CommonServiceBase {
6363
if (eventId === result.result.eventId && callback) {
6464
delete result.result.eventId;
6565
callback(result);
66-
this.events.un(eventListeners);
66+
this.events && this.events.un(eventListeners);
6767
return false;
6868
}
6969
},
7070
processFailed: function(result) {
7171
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
7272
callback(result);
73-
this.events.un(eventListeners);
73+
this.events && this.events.un(eventListeners);
7474
return false;
7575
}
7676
}

‎src/common/iServer/WebPrintingService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ export class WebPrintingService extends CommonServiceBase {
162162
if (eventId === result.result.eventId && callback) {
163163
delete result.result.eventId;
164164
callback(result);
165-
this.events.un(eventListeners);
165+
this.events && this.events.un(eventListeners);
166166
return false;
167167
}
168168
},
169169
processFailed: function(result) {
170170
if (eventId === result.error.eventId || eventId === result.eventId) {
171171
callback(result);
172-
this.events.un(eventListeners);
172+
this.events && this.events.un(eventListeners);
173173
return false;
174174
}
175175
}

0 commit comments

Comments
 (0)