Skip to content

Commit ce5e165

Browse files
songyumengsongyumeng
committed
ol.source.baidu-->ol.source.baiduMap 修复一些API描述 超图云版权升级
1 parent 9f49d4e commit ce5e165

File tree

16 files changed

+54
-54
lines changed

16 files changed

+54
-54
lines changed

‎build/deps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,9 @@ deps = {
467467

468468
"Baidu": {
469469
"name": "百度图层",
470-
"src": ['./src/openlayers/mapping/Baidu.js'],
470+
"src": ['./src/openlayers/mapping/BaiduMap.js'],
471471
"modules": [{
472-
"name": "ol.source.Baidu",
472+
"name": "ol.source.BaiduMap",
473473
"des": "百度地图"
474474
}]
475475
},

‎build/jsdocs/openlayers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
3838
<td><p>丰富地图，iSevrer REST MAP、互联网地图</p>
3939
[ol.source.TileSuperMapRest](ol.source.TileSuperMapRest.html)<br>
4040
[ol.source.ImageSuperMapRest](ol.source.ImageSuperMapRest.html)<br>
41-
[ol.source.Baidu](ol.source.Baidu.html)<br>
41+
[ol.source.BaiduMap](ol.source.BaiduMap.html)<br>
4242
[ol.source.Tianditu](ol.source.Tianditu.html)<br>
4343
......</td>
4444
<td><p></p>

‎dist/iclient9-leaflet.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28248,7 +28248,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
2824828248

2824928249
/**
2825028250
* @class L.supermap.baiduTileLayer
28251-
* @classdesc 百度切片图层类。
28251+
* @classdesc 百度地图图层。
2825228252
* @extends L.TileLayer{@linkdoc-leaflet/#tilelayer}
2825328253
* @param url -{string} 切片地址
2825428254
* @param options -{Object} 切片参数。如：<br>
@@ -28328,10 +28328,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
2832828328

2832928329
/**
2833028330
* @class L.supermap.cloudTileLayer
28331-
* @classdesc 云端切片图层类。
28331+
* @classdesc 超图云服务图层。
2833228332
* @extends L.TileLayer{@linkdoc-leaflet/#tilelayer}
28333-
* @param defaultURL -{string} 默认图层地址
28334-
* @param options -{Object} 云端切片图层可选参数。如：<br>
28333+
* @param url -{string} 服务地址，默认为 http://t2.supermapcloud.com/FileService/image?map={mapName}&type={type}&x={x}&y={y}&z={z}
28334+
* @param options -{Object} 图层可选参数。如：<br>
2833528335
* layersID - {number}图层ID，如果有layersID，则是在使用专题图。<br>
2833628336
* redirect - {boolean} 是否从定向，如果为 true，则将请求重定向到图片的真实地址；如果为 false，则响应体中是图片的字节流。<br>
2833728337
* transparent - {number}设置透明度。<br>
@@ -28365,7 +28365,7 @@ var CloudTileLayer = exports.CloudTileLayer = _leaflet2["default"].TileLayer.ext
2836528365
type: "web",
2836628366
minZoom: 3,
2836728367
maxZoom: 18,
28368-
attribution: "Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
28368+
attribution: "Map Data ©2014 SuperMap - GS(2014)6070号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
2836928369

2837028370
},
2837128371

@@ -28609,7 +28609,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
2860928609

2861028610
/**
2861128611
* @class L.supermap.tiandituTileLayer
28612-
* @classdesc 天地图切片图层类。
28612+
* @classdesc 天地图图层类。
2861328613
* @extends L.supermap.wmtsLayer
2861428614
* @param defaultURL -{string} 默认图层地址
2861528615
* @param options -{Object} 切片图层参数。如：<br>
@@ -28676,12 +28676,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
2867628676

2867728677
/**
2867828678
* @class L.supermap.webmap
28679-
* @classdesc 网络图层类。
28679+
* @classdesc 对接iPortal/Online地图类。
2868028680
* @extends L.LayerGroup{@linkdoc-leaflet/#layergroup}
28681-
* @param id - {number}网络图层id。
28682-
* @param options - {Object} 图层可选参数。如：<br>
28683-
* map - {string} 地图。<br>
28684-
* server - {string} 服务地址。<br>
28681+
* @param id - {number}iPortal/Online地图id。
28682+
* @param options - {Object} 可选参数。如：<br>
28683+
* map - {string} 地图容器id。<br>
28684+
* server - {string} iPortal/Online服务地址。默认为 http://www.supermapol.com <br>
2868528685
* featureLayerPopupEnable - {boolean} 是否启动要素图层提示框。<br>
2868628686
* featureLayerPopup - {string} 提示框提示信息。<br>
2868728687
* credentialValue - {string} 证书值。<br>

‎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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25293,7 +25293,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
2529325293
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
2529425294

2529525295
/**
25296-
* @class ol.source.Baidu
25296+
* @class ol.source.BaiduMap
2529725297
* @classdesc 百度地图
2529825298
* @param opt_options - {Object} 创建地图参数可选参数：<br>
2529925299
* url - {string} 服务地址。<br>
@@ -25304,23 +25304,23 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
2530425304
* opaque - {boolean} 是否透明。
2530525305
* @extends ol.source.TileImage{@linkdoc-openlayers/ol.source.TileImage}
2530625306
*/
25307-
var Baidu = function (_ol$source$TileImage) {
25308-
_inherits(Baidu, _ol$source$TileImage);
25307+
var BaiduMap = function (_ol$source$TileImage) {
25308+
_inherits(BaiduMap, _ol$source$TileImage);
2530925309

25310-
function Baidu(opt_options) {
25311-
_classCallCheck(this, Baidu);
25310+
function BaiduMap(opt_options) {
25311+
_classCallCheck(this, BaiduMap);
2531225312

2531325313
var options = opt_options || {};
2531425314
var attributions = options.attributions || new _olDebug2.default.Attribution({
2531525315
html: "Map Data © 2017 Baidu - GS(2016)2089号 - Data © 长地万方 with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
2531625316
});
25317-
var tileGrid = _olDebug2.default.source.Baidu.defaultTileGrid();
25317+
var tileGrid = _olDebug2.default.source.BaiduMap.defaultTileGrid();
2531825318
var crossOrigin = options.crossOrigin !== undefined ? options.crossOrigin : 'anonymous';
2531925319

2532025320
var url = options.url !== undefined ? options.url : "http://online1.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles={styles}&udt=20170408";
2532125321
var hidpi = options.hidpi || (window.devicePixelRatio || window.screen.deviceXDPI / window.screen.logicalXDPI) > 1;
2532225322
url = url.replace('{styles}', hidpi ? 'ph' : 'pl');
25323-
return _possibleConstructorReturn(this, (Baidu.__proto__ || Object.getPrototypeOf(Baidu)).call(this, {
25323+
return _possibleConstructorReturn(this, (BaiduMap.__proto__ || Object.getPrototypeOf(BaiduMap)).call(this, {
2532425324
attributions: attributions,
2532525325
cacheSize: options.cacheSize,
2532625326
crossOrigin: crossOrigin,
@@ -25349,13 +25349,13 @@ var Baidu = function (_ol$source$TileImage) {
2534925349
}
2535025350

2535125351
/**
25352-
* @function ol.source.Baidu.defaultTileGrid
25352+
* @function ol.source.BaiduMap.defaultTileGrid
2535325353
* @description 获取默认瓦片格网
2535425354
* @return {ol.tilegrid.TileGrid}
2535525355
*/
2535625356

2535725357

25358-
_createClass(Baidu, null, [{
25358+
_createClass(BaiduMap, null, [{
2535925359
key: 'defaultTileGrid',
2536025360
value: function defaultTileGrid() {
2536125361
var tileGird = new _olDebug2.default.tilegrid.TileGrid({
@@ -25368,12 +25368,12 @@ var Baidu = function (_ol$source$TileImage) {
2536825368
}
2536925369
}]);
2537025370

25371-
return Baidu;
25371+
return BaiduMap;
2537225372
}(_olDebug2.default.source.TileImage);
2537325373

25374-
exports.default = Baidu;
25374+
exports.default = BaiduMap;
2537525375

25376-
_olDebug2.default.source.Baidu = Baidu;
25376+
_olDebug2.default.source.BaiduMap = BaiduMap;
2537725377

2537825378
/***/ }),
2537925379
/* 88 */
@@ -25673,9 +25673,9 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
2567325673

2567425674
/**
2567525675
* @class ol.source.SuperMapCloud
25676-
* @classdesc 超图云
25676+
* @classdesc 超图云地图
2567725677
* @param opt_options - {Object} 可选参数：如：<br>
25678-
* url - {string} 服务地址。<br>
25678+
* url - {string} 服务地址。默认地址为 http://t2.supermapcloud.com/FileService/image?map={mapName}&type={type}&x={x}&y={y}&z={z} <br>
2567925679
* attributions - {string} 版权描述信息。<br>
2568025680
* cacheSize - {number} 缓冲大小。<br>
2568125681
* tileLoadFunction - {function} 切片加载完成后执行函数。<br>
@@ -26607,7 +26607,7 @@ var WebMap = function (_ol$Observable) {
2660726607
viewOptions.zoom = 3 + viewOptions.zoom;
2660826608
viewOptions.minZoom = 3;
2660926609
layer = new _olDebug2.default.layer.Tile({
26610-
source: new _olDebug2.default.source.Baidu()
26610+
source: new _olDebug2.default.source.BaiduMap()
2661126611
});
2661226612
break;
2661326613
case 'BING':

‎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.

‎dist/include-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
5353
}
5454
if (!inArray(excludes, 'iclient9-leaflet')) {
55-
inputScript("../../dist/iclient9-leaflet.min.js");
55+
inputScript("../../dist/iclient9-leaflet.js");
5656
}
5757
if (inArray(includes, 'iclient9-leaflet-css')) {
5858
inputCSS("../../dist/iclient9-leaflet.min.css");

‎dist/include-openlayers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
inputScript("https://cdn.bootcss.com/Turf.js/4.6.1/turf.min.js");
4747
}
4848
if (!inArray(excludes, 'iclient9-openlayers')) {
49-
inputScript("../../dist/iclient9-openlayers.min.js");
49+
inputScript("../../dist/iclient9-openlayers.js");
5050
}
5151
if (!inArray(excludes, 'iclient9-openlayers-css')) {
5252
inputCSS("../../dist/iclient9-openlayers.min.css");

‎examples/openlayers/baiduLayer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
})
2020
});
2121
var layer = new ol.layer.Tile({
22-
source: new ol.source.Baidu(),
22+
source: new ol.source.BaiduMap(),
2323
});
2424
map.addLayer(layer);
2525
</script>

‎src/leaflet/mapping/BaiduTileLayer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import L from "leaflet";
33

44
/**
55
* @class L.supermap.baiduTileLayer
6-
* @classdesc 百度切片图层类。
6+
* @classdesc 百度地图图层。
77
* @extends L.TileLayer{@linkdoc-leaflet/#tilelayer}
88
* @param url -{string} 切片地址
99
* @param options -{Object} 切片参数。如：<br>

‎src/leaflet/mapping/CloudTileLayer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import L from "leaflet";
33

44
/**
55
* @class L.supermap.cloudTileLayer
6-
* @classdesc 云端切片图层类。
6+
* @classdesc 超图云服务图层。
77
* @extends L.TileLayer{@linkdoc-leaflet/#tilelayer}
8-
* @param defaultURL -{string} 默认图层地址
9-
* @param options -{Object} 云端切片图层可选参数。如：<br>
8+
* @param url -{string} 服务地址，默认为 http://t2.supermapcloud.com/FileService/image?map={mapName}&type={type}&x={x}&y={y}&z={z}
9+
* @param options -{Object} 图层可选参数。如：<br>
1010
* layersID - {number}图层ID，如果有layersID，则是在使用专题图。<br>
1111
* redirect - {boolean} 是否从定向，如果为 true，则将请求重定向到图片的真实地址；如果为 false，则响应体中是图片的字节流。<br>
1212
* transparent - {number}设置透明度。<br>
@@ -40,7 +40,7 @@ export var CloudTileLayer = L.TileLayer.extend({
4040
type: "web",
4141
minZoom: 3,
4242
maxZoom: 18,
43-
attribution: "Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
43+
attribution: "Map Data ©2014 SuperMap - GS(2014)6070号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
4444

4545
},
4646

‎src/leaflet/mapping/TiandituTileLayer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {WMTSLayer} from "./TileLayer.WMTS";
44

55
/**
66
* @class L.supermap.tiandituTileLayer
7-
* @classdesc 天地图切片图层类。
7+
* @classdesc 天地图图层类。
88
* @extends L.supermap.wmtsLayer
99
* @param defaultURL -{string} 默认图层地址
1010
* @param options -{Object} 切片图层参数。如：<br>

‎src/leaflet/mapping/WebMap.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import {NonEarthCRS} from "../core/NonEarthCRS"
77

88
/**
99
* @class L.supermap.webmap
10-
* @classdesc 网络图层类。
10+
* @classdesc 对接iPortal/Online地图类。
1111
* @extends L.LayerGroup{@linkdoc-leaflet/#layergroup}
12-
* @param id - {number}网络图层id。
13-
* @param options - {Object} 图层可选参数。如：<br>
14-
* map - {string} 地图。<br>
15-
* server - {string} 服务地址。<br>
12+
* @param id - {number}iPortal/Online地图id。
13+
* @param options - {Object} 可选参数。如：<br>
14+
* map - {string} 地图容器id。<br>
15+
* server - {string} iPortal/Online服务地址。默认为 http://www.supermapol.com <br>
1616
* featureLayerPopupEnable - {boolean} 是否启动要素图层提示框。<br>
1717
* featureLayerPopup - {string} 提示框提示信息。<br>
1818
* credentialValue - {string} 证书值。<br>

‎src/openlayers/mapping/Baidu.js renamed to ‎src/openlayers/mapping/BaiduMap.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ol from 'openlayers/dist/ol-debug';
22
/**
3-
* @class ol.source.Baidu
3+
* @class ol.source.BaiduMap
44
* @classdesc 百度地图
55
* @param opt_options - {Object} 创建地图参数可选参数：<br>
66
* url - {string} 服务地址。<br>
@@ -11,13 +11,13 @@ import ol from 'openlayers/dist/ol-debug';
1111
* opaque - {boolean} 是否透明。
1212
* @extends ol.source.TileImage{@linkdoc-openlayers/ol.source.TileImage}
1313
*/
14-
export default class Baidu extends ol.source.TileImage {
14+
export default class BaiduMap extends ol.source.TileImage {
1515
constructor(opt_options) {
1616
var options = opt_options || {};
1717
var attributions = options.attributions || new ol.Attribution({
1818
html: "Map Data © 2017 Baidu - GS(2016)2089号 - Data © 长地万方 with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
1919
});
20-
var tileGrid = ol.source.Baidu.defaultTileGrid();
20+
var tileGrid = ol.source.BaiduMap.defaultTileGrid();
2121
var crossOrigin = options.crossOrigin !== undefined ?
2222
options.crossOrigin : 'anonymous';
2323

@@ -57,7 +57,7 @@ export default class Baidu extends ol.source.TileImage {
5757
}
5858

5959
/**
60-
* @function ol.source.Baidu.defaultTileGrid
60+
* @function ol.source.BaiduMap.defaultTileGrid
6161
* @description 获取默认瓦片格网
6262
* @return {ol.tilegrid.TileGrid}
6363
*/
@@ -72,4 +72,4 @@ export default class Baidu extends ol.source.TileImage {
7272
}
7373

7474
}
75-
ol.source.Baidu = Baidu;
75+
ol.source.BaiduMap = BaiduMap;

‎src/openlayers/mapping/SuperMapCloud.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import ol from 'openlayers/dist/ol-debug';
22
/**
33
* @class ol.source.SuperMapCloud
4-
* @classdesc 超图云
4+
* @classdesc 超图云地图
55
* @param opt_options - {Object} 可选参数：如：<br>
6-
* url - {string} 服务地址。<br>
6+
* url - {string} 服务地址。默认地址为 http://t2.supermapcloud.com/FileService/image?map={mapName}&type={type}&x={x}&y={y}&z={z} <br>
77
* attributions - {string} 版权描述信息。<br>
88
* cacheSize - {number} 缓冲大小。<br>
99
* tileLoadFunction - {function} 切片加载完成后执行函数。<br>
@@ -17,7 +17,7 @@ export default class SuperMapCloud extends ol.source.XYZ {
1717
var options = opt_options || {};
1818

1919
var attributions = options.attributions || new ol.Attribution({
20-
html: "Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
20+
html: "Map Data ©2014 SuperMap - GS(2014)6070号-data©Navinfo with <span>© <a href='http://iclient.supermapol.com' target='_blank'>SuperMap iClient</a></span>"
2121
});
2222
var mapName = options.mapName || 'quanguo';
2323
var mapType = options.mapType || 'web';

‎src/openlayers/mapping/WebMap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export default class WebMap extends ol.Observable {
243243
viewOptions.zoom = 3 + viewOptions.zoom;
244244
viewOptions.minZoom = 3;
245245
layer = new ol.layer.Tile({
246-
source: new ol.source.Baidu()
246+
source: new ol.source.BaiduMap()
247247
});
248248
break;
249249
case 'BING':

0 commit comments

Comments
 (0)