Skip to content
Browse files

Reorganized feature process.

Refactored package structure removing "gs" prefix and created factory assigning
"ras" prefix.
  • Loading branch information...
1 parent b925407 commit ddff09d50c3fe38251ffd40eb10084f98f6aa513 jdeolive committed Aug 21, 2012
Showing with 41 additions and 58 deletions.
  1. +1 −2 ...pported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/AddCoveragesProcess.java
  2. +1 −1 ...unsupported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/AreaGridProcess.java
  3. +1 −2 .../unsupported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/ContourProcess.java
  4. +1 −1 ...es/unsupported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/CropCoverage.java
  5. +1 −2 ...ed/process-raster/src/main/java/org/geotools/process/raster/{gs → }/MultiplyCoveragesProcess.java
  6. +1 −2 ...ed/process-raster/src/main/java/org/geotools/process/raster/{gs → }/PolygonExtractionProcess.java
  7. +1 −2 ...upported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/RangeLookupProcess.java
  8. +1 −2 ...cess-raster/src/main/java/org/geotools/process/raster/{gs → }/RasterAsPointCollectionProcess.java
  9. +23 −0 ...es/unsupported/process-raster/src/main/java/org/geotools/process/raster/RasterProcessFactory.java
  10. +1 −2 ...orted/process-raster/src/main/java/org/geotools/process/raster/{gs → }/RasterZonalStatistics.java
  11. +1 −1 ...s/unsupported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/ScaleCoverage.java
  12. +1 −1 ...s/unsupported/process-raster/src/main/java/org/geotools/process/raster/{gs → }/StyleCoverage.java
  13. +0 −37 modules/unsupported/process-raster/src/main/java/org/geotools/process/raster/gs/package-info.java
  14. +1 −0 ...supported/process-raster/src/main/resources/META-INF/services/org.geotools.process.ProcessFactory
  15. +2 −1 ...pported/process-raster/src/test/java/org/geotools/process/raster/{gs → }/AreaGridProcessTest.java
  16. +2 −1 ...upported/process-raster/src/test/java/org/geotools/process/raster/{gs → }/ContourProcessTest.java
  17. +2 −1 ...rocess-raster/src/test/java/org/geotools/process/raster/{gs → }/PolygonExtractionProcessTest.java
  18. 0 ...es/unsupported/process-raster/src/test/resources/org/geotools/process/raster/{gs → }/viewshed.tif
View
3 ...rocess/raster/gs/AddCoveragesProcess.java → ...s/process/raster/AddCoveragesProcess.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.raster.gs;
+package org.geotools.process.raster;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.processing.CoverageProcessor;
@@ -24,7 +24,6 @@
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
-import org.geotools.process.raster.BaseCoverageAlgebraProcess;
import org.opengis.coverage.processing.Operation;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.util.ProgressListener;
View
2 ...ls/process/raster/gs/AreaGridProcess.java → ...tools/process/raster/AreaGridProcess.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.raster.gs;
+package org.geotools.process.raster;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
View
3 ...ols/process/raster/gs/ContourProcess.java → ...otools/process/raster/ContourProcess.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.geom.AffineTransform;
import java.awt.image.RenderedImage;
@@ -48,7 +48,6 @@
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
-import org.geotools.process.raster.CoverageUtilities;
import org.geotools.resources.i18n.Vocabulary;
import org.geotools.resources.i18n.VocabularyKeys;
import org.geotools.util.NumberRange;
View
2 ...tools/process/raster/gs/CropCoverage.java → ...geotools/process/raster/CropCoverage.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.raster.gs;
+package org.geotools.process.raster;
import java.io.IOException;
View
3 ...s/raster/gs/MultiplyCoveragesProcess.java → ...cess/raster/MultiplyCoveragesProcess.java
@@ -15,13 +15,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
-package org.geotools.process.raster.gs;
+package org.geotools.process.raster;
import org.geotools.process.factory.DescribeParameter;
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
-import org.geotools.process.raster.BaseCoverageAlgebraProcess;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.processing.CoverageProcessor;
import org.geotools.process.ProcessException;
View
3 ...s/raster/gs/PolygonExtractionProcess.java → ...cess/raster/PolygonExtractionProcess.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.geom.AffineTransform;
import java.awt.image.RenderedImage;
@@ -39,7 +39,6 @@
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
-import org.geotools.process.raster.CoverageUtilities;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.data.collection.ListFeatureCollection;
import org.geotools.data.simple.SimpleFeatureCollection;
View
3 ...process/raster/gs/RangeLookupProcess.java → ...ls/process/raster/RangeLookupProcess.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
@@ -31,7 +31,6 @@
import org.geotools.process.factory.DescribeProcess;
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
-import org.geotools.process.raster.CoverageUtilities;
import org.geotools.coverage.Category;
import org.geotools.coverage.CoverageFactoryFinder;
View
3 ...er/gs/RasterAsPointCollectionProcess.java → ...aster/RasterAsPointCollectionProcess.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.Rectangle;
import java.awt.image.RenderedImage;
@@ -32,7 +32,6 @@
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
import org.geotools.process.gs.WrappingIterator;
-import org.geotools.process.raster.CoverageUtilities;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureIterator;
View
23 ...ported/process-raster/src/main/java/org/geotools/process/raster/RasterProcessFactory.java
@@ -0,0 +1,23 @@
+package org.geotools.process.raster;
+
+import org.geotools.process.factory.AnnotatedBeanProcessFactory;
+import org.geotools.text.Text;
+
+public class RasterProcessFactory extends AnnotatedBeanProcessFactory {
+
+ public RasterProcessFactory() {
+ super(Text.text("Raster processes"), "ras",
+ AddCoveragesProcess.class,
+ AreaGridProcess.class,
+ ContourProcess.class,
+ CropCoverage.class,
+ MultiplyCoveragesProcess.class,
+ PolygonExtractionProcess.class,
+ RangeLookupProcess.class,
+ RasterAsPointCollectionProcess.class,
+ RasterZonalStatistics.class,
+ ScaleCoverage.class,
+ StyleCoverage.class);
+ }
+
+}
View
3 ...cess/raster/gs/RasterZonalStatistics.java → ...process/raster/RasterZonalStatistics.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.geom.AffineTransform;
import java.awt.geom.NoninvertibleTransformException;
@@ -34,7 +34,6 @@
import org.geotools.process.factory.DescribeResult;
import org.geotools.process.gs.GSProcess;
import org.geotools.process.gs.WrappingIterator;
-import org.geotools.process.raster.GridCoverage2DRIA;
import org.geotools.coverage.Category;
import org.geotools.coverage.GridSampleDimension;
View
2 ...ools/process/raster/gs/ScaleCoverage.java → ...eotools/process/raster/ScaleCoverage.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.raster.gs;
+package org.geotools.process.raster;
import java.io.IOException;
View
2 ...ools/process/raster/gs/StyleCoverage.java → ...eotools/process/raster/StyleCoverage.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.raster.gs;
+package org.geotools.process.raster;
import java.io.IOException;
View
37 ...unsupported/process-raster/src/main/java/org/geotools/process/raster/gs/package-info.java
@@ -1,37 +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 up raster 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>
- * It looks as if many of these are simple wrappers around jai-tools work.
- * <p>
- * This uses a "marker" interface that is expected to be used in Spring
- * in order to round up all the implementations.
- * <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;
- </pre>
- * @author Jody Garnett - LISAsoft
- * @author Andrea Aime - OpenGeo
- */
-package org.geotools.process.raster.gs;
-
View
1 ...d/process-raster/src/main/resources/META-INF/services/org.geotools.process.ProcessFactory
@@ -0,0 +1 @@
+org.geotools.process.raster.RasterProcessFactory
View
3 ...rocess/raster/gs/AreaGridProcessTest.java → ...s/process/raster/AreaGridProcessTest.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.raster.gs;
+package org.geotools.process.raster;
import static org.junit.Assert.*;
@@ -25,6 +25,7 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.process.ProcessException;
+import org.geotools.process.raster.AreaGridProcess;
import org.geotools.util.logging.Logging;
import org.junit.Test;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
View
3 ...process/raster/gs/ContourProcessTest.java → ...ls/process/raster/ContourProcessTest.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.raster.gs;
+package org.geotools.process.raster;
import com.vividsolutions.jts.geom.Coordinate;
@@ -26,6 +26,7 @@
import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.simple.SimpleFeatureIterator;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.process.raster.ContourProcess;
import org.opengis.feature.simple.SimpleFeature;
import org.junit.Before;
View
3 ...ster/gs/PolygonExtractionProcessTest.java → .../raster/PolygonExtractionProcessTest.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.raster.gs;
+package org.geotools.process.raster;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
@@ -44,6 +44,7 @@
import org.geotools.feature.FeatureIterator;
import org.geotools.geometry.jts.JTS;
import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.process.raster.PolygonExtractionProcess;
import org.opengis.feature.simple.SimpleFeature;
View
0 ...g/geotools/process/raster/gs/viewshed.tif → .../org/geotools/process/raster/viewshed.tif
File renamed without changes.

0 comments on commit ddff09d

Please sign in to comment.
Something went wrong with that request. Please try again.