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

Merge pull request #748 from twpayne/rename-projection-to-proj

Browse Source 
Rename ol.projection to ol.proj
This commit is contained in:
Tom Payne
2013-05-31 04:34:22 -07:00
parent e9adc06bee 46553c719c
commit 075f4aadc7
50 changed files with 345 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/geolocation.js
View File

@@ -9,7 +9,7 @@ goog.require('goog.math');
goog.require('ol.Coordinate');
goog.require('ol.Object');
goog.require('ol.Projection');
goog.require('ol.projection');
goog.require('ol.proj');
/**
@@ -51,7 +51,7 @@ ol.Geolocation = function(opt_options) {
* @private
* @type {ol.TransformFunction}
*/
this.transform_ = ol.projection.identityTransform;
this.transform_ = ol.proj.identityTransform;
/**
* @private
@@ -67,7 +67,7 @@ ol.Geolocation = function(opt_options) {
this.handleTrackingChanged_, false, this);
if (goog.isDef(options.projection)) {
this.setProjection(ol.projection.get(options.projection));
this.setProjection(ol.proj.get(options.projection));
}
if (goog.isDef(options.trackingOptions)) {
this.setTrackingOptions(options.trackingOptions);
@@ -95,8 +95,8 @@ ol.Geolocation.prototype.disposeInternal = function() {
ol.Geolocation.prototype.handleProjectionChanged_ = function() {
var projection = this.getProjection();
if (goog.isDefAndNotNull(projection)) {
this.transform_ = ol.projection.getTransformFromProjections(
ol.projection.get('EPSG:4326'), projection);
this.transform_ = ol.proj.getTransformFromProjections(
ol.proj.get('EPSG:4326'), projection);
if (!goog.isNull(this.position_)) {
this.set(
ol.GeolocationProperty.POSITION, this.transform_(this.position_));