Skip to content

Commit d347354

Browse files
songyumengsongyumeng
committed
fix block
1 parent f2d4a78 commit d347354

File tree

8 files changed

+2326
-2421
lines changed

8 files changed

+2326
-2421
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 998 additions & 1092 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-mapboxgl.js‎

Lines changed: 653 additions & 654 deletions
Large diffs are not rendered by default.

‎dist/iclient9-mapboxgl.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: 653 additions & 654 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.

‎src/common/iServer/DataFlowService.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ import CommonServiceBase from './CommonServiceBase';
1414
*/
1515
export default class DataFlowService extends CommonServiceBase {
1616

17-
/*
18-
* @constant EVENT_TYPES
19-
* {Array<string>}
20-
* 此类支持的事件类型
21-
*/
22-
//EVENT_TYPES = ["broadcastSocketConnected", "broadcastSocketError", "broadcastFailed", "broadcastSuccessed", "subscribeSocketConnected", "subscribeSocketError", "messageSuccessed", "setFilterParamSuccessed"];
23-
2417
/**
2518
* @member SuperMap.DataFlowService.prototype.geometry -{Aarry<Object>}
2619
* @description 设置增添的几何要素对象数组。
@@ -40,8 +33,13 @@ export default class DataFlowService extends CommonServiceBase {
4033
excludeField = null;
4134

4235
constructor(url, options) {
43-
options=options||{};
44-
options.EVENT_TYPES=["broadcastSocketConnected", "broadcastSocketError", "broadcastFailed", "broadcastSuccessed", "subscribeSocketConnected", "subscribeSocketError", "messageSuccessed", "setFilterParamSuccessed"]
36+
options = options || {};
37+
/*
38+
* @constant EVENT_TYPES
39+
* {Array<string>}
40+
* 此类支持的事件类型
41+
*/
42+
options.EVENT_TYPES = ["broadcastSocketConnected", "broadcastSocketError", "broadcastFailed", "broadcastSuccessed", "subscribeSocketConnected", "subscribeSocketError", "messageSuccessed", "setFilterParamSuccessed"]
4543
super(url, options);
4644

4745
var me = this;
@@ -215,7 +213,8 @@ export default class DataFlowService extends CommonServiceBase {
215213
if ("WebSocket" in window) {
216214
return new WebSocket(url);
217215
} else if ("MozWebSocket" in window) {
218-
return new MozWebSocket(url);
216+
var mozWebSocket = window.MozWebSocket;
217+
return new mozWebSocket(url);
219218
} else {
220219
console.log("no WebSocket");
221220
return null;

‎src/leaflet/mapping/TiledMapLayer.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import '../core/Base';
22
import '../../common/security/SecurityManager';
3+
import SuperMap from '../../common/SuperMap';
34
import L from "leaflet";
45
import {ServerType, Unit} from "../../common/REST";
6+
import Credential from "../../common/commontypes/Credential";
57
import * as Util from "../core/Util";
68
import {Util as CommonUtil} from "../../common/commontypes/Util";
79
import ServerGeometry from '../../common/iServer/ServerGeometry';
@@ -317,25 +319,25 @@ export var TiledMapLayer = L.TileLayer.extend({
317319
_appendCredential: function (url) {
318320
var newUrl = url, credential, value;
319321
switch (this.options.serverType) {
320-
case SuperMap.ServerType.ISERVER:
322+
case ServerType.ISERVER:
321323
value = SuperMap.SecurityManager.getToken(url);
322-
credential = value ? new SuperMap.Credential(value, "token") : null;
324+
credential = value ? new Credential(value, "token") : null;
323325
break;
324-
case SuperMap.ServerType.IPORTAL:
326+
case ServerType.IPORTAL:
325327
value = SuperMap.SecurityManager.getToken(url);
326-
credential = value ? new SuperMap.Credential(value, "token") : null;
328+
credential = value ? new Credential(value, "token") : null;
327329
if (!credential) {
328330
value = SuperMap.SecurityManager.getKey(url);
329-
credential = value ? new SuperMap.Credential(value, "key") : null;
331+
credential = value ? new Credential(value, "key") : null;
330332
}
331333
break;
332-
case SuperMap.ServerType.ONLINE:
334+
case ServerType.ONLINE:
333335
value = SuperMap.SecurityManager.getKey(url);
334-
credential = value ? new SuperMap.Credential(value, "key") : null;
336+
credential = value ? new Credential(value, "key") : null;
335337
break;
336338
default:
337339
value = SuperMap.SecurityManager.getToken(url);
338-
credential = value ? new SuperMap.Credential(value, "token") : null;
340+
credential = value ? new Credential(value, "token") : null;
339341
break;
340342
}
341343
if (credential) {

0 commit comments

Comments
 (0)