Avoid shadowing

This commit is contained in:
Tim Schaub
2016-02-23 12:48:27 -07:00
parent 960c51f95d
commit 247eb62e3b
+7 -9
View File
@@ -103,7 +103,7 @@ try {
var log = []; var log = [];
raster = new ol.source.Raster({ var source = new ol.source.Raster({
threads: 0, threads: 0,
sources: [redSource, greenSource, blueSource], sources: [redSource, greenSource, blueSource],
operation: function(inputs) { operation: function(inputs) {
@@ -112,7 +112,7 @@ try {
} }
}); });
raster.on('afteroperations', function() { source.on('afteroperations', function() {
expect(log.length).to.equal(4); expect(log.length).to.equal(4);
var inputs = log[0]; var inputs = log[0];
var pixel = inputs[0]; var pixel = inputs[0];
@@ -120,19 +120,17 @@ try {
done(); done();
}); });
map.getLayers().item(0).setSource(raster); map.getLayers().item(0).setSource(source);
var view = map.getView(); var view = map.getView();
view.setCenter([0, 0]); view.setCenter([0, 0]);
view.setZoom(0); view.setZoom(0);
}); });
itNoPhantom('allows operation type to be set to "image"', itNoPhantom('allows operation type to be set to "image"', function(done) {
function(done) {
var log = []; var log = [];
raster = new ol.source.Raster({ var source = new ol.source.Raster({
operationType: ol.raster.OperationType.IMAGE, operationType: ol.raster.OperationType.IMAGE,
threads: 0, threads: 0,
sources: [redSource, greenSource, blueSource], sources: [redSource, greenSource, blueSource],
@@ -142,14 +140,14 @@ try {
} }
}); });
raster.on('afteroperations', function() { source.on('afteroperations', function() {
expect(log.length).to.equal(1); expect(log.length).to.equal(1);
var inputs = log[0]; var inputs = log[0];
expect(inputs[0]).to.be.an(ImageData); expect(inputs[0]).to.be.an(ImageData);
done(); done();
}); });
map.getLayers().item(0).setSource(raster); map.getLayers().item(0).setSource(source);
var view = map.getView(); var view = map.getView();
view.setCenter([0, 0]); view.setCenter([0, 0]);
view.setZoom(0); view.setZoom(0);