From 4f9968d106cfca1a87e7eba90e876c223869105c Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Fri, 2 May 2014 09:21:56 -0600
Subject: [PATCH] Rename transform to applyTransform for geometries

---
 src/ol/geolocation.js                        | 2 +-
 src/ol/geom/circle.js                        | 2 +-
 src/ol/geom/geometry.js                      | 3 ++-
 src/ol/geom/geometrycollection.js            | 4 ++--
 src/ol/geom/simplegeometry.js                | 2 +-
 src/ol/interaction/draganddropinteraction.js | 2 +-
 src/ol/source/formatvectorsource.js          | 2 +-
 test/spec/ol/geom/circle.test.js             | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js
index ecbf7e6669..bc7fe3a501 100644
--- a/src/ol/geolocation.js
+++ b/src/ol/geolocation.js
@@ -187,7 +187,7 @@ ol.Geolocation.prototype.positionChange_ = function(position) {
   this.set(ol.GeolocationProperty.SPEED,
       goog.isNull(coords.speed) ? undefined : coords.speed);
   var geometry = ol.sphere.WGS84.circle(this.position_, coords.accuracy);
-  geometry.transform(this.transform_);
+  geometry.applyTransform(this.transform_);
   this.set(ol.GeolocationProperty.ACCURACY_GEOMETRY, geometry);
   this.dispatchChangeEvent();
 };
diff --git a/src/ol/geom/circle.js b/src/ol/geom/circle.js
index 10efe0cefb..a8762facf1 100644
--- a/src/ol/geom/circle.js
+++ b/src/ol/geom/circle.js
@@ -217,4 +217,4 @@ ol.geom.Circle.prototype.setRadius = function(radius) {
 /**
  * @inheritDoc
  */
-ol.geom.Circle.prototype.transform = goog.abstractMethod;
+ol.geom.Circle.prototype.applyTransform = goog.abstractMethod;
diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js
index 613de8949d..664ab20a18 100644
--- a/src/ol/geom/geometry.js
+++ b/src/ol/geom/geometry.js
@@ -159,10 +159,11 @@ ol.geom.Geometry.prototype.getType = goog.abstractMethod;
 
 
 /**
+ * Apply a transform function to the geometry.  Modifies the geometry in place.
  * @function
  * @param {ol.TransformFunction} transformFn Transform.
  */
-ol.geom.Geometry.prototype.transform = goog.abstractMethod;
+ol.geom.Geometry.prototype.applyTransform = goog.abstractMethod;
 
 
 /**
diff --git a/src/ol/geom/geometrycollection.js b/src/ol/geom/geometrycollection.js
index f64ebf396a..a1ea40b2a7 100644
--- a/src/ol/geom/geometrycollection.js
+++ b/src/ol/geom/geometrycollection.js
@@ -247,11 +247,11 @@ ol.geom.GeometryCollection.prototype.setGeometriesArray = function(geometries) {
 /**
  * @inheritDoc
  */
-ol.geom.GeometryCollection.prototype.transform = function(transformFn) {
+ol.geom.GeometryCollection.prototype.applyTransform = function(transformFn) {
   var geometries = this.geometries_;
   var i, ii;
   for (i = 0, ii = geometries.length; i < ii; ++i) {
-    geometries[i].transform(transformFn);
+    geometries[i].applyTransform(transformFn);
   }
   this.dispatchChangeEvent();
 };
diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js
index 24adb6b983..8f4555800d 100644
--- a/src/ol/geom/simplegeometry.js
+++ b/src/ol/geom/simplegeometry.js
@@ -244,7 +244,7 @@ ol.geom.SimpleGeometry.prototype.setLayout =
  * @inheritDoc
  * @todo api
  */
-ol.geom.SimpleGeometry.prototype.transform = function(transformFn) {
+ol.geom.SimpleGeometry.prototype.applyTransform = function(transformFn) {
   if (!goog.isNull(this.flatCoordinates)) {
     transformFn(this.flatCoordinates, this.flatCoordinates, this.stride);
     this.dispatchChangeEvent();
diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js
index a1a31bc010..5b76294a4a 100644
--- a/src/ol/interaction/draganddropinteraction.js
+++ b/src/ol/interaction/draganddropinteraction.js
@@ -118,7 +118,7 @@ ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, result) {
         var feature = readFeatures[j];
         var geometry = feature.getGeometry();
         if (!goog.isNull(geometry)) {
-          geometry.transform(transform);
+          geometry.applyTransform(transform);
         }
         features.push(feature);
       }
diff --git a/src/ol/source/formatvectorsource.js b/src/ol/source/formatvectorsource.js
index 7cf28860b7..e6f1fd2242 100644
--- a/src/ol/source/formatvectorsource.js
+++ b/src/ol/source/formatvectorsource.js
@@ -125,7 +125,7 @@ ol.source.FormatVector.prototype.readFeatures = function(source) {
         var feature = features[i];
         var geometry = feature.getGeometry();
         if (!goog.isNull(geometry)) {
-          geometry.transform(transform);
+          geometry.applyTransform(transform);
         }
       }
     }
diff --git a/test/spec/ol/geom/circle.test.js b/test/spec/ol/geom/circle.test.js
index 3ae6298440..bd1bee2802 100644
--- a/test/spec/ol/geom/circle.test.js
+++ b/test/spec/ol/geom/circle.test.js
@@ -207,7 +207,7 @@ describe('ol.geom.Circle', function() {
 
       it('throws an exception', function() {
         expect(function() {
-          circle.transform(ol.proj.identityTransform);
+          circle.applyTransform(ol.proj.identityTransform);
         }).to.throwException();
       });