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

Merge pull request #266 from tschaub/permalink

Browse Source 
Making map construction work with permalink.
This commit is contained in:
Tim Schaub
2012-03-01 15:11:10 -08:00
parent 930206fb57 4e9701caa8
commit 485317567e
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/OpenLayers/Map.js
View File

@@ -496,13 +496,16 @@ OpenLayers.Map = OpenLayers.Class({
this.projection.projCode : this.projection;
OpenLayers.Util.applyDefaults(this, OpenLayers.Projection.defaults[projCode]);
// allow extents to be arrays
// allow extents and center to be arrays
if (this.maxExtent && !(this.maxExtent instanceof OpenLayers.Bounds)) {
this.maxExtent = new OpenLayers.Bounds(this.maxExtent);
}
if (this.restrictedExtent && !(this.restrictedExtent instanceof OpenLayers.Bounds)) {
this.restrictedExtent = new OpenLayers.Bounds(this.restrictedExtent);
}
if (this.center && !(this.center instanceof OpenLayers.LonLat)) {
this.center = new OpenLayers.LonLat(this.center);
}
// initialize layers array
this.layers = [];

23
tests/Control/Permalink.html
View File

@@ -321,6 +321,29 @@
map.layers[1].setVisibility(false);
t.ok(OpenLayers.Util.isEquivalentUrl(OpenLayers.Util.getElement('permalink').href, location+"#zoom=2&lat=0&lon=1.75781&layers=BF"), 'setVisibility sets permalink');
}
function test_arrayCenter(t) {
t.plan(1);
var err;
try {
var map = new OpenLayers.Map({
layers: [new OpenLayers.Layer(null, {isBaseLayer: true})],
controls: [
new OpenLayers.Control.Permalink({anchor: true})
],
center: [0, 0],
zoom: 1
});
} catch (e) {
err = e;
}
if (err) {
t.fail("Map construction failure: " + err.message);
} else {
t.ok(true, "Map construction works");
}
}
</script>
</head>
<body>