From 01168e805a96a4fbe2368bede0d6c36e14886f26 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 16 Apr 2013 16:26:47 +0200
Subject: [PATCH] Port ol.filter.ExtentFilter to new extents

---
 src/ol/filter/extentfilter.js            | 4 ++--
 test/spec/ol/filter/extentfilter.test.js | 3 +--
 test/spec/ol/layer/vectorlayer.test.js   | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/ol/filter/extentfilter.js b/src/ol/filter/extentfilter.js
index b8738bfa73..2892246519 100644
--- a/src/ol/filter/extentfilter.js
+++ b/src/ol/filter/extentfilter.js
@@ -1,6 +1,6 @@
 goog.provide('ol.filter.Extent');
 
-goog.require('ol.Extent');
+goog.require('ol.extent');
 goog.require('ol.filter.Filter');
 
 
@@ -35,5 +35,5 @@ ol.filter.Extent.prototype.getExtent = function() {
  * @inheritDoc
  */
 ol.filter.Extent.prototype.applies = function(feature) {
-  return feature.getGeometry().getBounds().intersects(this.extent_);
+  return ol.extent.intersects(feature.getGeometry().getBounds(), this.extent_);
 };
diff --git a/test/spec/ol/filter/extentfilter.test.js b/test/spec/ol/filter/extentfilter.test.js
index b6148e506e..835d4411d8 100644
--- a/test/spec/ol/filter/extentfilter.test.js
+++ b/test/spec/ol/filter/extentfilter.test.js
@@ -6,7 +6,7 @@ describe('ol.filter.Extent', function() {
   var extent, filter;
 
   beforeEach(function() {
-    extent = new ol.Extent(0, 0, 45, 90);
+    extent = [0, 45, 0, 90];
     filter = new ol.filter.Extent(extent);
   });
 
@@ -31,7 +31,6 @@ describe('ol.filter.Extent', function() {
 
 });
 
-goog.require('ol.Extent');
 goog.require('ol.Feature');
 goog.require('ol.filter.Extent');
 goog.require('ol.geom.Point');
diff --git a/test/spec/ol/layer/vectorlayer.test.js b/test/spec/ol/layer/vectorlayer.test.js
index 7e15b4c622..598213b2ed 100644
--- a/test/spec/ol/layer/vectorlayer.test.js
+++ b/test/spec/ol/layer/vectorlayer.test.js
@@ -51,7 +51,7 @@ describe('ol.layer.Vector', function() {
     });
 
     var geomFilter = new ol.filter.Geometry(ol.geom.GeometryType.LINESTRING);
-    var extentFilter = new ol.filter.Extent(new ol.Extent(16, 48, 16.3, 48.3));
+    var extentFilter = new ol.filter.Extent([16, 16.3, 48, 48.3]);
 
     it('can filter by geometry type using its GeometryType index', function() {
       sinon.spy(geomFilter, 'applies');
@@ -177,7 +177,6 @@ describe('ol.layer.Vector', function() {
 });
 
 goog.require('ol.Expression');
-goog.require('ol.Extent');
 goog.require('ol.Feature');
 goog.require('ol.filter.Extent');
 goog.require('ol.filter.Geometry');