ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_style_IconImage_ to IconImage

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:29:26 -07:00
parent 14ddcf843d
commit 66182f4cfb
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/style/icon.test.js
+3 -3
View File
@@ -1,7 +1,7 @@
import {getUid} from '../../../../src/ol/index.js';
import {iconImageCache} from '../../../../src/ol/style.js';
import Icon from '../../../../src/ol/style/Icon.js';
import _ol_style_IconImage_ from '../../../../src/ol/style/IconImage.js';
import IconImage from '../../../../src/ol/style/IconImage.js';
describe('ol.style.Icon', function() {
@@ -17,7 +17,7 @@ describe('ol.style.Icon', function() {
img: canvas,
imgSize: size
});
expect(_ol_style_IconImage_.get(
expect(IconImage.get(
canvas, getUid(canvas), size, '').getImage()).to.eql(canvas);
});
@@ -227,7 +227,7 @@ describe('ol.style.Icon', function() {
// pretend that the image is already in the cache,
// this image will be used for the icon.
var src = 'test.png';
var iconImage = new _ol_style_IconImage_(null, 'test.png', imgSize);
var iconImage = new IconImage(null, 'test.png', imgSize);
iconImageCache.set(src, null, null, iconImage);
var iconStyle = new Icon({
test/spec/ol/style/iconimagecache.test.js
+6 -6
View File
@@ -1,7 +1,7 @@
import {nullFunction} from '../../../../src/ol/index.js';
import _ol_events_ from '../../../../src/ol/events.js';
import {iconImageCache} from '../../../../src/ol/style.js';
import _ol_style_IconImage_ from '../../../../src/ol/style/IconImage.js';
import IconImage from '../../../../src/ol/style/IconImage.js';
describe('ol.style.IconImageCache', function() {
var originalMaxCacheSize;
@@ -23,7 +23,7 @@ describe('ol.style.IconImageCache', function() {
for (i = 0; i < 4; ++i) {
src = i + '';
iconImage = new _ol_style_IconImage_(null, src);
iconImage = new IconImage(null, src);
iconImageCache.set(src, null, null, iconImage);
}
@@ -33,7 +33,7 @@ describe('ol.style.IconImageCache', function() {
expect(iconImageCache.cacheSize_).to.eql(4);
src = '4';
iconImage = new _ol_style_IconImage_(null, src);
iconImage = new IconImage(null, src);
iconImageCache.set(src, null, null, iconImage);
expect(iconImageCache.cacheSize_).to.eql(5);
@@ -41,13 +41,13 @@ describe('ol.style.IconImageCache', function() {
expect(iconImageCache.cacheSize_).to.eql(3);
src = '0';
iconImage = new _ol_style_IconImage_(null, src);
iconImage = new IconImage(null, src);
_ol_events_.listen(iconImage, 'change', nullFunction, false);
iconImageCache.set(src, null, null, iconImage);
expect(iconImageCache.cacheSize_).to.eql(4);
src = '4';
iconImage = new _ol_style_IconImage_(null, src);
iconImage = new IconImage(null, src);
_ol_events_.listen(iconImage, 'change', nullFunction, false);
iconImageCache.set(src, null, null, iconImage);
expect(iconImageCache.cacheSize_).to.eql(5);
@@ -65,7 +65,7 @@ describe('ol.style.IconImageCache', function() {
for (i = 0; i < 3; ++i) {
src = i + '';
iconImage = new _ol_style_IconImage_(null, src);
iconImage = new IconImage(null, src);
iconImageCache.set(src, null, null, iconImage);
}