Make ZoomSlider use View2D value/resolution funcs

This commit is contained in:
Éric Lemoine
2013-04-08 12:51:14 +02:00
parent 6163f05b2b
commit 516f21eb17
3 changed files with 13 additions and 115 deletions

View File

@@ -10,8 +10,6 @@ describe('ol.control.ZoomSlider', function() {
target: target
});
zoomslider = new ol.control.ZoomSlider({
minResolution: 5000,
maxResolution: 100000,
map: map
});
});
@@ -25,43 +23,6 @@ describe('ol.control.ZoomSlider', function() {
target = null;
});
describe('configuration & defaults', function() {
it('has valid defaults for min and maxresolution', function() {
var zoomslider,
expectedMin = 0.5971642833948135,
expectedMax = 156543.0339,
expectedRange = expectedMax - expectedMin;
expect(function() {
zoomslider = new ol.control.ZoomSlider({});
}).not.to.throwException();
expect(zoomslider.minResolution_).to.be(expectedMin);
expect(zoomslider.maxResolution_).to.be(expectedMax);
expect(zoomslider.range_).to.be(expectedRange);
});
it('throws exception when configured with wrong resolutions', function() {
expect(function() {
zoomslider = new ol.control.ZoomSlider({
minResolution: 50,
maxResolution: 0
});
}).to.throwException();
});
it('can be configured with valid resolutions', function() {
expect(function() {
zoomslider = new ol.control.ZoomSlider({
minResolution: 790,
maxResolution: 91000
});
}).not.to.throwException();
expect(zoomslider.minResolution_).to.be(790);
expect(zoomslider.maxResolution_).to.be(91000);
expect(zoomslider.range_).to.be(90210);
});
});
describe('DOM creation', function() {
it('creates the expected DOM elements', function() {
var zoomSliderContainers = goog.dom.getElementsByClass(
@@ -103,10 +64,7 @@ describe('ol.control.ZoomSlider', function() {
describe('#direction_', function() {
it('is horizontal for wide containers', function() {
var control = new ol.control.ZoomSlider({
minResolution: 5000,
maxResolution: 100000
});
var control = new ol.control.ZoomSlider({});
control.element.style.width = '1000px';
control.element.style.height = '10px';
control.setMap(map);
@@ -118,10 +76,7 @@ describe('ol.control.ZoomSlider', function() {
});
it('is vertical for tall containers', function() {
var control = new ol.control.ZoomSlider({
minResolution: 5000,
maxResolution: 100000
});
var control = new ol.control.ZoomSlider({});
control.element.style.width = '10px';
control.element.style.height = '1000px';