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

Merge pull request #5507 from ahocevar/remove-goog-vec

Browse Source 
Remove use of goog.vec.*
This commit is contained in:
Andreas Hocevar
2016-07-01 22:46:42 +02:00
committed by GitHub
parent 9cc724550a 618cb389e5
commit 9624357bc3
38 changed files with 740 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/spec/ol/dom/dom.test.js
View File

@@ -147,8 +147,8 @@ describe('ol.dom', function() {
describe('ol.dom.transformElement2D', function() {
var element = null;
var transform = goog.vec.Mat4.createNumber();
var transformFloat = goog.vec.Mat4.createNumber();
var transform = ol.transform.create();
var transformFloat = ol.transform.create();
transformFloat[0] = 0.12345;
beforeEach(function() {
element = document.createElement('div');
@@ -564,5 +564,5 @@ describe('ol.dom', function() {
});
goog.require('goog.userAgent');
goog.require('goog.vec.Mat4');
goog.require('ol.transform');
goog.require('ol.dom');

1
test/spec/ol/extent.test.js
View File

@@ -864,7 +864,6 @@ describe('ol.extent', function() {
});
goog.require('goog.vec.Mat4');
goog.require('ol.extent');
goog.require('ol.extent.Corner');
goog.require('ol.extent.Relationship');

8
test/spec/ol/geom/flat/transformflatgeom.test.js
View File

@@ -23,9 +23,11 @@ describe('ol.geom.flat.transform', function() {
[-82.128838, 26.693342, 0],
[-82.102127, 26.585724, 0]]]
]).transform('EPSG:4326', 'EPSG:3857');
var transform = [0.0004088332670837288, 0, 0, 0, 0,
-0.0004088332670837288, 0, 0, 0, 0, 1, 0, 4480.991370439071,
1529.5752568707105, 0, 1];
var transform = [
0.0004088332670837288, 0,
0, -0.0004088332670837288,
4480.991370439071, 1529.5752568707105
];
var pixelCoordinates = ol.geom.transformSimpleGeometry2D(
multiPolygonGeometry, transform, []);
expect(pixelCoordinates[0]).to.roughlyEqual(806.6035275946265, 1e-9);

8
test/spec/ol/render.test.js
View File

@@ -22,16 +22,16 @@ describe('ol.render', function() {
[0, 0, size[0] * pixelRatio, size[1] * pixelRatio]);
expect(canvas.style.width).to.be(size[0] + 'px');
expect(canvas.style.height).to.be(size[1] + 'px');
var transform = ol.vec.Mat4.makeTransform2D(goog.vec.Mat4.createNumber(),
0, 0, pixelRatio, pixelRatio, 0, 0, 0);
expect(ol.vec.Mat4.equals2D(render.transform_, transform)).to.be.ok();
var transform = ol.transform.scale(ol.transform.create(),
pixelRatio, pixelRatio);
expect(ol.array.equals(render.transform_, transform)).to.be.ok();
});
});
});
goog.require('goog.vec.Mat4');
goog.require('ol.transform');
goog.require('ol.render');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.vec.Mat4');

7
test/spec/ol/render/canvasimmediate.test.js
View File

@@ -198,10 +198,9 @@ describe('ol.render.canvas.Immediate', function() {
};
var transform = [
0.0004088332670837288, 0, 0, 0,
0, -0.0004088332670837288, 0, 0,
0, 0, 1, 0,
4480.991370439071, 1529.5752568707105, 0, 1
0.0004088332670837288, 0,
0, -0.0004088332670837288,
4480.991370439071, 1529.5752568707105
];
var extent = [

8
test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js
View File

@@ -23,11 +23,11 @@ describe('ol.renderer.canvas.Layer', function() {
},
size: [10, 10],
pixelRatio: 1,
coordinateToPixelMatrix: goog.vec.Mat4.createNumber(),
pixelToCoordinateMatrix: goog.vec.Mat4.createNumber()
coordinateToPixelTransform: ol.transform.create(),
pixelToCoordinateTransform: ol.transform.create()
};
renderer.getImageTransform = function() {
return goog.vec.Mat4.createNumberIdentity();
return ol.transform.create();
};
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
var layerState = layer.getLayerState();
@@ -62,7 +62,7 @@ describe('ol.renderer.canvas.Layer', function() {
goog.require('ol.render.canvas');
goog.require('goog.vec.Mat4');
goog.require('ol.transform');
goog.require('ol.layer.Image');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Layer');

21
test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js
View File

@@ -49,39 +49,30 @@ describe('ol.renderer.webgl.ImageLayer', function() {
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
var matrix = renderer.getProjectionMatrix();
var input;
var output = goog.vec.Vec4.createNumber();
input = goog.vec.Vec4.createFromValues(-1, -1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
var output = ol.transform.apply(matrix, [-1, -1]);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(-6);
input = goog.vec.Vec4.createFromValues(1, -1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
output = ol.transform.apply(matrix, [1, -1]);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(-6);
input = goog.vec.Vec4.createFromValues(-1, 1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
output = ol.transform.apply(matrix, [-1, 1]);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(6);
input = goog.vec.Vec4.createFromValues(1, 1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
output = ol.transform.apply(matrix, [1, 1]);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(6);
input = goog.vec.Vec4.createFromValues(0, 0, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
output = ol.transform.apply(matrix, [0, 0]);
expect(output[0]).to.eql(-2);
expect(output[1]).to.eql(0);
});
});
});
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4');
goog.require('ol.transform');
goog.require('ol.Map');
goog.require('ol.proj.common');
goog.require('ol.layer.Image');

121
test/spec/ol/transform.test.js Normal file
View File

@@ -0,0 +1,121 @@
goog.provide('ol.test.transform');
describe('ol.transform', function() {
function assertRoughlyEqual(t1, t2) {
t1.forEach(function(item, index) {
expect(item).to.roughlyEqual(t2[index], 1e-8);
});
}
describe('ol.transform.create()', function() {
it('creates an identity transform', function() {
expect(ol.transform.create()).to.eql([1, 0, 0, 1, 0, 0]);
});
});
describe('ol.transform.reset()', function() {
it('resets tansform to an identity transform', function() {
var transform = [1, 2, 3, 4, 5, 6];
expect(ol.transform.reset(transform)).to.eql([1, 0, 0, 1, 0, 0]);
expect(transform).to.eql([1, 0, 0, 1, 0, 0]);
});
});
describe('ol.transform.set()', function() {
it('sets the given values', function() {
var transform = ol.transform.create();
expect(ol.transform.set(transform, 1, 2, 3, 4, 5, 6)).to.eql([1, 2, 3, 4, 5, 6]);
expect(transform).to.eql([1, 2, 3, 4, 5, 6]);
});
});
describe('ol.transform.setFromArray()', function() {
it('sets values of 2nd transform on 1st transform', function() {
var transform1 = ol.transform.create();
var transform2 = [1, 2, 3, 4, 5, 6];
expect(ol.transform.setFromArray(transform1, transform2)).to.eql(transform2);
expect(transform1).to.eql(transform2);
});
});
describe('ol.transform.translate()', function() {
it('applies translation to a transform', function() {
var transform = ol.transform.create();
expect(ol.transform.translate(transform, 3, 4)).to.eql([1, 0, 0, 1, 3, 4]);
expect(transform).to.eql([1, 0, 0, 1, 3, 4]);
});
});
describe('ol.transform.scale()', function() {
it('applies scaling to a transform', function() {
var transform = ol.transform.create();
expect(ol.transform.scale(transform, 3, 4)).to.eql([3, 0, 0, 4, 0, 0]);
expect(transform).to.eql([3, 0, 0, 4, 0, 0]);
});
});
describe('ol.transform.rotate()', function() {
it('applies rotation to a transform', function() {
var transform = ol.transform.create();
assertRoughlyEqual(ol.transform.rotate(transform, Math.PI / 2), [0, 1, -1, 0, 0, 0]);
assertRoughlyEqual(transform, [0, 1, -1, 0, 0, 0]);
});
});
describe('ol.transform.multiply()', function() {
it('multiplies two transforms', function() {
var transform1 = [1, 2, 1, 2, 1, 2];
var transform2 = [1, 2, 1, 2, 1, 2];
expect(ol.transform.multiply(transform1, transform2)).to.eql([3, 6, 3, 6, 4, 8]);
expect(transform1).to.eql([3, 6, 3, 6, 4, 8]);
});
});
describe('ol.transform.compose()', function() {
it('composes a translate, scale, rotate, translate transform', function() {
var dx1 = 3;
var dy1 = 4;
var sx = 1.5;
var sy = -1.5;
var angle = Math.PI / 3;
var dx2 = -dx1 / 2;
var dy2 = -dy1 / 2;
var expected = ol.transform.create();
ol.transform.translate(expected, dx1, dy1);
ol.transform.scale(expected, sx, sy);
ol.transform.rotate(expected, angle);
ol.transform.translate(expected, dx2, dy2);
var composed = ol.transform.create();
var composedReturn = ol.transform.compose(composed, dx1, dy1, sx, sy, angle, dx2, dy2);
expect(composed).to.equal(composedReturn);
expect(composed).to.eql(expected);
});
});
describe('ol.transform.invert()', function() {
it('inverts a transform', function() {
var transform = [1, 0, 1, 0, 1, 0];
expect(function() {
ol.transform.invert(transform);
}).to.throwException();
transform = [1, 1, 1, 2, 2, 0];
expect(ol.transform.invert(transform)).to.eql([2, -1, -1, 1, -4, 2]);
expect(transform).to.eql([2, -1, -1, 1, -4, 2]);
});
});
describe('ol.transform.apply()', function() {
it('applies a transform to a 2d vector', function() {
var transform = ol.transform.translate(ol.transform.create(), 2, 3);
var point = [1, 2];
expect(ol.transform.apply(transform, point)).to.eql([3, 5]);
expect(point).to.eql([3, 5]);
});
});
});
goog.require('ol.transform');

25
test/spec/ol/vec/mat4.test.js Normal file
View File

@@ -0,0 +1,25 @@
goog.provide('ol.test.vec.Mat4');
describe('ol.vec.Mat4', function() {
describe('ol.vec.Mat4.create()', function() {
it('returns the expected matrix', function() {
expect(ol.vec.Mat4.create()).to.eql(
[1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
});
});
describe('ol.vec.Mat4.fromTransform()', function() {
it('sets the expected transform on the matrix', function() {
var transform = [1, 2, 3, 4, 5, 6];
var result = ol.vec.Mat4.create();
expect(ol.vec.Mat4.fromTransform(result, transform)).to.eql(
[1, 2, 0, 0, 3, 4, 0, 0, 0, 0, 1, 0, 5, 6, 0, 1]);
expect(result).to.eql(
[1, 2, 0, 0, 3, 4, 0, 0, 0, 0, 1, 0, 5, 6, 0, 1]);
});
});
});
goog.require('ol.vec.Mat4');