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

Renamed zoomExtent to zoomToFullExtent, added tests for it and for the new lonlat/px convenience functions.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@663 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2006-06-21 17:12:19 +00:00
parent 221aedebc6
commit bf6ad055df
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Control/PanZoom.js
View File

@@ -137,7 +137,7 @@ OpenLayers.Control.PanZoom.prototype =
this.map.zoomOut(); this.map.zoomOut();
break; break;
case "zoomworld": case "zoomworld":
this.map.zoomExtent(); this.map.zoomToFullExtent();
break; break;
} }

4
lib/OpenLayers/Map.js
View File

@@ -540,10 +540,10 @@ OpenLayers.Map.prototype = {
}, },
/** /**
* zoomExtent * zoomToFullExtent
* Zoom to the full extent and recenter. * Zoom to the full extent and recenter.
*/ */
zoomExtent: function() { zoomToFullExtent: function() {
var fullExtent = this.getFullExtent(); var fullExtent = this.getFullExtent();
var oldZoom = this.zoom; var oldZoom = this.zoom;
this.setCenter( this.setCenter(

20
tests/test_Map.html
View File

@@ -59,7 +59,7 @@
t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hash" ); t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hash" );
} }
function test_05_Map_center(t) { function test_05_Map_center(t) {
t.plan(4); t.plan(7);
map = new OpenLayers.Map($('map')); map = new OpenLayers.Map($('map'));
map.setCenter(new OpenLayers.LonLat(2, 1), 0); map.setCenter(new OpenLayers.LonLat(2, 1), 0);
map.zoomIn(); map.zoomIn();
@@ -68,7 +68,15 @@
t.eq( map.getCenter().lat, 1, "map center lat is correct after calling setCenter,zoom in"); t.eq( map.getCenter().lat, 1, "map center lat is correct after calling setCenter,zoom in");
map.zoomOut(); map.zoomOut();
t.eq( map.getZoom(), 0, "map.zoom is correct after calling setCenter,zoom in, zoom out"); t.eq( map.getZoom(), 0, "map.zoom is correct after calling setCenter,zoom in, zoom out");
map.zoomTo(5);
t.eq( map.getZoom(), 5, "map.zoom is correct after calling zoomTo" );
map.zoomToFullExtent();
t.eq( map.getZoom(), 0, "map.zoom is correct after calling zoomToFullExtent" );
var lonlat = map.getCenter();
var zero = new OpenLayers.LonLat(0, 0);
t.ok( lonlat.equals(zero), "map center is correct after calling zoomToFullExtent" );
} }
function test_06_Map_zoomend_event (t) { function test_06_Map_zoomend_event (t) {
t.plan(3); t.plan(3);
map = new OpenLayers.Map('map'); map = new OpenLayers.Map('map');
@@ -120,7 +128,7 @@
} }
function test_08_Map_px_lonlat_translation (t) { function test_08_Map_px_lonlat_translation (t) {
t.plan( 3 ); t.plan( 6 );
map = new OpenLayers.Map($('map')); map = new OpenLayers.Map($('map'));
map.setCenter(new OpenLayers.LonLat(0, 0), 0); map.setCenter(new OpenLayers.LonLat(0, 0), 0);
@@ -136,6 +144,14 @@
// in the default case, it seems to work. This may not // in the default case, it seems to work. This may not
// always be so. // always be so.
t.ok( newPixel.equals(pixel), "Translation to pixel and back to lonlat is consistent"); t.ok( newPixel.equals(pixel), "Translation to pixel and back to lonlat is consistent");
lonlat = map.getLonLatFromPixel(pixel);
t.ok( lonlat instanceof OpenLayers.LonLat, "getLonLatFromPixel returns valid OpenLayers.LonLat" );
newPixel = map.getPixelFromLonLat(lonlat);
t.ok( newPixel instanceof OpenLayers.Pixel, "getPixelFromLonLat returns valid OpenLayers.Pixel" );
t.ok( newPixel.equals(pixel), "2nd translation to pixel and back to lonlat is consistent");
} }
function test_99_Map_destroy (t) { function test_99_Map_destroy (t) {