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

Merge pull request #4947 from tschaub/pixelworks

Browse Source 
IE support for ol.source.Raster.
This commit is contained in:
Tim Schaub
2016-03-01 15:13:48 -07:00
parent 4cebe3d92b efdc892219
commit e3b88b8785
4 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/region-growing.js
View File

@@ -59,7 +59,7 @@ function growRegion(inputs, data) {
}
edge = newedge;
}
return new ImageData(outputData, width, height);
return {data: outputData, width: width, height: height};
}
function next4Edges(edge) {

2
examples/shaded-relief.js
View File

@@ -99,7 +99,7 @@ function shade(inputs, data) {
}
}
return new ImageData(shadeData, width, height);
return {data: shadeData, width: width, height: height};
}
var elevation = new ol.source.XYZ({

2
package.json
View File

@@ -44,7 +44,7 @@
"metalsmith-layouts": "1.6.4",
"nomnom": "1.8.1",
"pbf": "1.3.5",
"pixelworks": "1.0.0",
"pixelworks": "1.1.0",
"rbush": "1.4.2",
"temp": "0.8.3",
"vector-tile": "1.2.0",

34
test/spec/ol/source/rastersource.test.js
View File

@@ -9,18 +9,7 @@ var green = 'data:image/gif;base64,R0lGODlhAQABAPAAAAD/AP///yH5BAAAAAAALAAAA' +
var blue = 'data:image/gif;base64,R0lGODlhAQABAPAAAAAA/////yH5BAAAAAAALAAAAA' +
'ABAAEAAAICRAEAOw==';
var itNoPhantom = window.checkForMocha ? xit : it;
var hasImageDataConstructor = true;
try {
new ImageData(1, 1);
} catch (e) {
hasImageDataConstructor = false;
}
var maybeDescribe = hasImageDataConstructor ? describe : xdescribe;
maybeDescribe('ol.source.Raster', function() {
describe('ol.source.Raster', function() {
var target, map, redSource, greenSource, blueSource, raster;
@@ -99,7 +88,7 @@ maybeDescribe('ol.source.Raster', function() {
expect(source).to.be.a(ol.source.Raster);
});
itNoPhantom('defaults to "pixel" operation', function(done) {
it('defaults to "pixel" operation', function(done) {
var log = [];
@@ -127,7 +116,7 @@ maybeDescribe('ol.source.Raster', function() {
});
itNoPhantom('allows operation type to be set to "image"', function(done) {
it('allows operation type to be set to "image"', function(done) {
var log = [];
var source = new ol.source.Raster({
@@ -143,7 +132,10 @@ maybeDescribe('ol.source.Raster', function() {
source.once('afteroperations', function() {
expect(log.length).to.equal(1);
var inputs = log[0];
expect(inputs[0]).to.be.an(ImageData);
var imageData = inputs[0];
expect(imageData.data).to.be.a(Uint8ClampedArray);
expect(imageData.width).to.be(2);
expect(imageData.height).to.be(2);
done();
});
@@ -158,7 +150,7 @@ maybeDescribe('ol.source.Raster', function() {
describe('#setOperation()', function() {
itNoPhantom('allows operation to be set', function(done) {
it('allows operation to be set', function(done) {
var count = 0;
raster.setOperation(function(pixels) {
@@ -183,7 +175,7 @@ maybeDescribe('ol.source.Raster', function() {
});
itNoPhantom('updates and re-runs the operation', function(done) {
it('updates and re-runs the operation', function(done) {
var view = map.getView();
view.setCenter([0, 0]);
@@ -207,7 +199,7 @@ maybeDescribe('ol.source.Raster', function() {
describe('beforeoperations', function() {
itNoPhantom('gets called before operations are run', function(done) {
it('gets called before operations are run', function(done) {
var count = 0;
raster.setOperation(function(inputs) {
@@ -231,7 +223,7 @@ maybeDescribe('ol.source.Raster', function() {
});
itNoPhantom('allows data to be set for the operation', function(done) {
it('allows data to be set for the operation', function(done) {
raster.setOperation(function(inputs, data) {
++data.count;
@@ -257,7 +249,7 @@ maybeDescribe('ol.source.Raster', function() {
describe('afteroperations', function() {
itNoPhantom('gets called after operations are run', function(done) {
it('gets called after operations are run', function(done) {
var count = 0;
raster.setOperation(function(inputs) {
@@ -280,7 +272,7 @@ maybeDescribe('ol.source.Raster', function() {
});
itNoPhantom('receives data set by the operation', function(done) {
it('receives data set by the operation', function(done) {
raster.setOperation(function(inputs, data) {
data.message = 'hello world';