Menu
▾
▴
[Geotools-commits] svn - r24106 - in geotools/trunk/gt/modules/plugin/gtopo30/src: main/java/org/geotools/gce/gtopo30 test/java/org/geotools/gce/gtopo30
|
From: <si...@sv...> - 2007-01-31 10:02:08
|
Author: simboss
Date: 2007-01-31 02:57:36 -0800 (Wed, 31 Jan 2007)
New Revision: 24106
Modified:
geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/gc=
e/gtopo30/GTopo30Format.java
geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/gc=
e/gtopo30/GTopo30Reader.java
geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/gc=
e/gtopo30/GTopo30Writer.java
geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/gc=
e/gtopo30/GT30DecimationTest.java
geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/gc=
e/gtopo30/GT30ReaderWriterTest.java
geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/gc=
e/gtopo30/GT30TestBase.java
Log:
-first minor fixes for merging 2.3.x onto trunk. I have updated (not comp=
letely the GTOPO30 plugin)
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geot=
ools/gce/gtopo30/GTopo30Format.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Format.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Format.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -30,6 +30,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
=20
+import org.geotools.data.DataSourceException;
import org.geotools.data.coverage.grid.AbstractGridFormat;
import org.geotools.factory.Hints;
import org.geotools.parameter.DefaultParameterDescriptorGroup;
@@ -99,7 +100,13 @@
* @return a GridCoverageWriter object
*/
public GridCoverageWriter getWriter(final Object destination) {
- return new GTopo30Writer(destination);
+ try {
+ return new GTopo30Writer(destination);
+ } catch (DataSourceException e) {
+ if (LOGGER.isLoggable(Level.WARNING))
+ LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e);
+ return null;
+ }
}
=20
/**
@@ -111,8 +118,14 @@
*=20
* @return a GridCoverageWriter object
*/
- public GridCoverageWriter getWriter(final Object destination,Hints hint=
s) {
- return new GTopo30Writer(destination,hints);
+ public GridCoverageWriter getWriter(final Object destination, Hints hin=
ts) {
+ try {
+ return new GTopo30Writer(destination, hints);
+ } catch (DataSourceException e) {
+ if (LOGGER.isLoggable(Level.WARNING))
+ LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e);
+ return null;
+ }
}
/**
* Checks if the GTopo30DataSource supports a given file
@@ -131,8 +144,8 @@
try {
urlToUse =3D ((File) o).toURL();
} catch (MalformedURLException e) {
- if (LOGGER.isLoggable(Level.SEVERE))
- LOGGER.log(Level.SEVERE, e.getLocalizedMessage(), e);
+ if (LOGGER.isLoggable(Level.FINE))
+ LOGGER.log(Level.FINE, e.getLocalizedMessage(), e);
return false;
}
} else if (o instanceof URL) {
@@ -147,8 +160,8 @@
try {
urlToUse =3D new URL((String) o);
} catch (MalformedURLException e1) {
- if (LOGGER.isLoggable(Level.SEVERE))
- LOGGER.log(Level.SEVERE, e.getLocalizedMessage(), e);
+ if (LOGGER.isLoggable(Level.FINE))
+ LOGGER.log(Level.FINE, e.getLocalizedMessage(), e);
return false;
}
}
@@ -160,8 +173,8 @@
try {
final GTopo30Reader reader =3D new GTopo30Reader(urlToUse);
} catch (IOException e) {
- if (LOGGER.isLoggable(Level.SEVERE))
- LOGGER.log(Level.SEVERE, e.getLocalizedMessage(), e);
+ if (LOGGER.isLoggable(Level.FINE))
+ LOGGER.log(Level.FINE, e.getLocalizedMessage(), e);
return false;
}
=20
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geot=
ools/gce/gtopo30/GTopo30Reader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Reader.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Reader.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -82,6 +82,8 @@
import org.opengis.spatialschema.geometry.Envelope;
=20
import com.sun.media.imageio.stream.RawImageInputStream;
+import com.sun.media.imageioimpl.plugins.raw.RawImageReader;
+import com.sun.media.imageioimpl.plugins.raw.RawImageReaderSpi;
=20
/**
* This class provides a GridCoverageReader for the GTopo30Format.
@@ -98,6 +100,11 @@
/** Logger. */
private final static Logger LOGGER =3D Logger
.getLogger("org.geotools.gce.gtopo30");
+ /**
+ * Cached {@link ImageIO} SPI for creating instances of
+ * {@link RawImageReader}.
+ */
+ private final static RawImageReaderSpi imageIOSPI =3D new RawImageReade=
rSpi();
=20
private final static String dmext =3D ".dem";
=20
@@ -186,6 +193,7 @@
if (hints !=3D null)
this.hints.add(hints);
this.source =3D source;
+ coverageName =3D "gtopo30_coverage";
// ///////////////////////////////////////////////////////////
//
// decoding source
@@ -194,7 +202,7 @@
final String filename;
=20
try {
- filename =3D URLDecoder.decode(urlToUse.getFile(), "US-ASCII");
+ filename =3D URLDecoder.decode(urlToUse.getFile(), "UTF-8");
} catch (UnsupportedEncodingException use) {
MalformedURLException exception =3D new MalformedURLException(
new StringBuffer("Unable to decode ").append(urlToUse)
@@ -205,6 +213,7 @@
}
=20
boolean recognized =3D false;
+ boolean extUpperCase =3D false;
=20
if (filename.endsWith(dmext) || filename.endsWith(dhext)
|| filename.endsWith(srext) || filename.endsWith(shext)
@@ -219,6 +228,7 @@
|| filename.endsWith(stext.toUpperCase())
|| filename.endsWith(prjext.toUpperCase())) {
recognized =3D true;
+ extUpperCase =3D true;
}
}
=20
@@ -228,10 +238,14 @@
}
=20
this.coverageName =3D filename.substring(0, filename.length() - 4);
- demURL =3D new URL(urlToUse, this.coverageName + dmext);
- prjURL =3D new URL(urlToUse, this.coverageName + prjext);
- demHeaderURL =3D new URL(urlToUse, this.coverageName + dhext);
- statsURL =3D new URL(urlToUse, this.coverageName + stext);
+ demURL =3D new URL(urlToUse, this.coverageName
+ + (!extUpperCase ? dmext : dmext.toUpperCase()));
+ prjURL =3D new URL(urlToUse, this.coverageName
+ + (!extUpperCase ? prjext : prjext.toUpperCase()));
+ demHeaderURL =3D new URL(urlToUse, this.coverageName
+ + (!extUpperCase ? dhext : dhext.toUpperCase()));
+ statsURL =3D new URL(urlToUse, this.coverageName
+ + (!extUpperCase ? stext : stext.toUpperCase()));
=20
// ///////////////////////////////////////////////////////////
//
@@ -249,7 +263,15 @@
// Build the coordinate system and the envelope
//
// ///////////////////////////////////////////////////////////
- crs =3D initCRS();
+ final Object tempCRS =3D this.hints
+ .get(Hints.DEFAULT_COORDINATE_REFERENCE_SYSTEM);
+ if (tempCRS !=3D null) {
+ this.crs =3D (CoordinateReferenceSystem) tempCRS;
+ LOGGER.log(Level.WARNING, new StringBuffer(
+ "Using forced coordinate reference system ").append(
+ crs.toWKT()).toString());
+ } else
+ crs =3D initCRS();
this.originalEnvelope =3D getBounds(crs);
=20
// ///////////////////////////////////////////////////////////////////=
//
@@ -506,7 +528,7 @@
pbjImageRead.add(null);
pbjImageRead.add(null);
pbjImageRead.add(readP);
- pbjImageRead.add(null);
+ pbjImageRead.add(imageIOSPI.createReaderInstance());
RenderedOp image =3D JAI.create("ImageRead", pbjImageRead, hints);
=20
// sample dimension for this coverage
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geot=
ools/gce/gtopo30/GTopo30Writer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Writer.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/main/java/org/geotools/g=
ce/gtopo30/GTopo30Writer.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -28,7 +28,9 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
@@ -40,6 +42,7 @@
import javax.imageio.ImageWriter;
import javax.imageio.stream.FileCacheImageOutputStream;
import javax.imageio.stream.FileImageOutputStream;
+import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.ImageOutputStreamImpl;
import javax.media.jai.Histogram;
import javax.media.jai.ImageLayout;
@@ -55,6 +58,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridGeometry2D;
import org.geotools.coverage.processing.Operations;
+import org.geotools.coverage.processing.operation.Resample;
+import org.geotools.coverage.processing.operation.SelectSampleDimension;
+import org.geotools.data.DataSourceException;
import org.geotools.data.coverage.grid.AbstractGridCoverageWriter;
import org.geotools.factory.Hints;
import org.geotools.referencing.operation.matrix.XAffineTransform;
@@ -80,7 +86,8 @@
* @source $URL:
* http://svn.geotools.org/geotools/trunk/gt/plugin/gtopo30/src/=
org/geotools/gce/gtopo30/GTopo30Writer.java $
*/
-final public class GTopo30Writer extends AbstractGridCoverageWriter impl=
ements GridCoverageWriter {
+final public class GTopo30Writer extends AbstractGridCoverageWriter impl=
ements
+ GridCoverageWriter {
=20
/** Logger. */
private final static Logger LOGGER =3D Logger
@@ -91,117 +98,138 @@
NoDataReplacerOpImage.register(JAI.getDefaultInstance());
}
=20
+ /** Cached factory for a {@link SelectSampleDimension} operation. */
+ private final static SelectSampleDimension sdFactory =3D new SelectSamp=
leDimension();
+
+ /** Cached factory for {@link Resample} operation. */
+ private final static Resample resampleFactory =3D new Resample();
+
/** Standard width for the GIF image. */
private final static int GIF_WIDTH =3D 640;
=20
/** Standard height for the GIF image. */
private final static int GIF_HEIGHT =3D 480;
=20
- /**
- * The destination (can be a File (a directory actually), an URL to a
- * directory, a ZipOutputStream or a String representing a directory or=
an
- * URL to a directory.)
- */
+ /** Destination for this writer. */
private Object destination;
=20
/**
- * Creates a GTopo30Writer.
+ * Creates a {@link GTopo30Writer}.
*=20
* @param dest
- * The destination object can be a File (a directory actuall=
y),
- * an URL to a directory, a ZipOutputStream or a String
- * representing a directory or an URL to a directory.
+ * The destination object can be a {@link File} (a directory
+ * actually), an {@link URL} to a directory, or a String
+ * representing a directory or an {@link URL} to a directory=
.
+ * @throws DataSourceException
*/
- public GTopo30Writer(final Object dest) {
- this(dest,null);
- }/**
- * Creates a GTopo30Writer.
+ public GTopo30Writer(final Object dest) throws DataSourceException {
+ this(dest, null);
+ }
+
+ /**
+ * Creates a {@link GTopo30Writer}.
*=20
* @param dest
* The destination object can be a File (a directory actuall=
y),
- * an URL to a directory, a ZipOutputStream or a String
- * representing a directory or an URL to a directory.
+ * an URL to a directory, or a String representing a directo=
ry or
+ * an URL to a directory.
+ * @throws DataSourceException
*/
- public GTopo30Writer(final Object dest,final Hints hints) {
- destination =3D dest;
+ public GTopo30Writer(final Object dest, final Hints hints)
+ throws DataSourceException {
=20
+ // ///////////////////////////////////////////////////////////////////=
//
+ //
+ // Initial checks
+ //
+ // ///////////////////////////////////////////////////////////////////=
//
if (dest =3D=3D null) {
- return;
+ throw new NullPointerException("The provided destination is null.");
}
=20
+ destination =3D dest;
final File temp;
final URL url;
=20
- try {
- // we only accept a directory as a path
- if (dest instanceof String) {
- temp =3D new File((String) dest);
+ // we only accept a directory as a path
+ if (dest instanceof String) {
+ temp =3D new File((String) dest);
=20
- // if it exists and it is not a directory that 's not good
- if ((temp.exists() && !temp.isDirectory()) || !temp.exists()) {
- destination =3D null; // we cannot write
- } else if (!temp.exists()) {
- // well let's create it!
- if (!temp.mkdir()) {
- destination =3D null;
- } else {
- destination =3D temp.getAbsolutePath();
- }
+ // if it exists and it is not a directory that 's not good
+ if ((temp.exists() && !temp.isDirectory()) || !temp.exists()) {
+ destination =3D null; // we cannot write
+ } else if (!temp.exists()) {
+ // well let's create it!
+ if (!temp.mkdir()) {
+ destination =3D null;
+ } else {
+ destination =3D temp.getAbsolutePath();
}
- } else if (dest instanceof File) {
- temp =3D (File) dest;
+ }
+ } else if (dest instanceof File) {
+ temp =3D (File) dest;
=20
- if (temp.exists() && !temp.isDirectory()) {
- this.destination =3D null;
- } else if (!temp.exists()) {
- // let's create it
- if (temp.mkdir()) {
- destination =3D temp.getAbsolutePath();
- } else {
- destination =3D null;
- }
- }
- } else if (dest instanceof URL) {
- url =3D (URL) dest;
-
- if (url.getProtocol().compareToIgnoreCase("file") !=3D 0) {
+ if (temp.exists() && !temp.isDirectory()) {
+ this.destination =3D null;
+ } else if (!temp.exists()) {
+ // let's create it
+ if (temp.mkdir()) {
+ destination =3D temp.getAbsolutePath();
+ } else {
destination =3D null;
}
+ }
+ } else if (dest instanceof URL) {
+ url =3D (URL) dest;
=20
- temp =3D new File(url.getFile());
+ if (url.getProtocol().compareToIgnoreCase("file") !=3D 0) {
+ destination =3D null;
+ }
=20
- if (temp.exists() && !temp.isDirectory()) {
+ try {
+ temp =3D new File(URLDecoder.decode(url.getFile(), "UTF-8)"));
+ } catch (UnsupportedEncodingException e) {
+ LOGGER.log(Level.SEVERE, e.getLocalizedMessage(), e);
+ final DataSourceException ex =3D new DataSourceException(e);
+ throw ex;
+ }
+
+ if (temp.exists() && !temp.isDirectory()) {
+ destination =3D null;
+ } else if (!temp.exists()) {
+ // let's create it
+ if (temp.mkdir()) {
+ destination =3D temp.getAbsolutePath();
+ } else {
destination =3D null;
- } else if (!temp.exists()) {
- // let's create it
- if (temp.mkdir()) {
- destination =3D temp.getAbsolutePath();
- } else {
- destination =3D null;
- }
}
- } else if (dest instanceof ZipOutputStream) {
- this.destination =3D (ZipOutputStream) dest;
- ((ZipOutputStream) destination)
- .setMethod(ZipOutputStream.DEFLATED);
- ((ZipOutputStream) destination)
- .setLevel(Deflater.BEST_COMPRESSION);
}
- } catch (Exception e) {
- if (LOGGER.isLoggable(Level.SEVERE))
- LOGGER.log(Level.SEVERE, e.getLocalizedMessage(), e);
- destination =3D null;
+
+ } else if (dest instanceof ZipOutputStream) {
+ this.destination =3D (ZipOutputStream) dest;
+ ((ZipOutputStream) destination).setMethod(ZipOutputStream.DEFLATED);
+ ((ZipOutputStream) destination).setLevel(Deflater.BEST_COMPRESSION);
+
+ } else if (dest instanceof ImageOutputStream) {
+ this.destination =3D dest;
+ } else {
+ throw new IllegalArgumentException(
+ "The provided destination is of an incorrect type.");
+
}
- =09
- // //
+
+ // ///////////////////////////////////////////////////////////////////=
//
//
// managing hints
//
- // //
+ // ///////////////////////////////////////////////////////////////////=
//
+ if (super.hints =3D=3D null) {
+ this.hints =3D new Hints(Hints.LENIENT_DATUM_SHIFT, Boolean.TRUE);
+ this.hints.add(new RenderingHints(JAI.KEY_TILE_CACHE, null));
+ }
if (hints !=3D null) {
- if (super.hints =3D=3D null)
- this.hints =3D new Hints(null);
- hints.add(hints);
+
+ this.hints.add(hints);
}
}
=20
@@ -209,14 +237,14 @@
* @see org.opengis.coverage.grid.GridCoverageWriter#getFormat()
*/
public Format getFormat() {
- return null;
+ return new GTopo30Format();
}
=20
/**
* @see org.opengis.coverage.grid.GridCoverageWriter#getDestination()
*/
public Object getDestination() {
- return null;
+ return destination;
}
=20
/**
@@ -416,11 +444,12 @@
// specified
final CoordinateReferenceSystem crs =3D CRSUtilities.getCRS2D(gc
.getCoordinateReferenceSystem());
-/*
- * Note from Martin: I suggest to replace all the above lines by the com=
mented code below.
- * The change need to be tested in order to make sure that I didn't made=
a mistake in the
- * mathematic. Note that 'lonFirst' totally vanish.
- */
+ /*
+ * Note from Martin: I suggest to replace all the above lines by the
+ * commented code below. The change need to be tested in order to
+ * make sure that I didn't made a mistake in the mathematic. Note
+ * that 'lonFirst' totally vanish.
+ */
final AffineTransform gridToWorld =3D (AffineTransform) gc
.getGridGeometry().getGridToCoordinateSystem();
boolean lonFirst =3D (XAffineTransform.getSwapXY(gridToWorld) !=3D -1=
);
@@ -435,18 +464,19 @@
: gridToWorld.getTranslateY();
final double yUpperLeft =3D lonFirst ? gridToWorld.getTranslateY()
: gridToWorld.getTranslateX();
-/*
- final AffineTransform worldToGrid =3D (AffineTransform) gc
- .getGridGeometry().getGridToCoordinateSystem().inverse();
+ /*
+ * final AffineTransform worldToGrid =3D (AffineTransform) gc
+ * .getGridGeometry().getGridToCoordinateSystem().inverse();
+ *=20
+ * final double geospatialDx =3D 1 /
+ * XAffineTransform.getScaleX0(worldToGrid); final double
+ * geospatialDy =3D 1 / XAffineTransform.getScaleY0(worldToGrid);
+ * // getting corner coordinates of the left upper corner final
+ * double xUpperLeft =3D -worldToGrid.getTranslateX() * geospatialDx;
+ * final double yUpperLeft =3D -worldToGrid.getTranslateY() *
+ * geospatialDy;
+ */
=20
- final double geospatialDx =3D 1 / XAffineTransform.getScaleX0(worldTo=
Grid);
- final double geospatialDy =3D 1 / XAffineTransform.getScaleY0(worldTo=
Grid);
-
- // getting corner coordinates of the left upper corner
- final double xUpperLeft =3D -worldToGrid.getTranslateX() * geospatial=
Dx;
- final double yUpperLeft =3D -worldToGrid.getTranslateY() * geospatial=
Dy;
-*/
-
// calculating the physical resolution over x and y.
final int geometryWidth =3D gc.getGridGeometry().getGridRange()
.getLength(0);
@@ -725,6 +755,7 @@
if (file instanceof File) {
out.close();
} else {
+ out.flush();
((ZipOutputStream) file).closeEntry();
}
=20
@@ -1072,10 +1103,6 @@
=20
final RenderingHints hints =3D new RenderingHints(JAI.KEY_IMAGE_LAYOUT=
,
layout);
- hints.add(new RenderingHints(JAI.KEY_TILE_CACHE, null)); // avoid
- // caching
- // this
- // image
=20
return JAI.create("format", pbj, hints);
}
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geot=
ools/gce/gtopo30/GT30DecimationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30DecimationTest.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30DecimationTest.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -55,7 +55,7 @@
// using a big tile cache
final JAI jaiDef =3D JAI.getDefaultInstance();
final TileCache cache =3D jaiDef.getTileCache();
- cache.setMemoryCapacity(128 * 1024 * 1024);
+ cache.setMemoryCapacity(64 * 1024 * 1024);
cache.setMemoryThreshold(1.0f);
// final TCTool tool=3D new TCTool();
=20
@@ -93,13 +93,18 @@
gc =3D ((GridCoverage2D) reader.read((GeneralParameterValue[]) params
.values().toArray(new GeneralParameterValue[1])));
if(TestData.isInteractiveTest())
+ {
+// logging some info
+ logger.info(gc.getCoordinateReferenceSystem2D().toWKT());
+ logger.info(gc.toString());
gc.show();
+ }
else
+ {
gc.getRenderedImage().getData();
+ }
=20
- // logging some info
- logger.info(gc.getCoordinateReferenceSystem2D().toWKT());
- logger.info(gc.toString());
+ =09
=20
}
}
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geot=
ools/gce/gtopo30/GT30ReaderWriterTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30ReaderWriterTest.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30ReaderWriterTest.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -65,7 +65,7 @@
// using a big tile cache
final JAI jaiDef =3D JAI.getDefaultInstance();
final TileCache cache =3D jaiDef.getTileCache();
- cache.setMemoryCapacity(128 * 1024 * 1024);
+ cache.setMemoryCapacity(64 * 1024 * 1024);
cache.setMemoryThreshold(1.0f);
// final TCTool tool=3D new TCTool();
=20
@@ -124,14 +124,18 @@
*/
// packed view for this coverage
GridCoverage2D gc1 =3D gc.geophysics(false);
- if(TestData.isInteractiveTest())
+ if (TestData.isInteractiveTest()) {
gc1.show();
- else
+ // logging some info
+ logger.info(gc.getCoordinateReferenceSystem2D().toWKT() + "\n"
+ + gc.toString());
+ logger.info(gc1.getCoordinateReferenceSystem2D().toWKT() + "\n"
+ + gc1.toString());
+ } else {
gc1.getRenderedImage().getData();
=20
- // logging some info
- logger.info(gc.getCoordinateReferenceSystem2D().toWKT()+"\n"+gc.toStr=
ing());
- logger.info(gc1.getCoordinateReferenceSystem2D().toWKT()+"\n"+gc1.toS=
tring());
+ }
+
}
}
=20
Modified: geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geot=
ools/gce/gtopo30/GT30TestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30TestBase.java 2007-01-31 03:08:14 UTC (rev 24105)
+++ geotools/trunk/gt/modules/plugin/gtopo30/src/test/java/org/geotools/g=
ce/gtopo30/GT30TestBase.java 2007-01-31 10:57:36 UTC (rev 24106)
@@ -9,7 +9,7 @@
import junit.framework.TestCase;
=20
import org.geotools.coverage.grid.GridCoverage2D;
-import org.geotools.test.TestData;
+import org.geotools.resources.TestData;
=20
/**
* @author Simone Giannecchini
|