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

Issue #798 - Updates to satellite

Browse source 
Former-commit-id: 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]
Former-commit-id: 2ddb2f6df0
This commit is contained in:
James Korman 2012-08-01 16:03:33 -05:00
parent 024a23e7a3
commit 241303f9a0
3 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
View file

@ -159,21 +159,29 @@ public class SatelliteDao extends PluginDao {
// set the number of levels in the 'parent' satellite data.
// Subtract one for the base level data.
satRecord.setInterpolationLevels(levels - 1);
// How many interpolation levels do we need for this data? Includes
// the base level!
// Subtract one for the base level data.
int downScaleLevels = downScaler.getNumberOfDownscaleLevels() - 1;
// set the number of downscale levels in the satellite metadata.
satRecord.setInterpolationLevels(downScaleLevels);
if (DataStoreFactory.isInterpolated(levels)) {
for (int downscaleLevel = 1; downscaleLevel <= levels; downscaleLevel++) {
for (int level = 0; level < downScaleLevels; level++) {
int downScaleLevel = level + 1;
Rectangle size = downScaler
.getDownscaleSize(downscaleLevel);
.getDownscaleSize(downScaleLevel);
AbstractDataWrapper dest = getDestination(storageRecord,
size);
dest.setFillValue(fillValue);
try {
// Downscale from previous level
downScaler.downscale(downscaleLevel - 1,
downscaleLevel, dataSource, dest);
downScaler.downscale(downScaleLevel - 1,
downScaleLevel, dataSource, dest);
IDataRecord dr = createDataRecord(satRecord, dest,
downscaleLevel, size);
downScaleLevel, size);
// Set the attributes and properties from the parent
// data.
dr.setDataAttributes(attributes);

13
edexOsgi/com.raytheon.edex.plugin.satellite/utility/edex_static/base/distribution/satellite.xml
View file

@ -19,5 +19,16 @@
further_licensing_information.
-->
<requestPatterns xmlns:ns2="group">
<regex>TI.... ....</regex>
<!--
This pattern excludes the current "prototype" WMO headers for future GOES-R data.
Point of contact
Brian M. Rapp
Communications Software Team Lead
Raytheon AWIPS Team
Brian.Rapp@noaa.gov
Office: (301) 495-2221
Cell: (301) 787-9925
-->
<regex>TI[^RS]... ....</regex>
</requestPatterns>

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

@ -55,6 +55,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* getPersistenceTime() from new IPersistable
* 20071129 472 jkorman Added IDecoderGettable interface.
* 20081106 1515 jkorman Changed units length from 16 to 26
* - AWIPS2 Baseline Repository --------
* 07/30/2012 798 jkorman Support for common satellite data.
* </pre>
*
* @author bphillip
@ -70,13 +72,26 @@ public class SatelliteRecord extends ServerSpecificPersistablePluginDataObject
private static final long serialVersionUID = 1L;
/**
* The default dataset name to use for persisted satellite data.
*/
public static final String SAT_DATASET_NAME = DataStoreFactory.DEF_DATASET_NAME;
public static final String SAT_FILL_VALUE = "FILL_VALUE";
/**
* The attribute name for a value that will be used to "fill" undefined
* data.
*/
public static final String SAT_FILL_VALUE = "_FillValue";
public static final String SAT_ADD_OFFSET = "ADD_OFFSET";
/**
* The attribute name for the data additive offset value.
*/
public static final String SAT_ADD_OFFSET = "add_offset";
public static final String SAT_SCALE_FACTOR = "SCALE_FACTOR";
/**
* The attribute name for the data scale factor value..
*/
public static final String SAT_SCALE_FACTOR = "scale_factor";
/**
* The source of the data - NESDIS