GEOWAVE-1045: ingest at all lower resolution pyramid levels (#1047)

rfecher · web-flow · commit 1a655a30e172 · 2017-03-10T12:42:53.000-05:00
diff --git a/extensions/adapters/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/adapter/RasterDataAdapter.java b/extensions/adapters/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/adapter/RasterDataAdapter.java
@@ -54,6 +54,7 @@
 import org.geotools.geometry.jts.GeometryClipper;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.geotools.referencing.operation.projection.MapProjection;
 import org.geotools.referencing.operation.transform.AffineTransform2D;
 import org.geotools.renderer.lite.RendererUtilities;
 import org.geotools.resources.coverage.CoverageUtilities;
@@ -137,6 +138,7 @@ public class RasterDataAdapter implements
 {
 	static {
 		SourceThresholdFixMosaicDescriptor.register(false);
+		MapProjection.SKIP_SANITY_CHECKS = true;
 	}
 
 	public final static String TILE_METADATA_PROPERTY_KEY = "TILE_METADATA";
@@ -499,14 +501,9 @@ public Iterator<GridCoverage> convertToIndex(
 			final double[] tileRangePerDimension = new double[bounds.getDimensionCount()];
 			final double[] maxValuesPerDimension = bounds.getMaxValuesPerDimension();
 			final double[] minValuesPerDimension = bounds.getMinValuesPerDimension();
-			double maxSpan = -Double.MAX_VALUE;
 			for (int d = 0; d < tileRangePerDimension.length; d++) {
 				tileRangePerDimension[d] = ((maxValuesPerDimension[d] - minValuesPerDimension[d]) * tileSize)
 						/ gridEnvelope.getSpan(d);
-
-				maxSpan = Math.max(
-						gridEnvelope.getSpan(d),
-						maxSpan);
 			}
 			final TreeMap<Double, SubStrategy> substrategyMap = new TreeMap<Double, SubStrategy>();
 			for (final SubStrategy pyramidLevel : indexStrategy.getSubStrategies()) {
@@ -545,13 +542,7 @@ public Iterator<GridCoverage> convertToIndex(
 				NavigableMap<Double, SubStrategy> map = substrategyMap.tailMap(
 						fullRes,
 						false);
-				final double toKey = maxSpan / tileSize;
-				if (map.firstKey() <= toKey) {
-					map = map.headMap(
-							toKey,
-							true);
-					pyramidLevels.addAll(map.values());
-				}
+				pyramidLevels.addAll(map.values());
 			}
 			if (pyramidLevels.isEmpty()) {
 				// this case shouldn't occur theoretically, but just in case,
diff --git a/extensions/adapters/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/stats/HistogramStatistics.java b/extensions/adapters/raster/src/main/java/mil/nga/giat/geowave/adapter/raster/stats/HistogramStatistics.java
@@ -7,6 +7,7 @@
 import java.io.ObjectOutputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -62,10 +63,10 @@ public HistogramStatistics(
 
 	@Override
 	public byte[] toBinary() {
-		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		final List<byte[]> perEntryBinary = new ArrayList<byte[]>();
 		int totalBytes = 4;
 		for (final Entry<Resolution, javax.media.jai.Histogram> entry : histograms.entrySet()) {
+			final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 			byte[] keyBytes;
 			byte[] valueBytes = new byte[] {};
 			if (entry.getKey() != null) {
