Merge pull request #1253 from dvntucker/mosaicking_refactor

[GEOT-5392] Mosaicking refactor
geotools · Aug 17, 2016 · 89fcf34 · 89fcf34
2 parents 228c02c + 2068bd9
commit 89fcf34
Show file tree

Hide file tree

Showing 60 changed files with 2,960 additions and 1,279 deletions.
diff --git a/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java b/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleDescriptor.java
@@ -63,6 +63,7 @@
 import org.geotools.data.DataUtilities;
 import org.geotools.factory.Hints;
 import org.geotools.factory.Hints.Key;
+import org.geotools.geometry.GeneralEnvelope;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.image.ImageWorker;
@@ -137,6 +138,16 @@ public class GranuleDescriptor {
 
     OverviewsController overviewsController;
 
+    private GeneralEnvelope granuleEnvelope;
+
+    public GeneralEnvelope getGranuleEnvelope() {
+        return granuleEnvelope;
+    }
+
+    public void setGranuleEnvelope(GeneralEnvelope granuleEnvelope) {
+        this.granuleEnvelope = granuleEnvelope;
+    }
+
     /**
      * This class represent an overview level in a single granuleDescriptor.
      * 
@@ -228,7 +239,7 @@ public String toString() {
      * @author Daniele Romagnoli, GeoSolutions S.A.S.
      * 
      */
-    static class GranuleLoadingResult {
+    public static class GranuleLoadingResult {
 
         RenderedImage loadedImage;
 
@@ -294,7 +305,7 @@ public boolean isDoFiltering() {
 
     ImageReaderSpi cachedReaderSPI;
 
-    SimpleFeature originator;
+    private SimpleFeature originator;
 
     PAMDataset pamDataset;
 
@@ -309,7 +320,9 @@ public boolean isDoFiltering() {
     /** {@link DatasetLayout} object containing information about granule internal structure */
     private DatasetLayout layout;
 
-    /** {@link MaskOverviewProvider} used for handling external ROIs and Overviews */
+    /**
+     * {@link MaskOverviewProvider} used for handling external ROIs and Overviews
+     */
     private MaskOverviewProvider ovrProvider;
 
     protected void init(final BoundingBox granuleBBOX, final URL granuleUrl,
@@ -340,6 +353,9 @@ protected void init(final BoundingBox granuleBBOX, final URL granuleUrl,
             SpiHelper spiProvider = new SpiHelper(granuleFile, suggestedSPI);
             boolean isMultidim = spiProvider.isMultidim();
 
+            GeneralEnvelope envelope = gcReader.getOriginalEnvelope();
+            this.granuleEnvelope = envelope;
+
             ovrProvider = new MaskOverviewProvider(layout, granuleFile, spiProvider);
 
             // get a stream
@@ -470,7 +486,7 @@ protected void init(final BoundingBox granuleBBOX, final URL granuleUrl,
 
     /**
      * Look for GDAL Auxiliary File and unmarshall it to setup a PamDataset if available
-     * 
+     *
      * @throws IOException
      */
     private void checkPamDataset() throws IOException {
@@ -1254,5 +1270,4 @@ public Geometry getFootprint() {
             return roiProvider.getFootprint();
         }
     }
-
 }
diff --git a/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleLoader.java b/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/GranuleLoader.java
@@ -38,7 +38,7 @@
  * @author Simone Giannecchini, GeoSolutions SAS
  * 
  */
-class GranuleLoader implements Callable<GranuleLoadingResult> {
+public class GranuleLoader implements Callable<GranuleLoadingResult> {
 
     final ReferencedEnvelope cropBBox;
 
@@ -54,7 +54,7 @@ class GranuleLoader implements Callable<GranuleLoadingResult> {
 
     RasterLayerRequest request;
 
-    GranuleLoader(final ImageReadParam readParameters, final int imageIndex,
+    public GranuleLoader(final ImageReadParam readParameters, final int imageIndex,
             final ReferencedEnvelope cropBBox, final MathTransform2D mosaicWorldToGrid,
             final GranuleDescriptor granuleDescriptor, final RasterLayerRequest request,
             final Hints hints) {