Skip to content

Commit cdd987b

Browse files
author
Kogis IWI
committed
Remove use of curly braces
1 parent e726b0d commit cdd987b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Source/Scene/UrlTemplateImageryProvider.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ define([
160160
* });
161161
* // Using custom tags in your template url.
162162
* var custom = new Cesium.UrlTemplateImageryProvider({
163-
* url : 'https://yoururl/{time}/{z}/{y}/{x}.png',
163+
* url : 'https://yoururl/{Time}/{z}/{y}/{x}.png',
164164
* customTags : {
165-
* '{time}': function(imageryProvider, x, y , level) {
165+
* Time: function(imageryProvider, x, y , level) {
166166
* return '20171231'
167167
* }
168168
* }
@@ -578,11 +578,12 @@ define([
578578
}
579579
that._credit = credit;
580580

581-
if (properties.customTags) {
581+
if (defined(properties.customTags)) {
582582
for (var tag in properties.customTags) {
583583
if (properties.customTags.hasOwnProperty(tag)) {
584-
tags[tag] = properties.customTags[tag]; //eslint-disable-line no-use-before-define
585-
pickFeaturesTags[tag] = properties.customTags[tag]; //eslint-disable-line no-use-before-define
584+
var targetTag = '{' + tag + '}';
585+
tags[targetTag] = properties.customTags[tag];
586+
pickFeaturesTags[targetTag] = properties.customTags[tag];
586587
}
587588
}
588589
}

Specs/Scene/UrlTemplateImageryProviderSpec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -640,14 +640,14 @@ defineSuite([
640640
tilingScheme: new GeographicTilingScheme(),
641641
maximumLevel: 6,
642642
customTags: {
643-
'{custom1}': function() { return 'foo';},
644-
'{custom2}': function() { return 'bar';}
643+
custom1: function() { return 'foo';},
644+
custom2: function() { return 'bar';}
645645
}
646646
});
647647

648648
return pollToPromise(function() {
649649
return provider.ready;
650-
}).then(function() {console.error('spyon');
650+
}).then(function() {
651651
spyOn(loadImage, 'createImage').and.callFake(function(url, crossOrigin, deferred) {
652652
expect(url).toEqual('made/up/tms/server/foo/bar/2/1/3.PNG');
653653

0 commit comments

Comments
 (0)