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

Merge branch 'master' of github.com:openlayers/ol3

Browse Source
This commit is contained in:
ahocevar
2012-06-23 17:03:57 +02:00
parent bba7500ab7 bcc85b9dd7
commit 12fb6c5af4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/Map.js
View File

@@ -10,6 +10,7 @@ goog.require('ol.renderer.MapRenderer');
goog.require('goog.dom');
goog.require('goog.math');
goog.require('goog.asserts');
/**
@@ -292,7 +293,8 @@ ol.Map.prototype.getSize = function() {
* @param {ol.Loc} center Center in map projection.
*/
ol.Map.prototype.setCenter = function(center) {
this.center_ = center;
goog.asserts.assert(!goog.isNull(center.getProjection()));
this.center_ = center.doTransform(this.getProjection());
this.conditionallyRender();
};
@@ -302,8 +304,9 @@ ol.Map.prototype.setCenter = function(center) {
* @param {number} zoom
*/
ol.Map.prototype.setCenterAndZoom = function(center, zoom) {
goog.asserts.assert(!goog.isNull(center.getProjection()));
this.center_ = center.doTransform(this.getProjection());
this.zoom_ = this.limitZoom(zoom);
this.center_ = center;
this.conditionallyRender();
};
@@ -480,6 +483,7 @@ ol.Map.prototype.moveByPx = function(dx, dy) {
this.center_.getX() - dx * resolution,
this.center_.getY() + dy * resolution
);
center.setProjection(this.getProjection());
this.setCenter(center);
}
};