Rename transform to applyTransform for geometries

This commit is contained in:
Tim Schaub
2014-05-02 09:21:56 -06:00
parent 7b4c240a5a
commit 4f9968d106
8 changed files with 10 additions and 9 deletions

View File

@@ -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();
};

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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();
};

View File

@@ -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();

View File

@@ -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);
}

View File

@@ -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);
}
}
}

View File

@@ -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();
});