diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index 6655842bb0..42b53fd9ca 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -468,9 +468,9 @@ ol.layer.Vector.prototype.parseFeatures = function(data, parser, projection) { options); } else { goog.asserts.assert( - goog.isFunction(parser.readFeaturesWithMetadataFromString), - 'Expected parser with a readFeaturesWithMetadataFromString method.'); - result = parser.readFeaturesWithMetadataFromString(data, options); + goog.isFunction(parser.readFeaturesFromString), + 'Expected parser with a readFeaturesFromString method.'); + result = parser.readFeaturesFromString(data, options); addFeatures.call(this, result); } } else if (goog.isObject(data)) { @@ -479,9 +479,9 @@ ol.layer.Vector.prototype.parseFeatures = function(data, parser, projection) { options); } else { goog.asserts.assert( - goog.isFunction(parser.readFeaturesWithMetadataFromObject), - 'Expected parser with a readFeaturesWithMetadataFromObject method.'); - result = parser.readFeaturesWithMetadataFromObject(data, options); + goog.isFunction(parser.readFeaturesFromObject), + 'Expected parser with a readFeaturesFromObject method.'); + result = parser.readFeaturesFromObject(data, options); addFeatures.call(this, result); } } else { diff --git a/src/ol/parser/featureparser.js b/src/ol/parser/featureparser.js index f8c8d09a8f..c9210f226f 100644 --- a/src/ol/parser/featureparser.js +++ b/src/ol/parser/featureparser.js @@ -20,7 +20,7 @@ ol.parser.DomFeatureParser = function() {}; * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.DomFeatureParser.prototype.readFeaturesWithMetadataFromNode = +ol.parser.DomFeatureParser.prototype.readFeaturesFromNode = goog.abstractMethod; @@ -36,7 +36,7 @@ ol.parser.ObjectFeatureParser = function() {}; * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.ObjectFeatureParser.prototype.readFeaturesWithMetadataFromObject = +ol.parser.ObjectFeatureParser.prototype.readFeaturesFromObject = goog.abstractMethod; @@ -52,7 +52,7 @@ ol.parser.StringFeatureParser = function() {}; * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.StringFeatureParser.prototype.readFeaturesWithMetadataFromString = +ol.parser.StringFeatureParser.prototype.readFeaturesFromString = goog.abstractMethod; diff --git a/src/ol/parser/geojson.js b/src/ol/parser/geojson.js index e1e3b26fd6..ac6859e8d1 100644 --- a/src/ol/parser/geojson.js +++ b/src/ol/parser/geojson.js @@ -60,7 +60,7 @@ ol.parser.GeoJSON.read = function(str) { * @param {ol.parser.ReadFeaturesOptions=} opt_options Reader options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.GeoJSON.prototype.readFeaturesWithMetadataFromString = +ol.parser.GeoJSON.prototype.readFeaturesFromString = function(str, opt_options) { var json = /** @type {GeoJSONFeatureCollection} */ (JSON.parse(str)); return {features: this.parseFeatureCollection_(json, opt_options), @@ -75,7 +75,7 @@ ol.parser.GeoJSON.prototype.readFeaturesWithMetadataFromString = * @param {ol.parser.ReadFeaturesOptions=} opt_options Reader options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.GeoJSON.prototype.readFeaturesWithMetadataFromObject = +ol.parser.GeoJSON.prototype.readFeaturesFromObject = function(object, opt_options) { return {features: this.parseFeatureCollection_(object, opt_options), metadata: {projection: 'EPSG:4326'}}; diff --git a/src/ol/parser/gpx.js b/src/ol/parser/gpx.js index 4f4ff946e7..d21ee2fba8 100644 --- a/src/ol/parser/gpx.js +++ b/src/ol/parser/gpx.js @@ -256,7 +256,7 @@ ol.parser.GPX.prototype.read = function(data) { * @param {ol.parser.ReadFeaturesOptions=} opt_options Reader options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.GPX.prototype.readFeaturesWithMetadataFromString = +ol.parser.GPX.prototype.readFeaturesFromString = function(str, opt_options) { this.readFeaturesOptions_ = opt_options; return this.read(str); @@ -269,7 +269,7 @@ ol.parser.GPX.prototype.readFeaturesWithMetadataFromString = * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.GPX.prototype.readFeaturesWithMetadataFromNode = +ol.parser.GPX.prototype.readFeaturesFromNode = function(node, opt_options) { this.readFeaturesOptions_ = opt_options; return this.read(node); @@ -281,7 +281,7 @@ ol.parser.GPX.prototype.readFeaturesWithMetadataFromNode = * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.GPX.prototype.readFeaturesWithMetadataFromObject = +ol.parser.GPX.prototype.readFeaturesFromObject = function(obj, opt_options) { this.readFeaturesOptions_ = opt_options; return this.read(obj); diff --git a/src/ol/parser/kml.js b/src/ol/parser/kml.js index b3080ac44d..a1ed3996e4 100644 --- a/src/ol/parser/kml.js +++ b/src/ol/parser/kml.js @@ -851,7 +851,7 @@ ol.parser.KML.prototype.readFeaturesFromStringAsync = * @param {ol.parser.ReadFeaturesOptions=} opt_options Reader options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.KML.prototype.readFeaturesWithMetadataFromString = +ol.parser.KML.prototype.readFeaturesFromString = function(str, opt_options) { this.readFeaturesOptions_ = opt_options; return /** @type {ol.parser.ReadFeaturesResult} */ (this.read(str)); @@ -864,7 +864,7 @@ ol.parser.KML.prototype.readFeaturesWithMetadataFromString = * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.KML.prototype.readFeaturesWithMetadataFromNode = +ol.parser.KML.prototype.readFeaturesFromNode = function(node, opt_options) { this.readFeaturesOptions_ = opt_options; return /** @type {ol.parser.ReadFeaturesResult} */ (this.read(node)); @@ -876,7 +876,7 @@ ol.parser.KML.prototype.readFeaturesWithMetadataFromNode = * @param {ol.parser.ReadFeaturesOptions=} opt_options Feature reading options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.KML.prototype.readFeaturesWithMetadataFromObject = +ol.parser.KML.prototype.readFeaturesFromObject = function(obj, opt_options) { this.readFeaturesOptions_ = opt_options; return /** @type {ol.parser.ReadFeaturesResult} */ (this.read(obj)); diff --git a/src/ol/parser/ogc/gml.js b/src/ol/parser/ogc/gml.js index 8976e360f9..d48f2ab0e7 100644 --- a/src/ol/parser/ogc/gml.js +++ b/src/ol/parser/ogc/gml.js @@ -619,7 +619,7 @@ ol.parser.ogc.GML.prototype.createGeometry_ = function(container, * @param {ol.parser.ReadFeaturesOptions=} opt_options Reader options. * @return {ol.parser.ReadFeaturesResult} Features and metadata. */ -ol.parser.ogc.GML.prototype.readFeaturesWithMetadataFromString = +ol.parser.ogc.GML.prototype.readFeaturesFromString = function(str, opt_options) { this.readFeaturesOptions_ = opt_options; return this.read(str); diff --git a/test/spec/ol/parser/geojson.test.js b/test/spec/ol/parser/geojson.test.js index af4aebb18f..92132db407 100644 --- a/test/spec/ol/parser/geojson.test.js +++ b/test/spec/ol/parser/geojson.test.js @@ -237,7 +237,7 @@ describe('ol.parser.GeoJSON', function() { return lookup[type]; }; - var result = parser.readFeaturesWithMetadataFromString(text, + var result = parser.readFeaturesFromString(text, {callback: callback}).features; expect(result.length).to.be(179);