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

Pullup #2561 #2562 #2563 #2564 for 2.9RC2

Browse Source 
git-svn-id: http://svn.openlayers.org/branches/openlayers/2.9@10175 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
bartvde
2010-04-08 06:23:01 +00:00
parent 2150a2c783
commit bada3d98a1
3 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/OpenLayers/Map.js
View File

@@ -424,9 +424,9 @@ OpenLayers.Map = OpenLayers.Class({
* ways to call the map constructor. See the examples below.
*
* Parameters:
* div - {String} Id of an element in your page that will contain the map.
* May be omitted if the <div> option is provided or if you intend
* to use <render> later.
* div - {DOMElement|String} The element or id of an element in your page
* that will contain the map. May be omitted if the <div> option is
* provided or if you intend to call the <render> method later.
* options - {Object} Optional object with properties to tag onto the map.
*
* Examples (method one):
@@ -594,13 +594,12 @@ OpenLayers.Map = OpenLayers.Class({
// add any initial layers
if (options && options.layers) {
this.addLayers(options.layers);
}
// set center (and optionally zoom)
if (options && options.center) {
// zoom can be undefined here
this.setCenter(options.center, options.zoom);
this.addLayers(options.layers);
// set center (and optionally zoom)
if (options.center) {
// zoom can be undefined here
this.setCenter(options.center, options.zoom);
}
}
},