Permalink
Browse files

Reorganized feature process.

Refactored package structure using "vector" rather than "feature" and renamed
namespace from "gs" to "vec".
  • Loading branch information...
1 parent 307ef9c commit 2c476fd7ae71d6b1f017a65429f560d74ad3db57 jdeolive committed Aug 21, 2012
Showing with 119 additions and 147 deletions.
  1. +0 −36 modules/unsupported/process-feature/src/main/java/org/geotools/process/feature/gs/package-info.java
  2. +1 −1 ...ed/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/AggregateProcess.java
  3. +1 −1 ...orted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/BoundsProcess.java
  4. +1 −1 ...ess-feature/src/main/java/org/geotools/process/{feature/gs → vector}/BufferFeatureCollection.java
  5. +1 −1 ...ted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/CentroidProcess.java
  6. +1 −1 ...pported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/ClipProcess.java
  7. +1 −1 ...d/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/CollectGeometries.java
  8. +1 −1 ...ported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/CountProcess.java
  9. +1 −1 ...rted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/FeatureProcess.java
  10. +1 −1 ...pported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/GridProcess.java
  11. +1 −1 ...-feature/src/main/java/org/geotools/process/{feature/gs → vector}/InclusionFeatureCollection.java
  12. +1 −1 ...ature/src/main/java/org/geotools/process/{feature/gs → vector}/IntersectionFeatureCollection.java
  13. +1 −1 ...d/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/LRSGeocodeProcess.java
  14. +1 −1 ...d/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/LRSMeasureProcess.java
  15. +1 −1 ...d/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/LRSSegmentProcess.java
  16. +1 −1 ...rted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/NearestProcess.java
  17. +1 −1 ...ported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/PointBuffers.java
  18. +1 −1 ...process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/PointStackerProcess.java
  19. +1 −1 ...rocess-feature/src/main/java/org/geotools/process/{feature/gs → vector}/ProcessingCollection.java
  20. +1 −1 ...ported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/QueryProcess.java
  21. +1 −1 ...cess-feature/src/main/java/org/geotools/process/{feature/gs → vector}/RectangularClipProcess.java
  22. +1 −1 ...ed/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/ReprojectProcess.java
  23. +1 −1 ...-feature/src/main/java/org/geotools/process/{feature/gs → vector}/SimpleProcessingCollection.java
  24. +1 −1 ...ted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/SimplifyProcess.java
  25. +1 −1 ...pported/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/SnapProcess.java
  26. +1 −1 ...ed/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/TransformProcess.java
  27. +1 −1 ...cess-feature/src/main/java/org/geotools/process/{feature/gs → vector}/UnionFeatureCollection.java
  28. +1 −1 ...orted/process-feature/src/main/java/org/geotools/process/{feature/gs → vector}/UniqueProcess.java
  29. +24 −25 ...org/geotools/process/{feature/gs/FeatureGSProcessFactory.java → vector/VectorProcessFactory.java}
  30. +3 −3 ...ocess-feature/src/main/java/org/geotools/process/{feature/gs → vector}/VectorZonalStatistics.java
  31. +6 −9 ...supported/process-feature/src/main/java/org/geotools/process/{feature → vector}/package-info.java
  32. +1 −1 ...upported/process-feature/src/main/resources/META-INF/services/org.geotools.process.ProcessFactory
  33. +4 −3 ...rocess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/AggregateProcessTest.java
  34. +2 −1 ...feature/src/test/java/org/geotools/process/{feature/gs → vector}/BufferFeatureCollectionTest.java
  35. +2 −1 ...process-feature/src/test/java/org/geotools/process/{feature/gs → vector}/CentroidProcessTest.java
  36. +4 −4 .../src/test/java/org/geotools/process/{feature/gs → vector}/FeatureGSProcessFactoryFactoryTest.java
  37. +2 −1 .../process-feature/src/test/java/org/geotools/process/{feature/gs → vector}/FeatureProcessTest.java
  38. +3 −3 ...ted/process-feature/src/test/java/org/geotools/process/{feature/gs → vector}/GridProcessTest.java
  39. +2 −1 ...ture/src/test/java/org/geotools/process/{feature/gs → vector}/InclusionFeatureCollectionTest.java
  40. +3 −2 ...e/src/test/java/org/geotools/process/{feature/gs → vector}/IntersectionFeatureCollectionTest.java
  41. +2 −1 ...ocess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/LRSGeocodeProcessTest.java
  42. +2 −1 ...ocess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/LRSMeasureProcessTest.java
  43. +2 −1 ...ocess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/LRSSegmentProcessTest.java
  44. +2 −1 ...ess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/PointStackerProcessTest.java
  45. +5 −4 ...rocess-feature/src/test/java/org/geotools/process/{feature/gs → vector}/TransformProcessTest.java
  46. +2 −1 ...-feature/src/test/java/org/geotools/process/{feature/gs → vector}/UnionFeatureCollectionTest.java
  47. 0 ...ature/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/bugsites.properties
  48. +6 −6 ...ature/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/features.properties
  49. 0 ...ture/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/lrssimple.properties
  50. +6 −6 ...ure/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/multipoint.properties
  51. +6 −6 ...ature/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/polyline.properties
  52. +3 −3 ...-feature/src/test/resources/org/geotools/process/{feature/gs → vector}/test-data/zones.properties
View
36 ...supported/process-feature/src/main/java/org/geotools/process/feature/gs/package-info.java
@@ -1,36 +0,0 @@
-/*
- * GeoTools - The Open Source Java GIS Toolkit
- * http://geotools.org
- *
- * (C) 2008, Open Source Geospatial Foundation (OSGeo)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- */
-/**
- * Gathers Feature processes for the "gs" GeoSpatial factory; most of these have
- * been back ported from GeoServer for wider use. The "gs" namespace allows
- * us to preserve backwards compatibility.
- * <p>
- * This package defines a "marker" interface that is expected to be used in Spring
- * in order to round up all the implementations. We may do the same in GeoTools using
- * Factory SPI.
- * <p>
- * Code example:<pre>
- import org.geotools.process.factory.DescribeParameter;
- import org.geotools.process.factory.DescribeProcess;
- import org.geotools.process.factory.DescribeResult;
- import org.geotools.process.gs.GeoServerProcess;
- import org.geotools.process.gs.WrappingIterator;
- </pre>
- * @author Jody Garnett - LISAsoft
- * @author Andrea Aime - OpenGeo
- */
-package org.geotools.process.feature.gs;
View
2 .../process/feature/gs/AggregateProcess.java → ...ools/process/vector/AggregateProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.IOException;
import java.util.ArrayList;
View
2 ...ols/process/feature/gs/BoundsProcess.java → ...eotools/process/vector/BoundsProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.feature.FeatureCollection;
import org.geotools.geometry.jts.ReferencedEnvelope;
View
2 ...s/feature/gs/BufferFeatureCollection.java → ...ocess/vector/BufferFeatureCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Iterator;
import java.util.NoSuchElementException;
View
2 ...s/process/feature/gs/CentroidProcess.java → ...tools/process/vector/CentroidProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.NoSuchElementException;
View
2 ...tools/process/feature/gs/ClipProcess.java → .../geotools/process/vector/ClipProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.ArrayList;
import java.util.Iterator;
View
2 ...process/feature/gs/CollectGeometries.java → ...ols/process/vector/CollectGeometries.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.IOException;
View
2 ...ools/process/feature/gs/CountProcess.java → ...geotools/process/vector/CountProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.process.factory.DescribeParameter;
import org.geotools.process.factory.DescribeProcess;
View
2 ...ls/process/feature/gs/FeatureProcess.java → ...otools/process/vector/FeatureProcess.java
@@ -1,4 +1,4 @@
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.data.collection.ListFeatureCollection;
import org.geotools.data.simple.SimpleFeatureCollection;
View
2 ...tools/process/feature/gs/GridProcess.java → .../geotools/process/vector/GridProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.IOException;
import java.util.Map;
View
2 ...eature/gs/InclusionFeatureCollection.java → ...ss/vector/InclusionFeatureCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Iterator;
import java.util.NoSuchElementException;
View
2 ...ure/gs/IntersectionFeatureCollection.java → ...vector/IntersectionFeatureCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.ArrayList;
import java.util.Iterator;
View
2 ...process/feature/gs/LRSGeocodeProcess.java → ...ols/process/vector/LRSGeocodeProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.logging.Logger;
View
2 ...process/feature/gs/LRSMeasureProcess.java → ...ols/process/vector/LRSMeasureProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.logging.Logger;
View
2 ...process/feature/gs/LRSSegmentProcess.java → ...ols/process/vector/LRSSegmentProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.logging.Logger;
View
2 ...ls/process/feature/gs/NearestProcess.java → ...otools/process/vector/NearestProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Iterator;
import java.util.logging.Logger;
View
2 ...ools/process/feature/gs/PointBuffers.java → ...geotools/process/vector/PointBuffers.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.awt.geom.Point2D;
View
2 ...ocess/feature/gs/PointStackerProcess.java → ...s/process/vector/PointStackerProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Collection;
import java.util.HashMap;
View
2 ...cess/feature/gs/ProcessingCollection.java → .../process/vector/ProcessingCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.IOException;
import java.util.ArrayList;
View
2 ...ools/process/feature/gs/QueryProcess.java → ...geotools/process/vector/QueryProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.List;
View
2 ...ss/feature/gs/RectangularClipProcess.java → ...rocess/vector/RectangularClipProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.geometry.jts.JTS;
View
2 .../process/feature/gs/ReprojectProcess.java → ...ools/process/vector/ReprojectProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.process.factory.DescribeParameter;
import org.geotools.process.factory.DescribeProcess;
View
2 ...eature/gs/SimpleProcessingCollection.java → ...ss/vector/SimpleProcessingCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.data.DataUtilities;
import org.geotools.data.simple.SimpleFeatureCollection;
View
2 ...s/process/feature/gs/SimplifyProcess.java → ...tools/process/vector/SimplifyProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Iterator;
import java.util.NoSuchElementException;
View
2 ...tools/process/feature/gs/SnapProcess.java → .../geotools/process/vector/SnapProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.HashMap;
import java.util.Iterator;
View
2 .../process/feature/gs/TransformProcess.java → ...ools/process/vector/TransformProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.ArrayList;
import java.util.HashSet;
View
2 ...ss/feature/gs/UnionFeatureCollection.java → ...rocess/vector/UnionFeatureCollection.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.Iterator;
import java.util.NoSuchElementException;
View
2 ...ols/process/feature/gs/UniqueProcess.java → ...eotools/process/vector/UniqueProcess.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.ArrayList;
import java.util.List;
View
49 ...s/feature/gs/FeatureGSProcessFactory.java → .../process/vector/VectorProcessFactory.java
@@ -1,29 +1,28 @@
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import org.geotools.process.factory.AnnotatedBeanProcessFactory;
import org.geotools.process.factory.DescribeProcess;
-import org.geotools.process.feature.gs.AggregateProcess;
-import org.geotools.process.feature.gs.BoundsProcess;
-import org.geotools.process.feature.gs.BufferFeatureCollection;
-import org.geotools.process.feature.gs.CentroidProcess;
-import org.geotools.process.feature.gs.ClipProcess;
-import org.geotools.process.feature.gs.CollectGeometries;
-import org.geotools.process.feature.gs.CountProcess;
-import org.geotools.process.feature.gs.GridProcess;
-import org.geotools.process.feature.gs.InclusionFeatureCollection;
-import org.geotools.process.feature.gs.IntersectionFeatureCollection;
-import org.geotools.process.feature.gs.NearestProcess;
-import org.geotools.process.feature.gs.PointBuffers;
-import org.geotools.process.feature.gs.QueryProcess;
-import org.geotools.process.feature.gs.RectangularClipProcess;
-import org.geotools.process.feature.gs.ReprojectProcess;
-import org.geotools.process.feature.gs.SimplifyProcess;
-import org.geotools.process.feature.gs.SnapProcess;
-import org.geotools.process.feature.gs.UnionFeatureCollection;
-import org.geotools.process.feature.gs.UniqueProcess;
-import org.geotools.process.feature.gs.VectorZonalStatistics;
+import org.geotools.process.vector.AggregateProcess;
+import org.geotools.process.vector.BoundsProcess;
+import org.geotools.process.vector.BufferFeatureCollection;
+import org.geotools.process.vector.CentroidProcess;
+import org.geotools.process.vector.ClipProcess;
+import org.geotools.process.vector.CollectGeometries;
+import org.geotools.process.vector.CountProcess;
+import org.geotools.process.vector.GridProcess;
+import org.geotools.process.vector.InclusionFeatureCollection;
+import org.geotools.process.vector.IntersectionFeatureCollection;
+import org.geotools.process.vector.NearestProcess;
+import org.geotools.process.vector.PointBuffers;
+import org.geotools.process.vector.QueryProcess;
+import org.geotools.process.vector.RectangularClipProcess;
+import org.geotools.process.vector.ReprojectProcess;
+import org.geotools.process.vector.SimplifyProcess;
+import org.geotools.process.vector.SnapProcess;
+import org.geotools.process.vector.UnionFeatureCollection;
+import org.geotools.process.vector.UniqueProcess;
+import org.geotools.process.vector.VectorZonalStatistics;
import org.geotools.text.Text;
-import org.opengis.util.InternationalString;
/**
* Factory providing a number of processes for working with feature data.
@@ -36,10 +35,10 @@
*
* @source $URL$
*/
-public class FeatureGSProcessFactory extends AnnotatedBeanProcessFactory {
+public class VectorProcessFactory extends AnnotatedBeanProcessFactory {
- public FeatureGSProcessFactory() {
- super(Text.text("Geospatial Feature Process Factory"), "gs",
+ public VectorProcessFactory() {
+ super(Text.text("Vector processes"), "vec",
AggregateProcess.class,
BoundsProcess.class,
BufferFeatureCollection.class,
View
6 ...ess/feature/gs/VectorZonalStatistics.java → ...process/vector/VectorZonalStatistics.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.HashSet;
import java.util.Iterator;
@@ -26,10 +26,10 @@
import org.geotools.process.factory.DescribeParameter;
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
-import org.geotools.process.feature.gs.AggregateProcess.AggregationFunction;
-import org.geotools.process.feature.gs.AggregateProcess.Results;
import org.geotools.process.gs.GSProcess;
import org.geotools.process.gs.WrappingIterator;
+import org.geotools.process.vector.AggregateProcess.AggregationFunction;
+import org.geotools.process.vector.AggregateProcess.Results;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureIterator;
View
15 ...eotools/process/feature/package-info.java → ...geotools/process/vector/package-info.java
@@ -2,7 +2,7 @@
* GeoTools - The Open Source Java GIS Toolkit
* http://geotools.org
*
- * (C) 2011, Open Source Geospatial Foundation (OSGeo)
+ * (C) 2008, Open Source Geospatial Foundation (OSGeo)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -15,12 +15,9 @@
* Lesser General Public License for more details.
*/
/**
- * Feature processing support for the GeoTools library.
- * <p>
- * These geometry operations are made available as:
- * <ul>
- * <li>static methods for direct use in your code</li>
- * <li>ProcessFactory for use in dynamic systems</li>
- * </ul>
+ * Vector processing support for the GeoTools library.
+ *
+ * @author Jody Garnett - LISAsoft
+ * @author Andrea Aime - OpenGeo
*/
-package org.geotools.process.feature;
+package org.geotools.process.vector;
View
2 .../process-feature/src/main/resources/META-INF/services/org.geotools.process.ProcessFactory
@@ -1 +1 @@
-org.geotools.process.feature.gs.FeatureGSProcessFactory
+org.geotools.process.vector.VectorProcessFactory
View
7 ...cess/feature/gs/AggregateProcessTest.java → .../process/vector/AggregateProcessTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.assertTrue;
@@ -27,8 +27,9 @@
import org.geotools.data.DataStore;
import org.geotools.data.property.PropertyDataStore;
import org.geotools.data.simple.SimpleFeatureSource;
-import org.geotools.process.feature.gs.AggregateProcess.AggregationFunction;
-import org.geotools.process.feature.gs.AggregateProcess.Results;
+import org.geotools.process.vector.AggregateProcess;
+import org.geotools.process.vector.AggregateProcess.AggregationFunction;
+import org.geotools.process.vector.AggregateProcess.Results;
import org.geotools.test.TestData;
import org.junit.After;
import org.junit.Before;
View
3 ...ature/gs/BufferFeatureCollectionTest.java → ...s/vector/BufferFeatureCollectionTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import junit.framework.TestCase;
@@ -27,6 +27,7 @@
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.process.vector.BufferFeatureCollection;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.filter.FilterFactory;
View
3 ...ocess/feature/gs/CentroidProcessTest.java → ...s/process/vector/CentroidProcessTest.java
@@ -1,4 +1,4 @@
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static junit.framework.Assert.*;
@@ -7,6 +7,7 @@
import org.geotools.data.simple.SimpleFeatureIterator;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
+import org.geotools.process.vector.CentroidProcess;
import org.junit.Before;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
View
8 ...s/FeatureGSProcessFactoryFactoryTest.java → ...r/FeatureGSProcessFactoryFactoryTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
@@ -32,8 +32,8 @@
import org.geotools.feature.NameImpl;
import org.geotools.process.Process;
import org.geotools.process.Processors;
-import org.geotools.process.feature.gs.AggregateProcess.AggregationFunction;
-import org.geotools.process.feature.gs.AggregateProcess.Results;
+import org.geotools.process.vector.AggregateProcess.AggregationFunction;
+import org.geotools.process.vector.AggregateProcess.Results;
import org.geotools.test.TestData;
import org.geotools.util.KVP;
import org.geotools.util.NullProgressListener;
@@ -70,7 +70,7 @@ public void testSum() throws Exception {
"function",EnumSet.of(AggregationFunction.Sum),
"singlePass", true);
- NameImpl name = new NameImpl("gs","Aggregate");
+ NameImpl name = new NameImpl("vec","Aggregate");
Process process = Processors.createProcess( name );
assertNotNull("aggregateProcess not found", process);
NullProgressListener monitor = new NullProgressListener();
View
3 ...rocess/feature/gs/FeatureProcessTest.java → ...ls/process/vector/FeatureProcessTest.java
@@ -15,11 +15,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.*;
import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.process.vector.FeatureProcess;
import org.geotools.referencing.CRS;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
View
6 ...s/process/feature/gs/GridProcessTest.java → ...tools/process/vector/GridProcessTest.java
@@ -1,4 +1,4 @@
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.*;
@@ -8,14 +8,14 @@
import org.geotools.feature.NameImpl;
import org.geotools.process.ProcessFactory;
import org.geotools.process.Processors;
-import org.geotools.process.feature.gs.GridProcess.GridMode;
+import org.geotools.process.vector.GridProcess.GridMode;
import org.junit.Test;
public class GridProcessTest {
@Test
public void testDescription() {
- NameImpl gridName = new NameImpl("gs", "Grid");
+ NameImpl gridName = new NameImpl("vec", "Grid");
ProcessFactory pf = Processors.createProcessFactory(gridName);
assertNotNull(pf);
Map<String, Parameter<?>> parameterInfo = pf.getParameterInfo(gridName);
View
3 ...re/gs/InclusionFeatureCollectionTest.java → ...ector/InclusionFeatureCollectionTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -26,6 +26,7 @@
import org.geotools.feature.DefaultFeatureCollection;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
+import org.geotools.process.vector.InclusionFeatureCollection;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.filter.FilterFactory;
View
5 ...gs/IntersectionFeatureCollectionTest.java → ...or/IntersectionFeatureCollectionTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.util.List;
import com.vividsolutions.jts.geom.Coordinate;
@@ -40,7 +40,8 @@
import org.geotools.feature.DefaultFeatureCollection;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
-import org.geotools.process.feature.gs.IntersectionFeatureCollection.IntersectionMode;
+import org.geotools.process.vector.IntersectionFeatureCollection;
+import org.geotools.process.vector.IntersectionFeatureCollection.IntersectionMode;
import org.junit.Before;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
View
3 ...ess/feature/gs/LRSGeocodeProcessTest.java → ...process/vector/LRSGeocodeProcessTest.java
@@ -14,7 +14,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.File;
import java.io.IOException;
@@ -26,6 +26,7 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
import org.geotools.process.ProcessException;
+import org.geotools.process.vector.LRSGeocodeProcess;
import org.geotools.test.TestData;
import org.junit.After;
import org.junit.Assert;
View
3 ...ess/feature/gs/LRSMeasureProcessTest.java → ...process/vector/LRSMeasureProcessTest.java
@@ -14,7 +14,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.File;
import java.io.IOException;
@@ -26,6 +26,7 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
import org.geotools.process.ProcessException;
+import org.geotools.process.vector.LRSMeasureProcess;
import org.geotools.test.TestData;
import org.junit.After;
import org.junit.Assert;
View
3 ...ess/feature/gs/LRSSegmentProcessTest.java → ...process/vector/LRSSegmentProcessTest.java
@@ -14,7 +14,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import java.io.File;
import java.io.IOException;
@@ -26,6 +26,7 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
import org.geotools.process.ProcessException;
+import org.geotools.process.vector.LRSSegmentProcess;
import org.geotools.test.TestData;
import org.junit.After;
import org.junit.Assert;
View
3 ...s/feature/gs/PointStackerProcessTest.java → ...ocess/vector/PointStackerProcessTest.java
@@ -14,7 +14,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static junit.framework.Assert.*;
@@ -25,6 +25,7 @@
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.process.ProcessException;
+import org.geotools.process.vector.PointStackerProcess;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.junit.Test;
View
9 ...cess/feature/gs/TransformProcessTest.java → .../process/vector/TransformProcessTest.java
@@ -14,7 +14,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.*;
@@ -29,9 +29,10 @@
import org.geotools.data.property.PropertyDataStore;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureSource;
-import org.geotools.process.feature.gs.AggregateProcess.AggregationFunction;
-import org.geotools.process.feature.gs.AggregateProcess.Results;
-import org.geotools.process.feature.gs.TransformProcess.Definition;
+import org.geotools.process.vector.TransformProcess;
+import org.geotools.process.vector.AggregateProcess.AggregationFunction;
+import org.geotools.process.vector.AggregateProcess.Results;
+import org.geotools.process.vector.TransformProcess.Definition;
import org.geotools.test.TestData;
import org.junit.After;
import org.junit.Before;
View
3 ...eature/gs/UnionFeatureCollectionTest.java → ...ss/vector/UnionFeatureCollectionTest.java
@@ -15,7 +15,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.feature.gs;
+package org.geotools.process.vector;
import static org.junit.Assert.*;
@@ -25,6 +25,7 @@
import org.geotools.feature.DefaultFeatureCollection;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
+import org.geotools.process.vector.UnionFeatureCollection;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.filter.FilterFactory;
View
0 .../feature/gs/test-data/bugsites.properties → ...cess/vector/test-data/bugsites.properties
File renamed without changes.
View
12 .../feature/gs/test-data/features.properties → ...cess/vector/test-data/features.properties
@@ -1,7 +1,7 @@
-_=the_geom:MultiPolygon:srid=4326,cat:java.lang.Long,str2:String
-features.1=MULTIPOLYGON(((2 2,2 3,3 3,3 2,2 2)), ((3 9,3 12,5 12,5 9,3 9)))|10| feature 1
-features.2=MULTIPOLYGON(((10 4,10 6,12 6,12 4,10 4)))|20|feature 2
-features.3=MULTIPOLYGON(((15 7,15 8,16 8,16 7,15 7)))|30|feature 3
-features.4=MULTIPOLYGON(((3 10,3 12,5 12,5 10,3 10)))|40|feature 4
-features.5=MULTIPOLYGON(((9 9,9 11,12 11,12 9,9 9)))|50|feature 5
+_=the_geom:MultiPolygon:srid=4326,cat:java.lang.Long,str2:String
+features.1=MULTIPOLYGON(((2 2,2 3,3 3,3 2,2 2)), ((3 9,3 12,5 12,5 9,3 9)))|10| feature 1
+features.2=MULTIPOLYGON(((10 4,10 6,12 6,12 4,10 4)))|20|feature 2
+features.3=MULTIPOLYGON(((15 7,15 8,16 8,16 7,15 7)))|30|feature 3
+features.4=MULTIPOLYGON(((3 10,3 12,5 12,5 10,3 10)))|40|feature 4
+features.5=MULTIPOLYGON(((9 9,9 11,12 11,12 9,9 9)))|50|feature 5
features.6=MULTIPOLYGON(((12 12,12 15, 16 15,16 12, 12 12)))|60|feature 6
View
0 ...feature/gs/test-data/lrssimple.properties → ...ess/vector/test-data/lrssimple.properties
File renamed without changes.
View
12 ...eature/gs/test-data/multipoint.properties → ...ss/vector/test-data/multipoint.properties
@@ -1,6 +1,6 @@
-_=the_geom:MultiPoint:srid=26713,cat:java.lang.Long,str1:String
-multipoint.1=MULTIPOINT (1 1, 2 2, 3 3, 4 4)|1| Multipoint 1
-multipoint.2=MULTIPOINT (5 5, 6 6, 7 7, 10 20)|2|Multipoint 2
-multipoint.3=MULTIPOINT (8 8, 40 30, 20 20, 30 40)|3|Multipoint 3
-multipoint.4=MULTIPOINT (40 40, 40 30, 20 20, 30 10)|4|Multipoint 4
-
+_=the_geom:MultiPoint:srid=26713,cat:java.lang.Long,str1:String
+multipoint.1=MULTIPOINT (1 1, 2 2, 3 3, 4 4)|1| Multipoint 1
+multipoint.2=MULTIPOINT (5 5, 6 6, 7 7, 10 20)|2|Multipoint 2
+multipoint.3=MULTIPOINT (8 8, 40 30, 20 20, 30 40)|3|Multipoint 3
+multipoint.4=MULTIPOINT (40 40, 40 30, 20 20, 30 10)|4|Multipoint 4
+
View
12 .../feature/gs/test-data/polyline.properties → ...cess/vector/test-data/polyline.properties
@@ -1,6 +1,6 @@
-_=the_geom:MultiLineString:srid=4326,cat2:java.lang.Long,str1:String
-polyline.1=MULTILINESTRING ((0 1, 0 3, 2 4, 3 5))|10|polyline a
-polyline.2=MULTILINESTRING ((12 1, 7 5, 7 13))|20|polyline b
-polyline.3=MULTILINESTRING ((20 20,30 30))|30|polyline c
-polyline.3=MULTILINESTRING ((10 20,30 30))|40|polyline d
-
+_=the_geom:MultiLineString:srid=4326,cat2:java.lang.Long,str1:String
+polyline.1=MULTILINESTRING ((0 1, 0 3, 2 4, 3 5))|10|polyline a
+polyline.2=MULTILINESTRING ((12 1, 7 5, 7 13))|20|polyline b
+polyline.3=MULTILINESTRING ((20 20,30 30))|30|polyline c
+polyline.3=MULTILINESTRING ((10 20,30 30))|40|polyline d
+
View
6 ...ess/feature/gs/test-data/zones.properties → ...process/vector/test-data/zones.properties
@@ -1,4 +1,4 @@
-_=the_geom:MultiPolygon:srid=4326,cat2:java.lang.Long,str1:String
-zones.1=MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))|10|zone 1
-zones.2=MULTIPOLYGON (((10 0,10 10,20 10,20 0,10 0)))|20|zone 2
+_=the_geom:MultiPolygon:srid=4326,cat2:java.lang.Long,str1:String
+zones.1=MULTIPOLYGON (((0 0,0 10,10 10,10 0,0 0)))|10|zone 1
+zones.2=MULTIPOLYGON (((10 0,10 10,20 10,20 0,10 0)))|20|zone 2
zones.3=MULTIPOLYGON (((0 10,0 20,10 20,10 10,0 10)))|20|zone 3

0 comments on commit 2c476fd

Please sign in to comment.