Rename getAllFeatruesInExtent to getFeaturesInExtent
This commit is contained in:
@@ -222,7 +222,7 @@ ol.source.Vector.prototype.getAllFeaturesAtCoordinate = function(coordinate) {
|
|||||||
* @return {Array.<ol.Feature>} Features.
|
* @return {Array.<ol.Feature>} Features.
|
||||||
* @todo stability experimental
|
* @todo stability experimental
|
||||||
*/
|
*/
|
||||||
ol.source.Vector.prototype.getAllFeaturesInExtent = function(extent) {
|
ol.source.Vector.prototype.getFeaturesInExtent = function(extent) {
|
||||||
return this.rBush_.getAllInExtent(extent);
|
return this.rBush_.getAllInExtent(extent);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ describe('ol.source.Vector', function() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('#getAllFeaturesInExtent', function() {
|
describe('#getFeaturesInExtent', function() {
|
||||||
|
|
||||||
it('returns an empty array', function() {
|
it('returns an empty array', function() {
|
||||||
var features = vectorSource.getAllFeaturesInExtent(infiniteExtent);
|
var features = vectorSource.getFeaturesInExtent(infiniteExtent);
|
||||||
expect(features).to.be.an(Array);
|
expect(features).to.be.an(Array);
|
||||||
expect(features).to.be.empty();
|
expect(features).to.be.empty();
|
||||||
});
|
});
|
||||||
@@ -49,7 +49,7 @@ describe('ol.source.Vector', function() {
|
|||||||
|
|
||||||
it('can add a single point feature', function() {
|
it('can add a single point feature', function() {
|
||||||
vectorSource.addFeature(pointFeature);
|
vectorSource.addFeature(pointFeature);
|
||||||
var features = vectorSource.getAllFeaturesInExtent(infiniteExtent);
|
var features = vectorSource.getFeaturesInExtent(infiniteExtent);
|
||||||
expect(features).to.be.an(Array);
|
expect(features).to.be.an(Array);
|
||||||
expect(features).to.have.length(1);
|
expect(features).to.have.length(1);
|
||||||
expect(features[0]).to.be(pointFeature);
|
expect(features[0]).to.be(pointFeature);
|
||||||
@@ -121,10 +121,10 @@ describe('ol.source.Vector', function() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('#getAllFeaturesInExtent', function() {
|
describe('#getFeaturesInExtent', function() {
|
||||||
|
|
||||||
it('returns the expected number of features', function() {
|
it('returns the expected number of features', function() {
|
||||||
expect(vectorSource.getAllFeaturesInExtent(infiniteExtent)).
|
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).
|
||||||
to.have.length(10);
|
to.have.length(10);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -144,7 +144,7 @@ describe('ol.source.Vector', function() {
|
|||||||
var i;
|
var i;
|
||||||
for (i = features.length - 1; i >= 0; --i) {
|
for (i = features.length - 1; i >= 0; --i) {
|
||||||
vectorSource.removeFeature(features[i]);
|
vectorSource.removeFeature(features[i]);
|
||||||
expect(vectorSource.getAllFeaturesInExtent(infiniteExtent)).
|
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).
|
||||||
have.length(i);
|
have.length(i);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -161,13 +161,13 @@ describe('ol.source.Vector', function() {
|
|||||||
describe('modifying a feature\'s geometry', function() {
|
describe('modifying a feature\'s geometry', function() {
|
||||||
|
|
||||||
it('keeps the R-Tree index up to date', function() {
|
it('keeps the R-Tree index up to date', function() {
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 1, 1])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||||
to.have.length(10);
|
to.have.length(10);
|
||||||
features[0].getGeometry().setCoordinates([100, 100]);
|
features[0].getGeometry().setCoordinates([100, 100]);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 1, 1])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||||
to.have.length(9);
|
to.have.length(9);
|
||||||
features[0].getGeometry().setCoordinates([0.5, 0.5]);
|
features[0].getGeometry().setCoordinates([0.5, 0.5]);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 1, 1])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||||
to.have.length(10);
|
to.have.length(10);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -176,10 +176,10 @@ describe('ol.source.Vector', function() {
|
|||||||
describe('setting a features geometry', function() {
|
describe('setting a features geometry', function() {
|
||||||
|
|
||||||
it('keeps the R-Tree index up to date', function() {
|
it('keeps the R-Tree index up to date', function() {
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 1, 1])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||||
to.have.length(10);
|
to.have.length(10);
|
||||||
features[0].setGeometry(new ol.geom.Point([100, 100]));
|
features[0].setGeometry(new ol.geom.Point([100, 100]));
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 1, 1])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||||
to.have.length(9);
|
to.have.length(9);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -197,12 +197,12 @@ describe('ol.source.Vector', function() {
|
|||||||
it('keeps its index up-to-date', function() {
|
it('keeps its index up-to-date', function() {
|
||||||
var feature = new ol.Feature(new ol.geom.Point([1, 1]));
|
var feature = new ol.Feature(new ol.geom.Point([1, 1]));
|
||||||
vectorSource.addFeature(feature);
|
vectorSource.addFeature(feature);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 2, 2])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||||
to.eql([feature]);
|
to.eql([feature]);
|
||||||
feature.getGeometry().setCoordinates([3, 3]);
|
feature.getGeometry().setCoordinates([3, 3]);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 2, 2])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||||
to.be.empty();
|
to.be.empty();
|
||||||
expect(vectorSource.getAllFeaturesInExtent([2, 2, 4, 4])).
|
expect(vectorSource.getFeaturesInExtent([2, 2, 4, 4])).
|
||||||
to.eql([feature]);
|
to.eql([feature]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -217,7 +217,7 @@ describe('ol.source.Vector', function() {
|
|||||||
vectorSource.addFeature(feature);
|
vectorSource.addFeature(feature);
|
||||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||||
feature.setGeometry(new ol.geom.Point([1, 1]));
|
feature.setGeometry(new ol.geom.Point([1, 1]));
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 2, 2])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||||
to.eql([feature]);
|
to.eql([feature]);
|
||||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||||
});
|
});
|
||||||
@@ -226,10 +226,10 @@ describe('ol.source.Vector', function() {
|
|||||||
var feature = new ol.Feature(new ol.geom.Point([1, 1]));
|
var feature = new ol.Feature(new ol.geom.Point([1, 1]));
|
||||||
vectorSource.addFeature(feature);
|
vectorSource.addFeature(feature);
|
||||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 2, 2])).
|
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||||
to.eql([feature]);
|
to.eql([feature]);
|
||||||
feature.setGeometry(null);
|
feature.setGeometry(null);
|
||||||
expect(vectorSource.getAllFeaturesInExtent([0, 0, 2, 2])).to.be.empty();
|
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.be.empty();
|
||||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user