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

Merge pull request #261 from elemoine/zoomfactor

Browse Source 
Change default zoom delta and animate mousewheel zoom
This commit is contained in:
Éric Lemoine
2013-03-05 03:52:38 -08:00
parent 3b29ec610b b884f2f25d
commit 98f9f44877
16 changed files with 317 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/spec/ol/map.test.js
View File

@@ -85,28 +85,11 @@ describe('ol.Map', function() {
});
describe('create mousewheel interaction', function() {
beforeEach(function() {
it('creates mousewheel interaction', function() {
options.mouseWheelZoom = true;
});
describe('default mouseWheelZoomDelta', function() {
it('create mousewheel interaction with default delta', function() {
var interactions = ol.Map.createInteractions_(options);
expect(interactions.getLength()).toEqual(1);
expect(interactions.getAt(0)).toBeA(ol.interaction.MouseWheelZoom);
expect(interactions.getAt(0).delta_).toEqual(1);
});
});
describe('set mouseWheelZoomDelta', function() {
it('create mousewheel interaction with set delta', function() {
options.mouseWheelZoomDelta = 7;
var interactions = ol.Map.createInteractions_(options);
expect(interactions.getLength()).toEqual(1);
expect(interactions.getAt(0)).toBeA(ol.interaction.MouseWheelZoom);
expect(interactions.getAt(0).delta_).toEqual(7);
});
var interactions = ol.Map.createInteractions_(options);
expect(interactions.getLength()).toEqual(1);
expect(interactions.getAt(0)).toBeA(ol.interaction.MouseWheelZoom);
});
});
@@ -121,11 +104,11 @@ describe('ol.Map', function() {
var interactions = ol.Map.createInteractions_(options);
expect(interactions.getLength()).toEqual(1);
expect(interactions.getAt(0)).toBeA(ol.interaction.DblClickZoom);
expect(interactions.getAt(0).delta_).toEqual(4);
expect(interactions.getAt(0).delta_).toEqual(1);
});
});
describe('set mouseWheelZoomDelta', function() {
describe('set zoomDelta', function() {
it('create double click interaction with set delta', function() {
options.zoomDelta = 7;
var interactions = ol.Map.createInteractions_(options);

36
test/spec/ol/rotationconstraint.test.js Normal file
View File

@@ -0,0 +1,36 @@
goog.provide('ol.test.RotationConstraint');
describe('ol.RotationConstraint', function() {
describe('SnapToZero', function() {
it('returns expected rotation value', function() {
var rotationConstraint = ol.RotationConstraint.createSnapToZero(0.3);
expect(rotationConstraint(0.1, 0)).toEqual(0);
expect(rotationConstraint(0.2, 0)).toEqual(0);
expect(rotationConstraint(0.3, 0)).toEqual(0);
expect(rotationConstraint(0.4, 0)).toEqual(0.4);
expect(rotationConstraint(-0.1, 0)).toEqual(0);
expect(rotationConstraint(-0.2, 0)).toEqual(0);
expect(rotationConstraint(-0.3, 0)).toEqual(0);
expect(rotationConstraint(-0.4, 0)).toEqual(-0.4);
expect(rotationConstraint(1, -0.9)).toEqual(0);
expect(rotationConstraint(1, -0.8)).toEqual(0);
// floating-point arithmetic
expect(rotationConstraint(1, -0.7)).not.toEqual(0);
expect(rotationConstraint(1, -0.6)).toEqual(0.4);
expect(rotationConstraint(-1, 0.9)).toEqual(0);
expect(rotationConstraint(-1, 0.8)).toEqual(0);
// floating-point arithmetic
expect(rotationConstraint(-1, 0.7)).not.toEqual(0);
expect(rotationConstraint(-1, 0.6)).toEqual(-0.4);
});
});
});
goog.require('ol.RotationConstraint');

10
test/spec/ol/view2d.test.js
View File

@@ -49,6 +49,16 @@ describe('ol.View2D', function() {
});
});
describe('create rotation constraint', function() {
it('gives a correct rotation constraint function', function() {
var options = {};
var fn = ol.View2D.createConstraints_(options).rotation;
expect(fn(0.01, 0)).toEqual(0);
expect(fn(0.15, 0)).toEqual(0.15);
});
});
});
});