Merge branch 'three' of https://github.com/tschaub/openlayers into three

Conflicts:
	src/api/loc.js
	src/api/map.js
	src/ol/Map.js
This commit is contained in:
Mike Adair
2012-06-19 09:04:04 -04:00
7 changed files with 65 additions and 102 deletions
+1 -6
View File
@@ -49,12 +49,7 @@ ol.bounds = function(opt_arg){
throw new Error('ol.bounds');
}
var bounds = new ol.Bounds();
bounds.setMinX(minX);
bounds.setMinY(minY);
bounds.setMaxX(maxX);
bounds.setMaxY(maxY);
bounds.setProjection(projection);
var bounds = new ol.Bounds(minX, minY, maxX, maxY, projection);
return bounds;
};