Renaming readFeaturesWithMetadata* back to readFeatures*

Since this is not exported and we do not have a counterpart that
does not return the metadata, it should be fine to use a shorter
name.

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),
+          goog.isFunction(parser.readFeaturesFromString),
-          'Expected parser with a readFeaturesWithMetadataFromString method.');
+          'Expected parser with a readFeaturesFromString method.');
-      result = parser.readFeaturesWithMetadataFromString(data, options);
+      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),
+          goog.isFunction(parser.readFeaturesFromObject),
-          'Expected parser with a readFeaturesWithMetadataFromObject method.');
+          'Expected parser with a readFeaturesFromObject method.');
-      result = parser.readFeaturesWithMetadataFromObject(data, options);
+      result = parser.readFeaturesFromObject(data, options);
       addFeatures.call(this, result);
     }
   } else {

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;
 
 

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'}};

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

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

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

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