Skip to content

Commit 928848d

Browse files
songyumengsongyumeng
committed
openlayers 相关授权
1 parent 9b498ce commit 928848d

25 files changed

+73
-68
lines changed

‎dist/iclient9-openlayers.js‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6270,7 +6270,9 @@ var ThemeFeature = __webpack_require__(31);
62706270
ol.source.Theme = function (name, opt_options) {
62716271
var options = opt_options ? opt_options : {};
62726272
ol.source.ImageCanvas.call(this, {
6273-
attributions: options.attributions,
6273+
attributions: options.attributions|| new ol.Attribution({
6274+
html: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
6275+
}),
62746276
canvasFunction: this.canvasFunctionInternal_.bind(this),
62756277
logo: options.logo,
62766278
projection: options.projection,
@@ -10532,14 +10534,9 @@ ol.source.Baidu = function (opt_options) {
1053210534

1053310535
var options = opt_options || {};
1053410536

10535-
var attributions;
10536-
if (options.attributions !== undefined) {
10537-
attributions = options.attributions;
10538-
} else {
10539-
attributions = new ol.Attribution({
10540-
html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
10537+
var attributions = options.attributions || new ol.Attribution({
10538+
html: 'Map Data © 2017 Baidu - GS(2016)2089号 - Data © 长地万方 with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
1054110539
});
10542-
}
1054310540
var tileGrid = ol.source.Baidu.defaultTileGrid();
1054410541
var crossOrigin = options.crossOrigin !== undefined ?
1054510542
options.crossOrigin : 'anonymous';
@@ -10593,14 +10590,9 @@ ol.source.SuperMapCloud = function (opt_options) {
1059310590

1059410591
var options = opt_options || {};
1059510592

10596-
var attributions;
10597-
if (options.attributions !== undefined) {
10598-
attributions = options.attributions;
10599-
} else {
10600-
attributions = new ol.Attribution({
10601-
html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
10593+
var attributions = options.attributions||new ol.Attribution({
10594+
html: 'Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
1060210595
});
10603-
}
1060410596
var mapName = options.mapName || 'quanguo';
1060510597
var mapType = options.mapType || 'web';
1060610598
var url = options.url || 'http://t2.supermapcloud.com/FileService/image?map={mapName}&type={type}&x={x}&y={y}&z={z}';
@@ -10630,7 +10622,7 @@ var ol = __webpack_require__(2);
1063010622
ol.source.Tianditu = function (opt_options) {
1063110623
var options = opt_options || {};
1063210624
var attributions = options.attributions || new ol.Attribution({
10633-
html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
10625+
html: 'Map Data <a href="http://www.tianditu.com"><img style="background-color:transparent;bottom:2px;opacity:1;" src="http://api.tianditu.com/img/map/logo.png" width="53px" height="22px" opacity="0"></a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
1063410626
});
1063510627

1063610628
if (!options.url && !options.urls) {
@@ -10711,12 +10703,10 @@ ol.supermap.TileSuperMapRest = function (options) {
1071110703
if (options.url === undefined) {
1071210704
return;
1071310705
}
10714-
if (!options.attributions) {
10715-
options.attributions = [
10706+
options.attributions =options.attributions||
1071610707
new ol.Attribution({
10717-
html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
10718-
})]
10719-
}
10708+
html: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
10709+
})
1072010710

1072110711
var layerUrl = options.url + "/image.png?redirect=false";
1072210712
options.serverType = options.serverType || SuperMap.ServerType.ISERVER;
@@ -11325,12 +11315,10 @@ ol.supermap.VectorTileSuperMapRest = function (options) {
1132511315
return;
1132611316
}
1132711317
options.crossOrigin = 'anonymous';
11328-
if (!options.attributions) {
11329-
options.attributions = [
11318+
options.attributions = options.attributions||
1133011319
new ol.Attribution({
11331-
html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
11332-
})]
11333-
}
11320+
html: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
11321+
})
1133411322
var layerUrl = options.url + '/tileFeature.json?';
1133511323
if (options.format instanceof ol.format.MVT) {
1133611324
layerUrl = options.url + '/tileFeature.mvt?';
@@ -11582,7 +11570,8 @@ var MapvLayer = __webpack_require__(82);
1158211570
ol.source.Mapv = function (opt_options) {
1158311571
var options = opt_options ? opt_options : {};
1158411572
ol.source.ImageCanvas.call(this, {
11585-
attributions: options.attributions,
11573+
attributions: options.attributions|| new ol.Attribution({
11574+
html: '© 2017 百度 MapV with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'}),
1158611575
canvasFunction: this.canvasFunctionInternal_.bind(this),
1158711576
logo: options.logo,
1158811577
projection: options.projection,

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

‎examples/leaflet/WMSLayer.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
layers: 'China',
2222
format: 'image/png',
2323
transparent: true,
24-
noWrap: true
24+
noWrap: true,
25+
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
2526
}).addTo(map);
2627
</script>
2728
</body>

‎examples/leaflet/WMTSLayer.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
style: "default",
3434
tilematrixSet: "Custom_China",
3535
format: "image/png",
36+
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
3637
}
3738
).addTo(map);
3839
</script>

‎examples/leaflet/mapboxVectorTile.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@
194194
format: L.supermap.VectorTileFormat.PBF,
195195
vectorTileLayerStyles: vectorTileStyling,
196196
tileTemplate: "https://{s}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/{z}/{x}/{y}.vector.pbf?access_token={token}",
197-
token: "pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA"
197+
token: "pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA",
198+
attribution: 'Tile Data <a href="https://www.mapbox.com/about/maps/" target="_blank">© Mapbox</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
198199
}).addTo(map);
199200

200201

‎examples/leaflet/vectorTileLayerBoundary.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
layer = L.supermap.tiledVectorLayer(url, {
102102
cacheEnabled: true,
103103
cartoCSS: cartoCSS,
104-
serverCartoCSSStyle: false
104+
serverCartoCSSStyle: false,
105+
attribution: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
105106
}).addTo(map);
106107

107108
</script>

‎examples/leaflet/vectorTileLayerDarkBlue.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@
100100
layer = L.supermap.tiledVectorLayer(url, {
101101
cacheEnabled: true,
102102
cartoCSS: cartoCSS,
103-
serverCartoCSSStyle: false
103+
serverCartoCSSStyle: false,
104+
attribution: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
104105
}).addTo(map);
105106

106107
</script>

‎examples/leaflet/vectorTileLayerHelloKitty.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
layer = L.supermap.tiledVectorLayer(url, {
121121
cacheEnabled: true,
122122
cartoCSS: cartoCSS,
123+
attribution: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>',
123124
serverCartoCSSStyle: false
124125
}).addTo(map);
125126

‎examples/leaflet/vectorTileLayerMVT.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
tileSize:512,
2525
format: L.supermap.VectorTileFormat.MVT,
2626
cacheEnabled: true,
27-
returnAttributes: true
27+
returnAttributes: true,
28+
attribution: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
2829
}).addTo(map);
2930

3031
vectorLayer.on('click', function (evt) {

‎examples/leaflet/vectorTileLayerMVT_4326.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
tileSize: 512,
2525
format: L.supermap.VectorTileFormat.MVT,
2626
cacheEnabled: true,
27-
returnAttributes: true
27+
returnAttributes: true,
28+
attribution: 'Tile Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
2829
}).addTo(map);
2930

3031

0 commit comments

Comments
 (0)