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

Issue #2333 Removed more unused fields from satellite record

Browse source 
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec

Former-commit-id: b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]
Former-commit-id: 8fddd5a57b
This commit is contained in:
Max Schenkelberg 2013-10-11 16:17:52 -05:00
parent 2d1963c665
commit 3b53d18be4
4 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deltaScripts/14.2.1/satellite_spatial_update/update_satellite_spatial.sh
View file

@ -8,7 +8,7 @@ PSQL="/awips2/psql/bin/psql"
JAVA="/awips2/java/bin/java" JAVA="/awips2/java/bin/java"
# Update columns on tables for satellite # Update columns on tables for satellite
${PSQL} -U awips -d metadata -c "ALTER TABLE satellite DROP COLUMN upperrightlat, DROP COLUMN upperrightlon;" ${PSQL} -U awips -d metadata -c "ALTER TABLE satellite DROP COLUMN upperrightlat, DROP COLUMN upperrightlon, DROP COLUMN sizerecords, DROP COLUMN numrecords;"
${PSQL} -U awips -d metadata -c "ALTER TABLE satellite_spatial DROP COLUMN la1, DROP COLUMN la2, DROP COLUMN latin, DROP COLUMN lo1, DROP COLUMN lo2, DROP COLUMN lov;" ${PSQL} -U awips -d metadata -c "ALTER TABLE satellite_spatial DROP COLUMN la1, DROP COLUMN la2, DROP COLUMN latin, DROP COLUMN lo1, DROP COLUMN lo2, DROP COLUMN lov;"
${PSQL} -U awips -d metadata -c "ALTER TABLE satellite_spatial ADD COLUMN minx double precision, ADD COLUMN miny double precision;" ${PSQL} -U awips -d metadata -c "ALTER TABLE satellite_spatial ADD COLUMN minx double precision, ADD COLUMN miny double precision;"

5
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
View file

@ -190,11 +190,6 @@ public class SatelliteDecoder {
if (unit != null) { if (unit != null) {
record.setUnits(unit.getUnitName()); record.setUnits(unit.getUnitName());
} }
// read the number of records
record.setNumRecords((int) byteBuffer.getShort(4));
// read the size of each record
record.setSizeRecords((int) byteBuffer.getShort(6));
// read the century // read the century
intValue = 1900 + byteBuffer.get(8); intValue = 1900 + byteBuffer.get(8);

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

@ -149,24 +149,6 @@ public class SatelliteRecord extends PersistablePluginDataObject implements
@DynamicSerializeElement @DynamicSerializeElement
private String physicalElement; private String physicalElement;
/**
* Number of logical records in the product. See tables 4.9, 4.11, 4.12,
* 4.13, 4.14, 4.16 of the GINI satellite ICD
*/
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer numRecords;
/**
* Size of logical records in bytes for product. See tables 4.9, 4.11, 4.12,
* 4.13, 4.14, 4.16 of the GINI satellite ICD
*/
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer sizeRecords;
/** The latitude directly beneath the satellite */ /** The latitude directly beneath the satellite */
@Column @Column
@DynamicSerializeElement @DynamicSerializeElement
@ -248,22 +230,6 @@ public class SatelliteRecord extends PersistablePluginDataObject implements
this.satSubPointLon = satSubPointLon; this.satSubPointLon = satSubPointLon;
} }
public Integer getNumRecords() {
return numRecords;
}
public void setNumRecords(Integer numRecords) {
this.numRecords = numRecords;
}
public Integer getSizeRecords() {
return sizeRecords;
}
public void setSizeRecords(Integer sizeRecords) {
this.sizeRecords = sizeRecords;
}
public Integer getSatHeight() { public Integer getSatHeight() {
return satHeight; return satHeight;
} }

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

@ -175,11 +175,8 @@ public class RegionalSatDecoder extends AbstractDecoder {
// read the number of records // read the number of records
int numRecords = netCdfFile.findDimension("y").getLength(); int numRecords = netCdfFile.findDimension("y").getLength();
record.setNumRecords(numRecords);
// read the size of each record // read the size of each record
int recordSize = netCdfFile.findDimension("x").getLength(); int recordSize = netCdfFile.findDimension("x").getLength();
record.setSizeRecords(recordSize);
// read the valid time in seconds and store the time in milliseconds // read the valid time in seconds and store the time in milliseconds
long time = netCdfFile.findVariable("validTime").readScalarLong(); // time long time = netCdfFile.findVariable("validTime").readScalarLong(); // time