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

Avoid shadowing

Browse Source
This commit is contained in:
Tim Schaub
2016-02-23 12:48:27 -07:00
parent 960c51f95d
commit 247eb62e3b
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/source/rastersource.test.js
+25 -27
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,41 +120,39 @@ 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 = []; var source = new ol.source.Raster({
operationType: ol.raster.OperationType.IMAGE,
threads: 0,
sources: [redSource, greenSource, blueSource],
operation: function(inputs) {
log.push(inputs);
return inputs[0];
}
});
raster = new ol.source.Raster({ source.on('afteroperations', function() {
operationType: ol.raster.OperationType.IMAGE, expect(log.length).to.equal(1);
threads: 0, var inputs = log[0];
sources: [redSource, greenSource, blueSource], expect(inputs[0]).to.be.an(ImageData);
operation: function(inputs) { done();
log.push(inputs); });
return inputs[0];
}
});
raster.on('afteroperations', function() { map.getLayers().item(0).setSource(source);
expect(log.length).to.equal(1); var view = map.getView();
var inputs = log[0]; view.setCenter([0, 0]);
expect(inputs[0]).to.be.an(ImageData); view.setZoom(0);
done();
});
map.getLayers().item(0).setSource(raster); });
var view = map.getView();
view.setCenter([0, 0]);
view.setZoom(0);
});
}); });