Add Raster crop by geometry method

Author: jericks

doc/api/raster.rst

@@ -125,6 +125,13 @@ Methods
 
     Crop the current Raster to only include data in the given Bounds.
 
+.. function:: Raster.crop(geometry)
+
+    :arg geometry: :class:`geom.Geometry` The Geometry to use when cropping the Raster
+
+    Crop the current Raster to only include data in the given Geometry.
+
+
 :class:`raster.Band`
 ====================
 

src/main/java/org/geoscript/js/raster/Raster.java

@@ -2,6 +2,7 @@
 
 import org.geoscript.js.GeoObject;
 import org.geoscript.js.geom.Bounds;
+import org.geoscript.js.geom.Geometry;
 import org.geoscript.js.geom.Point;
 import org.geoscript.js.proj.Projection;
 import org.geotools.coverage.grid.GridCoordinates2D;
@@ -140,11 +141,17 @@ public Object getValue(Object pointOrPixel) {
     }
 
     @JSFunction
-    public Raster crop(Bounds bounds) {
+    public Raster crop(Object boundsOrGeometry) {
         CoverageProcessor processor = new CoverageProcessor();
         ParameterValueGroup params = processor.getOperation("CoverageCrop").getParameters();
         params.parameter("Source").setValue(coverage);
-        params.parameter("Envelope").setValue(new org.geotools.geometry.GeneralEnvelope(bounds.unwrap()));
+        if (boundsOrGeometry instanceof Bounds) {
+            Bounds bounds = (Bounds) boundsOrGeometry;
+            params.parameter("Envelope").setValue(new org.geotools.geometry.GeneralEnvelope(bounds.unwrap()));
+        } else {
+            Geometry geometry = (Geometry) boundsOrGeometry;
+            params.parameter("ROI").setValue(geometry.unwrap());
+        }
         GridCoverage2D newCoverage = (GridCoverage2D) processor.doOperation(params);
         return new Raster(this.getParentScope(), newCoverage);
     }

src/test/resources/org/geoscript/js/tests/geoscript/raster/test_raster.js

@@ -87,7 +87,7 @@ exports["test: get raster pixel from point"] = function() {
     assert.strictEqual(20, pixel.y, "Value should be 20");
 };
 
-exports["test: crop a raster"] = function() {
+exports["test: crop a raster with a bounds"] = function() {
     var format = new raster.Format({source: admin.raster.source});
     var tif = format.read({});
     var smallTif = tif.crop(new geom.Bounds([-180,-90, 0, 0]))
@@ -96,4 +96,15 @@ exports["test: crop a raster"] = function() {
     assert.strictEqual(-90,  Math.round(bounds.minY), "Min Y should be -90");
     assert.strictEqual(0,    Math.round(bounds.maxX), "Max X should be 0");
     assert.strictEqual(0,    Math.round(bounds.maxY), "Max Y should be 0");
+};
+
+exports["test: crop a raster with a geometry"] = function() {
+    var format = new raster.Format({source: admin.raster.source});
+    var tif = format.read({});
+    var smallTif = tif.crop(new geom.Point([0, 0]).buffer(4))
+    var bounds = smallTif.bounds;
+    assert.strictEqual(-4, Math.round(bounds.minX), "Min X should be -4");
+    assert.strictEqual(-4, Math.round(bounds.minY), "Min Y should be -4");
+    assert.strictEqual(4,  Math.round(bounds.maxX), "Max X should be 4");
+    assert.strictEqual(4,  Math.round(bounds.maxY), "Max Y should be 4");
 };