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

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

Browse Source 
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
parent 82f204f30c 116c26422e
commit d990be61af
7 changed files with 65 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/Map.js
View File

@@ -14,13 +14,13 @@ ol.Map = function() {
* @private
* @type {ol.Projection}
*/
this.projection_ ;
this.projection_ = new ol.Projection('EPSG:900913');
/**
* @private
* @type {ol.Projection}
*/
this.userProjection_;
this.userProjection_ = new ol.Projection('EPSG:4326');
/**
* @private
@@ -120,8 +120,8 @@ ol.Map.prototype.setProjection = function(projection) {
* @param {ol.Projection} projection set the user projection.
* @return {ol.Map} This.
*/
ol.Map.prototype.setUserProjection = function(projection) {
this.userProjection_ = projection;
ol.Map.prototype.setUserProjection = function(userProjection) {
this.userProjection_ = userProjection;
return this;
};