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

Remove use of goog.vec.*

Browse Source
This commit is contained in:
Andreas Hocevar
2016-06-22 09:14:53 +02:00
parent 55edf4003f
commit cf7ff841a7
36 changed files with 511 additions and 412 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.matrix.create();
var transformFloat = ol.matrix.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.matrix');
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);

6
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(),
var transform = ol.matrix.makeTransform(ol.matrix.create(),
0, 0, pixelRatio, pixelRatio, 0, 0, 0);
expect(ol.vec.Mat4.equals2D(render.transform_, transform)).to.be.ok();
expect(ol.matrix.equals(render.transform_, transform)).to.be.ok();
});
});
});
goog.require('goog.vec.Mat4');
goog.require('ol.matrix');
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()
coordinateToPixelMatrix: ol.matrix.create(),
pixelToCoordinateMatrix: ol.matrix.create()
};
renderer.getImageTransform = function() {
return goog.vec.Mat4.createNumberIdentity();
return ol.matrix.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.matrix');
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,32 @@ describe('ol.renderer.webgl.ImageLayer', function() {
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
var matrix = renderer.getProjectionMatrix();
var input;
var output = goog.vec.Vec4.createNumber();
var output = ol.matrix.create();
input = goog.vec.Vec4.createFromValues(-1, -1, 0, 1);
goog.vec.Mat4.multVec4(matrix, input, output);
ol.matrix.multVec2(matrix, [-1, -1], output);
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);
ol.matrix.multVec2(matrix, [1, -1], output);
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);
ol.matrix.multVec2(matrix, [-1, 1], output);
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);
ol.matrix.multVec2(matrix, [1, 1], output);
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);
ol.matrix.multVec2(matrix, [0, 0], output);
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.matrix');
goog.require('ol.Map');
goog.require('ol.proj.common');
goog.require('ol.layer.Image');