VLab Issue #2867 - Remove dependency on Mcidas dataplugin
Removed the dependency for mcidas dataplugin. The ncep feature dependencies don't allow for that causing an error in the build scripts. Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09 Former-commit-id:c9af367a72[formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f] Former-commit-id:0e96169b6f
This commit is contained in:
Stephen Gilbert
parent
486096ada2
commit
71e8735fdf
2 changed files with 127 additions and 136 deletions
|
|
@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.ui,
|
|||
com.raytheon.uf.common.message;bundle-version="1.11.22",
|
||||
gov.noaa.nws.ncep.edex.common;bundle-version="1.0.0",
|
||||
gov.noaa.nws.ncep.viz.localization;bundle-version="1.0.0",
|
||||
gov.noaa.nws.ncep.gempak.parameters.core;bundle-version="1.0.0",
|
||||
gov.noaa.nws.ncep.common.dataplugin.mcidas;bundle-version="1.0.0"
|
||||
gov.noaa.nws.ncep.gempak.parameters.core;bundle-version="1.0.0"
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: gov.noaa.nws.ncep.viz.common,
|
||||
gov.noaa.nws.ncep.viz.common.area,
|
||||
|
|
|
|||
|
|
@ -1,12 +1,5 @@
|
|||
package gov.noaa.nws.ncep.viz.common.area;
|
||||
|
||||
import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasSpatialFactory;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.xml.bind.annotation.adapters.XmlAdapter;
|
||||
|
||||
import org.geotools.coverage.grid.GeneralGridEnvelope;
|
||||
import org.geotools.coverage.grid.GeneralGridGeometry;
|
||||
import org.geotools.coverage.grid.GridEnvelope2D;
|
||||
|
|
@ -19,13 +12,12 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
|
|||
|
||||
import com.raytheon.uf.common.serialization.IDeserializationContext;
|
||||
import com.raytheon.uf.common.serialization.ISerializationContext;
|
||||
import com.raytheon.uf.common.serialization.ISerializationTypeAdapter;
|
||||
import com.raytheon.uf.common.serialization.SerializationException;
|
||||
import com.raytheon.uf.common.serialization.adapters.GridGeometryAdapter;
|
||||
import com.raytheon.uf.common.serialization.adapters.GridGeometrySerialized;
|
||||
|
||||
/**
|
||||
* catch exception for native CRS's and create w/o wkt.
|
||||
* catch exception for native CRS's and create w/o wkt.
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
|
|
@ -41,141 +33,141 @@ import com.raytheon.uf.common.serialization.adapters.GridGeometrySerialized;
|
|||
*/
|
||||
public class NcGridGeometryAdapter extends GridGeometryAdapter {
|
||||
|
||||
@Override
|
||||
public GridGeometrySerialized marshal(GeneralGridGeometry v) throws Exception {
|
||||
try {
|
||||
System.out.println( v.getCoordinateReferenceSystem().getName().toString() );
|
||||
return super.marshal( v );
|
||||
}
|
||||
catch( Exception e ) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public GridGeometrySerialized marshal(GeneralGridGeometry v)
|
||||
throws Exception {
|
||||
try {
|
||||
System.out.println(v.getCoordinateReferenceSystem().getName()
|
||||
.toString());
|
||||
return super.marshal(v);
|
||||
} catch (Exception e) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GeneralGridGeometry unmarshal(GridGeometrySerialized v) throws Exception {
|
||||
CoordinateReferenceSystem crs=null;
|
||||
try {
|
||||
crs = CRS.parseWKT(v.CRS);
|
||||
}
|
||||
catch( Exception e ) {
|
||||
crs = McidasSpatialFactory.getInstance().constructCRSfromWKT( v.CRS );
|
||||
}
|
||||
|
||||
if( crs == null ) {
|
||||
throw new Exception("Unable to parse CRS from WKS: "+v.CRS );
|
||||
}
|
||||
@Override
|
||||
public GeneralGridGeometry unmarshal(GridGeometrySerialized v)
|
||||
throws Exception {
|
||||
CoordinateReferenceSystem crs = null;
|
||||
try {
|
||||
crs = CRS.parseWKT(v.CRS);
|
||||
} catch (Exception e) {
|
||||
crs = null;
|
||||
}
|
||||
|
||||
GeneralEnvelope env = new GeneralEnvelope( crs );
|
||||
env.setRange(0, v.envelopeMinX, v.envelopeMaxX);
|
||||
env.setRange(1, v.envelopeMinY, v.envelopeMaxY);
|
||||
if (crs == null) {
|
||||
throw new Exception("Unable to parse CRS from WKS: " + v.CRS);
|
||||
}
|
||||
|
||||
GeneralGridGeometry ggg = null;
|
||||
final int gridX = v.rangeX[1];
|
||||
final int gridY = v.rangeY[1];
|
||||
GeneralEnvelope env = new GeneralEnvelope(crs);
|
||||
env.setRange(0, v.envelopeMinX, v.envelopeMaxX);
|
||||
env.setRange(1, v.envelopeMinY, v.envelopeMaxY);
|
||||
|
||||
if (v.envelopeMinZ == null && v.envelopeMaxZ == null
|
||||
&& v.rangeZ == null) {
|
||||
GridEnvelope2D ge = new GridEnvelope2D(v.rangeX[0], v.rangeY[0],
|
||||
v.rangeX[1] - v.rangeX[0] + 1, v.rangeY[1] - v.rangeY[0]
|
||||
+ 1);
|
||||
ggg = new GeneralGridGeometry(ge, env);
|
||||
} else {
|
||||
final int gridZ = v.rangeZ[1];
|
||||
GeneralGridGeometry ggg = null;
|
||||
final int gridX = v.rangeX[1];
|
||||
final int gridY = v.rangeY[1];
|
||||
|
||||
env.setRange(2, v.envelopeMinZ, v.envelopeMaxZ);
|
||||
GeneralGridEnvelope gge = new GeneralGridEnvelope(new int[] {
|
||||
gridX / -2, gridY / -2, gridZ / -2 }, new int[] {
|
||||
gridX / 2, gridY / 2, gridZ / 2 }, false);
|
||||
ggg = new GeneralGridGeometry(gge, env);
|
||||
}
|
||||
if (v.envelopeMinZ == null && v.envelopeMaxZ == null
|
||||
&& v.rangeZ == null) {
|
||||
GridEnvelope2D ge = new GridEnvelope2D(v.rangeX[0], v.rangeY[0],
|
||||
v.rangeX[1] - v.rangeX[0] + 1, v.rangeY[1] - v.rangeY[0]
|
||||
+ 1);
|
||||
ggg = new GeneralGridGeometry(ge, env);
|
||||
} else {
|
||||
final int gridZ = v.rangeZ[1];
|
||||
|
||||
return ggg;
|
||||
env.setRange(2, v.envelopeMinZ, v.envelopeMaxZ);
|
||||
GeneralGridEnvelope gge = new GeneralGridEnvelope(new int[] {
|
||||
gridX / -2, gridY / -2, gridZ / -2 }, new int[] {
|
||||
gridX / 2, gridY / 2, gridZ / 2 }, false);
|
||||
ggg = new GeneralGridGeometry(gge, env);
|
||||
}
|
||||
|
||||
return ggg;
|
||||
|
||||
// CoordinateReferenceSystem crs = CRS.parseWKT(v.CRS);
|
||||
// GeneralEnvelope env = new GeneralEnvelope(crs);
|
||||
// env.setRange(0, v.envelopeMinX, v.envelopeMaxX);
|
||||
// env.setRange(1, v.envelopeMinY, v.envelopeMaxY);
|
||||
//
|
||||
// GeneralGridGeometry ggg = null;
|
||||
// final int gridX = v.rangeX[1];
|
||||
// final int gridY = v.rangeY[1];
|
||||
//
|
||||
// if (v.envelopeMinZ == null && v.envelopeMaxZ == null
|
||||
// && v.rangeZ == null) {
|
||||
// GridEnvelope2D ge = new GridEnvelope2D(v.rangeX[0], v.rangeY[0],
|
||||
// v.rangeX[1] - v.rangeX[0] + 1, v.rangeY[1] - v.rangeY[0]
|
||||
// + 1);
|
||||
// ggg = new GeneralGridGeometry(ge, env);
|
||||
// } else {
|
||||
// final int gridZ = v.rangeZ[1];
|
||||
//
|
||||
// env.setRange(2, v.envelopeMinZ, v.envelopeMaxZ);
|
||||
// GeneralGridEnvelope gge = new GeneralGridEnvelope(new int[] {
|
||||
// gridX / -2, gridY / -2, gridZ / -2 }, new int[] {
|
||||
// gridX / 2, gridY / 2, gridZ / 2 }, false);
|
||||
// ggg = new GeneralGridGeometry(gge, env);
|
||||
// }
|
||||
//
|
||||
// return ggg;
|
||||
}
|
||||
// CoordinateReferenceSystem crs = CRS.parseWKT(v.CRS);
|
||||
// GeneralEnvelope env = new GeneralEnvelope(crs);
|
||||
// env.setRange(0, v.envelopeMinX, v.envelopeMaxX);
|
||||
// env.setRange(1, v.envelopeMinY, v.envelopeMaxY);
|
||||
//
|
||||
// GeneralGridGeometry ggg = null;
|
||||
// final int gridX = v.rangeX[1];
|
||||
// final int gridY = v.rangeY[1];
|
||||
//
|
||||
// if (v.envelopeMinZ == null && v.envelopeMaxZ == null
|
||||
// && v.rangeZ == null) {
|
||||
// GridEnvelope2D ge = new GridEnvelope2D(v.rangeX[0], v.rangeY[0],
|
||||
// v.rangeX[1] - v.rangeX[0] + 1, v.rangeY[1] - v.rangeY[0]
|
||||
// + 1);
|
||||
// ggg = new GeneralGridGeometry(ge, env);
|
||||
// } else {
|
||||
// final int gridZ = v.rangeZ[1];
|
||||
//
|
||||
// env.setRange(2, v.envelopeMinZ, v.envelopeMaxZ);
|
||||
// GeneralGridEnvelope gge = new GeneralGridEnvelope(new int[] {
|
||||
// gridX / -2, gridY / -2, gridZ / -2 }, new int[] {
|
||||
// gridX / 2, gridY / 2, gridZ / 2 }, false);
|
||||
// ggg = new GeneralGridGeometry(gge, env);
|
||||
// }
|
||||
//
|
||||
// return ggg;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* com.raytheon.uf.common.serialization.ISerializationTypeAdapter#serialize
|
||||
* (com.raytheon.uf.common.serialization.ISerializationContext,
|
||||
* java.lang.Object)
|
||||
*/
|
||||
@Override
|
||||
public void serialize(ISerializationContext serializer,
|
||||
GeneralGridGeometry object) throws SerializationException {
|
||||
int numDims = object.getDimension();
|
||||
GridEnvelope range = object.getGridRange();
|
||||
Envelope env = object.getEnvelope();
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* com.raytheon.uf.common.serialization.ISerializationTypeAdapter#serialize
|
||||
* (com.raytheon.uf.common.serialization.ISerializationContext,
|
||||
* java.lang.Object)
|
||||
*/
|
||||
@Override
|
||||
public void serialize(ISerializationContext serializer,
|
||||
GeneralGridGeometry object) throws SerializationException {
|
||||
int numDims = object.getDimension();
|
||||
GridEnvelope range = object.getGridRange();
|
||||
Envelope env = object.getEnvelope();
|
||||
|
||||
serializer.writeString(object.getCoordinateReferenceSystem().toWKT());
|
||||
serializer.writeI32(numDims);
|
||||
for (int i = 0; i < numDims; ++i) {
|
||||
serializer.writeI32(range.getLow(i));
|
||||
serializer.writeI32(range.getHigh(i));
|
||||
serializer.writeDouble(env.getMinimum(i));
|
||||
serializer.writeDouble(env.getMaximum(i));
|
||||
}
|
||||
}
|
||||
serializer.writeString(object.getCoordinateReferenceSystem().toWKT());
|
||||
serializer.writeI32(numDims);
|
||||
for (int i = 0; i < numDims; ++i) {
|
||||
serializer.writeI32(range.getLow(i));
|
||||
serializer.writeI32(range.getHigh(i));
|
||||
serializer.writeDouble(env.getMinimum(i));
|
||||
serializer.writeDouble(env.getMaximum(i));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* com.raytheon.uf.common.serialization.ISerializationTypeAdapter#deserialize
|
||||
* (com.raytheon.uf.common.serialization.IDeserializationContext)
|
||||
*/
|
||||
@Override
|
||||
public GeneralGridGeometry deserialize(IDeserializationContext deserializer)
|
||||
throws SerializationException {
|
||||
try {
|
||||
CoordinateReferenceSystem crs = CRS.parseWKT(deserializer
|
||||
.readString());
|
||||
int numDims = deserializer.readI32();
|
||||
GeneralEnvelope env = new GeneralEnvelope(crs);
|
||||
int[] lowRange = new int[numDims];
|
||||
int[] highRange = new int[numDims];
|
||||
for (int i = 0; i < numDims; ++i) {
|
||||
lowRange[i] = deserializer.readI32();
|
||||
highRange[i] = deserializer.readI32();
|
||||
env.setRange(i, deserializer.readDouble(),
|
||||
deserializer.readDouble());
|
||||
}
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* com.raytheon.uf.common.serialization.ISerializationTypeAdapter#deserialize
|
||||
* (com.raytheon.uf.common.serialization.IDeserializationContext)
|
||||
*/
|
||||
@Override
|
||||
public GeneralGridGeometry deserialize(IDeserializationContext deserializer)
|
||||
throws SerializationException {
|
||||
try {
|
||||
CoordinateReferenceSystem crs = CRS.parseWKT(deserializer
|
||||
.readString());
|
||||
int numDims = deserializer.readI32();
|
||||
GeneralEnvelope env = new GeneralEnvelope(crs);
|
||||
int[] lowRange = new int[numDims];
|
||||
int[] highRange = new int[numDims];
|
||||
for (int i = 0; i < numDims; ++i) {
|
||||
lowRange[i] = deserializer.readI32();
|
||||
highRange[i] = deserializer.readI32();
|
||||
env.setRange(i, deserializer.readDouble(),
|
||||
deserializer.readDouble());
|
||||
}
|
||||
|
||||
return new GeneralGridGeometry(new GeneralGridEnvelope(lowRange,
|
||||
highRange, false), env);
|
||||
} catch (FactoryException e) {
|
||||
throw new SerializationException(
|
||||
"Error deserializing GeneralGridGeometry, could not read CRS",
|
||||
e);
|
||||
}
|
||||
}
|
||||
return new GeneralGridGeometry(new GeneralGridEnvelope(lowRange,
|
||||
highRange, false), env);
|
||||
} catch (FactoryException e) {
|
||||
throw new SerializationException(
|
||||
"Error deserializing GeneralGridGeometry, could not read CRS",
|
||||
e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue