Rename ol.format.Text to ol.format.TextFeature

This commit is contained in:
Tom Payne
2014-02-28 13:11:57 +01:00
parent 87cf424029
commit 7e32676a9e
3 changed files with 25 additions and 25 deletions

View File

@@ -5,7 +5,7 @@ goog.require('goog.asserts');
goog.require('goog.string');
goog.require('goog.string.newlines');
goog.require('ol.Feature');
goog.require('ol.format.Text');
goog.require('ol.format.TextFeature');
goog.require('ol.geom.LineString');
goog.require('ol.proj');
@@ -23,7 +23,7 @@ ol.format.IGCZ = {
/**
* @constructor
* @extends {ol.format.Text}
* @extends {ol.format.TextFeature}
* @param {olx.format.IGCOptions=} opt_options Options.
* @todo stability experimental
*/
@@ -41,7 +41,7 @@ ol.format.IGC = function(opt_options) {
options.altitudeMode : ol.format.IGCZ.NONE;
};
goog.inherits(ol.format.IGC, ol.format.Text);
goog.inherits(ol.format.IGC, ol.format.TextFeature);
/**

View File

@@ -2,7 +2,7 @@ goog.provide('ol.format.Polyline');
goog.require('goog.asserts');
goog.require('ol.Feature');
goog.require('ol.format.Text');
goog.require('ol.format.TextFeature');
goog.require('ol.geom.LineString');
goog.require('ol.geom.flat');
goog.require('ol.proj');
@@ -11,12 +11,12 @@ goog.require('ol.proj');
/**
* @constructor
* @extends {ol.format.Text}
* @extends {ol.format.TextFeature}
*/
ol.format.Polyline = function() {
goog.base(this);
};
goog.inherits(ol.format.Polyline, ol.format.Text);
goog.inherits(ol.format.Polyline, ol.format.TextFeature);
/**

View File

@@ -1,4 +1,4 @@
goog.provide('ol.format.Text');
goog.provide('ol.format.TextFeature');
goog.require('goog.asserts');
goog.require('ol.format.Feature');
@@ -10,10 +10,10 @@ goog.require('ol.format.FormatType');
* @constructor
* @extends {ol.format.Feature}
*/
ol.format.Text = function() {
ol.format.TextFeature = function() {
goog.base(this);
};
goog.inherits(ol.format.Text, ol.format.Feature);
goog.inherits(ol.format.TextFeature, ol.format.Feature);
/**
@@ -21,7 +21,7 @@ goog.inherits(ol.format.Text, ol.format.Feature);
* @private
* @return {string} Text.
*/
ol.format.Text.prototype.getText_ = function(source) {
ol.format.TextFeature.prototype.getText_ = function(source) {
if (goog.isString(source)) {
return source;
} else {
@@ -34,7 +34,7 @@ ol.format.Text.prototype.getText_ = function(source) {
/**
* @inheritDoc
*/
ol.format.Text.prototype.getType = function() {
ol.format.TextFeature.prototype.getType = function() {
return ol.format.FormatType.TEXT;
};
@@ -42,7 +42,7 @@ ol.format.Text.prototype.getType = function() {
/**
* @inheritDoc
*/
ol.format.Text.prototype.readFeature = function(source) {
ol.format.TextFeature.prototype.readFeature = function(source) {
return this.readFeatureFromText(this.getText_(source));
};
@@ -52,13 +52,13 @@ ol.format.Text.prototype.readFeature = function(source) {
* @protected
* @return {ol.Feature} Feature.
*/
ol.format.Text.prototype.readFeatureFromText = goog.abstractMethod;
ol.format.TextFeature.prototype.readFeatureFromText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.readFeatures = function(source) {
ol.format.TextFeature.prototype.readFeatures = function(source) {
return this.readFeaturesFromText(this.getText_(source));
};
@@ -68,13 +68,13 @@ ol.format.Text.prototype.readFeatures = function(source) {
* @protected
* @return {Array.<ol.Feature>} Features.
*/
ol.format.Text.prototype.readFeaturesFromText = goog.abstractMethod;
ol.format.TextFeature.prototype.readFeaturesFromText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.readGeometry = function(source) {
ol.format.TextFeature.prototype.readGeometry = function(source) {
return this.readGeometryFromText(this.getText_(source));
};
@@ -84,13 +84,13 @@ ol.format.Text.prototype.readGeometry = function(source) {
* @protected
* @return {ol.geom.Geometry} Geometry.
*/
ol.format.Text.prototype.readGeometryFromText = goog.abstractMethod;
ol.format.TextFeature.prototype.readGeometryFromText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.readProjection = function(source) {
ol.format.TextFeature.prototype.readProjection = function(source) {
return this.readProjectionFromText(this.getText_(source));
};
@@ -100,13 +100,13 @@ ol.format.Text.prototype.readProjection = function(source) {
* @protected
* @return {ol.proj.Projection} Projection.
*/
ol.format.Text.prototype.readProjectionFromText = goog.abstractMethod;
ol.format.TextFeature.prototype.readProjectionFromText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.writeFeature = function(feature) {
ol.format.TextFeature.prototype.writeFeature = function(feature) {
return this.writeFeatureText(feature);
};
@@ -116,13 +116,13 @@ ol.format.Text.prototype.writeFeature = function(feature) {
* @protected
* @return {string} Text.
*/
ol.format.Text.prototype.writeFeatureText = goog.abstractMethod;
ol.format.TextFeature.prototype.writeFeatureText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.writeFeatures = function(features) {
ol.format.TextFeature.prototype.writeFeatures = function(features) {
return this.writeFeaturesText(features);
};
@@ -132,13 +132,13 @@ ol.format.Text.prototype.writeFeatures = function(features) {
* @protected
* @return {string} Text.
*/
ol.format.Text.prototype.writeFeaturesText = goog.abstractMethod;
ol.format.TextFeature.prototype.writeFeaturesText = goog.abstractMethod;
/**
* @inheritDoc
*/
ol.format.Text.prototype.writeGeometry = function(geometry) {
ol.format.TextFeature.prototype.writeGeometry = function(geometry) {
return this.writeGeometryText(geometry);
};
@@ -148,4 +148,4 @@ ol.format.Text.prototype.writeGeometry = function(geometry) {
* @protected
* @return {string} Text.
*/
ol.format.Text.prototype.writeGeometryText = goog.abstractMethod;
ol.format.TextFeature.prototype.writeGeometryText = goog.abstractMethod;