From da7820121fa5b11bad4b984b0fd0d5773497a909 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Sat, 2 Mar 2013 12:50:53 +0100 Subject: [PATCH] Renaming the 'evaluate' method to 'applies' --- src/ol/filter/extentfilter.js | 2 +- src/ol/filter/filter.js | 2 +- src/ol/filter/geometryfilter.js | 2 +- src/ol/filter/logicalfilter.js | 4 ++-- src/ol/source/vectorsource.js | 2 +- test/spec/ol/filter/extentfilter.test.js | 4 ++-- test/spec/ol/source/vectorsource.test.js | 22 +++++++++++----------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ol/filter/extentfilter.js b/src/ol/filter/extentfilter.js index aeceaf446c..d919b03954 100644 --- a/src/ol/filter/extentfilter.js +++ b/src/ol/filter/extentfilter.js @@ -32,6 +32,6 @@ ol.filter.Extent.prototype.getExtent = function() { /** * @inheritDoc */ -ol.filter.Extent.prototype.evaluate = function(feature) { +ol.filter.Extent.prototype.applies = function(feature) { return feature.getGeometry().getBounds().intersects(this.extent_); }; diff --git a/src/ol/filter/filter.js b/src/ol/filter/filter.js index 45f0f3eff8..d41a6bed23 100644 --- a/src/ol/filter/filter.js +++ b/src/ol/filter/filter.js @@ -14,4 +14,4 @@ ol.filter.Filter = function() {}; * @param {ol.Feature} feature Feature to evaluate. * @return {boolean} The provided feature passes this filter. */ -ol.filter.Filter.prototype.evaluate = function(feature) {}; +ol.filter.Filter.prototype.applies = function(feature) {}; diff --git a/src/ol/filter/geometryfilter.js b/src/ol/filter/geometryfilter.js index df482353bb..11deacedd6 100644 --- a/src/ol/filter/geometryfilter.js +++ b/src/ol/filter/geometryfilter.js @@ -25,7 +25,7 @@ ol.filter.Geometry = function(type) { /** * @inheritDoc */ -ol.filter.Geometry.prototype.evaluate = function(feature) { +ol.filter.Geometry.prototype.applies = function(feature) { var geometry = feature.getGeometry(); return goog.isNull(geometry) ? false : geometry.getType() === this.type_; }; diff --git a/src/ol/filter/logicalfilter.js b/src/ol/filter/logicalfilter.js index 56842d8635..ccc8a1bda7 100644 --- a/src/ol/filter/logicalfilter.js +++ b/src/ol/filter/logicalfilter.js @@ -30,14 +30,14 @@ ol.filter.Logical = function(filters, operator) { /** * @inheritDoc */ -ol.filter.Logical.prototype.evaluate = function(feature) { +ol.filter.Logical.prototype.applies = function(feature) { var filters = this.filters_, i = 0, ii = filters.length, operator = this.operator, start = operator(true, false), result = start; while (result === start && i < ii) { - result = operator(result, filters[i].evaluate(feature)); + result = operator(result, filters[i].applies(feature)); ++i; } return result; diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 27958b83f6..edbe74546f 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -128,7 +128,7 @@ ol.source.FeatureCache.prototype.getFeaturesObject_ = function(opt_filter) { features = {}; for (i in candidates) { feature = candidates[i]; - if (opt_filter.evaluate(feature) === true) { + if (opt_filter.applies(feature) === true) { features[i] = feature; } } diff --git a/test/spec/ol/filter/extentfilter.test.js b/test/spec/ol/filter/extentfilter.test.js index f4040d72f8..3a13cd4a8c 100644 --- a/test/spec/ol/filter/extentfilter.test.js +++ b/test/spec/ol/filter/extentfilter.test.js @@ -21,9 +21,9 @@ describe('ol.filter.Extent', function() { describe('#evaluate()', function() { it('returns true if a feature intersects, false if not', function() { - expect(filter.evaluate(new ol.Feature({g: new ol.geom.Point([44, 89])}))) + expect(filter.applies(new ol.Feature({g: new ol.geom.Point([44, 89])}))) .toBe(true); - expect(filter.evaluate(new ol.Feature({g: new ol.geom.Point([46, 91])}))) + expect(filter.applies(new ol.Feature({g: new ol.geom.Point([46, 91])}))) .toBe(false); }); diff --git a/test/spec/ol/source/vectorsource.test.js b/test/spec/ol/source/vectorsource.test.js index 8bf8df1f43..b84a1114b4 100644 --- a/test/spec/ol/source/vectorsource.test.js +++ b/test/spec/ol/source/vectorsource.test.js @@ -57,17 +57,17 @@ describe('ol.source.Vector', function() { var extentFilter = new ol.filter.Extent(new ol.Extent(16, 48, 16.3, 48.3)); it('can filter by geometry type using its GeometryType index', function() { - spyOn(geomFilter, 'evaluate'); + spyOn(geomFilter, 'applies'); var lineStrings = vectorSource.getFeatures(geomFilter); - expect(geomFilter.evaluate).not.toHaveBeenCalled(); + expect(geomFilter.applies).not.toHaveBeenCalled(); expect(lineStrings.length).toEqual(4); expect(lineStrings).toContain(features[4]); }); it('can filter by extent using its RTree', function() { - spyOn(extentFilter, 'evaluate'); + spyOn(extentFilter, 'applies'); var subset = vectorSource.getFeatures(extentFilter); - expect(extentFilter.evaluate).not.toHaveBeenCalled(); + expect(extentFilter.applies).not.toHaveBeenCalled(); expect(subset.length).toEqual(4); expect(subset).not.toContain(features[7]); }); @@ -77,22 +77,22 @@ describe('ol.source.Vector', function() { ol.filter.LogicalOperator.AND); var filter2 = new ol.filter.Logical([extentFilter, geomFilter], ol.filter.LogicalOperator.AND); - spyOn(filter1, 'evaluate'); - spyOn(filter2, 'evaluate'); + spyOn(filter1, 'applies'); + spyOn(filter2, 'applies'); var subset1 = vectorSource.getFeatures(filter1); var subset2 = vectorSource.getFeatures(filter2); - expect(filter1.evaluate).not.toHaveBeenCalled(); - expect(filter2.evaluate).not.toHaveBeenCalled(); + expect(filter1.applies).not.toHaveBeenCalled(); + expect(filter2.applies).not.toHaveBeenCalled(); expect(subset1.length).toEqual(0); expect(subset2.length).toEqual(0); }); - it('can handle query using the filter\'s evaluate function', function() { + it('can handle query using the filter\'s applies function', function() { var filter = new ol.filter.Logical([geomFilter, extentFilter], ol.filter.LogicalOperator.OR); - spyOn(filter, 'evaluate').andCallThrough(); + spyOn(filter, 'applies').andCallThrough(); var subset = vectorSource.getFeatures(filter); - expect(filter.evaluate).toHaveBeenCalled(); + expect(filter.applies).toHaveBeenCalled(); expect(subset.length).toEqual(8); });