Skip to content

Commit 69abb01

Browse files
songyumengsongyumeng
committed
更改类名
1 parent 6c52be5 commit 69abb01

File tree

9 files changed

+1119
-1156
lines changed

9 files changed

+1119
-1156
lines changed

‎dist/iclient9-leaflet.js‎

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

‎dist/iclient9-openlayers.js‎

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

‎src/common/online/DataInfo.js‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/common/online/Online.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* 对接SuperMap Online 所有基础服务
44
*/
55
require('../util/Request');
6-
require('./Security');
7-
require('./DataService');
8-
require('./QueryDatasParameter');
6+
require('./OnlineSecurity');
7+
require('./OnlineData');
8+
require('./OnlineQueryDatasParameter');
99
SuperMap.Online = SuperMap.Class({
1010

1111
/**
@@ -26,7 +26,7 @@ SuperMap.Online = SuperMap.Class({
2626
var mContentUrl = this.webUrl + "/mycontent";
2727
this.mDatasUrl = mContentUrl + "/datas";
2828

29-
this.security = new SuperMap.Security();
29+
this.security = new SuperMap.OnlineSecurity();
3030
this.request = new SuperMap.Request();
3131
},
3232

@@ -43,7 +43,7 @@ SuperMap.Online = SuperMap.Class({
4343

4444
/**
4545
* 查询Online “我的内容”下“我的数据”服务(需要登录状态获取),并返回可操作的服务对象
46-
* @param parameter <QueryDatasParameter>
46+
* @param parameter <OnlineQueryDatasParameter>
4747
*/
4848
queryDatas: function (parameter) {
4949
var me = this, url = me.mDatasUrl;
@@ -57,7 +57,7 @@ SuperMap.Online = SuperMap.Class({
5757
var services = [], contents = json.content, len = contents.length;
5858
for (var i = 0; i < len; i++) {
5959
var content = contents[i];
60-
var service = new SuperMap.DataService(me.mDatasUrl, content);
60+
var service = new SuperMap.OnlineData(me.mDatasUrl, content);
6161
services.push(service);
6262
}
6363
return services;

src/common/online/DataService.js renamed to src/common/online/OnlineData.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
require('../util/Request');
55
require('./DataInfo');
6-
SuperMap.DataService = SuperMap.Class({
6+
SuperMap.OnlineData = SuperMap.Class({
77
//MD5
88
MD5: null,
99
//文件类型。
@@ -94,10 +94,10 @@ SuperMap.DataService = SuperMap.Class({
9494
},
9595

9696

97-
CLASS_NAME: "SuperMap.DataService"
97+
CLASS_NAME: "SuperMap.OnlineData"
9898

9999
})
100100
;
101101
module.exports = function (serviceRootUrl, options) {
102-
return new SuperMap.DataService(serviceRootUrl, options);
102+
return new SuperMap.OnlineData(serviceRootUrl, options);
103103
};

src/common/online/QueryDatasParameter.js renamed to src/common/online/OnlineQueryDatasParameter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
2-
* Class:SuperMap.QueryDatasParameter
2+
* Class:SuperMap.OnlineQueryDatasParameter
33
* myDatas服务资源查询参数
44
*/
5-
require('./Resources');
6-
SuperMap.QueryDatasParameter = SuperMap.Class({
5+
require('./OnlineResources');
6+
SuperMap.OnlineQueryDatasParameter = SuperMap.Class({
77

88
//String[] 数据作者名。可以根据数据作者名查询，默认查询全部。
99
userNames: null,
@@ -52,9 +52,9 @@ SuperMap.QueryDatasParameter = SuperMap.Class({
5252
return jsonObj;
5353
},
5454

55-
CLASS_NAME: "SuperMap.QueryDatasParameter"
55+
CLASS_NAME: "SuperMap.OnlineQueryDatasParameter"
5656
});
5757

5858
module.exports = function (options) {
59-
return new SuperMap.QueryDatasParameter(options);
59+
return new SuperMap.OnlineQueryDatasParameter(options);
6060
};

src/common/online/Resources.js renamed to src/common/online/OnlineResources.js

File renamed without changes.

src/common/online/Security.js renamed to src/common/online/OnlineSecurity.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
* Class:SuperMap.Security
33
* Online SSO 安全管理类
44
*/
5-
SuperMap.Security = SuperMap.Class({
5+
SuperMap.OnlineSecurity = SuperMap.Class({
66
/**
77
* @param url：online地址
88
*/
99
initialize: function (url) {
1010
if (!url) {
11-
this.url = SuperMap.Security.ONLINE;
11+
this.url = SuperMap.OnlineSecurity.ONLINE;
1212
}
1313
},
1414

1515
login: function () {
16-
var loginUrl = SuperMap.Security.SSO + "/login?service=" + this.url;
16+
var loginUrl = SuperMap.OnlineSecurity.SSO + "/login?service=" + this.url;
1717
window.open(loginUrl, "login");
1818
return this;
1919
},
2020

2121
register: function () {
22-
var registerUrl = SuperMap.Security.SSO + "/register?service=" + this.url;
22+
var registerUrl = SuperMap.OnlineSecurity.SSO + "/register?service=" + this.url;
2323
window.open(registerUrl, "register");
2424
return this;
2525
}
2626
});
27-
SuperMap.Security.SSO = "https://sso.supermap.com";
28-
SuperMap.Security.ONLINE = "http://www.supermapol.com/shiro-cas";
27+
SuperMap.OnlineSecurity.SSO = "https://sso.supermap.com";
28+
SuperMap.OnlineSecurity.ONLINE = "http://www.supermapol.com/shiro-cas";

‎test/tool/GlobeParameter.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
//CI测试机的IP为：192.168.112.222
1+
//CI测试机的IP为：localhost
22
GlobeParameter = {
3-
rootURL: "http://192.168.112.222:8090/iserver/services",
4-
mapServiceURL: "http://192.168.112.222:8090/iserver/services/map-world/rest/maps/",
5-
worldMapURL: "http://192.168.112.222:8090/iserver/services/map-world/rest/maps/世界地图",
6-
networkAnalystURL: "http://192.168.112.222:8090/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun",
7-
spatialAnalystURL: "http://192.168.112.222:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst",
8-
spatialAnalystURL_Changchun:"http://192.168.112.222:8090/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst",
9-
dataServiceURL: "http://192.168.112.222:8090/iserver/services/data-world/rest/data",
10-
editServiceURL: "http://192.168.112.222:8090/iserver/services/data-jingjin/rest/data/datasources/name/Jingjin/datasets/name/Landuse_R",
11-
trafficTransferURL: "http://192.168.112.222:8090/iserver/services/traffictransferanalyst-sample/restjsr/traffictransferanalyst/Traffic-Changchun",
12-
vectorURL: "http://192.168.112.222:8090/iserver/services/map-world/rest/maps/World/",
13-
gridURL:"http://192.168.112.222:8090/iserver/services/map-jingjin/rest/maps/京津地区土地利用现状图",
14-
imageURL: "http://192.168.112.222:8090/iserver/services/map-world/rest/maps/世界地图_Day",
15-
WorldURL: "http://192.168.112.222:8090/iserver/services/map-world/rest/maps/World",
16-
ChinaURL:"http://192.168.112.222:8090/iserver/services/map-china400/rest/maps/China",
17-
WMTSURL:"http://192.168.112.222:8090/iserver/services/map-world/wmts100",
18-
WCSURL: "http://192.168.112.222:8090/iserver/services/data-world/wcs111",
19-
plotUrl: "http://192.168.112.222:8090/iserver/services/plot-jingyong/rest/plot",
20-
tileSetsURL: "http://192.168.112.222:8090/iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces"
3+
rootURL: "http://localhost:8090/iserver/services",
4+
mapServiceURL: "http://localhost:8090/iserver/services/map-world/rest/maps/",
5+
worldMapURL: "http://localhost:8090/iserver/services/map-world/rest/maps/世界地图",
6+
networkAnalystURL: "http://localhost:8090/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun",
7+
spatialAnalystURL: "http://localhost:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst",
8+
spatialAnalystURL_Changchun:"http://localhost:8090/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst",
9+
dataServiceURL: "http://localhost:8090/iserver/services/data-world/rest/data",
10+
editServiceURL: "http://localhost:8090/iserver/services/data-jingjin/rest/data/datasources/name/Jingjin/datasets/name/Landuse_R",
11+
trafficTransferURL: "http://localhost:8090/iserver/services/traffictransferanalyst-sample/restjsr/traffictransferanalyst/Traffic-Changchun",
12+
vectorURL: "http://localhost:8090/iserver/services/map-world/rest/maps/World/",
13+
gridURL:"http://localhost:8090/iserver/services/map-jingjin/rest/maps/京津地区土地利用现状图",
14+
imageURL: "http://localhost:8090/iserver/services/map-world/rest/maps/世界地图_Day",
15+
WorldURL: "http://localhost:8090/iserver/services/map-world/rest/maps/World",
16+
ChinaURL:"http://localhost:8090/iserver/services/map-china400/rest/maps/China",
17+
WMTSURL:"http://localhost:8090/iserver/services/map-world/wmts100",
18+
WCSURL: "http://localhost:8090/iserver/services/data-world/wcs111",
19+
plotUrl: "http://localhost:8090/iserver/services/plot-jingyong/rest/plot",
20+
tileSetsURL: "http://localhost:8090/iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces"
2121
};

0 commit comments

Comments
 (0)