Menu
▾
▴
[Geotools-commits] svn - r38668 - in trunk/modules/library/main/src: main/java/org/geotools/filter/function main/resources/META-INF/services test/java/org/geotools/filter/function
Author: aaime
Date: 2012-04-15 17:18:05 -0700 (Sun, 15 Apr 2012)
New Revision: 38668
Added:
trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumCircleTest.java
trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumRectangleTest.java
Modified:
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
trunk/modules/library/main/src/main/java/org/geotools/filter/function/StaticGeometry.java
trunk/modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function
Log:
[GEOT-3470] Minimum circle and rectangle Filter Functions, patch by Jared Erickson
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-04-16 00:06:18 UTC (rev 38667)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumCircle.java 2012-04-16 00:18:05 UTC (rev 38668)
@@ -16,29 +16,23 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import org.geotools.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
-import org.geotools.filter.capability.FunctionNameImpl;
-import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
/**
* A FilterFunction that expects a Geometry and returns it's minimum bounding circle.
* @author Jared Erickson
- *
- *
- * @source $URL$
*/
-public class FilterFunction_minimumCircle extends FunctionExpressionImpl {
+public class FilterFunction_minimumCircle extends FunctionExpressionImpl implements
+ FunctionExpression {
- public static FunctionName NAME = new FunctionNameImpl("mincircle","geometry");
-
/**
* Create a new FilterFunction_minimumCircle instance
*/
public FilterFunction_minimumCircle() {
super("mincircle");
- functionName = NAME;
}
/**
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-04-16 00:06:18 UTC (rev 38667)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/FilterFunction_minimumRectangle.java 2012-04-16 00:18:05 UTC (rev 38668)
@@ -16,29 +16,23 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
+import org.geotools.filter.FunctionExpression;
import org.geotools.filter.FunctionExpressionImpl;
-import org.geotools.filter.capability.FunctionNameImpl;
-import org.opengis.filter.capability.FunctionName;
import com.vividsolutions.jts.geom.Geometry;
/**
* A FilterFunction that expects a Geometry and returns it's minimum rectangle.
* @author Jared Erickson
- *
- *
- * @source $URL$
*/
-public class FilterFunction_minimumRectangle extends FunctionExpressionImpl {
+public class FilterFunction_minimumRectangle extends FunctionExpressionImpl implements
+ FunctionExpression {
- public static FunctionName NAME = new FunctionNameImpl("minrectangle","geometry");
-
/**
* Create a new FilterFunction_minimumRectangle instance
*/
public FilterFunction_minimumRectangle() {
super("minrectangle");
- functionName = NAME;
}
/**
@@ -60,7 +54,7 @@
// attempt to get value and perform conversion
try {
- arg0 = getExpression(0).evaluate(feature, Geometry.class);
+ arg0 = (Geometry) getExpression(0).evaluate(feature);
} catch (Exception e) {
// probably a type error
throw new IllegalArgumentException(
Modified: trunk/modules/library/main/src/main/java/org/geotools/filter/function/StaticGeometry.java
===================================================================
--- trunk/modules/library/main/src/main/java/org/geotools/filter/function/StaticGeometry.java 2012-04-16 00:06:18 UTC (rev 38667)
+++ trunk/modules/library/main/src/main/java/org/geotools/filter/function/StaticGeometry.java 2012-04-16 00:18:05 UTC (rev 38668)
@@ -438,15 +438,15 @@
return _this.getInteriorRingN(arg1);
}
- static public Geometry minimumCircle(Geometry arg0) {
- if (arg0 == null) return null;
- MinimumBoundingCircle circle = new MinimumBoundingCircle(arg0);
+ static public Geometry minimumCircle(Geometry g) {
+ if (g == null) return null;
+ MinimumBoundingCircle circle = new MinimumBoundingCircle(g);
return circle.getCircle();
}
- static public Geometry minimumRectangle(Geometry arg0) {
- if (arg0 == null) return null;
- MinimumDiameter min = new MinimumDiameter(arg0);
+ static public Geometry minimumRectangle(Geometry g) {
+ if (g == null) return null;
+ MinimumDiameter min = new MinimumDiameter(g);
return min.getMinimumRectangle();
}
Modified: trunk/modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- trunk/modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function 2012-04-16 00:06:18 UTC (rev 38667)
+++ trunk/modules/library/main/src/main/resources/META-INF/services/org.opengis.filter.expression.Function 2012-04-16 00:18:05 UTC (rev 38668)
@@ -67,6 +67,8 @@
org.geotools.filter.function.FilterFunction_isRing
org.geotools.filter.function.FilterFunction_exteriorRing
org.geotools.filter.function.FilterFunction_numInteriorRing
+org.geotools.filter.function.FilterFunction_minimumCircle
+org.geotools.filter.function.FilterFunction_minimumRectangle
org.geotools.filter.function.FilterFunction_interiorRingN
org.geotools.filter.function.FilterFunction_strConcat
org.geotools.filter.function.FilterFunction_strEndsWith
Added: trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumCircleTest.java
===================================================================
--- trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumCircleTest.java (rev 0)
+++ trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumCircleTest.java 2012-04-16 00:18:05 UTC (rev 38668)
@@ -0,0 +1,86 @@
+package org.geotools.filter.function;
+
+import com.vividsolutions.jts.algorithm.MinimumBoundingCircle;
+import static org.junit.Assert.*;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.io.WKTReader;
+import org.geotools.data.DataUtilities;
+import org.geotools.data.memory.MemoryDataStore;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureIterator;
+import org.geotools.factory.CommonFactoryFinder;
+import org.geotools.factory.GeoTools;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.junit.Test;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.expression.Function;
+
+/**
+ * The FilterFunction_minimumCircle UnitTest
+ * @author Jared Erickson
+ */
+public class FilterFunction_minimumCircleTest {
+
+ /**
+ * Test of getArgCount method, of class FilterFunction_minimumCircle.
+ */
+ @Test
+ public void testGetArgCount() {
+ FilterFunction_minimumCircle f = new FilterFunction_minimumCircle();
+ assertEquals(1, f.getArgCount());
+ }
+
+ /**
+ * Test of getName method, of class FilterFunction_minimumCircle.
+ */
+ @Test
+ public void getName() {
+ FilterFunction_minimumCircle f = new FilterFunction_minimumCircle();
+ assertEquals("mincircle", f.getName());
+ }
+
+ /**
+ * Test of evaluate method, of class FilterFunction_minimumCircle.
+ */
+ @Test
+ public void testEvaluate() throws Exception {
+
+ // Create SimpleFeatures
+ SimpleFeatureType type = DataUtilities.createType("polygons", "id:int,geom:Polygon");
+ MemoryDataStore store = new MemoryDataStore();
+ store.createSchema(type);
+ String[] polygons = {
+ "POLYGON ((1235702.2034807256 707935.1879023351, 1229587.156498981 671715.2942412316, 1242287.6386918353 688649.2704983709, 1245109.9680680253 677359.9529936113, 1247932.297444215 711227.9055078899, 1239935.6975450104 705583.2467555101, 1235702.2034807256 707935.1879023351))",
+ "POLYGON ((1237113.3681688206 622324.5301579087, 1224883.274205331 586575.0247261701, 1258280.8384902447 589397.3541023601, 1237113.3681688206 622324.5301579087))",
+ "POLYGON ((1131746.4047910655 718754.1171777296, 1115282.8167632914 681593.4470578962, 1139272.6164609052 679241.5059110713, 1147269.2163601099 707935.1879023351, 1131746.4047910655 718754.1171777296)))"
+ };
+ WKTReader reader = new WKTReader();
+ SimpleFeature[] features = new SimpleFeature[polygons.length];
+ for (int i = 0; i < polygons.length; i++) {
+ Geometry polygon = reader.read(polygons[i]);
+ features[i] = SimpleFeatureBuilder.build(type, new Object[]{i, polygon}, String.valueOf(i));
+ }
+ store.addFeatures(features);
+ SimpleFeatureCollection featureCollection = store.getFeatureSource("polygons").getFeatures();
+
+ // Test the Function
+ FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(GeoTools.getDefaultHints());
+ Function exp = ff.function("mincircle", ff.property("geom"));
+ SimpleFeatureIterator iter = featureCollection.features();
+ while (iter.hasNext()) {
+ SimpleFeature feature = iter.next();
+ Geometry geom = (Geometry) feature.getDefaultGeometry();
+ Geometry circle = new MinimumBoundingCircle(geom).getCircle();
+ Object value = exp.evaluate(feature);
+ assertTrue(value instanceof Polygon);
+ assertTrue(circle.equals((Geometry) value));
+ }
+ iter.close();
+
+ // Check for null safeness
+ assertNull(exp.evaluate(null));
+ }
+}
Added: trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumRectangleTest.java
===================================================================
--- trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumRectangleTest.java (rev 0)
+++ trunk/modules/library/main/src/test/java/org/geotools/filter/function/FilterFunction_minimumRectangleTest.java 2012-04-16 00:18:05 UTC (rev 38668)
@@ -0,0 +1,86 @@
+package org.geotools.filter.function;
+
+import com.vividsolutions.jts.algorithm.MinimumDiameter;
+import static org.junit.Assert.*;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.io.WKTReader;
+import org.geotools.data.DataUtilities;
+import org.geotools.data.memory.MemoryDataStore;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureIterator;
+import org.geotools.factory.CommonFactoryFinder;
+import org.geotools.factory.GeoTools;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.junit.Test;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+import org.opengis.filter.FilterFactory2;
+import org.opengis.filter.expression.Function;
+
+/**
+ * The FilterFunction_minimumRectangle UnitTest
+ * @author Jared Erickson
+ */
+public class FilterFunction_minimumRectangleTest {
+
+ /**
+ * Test of getArgCount method, of class FilterFunction_minimumRectangle.
+ */
+ @Test
+ public void testGetArgCount() {
+ FilterFunction_minimumRectangle f = new FilterFunction_minimumRectangle();
+ assertEquals(1, f.getArgCount());
+ }
+
+ /**
+ * Test of getName method, of class FilterFunction_minimumRectangle.
+ */
+ @Test
+ public void getName() {
+ FilterFunction_minimumRectangle f = new FilterFunction_minimumRectangle();
+ assertEquals("minrectangle", f.getName());
+ }
+
+ /**
+ * Test of evaluate method, of class FilterFunction_minimumCircle.
+ */
+ @Test
+ public void testEvaluate() throws Exception {
+
+ // Create SimpleFeatures
+ SimpleFeatureType type = DataUtilities.createType("polygons", "id:int,geom:Polygon");
+ MemoryDataStore store = new MemoryDataStore();
+ store.createSchema(type);
+ String[] polygons = {
+ "POLYGON ((1235702.2034807256 707935.1879023351, 1229587.156498981 671715.2942412316, 1242287.6386918353 688649.2704983709, 1245109.9680680253 677359.9529936113, 1247932.297444215 711227.9055078899, 1239935.6975450104 705583.2467555101, 1235702.2034807256 707935.1879023351))",
+ "POLYGON ((1237113.3681688206 622324.5301579087, 1224883.274205331 586575.0247261701, 1258280.8384902447 589397.3541023601, 1237113.3681688206 622324.5301579087))",
+ "POLYGON ((1131746.4047910655 718754.1171777296, 1115282.8167632914 681593.4470578962, 1139272.6164609052 679241.5059110713, 1147269.2163601099 707935.1879023351, 1131746.4047910655 718754.1171777296)))"
+ };
+ WKTReader reader = new WKTReader();
+ SimpleFeature[] features = new SimpleFeature[polygons.length];
+ for (int i = 0; i < polygons.length; i++) {
+ Geometry polygon = reader.read(polygons[i]);
+ features[i] = SimpleFeatureBuilder.build(type, new Object[]{i, polygon}, String.valueOf(i));
+ }
+ store.addFeatures(features);
+ SimpleFeatureCollection featureCollection = store.getFeatureSource("polygons").getFeatures();
+
+ // Test the Function
+ FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(GeoTools.getDefaultHints());
+ Function exp = ff.function("minrectangle", ff.property("geom"));
+ SimpleFeatureIterator iter = featureCollection.features();
+ while (iter.hasNext()) {
+ SimpleFeature feature = iter.next();
+ Geometry geom = (Geometry) feature.getDefaultGeometry();
+ Geometry rectangle = new MinimumDiameter(geom).getMinimumRectangle();
+ Object value = exp.evaluate(feature);
+ assertTrue(value instanceof Polygon);
+ assertTrue(rectangle.equals((Geometry) value));
+ }
+ iter.close();
+
+ // Check for null safeness
+ assertNull(exp.evaluate(null));
+ }
+}
\ No newline at end of file
|
