You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: CHANGES.md
+4
Original file line number
Diff line number
Diff line change
@@ -9,6 +9,9 @@ Change Log
9
9
##### Deprecated :hourglass_flowing_sand:
10
10
*`ClippingPlaneCollection` is now supported in Internet Explorer, so `ClippingPlaneCollection.isSupported` has been deprecated and will be removed in Cesium 1.45.
11
11
*`ClippingPlaneCollection` should now be used with `ClippingPlane` objects instead of `Plane`. Use of `Plane` objects has been deprecated and will be removed in Cesium 1.45.
12
+
*`Credit` now takes an `html` and `showOnScreen` parameters instead of an `options` object. Use of the `options` parameter is deprecated and will be removed in Cesium 1.46.
13
+
*`Credit.text`, `Credit.imageUrl` and `Credit.link` properties have all been deprecated and will be removed in Cesium 1.46. Use `Credit.html` to retrieve the credit content.
14
+
*`Credit.hasImage` and `Credit.hasLink` functions have been deprecated and will be removed in Cesium 1.46.
12
15
13
16
##### Additions :tada:
14
17
* Added support for glTF models with [Draco geometry compression](https://github.com/fanzhanggoogle/glTF/blob/KHR_mesh_compression/extensions/Khronos/KHR_draco_mesh_compression/README.md).
@@ -23,6 +26,7 @@ Change Log
23
26
* sourceType specifies the type of data source if the URL doesn't have a known file extension.
24
27
* flyTo=false optionally disables the automatic flyTo after loading the data source.
25
28
* Added a multi-part CZML example to Sandcastle. [#6320](https://github.com/AnalyticalGraphicsInc/cesium/pull/6320)
29
+
*`Credit` has been modified to take an HTML string as the credit content [#6331](https://github.com/AnalyticalGraphicsInc/cesium/pull/6331)
26
30
* Added support for ordering in `DataSourceCollection`[#6316](https://github.com/AnalyticalGraphicsInc/cesium/pull/6316)
27
31
* All ground geometry from one `DataSource` will render in front of all ground geometry from another `DataSource` in the same collection with a lower index.
28
32
* Use `DataSourceCollection.raise`, `DataSourceCollection.lower`, `DataSourceCollection.raiseToTop` and `DataSourceCollection.lowerToBottom` functions to change the ordering of a `DataSource` in the collection.
Copy file name to clipboardexpand all lines: Source/Core/BingMapsApi.js
+2-5
Original file line number
Diff line number
Diff line change
@@ -28,7 +28,7 @@ define([
28
28
29
29
varprintedBingWarning=false;
30
30
varerrorCredit;
31
-
varerrorString='This application is using Cesium\'s default Bing Maps key. Please create a new key for the application as soon as possible and prior to deployment by visiting https://www.bingmapsportal.com/, and provide your key to Cesium by setting the Cesium.BingMapsApi.defaultKey property before constructing the CesiumWidget or any other object that uses the Bing Maps API.';
31
+
varerrorString='<b>This application is using Cesium\'s default Bing Maps key. Please create a new key for the application as soon as possible and prior to deployment by visiting <a href="https://www.bingmapsportal.com/">https://www.bingmapsportal.com/</a>, and provide your key to Cesium by setting the Cesium.BingMapsApi.defaultKey property before constructing the CesiumWidget or any other object that uses the Bing Maps API.</b>';
Copy file name to clipboardexpand all lines: Source/Core/Credit.js
+124-70
Original file line number
Diff line number
Diff line change
@@ -1,62 +1,26 @@
1
1
define([
2
+
'../ThirdParty/xss',
2
3
'./defaultValue',
3
4
'./defined',
4
5
'./defineProperties',
6
+
'./deprecationWarning',
5
7
'./DeveloperError'
6
8
],function(
9
+
xss,
7
10
defaultValue,
8
11
defined,
9
12
defineProperties,
13
+
deprecationWarning,
10
14
DeveloperError){
11
15
'use strict';
12
16
13
17
varnextCreditId=0;
14
18
varcreditToId={};
15
19
16
-
functiongetElement(credit){
17
-
varelement=document.createElement('span');
18
-
vartext=credit.text;
19
-
varlink=credit.link;
20
-
vara;
21
-
if(credit._hasImage){
22
-
varcontent=document.createElement('img');
23
-
content.src=credit.imageUrl;
24
-
if(defined(text)){
25
-
content.alt=text;
26
-
content.title=text;
27
-
}
28
-
if(credit._hasLink){
29
-
a=document.createElement('a');
30
-
a.appendChild(content);
31
-
a.href=link;
32
-
a.target='_blank';
33
-
element.appendChild(a);
34
-
}else{
35
-
element.appendChild(content);
36
-
}
37
-
element.className='cesium-credit-image';
38
-
}else{
39
-
if(credit._hasLink){
40
-
a=document.createElement('a');
41
-
a.textContent=text;
42
-
a.href=link;
43
-
a.target='_blank';
44
-
element.appendChild(a);
45
-
}else{
46
-
element.textContent=text;
47
-
}
48
-
element.className='cesium-credit-text';
49
-
}
50
-
returnelement;
51
-
}
52
-
53
20
/**
54
21
* A credit contains data pertaining to how to display attributions/credits for certain content on the screen.
55
-
* @param {Object} [options] An object with the following properties
56
-
* @param {String} [options.text] The text to be displayed on the screen if no imageUrl is specified.
57
-
* @param {String} [options.imageUrl] The source location for an image
58
-
* @param {String} [options.link] A URL location for which the credit will be hyperlinked
59
-
* @param {Boolean} [options.showOnScreen=false] If true, the credit will be visible in the main credit container. Otherwise, it will appear in a popover
22
+
* @param {String} html An string representing an html code snippet (can be text only)
23
+
* @param {Boolean} [showOnScreen=false] If true, the credit will be visible in the main credit container. Otherwise, it will appear in a popover
deprecationWarning('Credit options','The options parameter has been deprecated and will be removed in Cesium 1.46. Instead, pass in an HTML string (or a string of text)');
thrownewDeveloperError('options.text, options.imageUrl, or options.link is required.');
56
+
}
57
+
//>>includeEnd('debug');
85
58
86
-
//>>includeStart('debug', pragmas.debug);
87
-
if(!hasText&&!hasImage&&!hasLink){
88
-
thrownewDeveloperError('options.text, options.imageUrl, or options.link is required.');
89
-
}
90
-
//>>includeEnd('debug');
59
+
if(!hasText&&!hasImage){
60
+
text=link;
61
+
}
91
62
92
-
if(!hasText&&!hasImage){
93
-
text=link;
94
-
}
63
+
this._text=text;
64
+
this._imageUrl=imageUrl;
65
+
this._link=link;
66
+
this._hasLink=hasLink;
67
+
this._hasImage=hasImage;
95
68
96
-
this._text=text;
97
-
this._imageUrl=imageUrl;
98
-
this._link=link;
99
-
this._hasLink=hasLink;
100
-
this._hasImage=hasImage;
101
-
this._showOnScreen=showOnScreen;
69
+
varelement=document.createElement('span');
70
+
vara;
71
+
if(hasImage){
72
+
varcontent=document.createElement('img');
73
+
content.src=imageUrl;
74
+
if(defined(text)){
75
+
content.alt=text;
76
+
content.title=text;
77
+
}
78
+
if(hasLink){
79
+
a=document.createElement('a');
80
+
a.appendChild(content);
81
+
a.href=link;
82
+
a.target='_blank';
83
+
element.appendChild(a);
84
+
}else{
85
+
element.appendChild(content);
86
+
}
87
+
element.className='cesium-credit-image';
88
+
}else{
89
+
if(hasLink){
90
+
a=document.createElement('a');
91
+
a.textContent=text;
92
+
a.href=link;
93
+
a.target='_blank';
94
+
element.appendChild(a);
95
+
}else{
96
+
element.textContent=text;
97
+
}
98
+
element.className='cesium-credit-text';
99
+
}
102
100
103
-
// Credits are immutable so generate an id to use to optimize equal()
104
-
varid;
105
-
varkey=JSON.stringify([text,imageUrl,link]);
101
+
html='<span>'+element.innerHTML+'</span>';
102
+
key=JSON.stringify([text,imageUrl,link]);
103
+
}else{
104
+
key=html;
105
+
}
106
106
107
107
if(defined(creditToId[key])){
108
108
id=creditToId[key];
@@ -111,12 +111,27 @@ define([
111
111
creditToId[key]=id;
112
112
}
113
113
114
-
this._id=id;
114
+
showOnScreen=defaultValue(showOnScreen,false);
115
115
116
+
// Credits are immutable so generate an id to use to optimize equal()
117
+
this._id=id;
118
+
this._html=html;
119
+
this._showOnScreen=showOnScreen;
116
120
this._element=undefined;
117
121
}
118
122
119
123
defineProperties(Credit.prototype,{
124
+
/**
125
+
* The credit content
126
+
* @memberof Credit.prototype
127
+
* @type {String}
128
+
* @readonly
129
+
*/
130
+
html : {
131
+
get : function(){
132
+
returnthis._html;
133
+
}
134
+
},
120
135
/**
121
136
* The credit text
122
137
* @memberof Credit.prototype
@@ -125,6 +140,7 @@ define([
125
140
*/
126
141
text : {
127
142
get : function(){
143
+
deprecationWarning('Credit.text','Credit.text is deprecated and will be removed in Cesium 1.46. Instead, use Credit.html to get the credit content.');
128
144
returnthis._text;
129
145
}
130
146
},
@@ -137,6 +153,7 @@ define([
137
153
*/
138
154
imageUrl : {
139
155
get : function(){
156
+
deprecationWarning('Credit.imageUrl','Credit.imageUrl is deprecated and will be removed in Cesium 1.46. Instead, use Credit.html to get the credit content.');
140
157
returnthis._imageUrl;
141
158
}
142
159
},
@@ -149,6 +166,7 @@ define([
149
166
*/
150
167
link : {
151
168
get : function(){
169
+
deprecationWarning('Credit.link','Credit.link is deprecated and will be removed in Cesium 1.46. Instead, use Credit.html to get the credit content.');
152
170
returnthis._link;
153
171
}
154
172
},
@@ -187,7 +205,19 @@ define([
187
205
element: {
188
206
get: function(){
189
207
if(!defined(this._element)){
190
-
this._element=getElement(this);
208
+
varhtml=this.html;
209
+
html=xss(html);
210
+
211
+
vardiv=document.createElement('div');
212
+
div.style.display='inline';
213
+
div.innerHTML=html;
214
+
215
+
varlinks=div.querySelectorAll('a');
216
+
for(vari=0;i<links.length;i++){
217
+
links[i].setAttribute('target','_blank');
218
+
}
219
+
220
+
this._element=div;
191
221
}
192
222
returnthis._element;
193
223
}
@@ -200,6 +230,7 @@ define([
200
230
* @returns {Boolean}
201
231
*/
202
232
Credit.prototype.hasImage=function(){
233
+
deprecationWarning('Credit.hasImage','Credit.hasImage is deprecated and will be removed in Cesium 1.46.');
203
234
returnthis._hasImage;
204
235
};
205
236
@@ -209,6 +240,7 @@ define([
209
240
* @returns {Boolean}
210
241
*/
211
242
Credit.prototype.hasLink=function(){
243
+
deprecationWarning('Credit.hasLink','Credit.hasLink is deprecated and will be removed in Cesium 1.46.');
0 commit comments