xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1210 - Correct to use IDataRecord" into development

Browse source 
Former-commit-id: 8879727535c2f22055214abe370b5dfdad73ed60
This commit is contained in:
Lee Venable 2012-09-25 10:41:05 -05:00 • committed by Gerrit Code Review
commit 4f13279610
5 changed files with 117 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
View file

@ -36,6 +36,7 @@ import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.geospatial.ISpatialEnabled;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -352,5 +353,30 @@ public class SatelliteRecord extends ServerSpecificPersistablePluginDataObject
}
interpolationLevels = levels;
}
/**
* Construct the data record from decoded data. Note this must not be called
* until after the record datauri has been created!
*
* @param record
* The SatelliteRecord containing a constructed dataURI, the
* binary satellite data, and geospatial coverage information.
* @return The IDataRecord associated with this decoded data.
*/
public static final IDataRecord getDataRecord(SatelliteRecord record) {
IDataRecord dataRec = null;
if (record != null) {
SatMapCoverage coverage = record.getCoverage();
byte[] image = (byte[]) record.getMessageData();
if ((coverage != null) && (image != null)) {
SatelliteMessageData messageData = new SatelliteMessageData(
image, coverage.getNx(), coverage.getNy());
dataRec = messageData.getStorageRecord(record,
SatelliteRecord.SAT_DATASET_NAME);
}
}
return dataRec;
}
}

7
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
View file

@ -17,13 +17,6 @@
</bean>
<bean id="satelliteMcidasDecoder" class="com.raytheon.uf.edex.plugin.satellite.mcidas.McidasSatelliteDecoder">
<property name="dao" ref="satelliteMcidasDao" />
</bean>
<!-- sat plugin has one but we don't want to be dep on the satellite-ingest beans... -->
<bean id="satelliteMcidasDao" class="com.raytheon.edex.plugin.satellite.dao.SatelliteDao"
depends-on="satelliteRegistered">
<constructor-arg ref="satellitePluginName" />
</bean>
<bean id="satMcidasDistRegistry" factory-bean="distributionSrv"

111
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/src/com/raytheon/uf/edex/plugin/satellite/mcidas/McidasSatelliteDecoder.java
View file

@ -28,11 +28,11 @@ import java.util.TimeZone;
import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.satellite.dao.SatelliteDao;
import com.raytheon.edex.util.satellite.SatSpatialFactory;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage;
import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.DataTime;
@ -57,6 +57,7 @@ import com.raytheon.uf.edex.plugin.satellite.mcidas.util.McidasSatelliteLookups.
* <li>Calibration block</li>
* <li>Non-byte data types</li>
* </ul>
*
* <pre>
*
* OFTWARE HISTORY
@ -65,7 +66,9 @@ import com.raytheon.uf.edex.plugin.satellite.mcidas.util.McidasSatelliteLookups.
* ----------- ---------- ----------- --------------------------
* No previous history
* - AWIPS2 Baseline Repository --------
* 07/12/2012 798 jkorman Changed projection "magic" numbers
* 07/12/2012 798 jkorman Changed projection "magic" numbers
* 09/24/2012 1210 jkorman Modified the decode method to create the
* IDataRecord required by the SatelliteDao
* </pre>
*
* @author
@ -88,14 +91,18 @@ public class McidasSatelliteDecoder {
private static final double DTR = Math.PI / 180.;
private SatelliteDao dao;
private String traceId;
public McidasSatelliteDecoder() {
}
/**
*
* @param data The file byte array data to be decoded.
* @return The decoded data record(s).
* @return
* @throws Exception
*/
public PluginDataObject[] decode(byte[] data, Headers headers)
throws Exception {
traceId = (String) headers.get("traceId");
@ -125,13 +132,15 @@ public class McidasSatelliteDecoder {
buf.order(ByteOrder.LITTLE_ENDIAN);
// Decode the directory block
if (buf.getInt() != 0)
if (buf.getInt() != 0) {
formatError(UNEXPECTED_HEADER_VALUE);
}
if (buf.getInt() != EXPECTED_IMAGE_TYPE_LE) {
if (buf.getInt(4) == EXPECTED_IMAGE_TYPE_BE)
if (buf.getInt(4) == EXPECTED_IMAGE_TYPE_BE) {
buf.order(ByteOrder.BIG_ENDIAN);
else
} else {
formatError(UNEXPECTED_HEADER_VALUE);
}
}
int sensorSourceNumber = buf.getInt();
int yyyddd = buf.getInt();
@ -177,8 +186,9 @@ public class McidasSatelliteDecoder {
buf.getInt(); // comment cards
long bandBits = ((long) bandMap33to64 << 32) | bandMap1to32;
if (nBands != Long.bitCount(bandBits))
if (nBands != Long.bitCount(bandBits)) {
formatError("Specified number of bands does not match number of bits in band map");
}
// Decode the navigation block
buf.position(navBlockOffset);
@ -190,11 +200,13 @@ public class McidasSatelliteDecoder {
PluginDataObject[] result = new PluginDataObject[nBands];
int bitIndex = 0;
RECORD: for (int ri = 0; ri < nBands; ++ri) {
while ((bandBits & (1L << bitIndex)) == 0)
if (++bitIndex >= 64)
while ((bandBits & (1L << bitIndex)) == 0) {
if (++bitIndex >= 64) {
break RECORD; // shouldn't happen
}
}
SatelliteRecord rec = new SatelliteRecord();
rec.setDataTime(new DataTime(unpackTime(yyyddd, hhmmss)));
rec.setSource("McIDAS");
rec.setCreatingEntity(getCreatingEntity(sensorSourceNumber));
@ -210,7 +222,9 @@ public class McidasSatelliteDecoder {
byte[] imageBytes = new byte[nLines * nElementsPerLine];
buf.position(dataBlockOffset);
buf.get(imageBytes);
rec.setMessageData(imageBytes);
} else if (nBytesPerElement == 1) {
byte[] imageBytes = new byte[nLines * nElementsPerLine];
int si = dataBlockOffset + ri * nBytesPerElement;
@ -223,15 +237,31 @@ public class McidasSatelliteDecoder {
si += eincr;
}
}
} else
} else {
unimplemented("non-byte elements");
}
rec.setTraceId(traceId);
rec.setPersistenceTime(TimeTools.getSystemCalendar().getTime());
rec.setPluginName("satellite");
rec.constructDataURI();
result[ri] = rec;
// Set the data into the IDataRecord
// Set the data into the IDataRecord
IDataRecord dataRec = SatelliteRecord.getDataRecord(rec);
if (dataRec != null) {
rec.setMessageData(dataRec);
} else {
theHandler.error(
String.format("Could not create datarecord for %s"),
traceId);
rec = null;
}
if (rec != null) {
result[ri] = rec;
} else {
result = new PluginDataObject[0];
}
}
return result;
@ -272,32 +302,31 @@ public class McidasSatelliteDecoder {
double dx = spacingAtStdLatInMeters * xImgRes;
double dy = spacingAtStdLatInMeters * yImgRes;
{
double phi0r = clat * DTR;
double rxp = ((double) (elementOfEquator - ulX) / xImgRes + 1.);
double ryp = (ny - (double) (lineOfEquator - ulY) / yImgRes);
double phi0r = clat * DTR;
double rxp = ((double) (elementOfEquator - ulX) / xImgRes + 1.);
double ryp = (ny - (double) (lineOfEquator - ulY) / yImgRes);
double dxp = 1. - rxp;
double dyp = 1. - ryp;
double rm = dx * dyp;
double rcos = radiusInMeters * Math.cos(phi0r);
double arg = Math.exp(rm / rcos);
la1 = (float) ((2. * Math.atan(arg) - HALFPI) * RTD);
lo1 = (float) prnlon((clon + ((dx * dxp) / rcos) * RTD));
dxp = nx - rxp;
dyp = ny - ryp;
rm = dx * dyp;
arg = Math.exp(rm / rcos);
la2 = (float) ((2. * Math.atan(arg) - HALFPI) * RTD);
lo2 = (float) prnlon((clon + ((dx * dxp) / rcos) * RTD));
lo2 = (float) prnlon(lo2);
}
double dxp = 1. - rxp;
double dyp = 1. - ryp;
double rm = dx * dyp;
double rcos = radiusInMeters * Math.cos(phi0r);
double arg = Math.exp(rm / rcos);
la1 = (float) ((2. * Math.atan(arg) - HALFPI) * RTD);
lo1 = (float) prnlon((clon + ((dx * dxp) / rcos) * RTD));
dxp = nx - rxp;
dyp = ny - ryp;
rm = dx * dyp;
arg = Math.exp(rm / rcos);
la2 = (float) ((2. * Math.atan(arg) - HALFPI) * RTD);
lo2 = (float) prnlon((clon + ((dx * dxp) / rcos) * RTD));
lo2 = (float) prnlon(lo2);
result = SatSpatialFactory.getInstance().getMapCoverage(
SatMapCoverage.PROJ_MERCATOR, nx, ny, (float) dx,
(float) dy, (float) clon, (float) clat, la1, lo1, la2, lo2);
} else
} else {
unimplemented(String.format("navigation type \"%s\"", navType));
}
return result;
}
@ -373,18 +402,4 @@ public class McidasSatelliteDecoder {
traceId, feature));
}
/**
* @return the dao
*/
public SatelliteDao getDao() {
return dao;
}
/**
* @param dao
* the dao to set
*/
public void setDao(SatelliteDao dao) {
this.dao = dao;
}
}

7
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
View file

@ -21,13 +21,6 @@
<bean id="regionalSatDecoder" class="gov.noaa.nws.ost.edex.plugin.regionalsat.decoder.RegionalSatDecoder">
<property name="source" value="Source" />
<property name="filename" value="regional_satellite_netcdf3" />
<property name="dao" ref="regionalSatDao" />
</bean>
<!-- sat plugin has one but we don't want to be dep on the satellite-ingest beans... -->
<bean id="regionalSatDao" class="com.raytheon.edex.plugin.satellite.dao.SatelliteDao"
depends-on="satelliteRegistered">
<constructor-arg ref="satellitePluginName" />
</bean>
<bean id="regionalSatDistRegistry" factory-bean="distributionSrv"

54
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
View file

@ -10,24 +10,26 @@
package gov.noaa.nws.ost.edex.plugin.regionalsat.decoder;
import gov.noaa.nws.ost.edex.plugin.regionalsat.util.RegionalSatSpatialFactory;
import gov.noaa.nws.ost.edex.plugin.regionalsat.util.RegionalSatLookups;
import gov.noaa.nws.ost.edex.plugin.regionalsat.util.RegionalSatLookups.PhysicalElementValue;
import gov.noaa.nws.ost.edex.plugin.regionalsat.util.RegionalSatSpatialFactory;
import java.util.Calendar;
import java.util.TimeZone;
import ucar.nc2.Attribute;
import ucar.nc2.NetcdfFile;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.AbstractDecoder;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
import com.raytheon.edex.plugin.satellite.dao.SatelliteDao;
import com.raytheon.uf.common.dataplugin.satellite.SatMapCoverage;
import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
import ucar.nc2.Attribute;
import ucar.nc2.NetcdfFile;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.decodertools.time.TimeTools;
/**
* Decoder implementation for alaska and regional satellite plugin. This decoder
@ -56,6 +58,8 @@ import ucar.nc2.NetcdfFile;
* 7/15/11 tk Initial Creation
* - AWIPS2 Baseline Repository --------
* 07/12/2012 798 jkorman Changed projection "magic" numbers
* 09/24/2012 1210 jkorman Modified the decode method to create the
* IDataRecord required by the SatelliteDao
* </pre>
*
* @author tk
@ -64,9 +68,10 @@ import ucar.nc2.NetcdfFile;
public class RegionalSatDecoder extends AbstractDecoder {
private String traceId = "";
private static final IUFStatusHandler handler = UFStatus
.getHandler(AbstractDecoder.class);
private SatelliteDao dao;
private String traceId = "";
private String source;
@ -86,8 +91,8 @@ public class RegionalSatDecoder extends AbstractDecoder {
* alaskasat-ingest.xml and the dao and source members are set when the
* RegionalSatDecoder instance is initialized:
*
* * @param dao the data access object for satellite records * @param source
* the source of the satellite images (Alaska Region)
* @param data The file byte array data to be decoded.
* @return The decoded data record(s).
*/
public PluginDataObject[] decode(byte[] data) throws Exception {
@ -312,8 +317,17 @@ public class RegionalSatDecoder extends AbstractDecoder {
.getTime());
record.setPluginName("satellite");
record.constructDataURI();
} // end of if statement
// Set the data into the IDataRecord
IDataRecord dataRec = SatelliteRecord.getDataRecord(record);
if(dataRec != null) {
record.setMessageData(dataRec);
} else {
handler.error(String.format("Could not create datarecord for %s"), traceId);
record = null;
}
} // end of if statement
} // end of if data not empty statement
if (record == null) {
@ -348,21 +362,6 @@ public class RegionalSatDecoder extends AbstractDecoder {
return value != null ? value : String.format("Unknown-%s", name);
}
/**
* @return dao the data access object for satellite records
*/
public SatelliteDao getDao() {
return dao;
}
/**
* @param dao
* the data access object for satellite records
*/
public void setDao(SatelliteDao dao) {
this.dao = dao;
}
/**
* @return the source
*/
@ -392,4 +391,5 @@ public class RegionalSatDecoder extends AbstractDecoder {
public void setFilename(String file) {
this.filename = file;
}
}