diff --git a/deltaScripts/14.2.1/satellite_spatial_update/update_satellite_spatial.sh b/deltaScripts/14.2.1/satellite_spatial_update/update_satellite_spatial.sh index 660a33c8a9..eb3f52eccf 100755 --- a/deltaScripts/14.2.1/satellite_spatial_update/update_satellite_spatial.sh +++ b/deltaScripts/14.2.1/satellite_spatial_update/update_satellite_spatial.sh @@ -8,7 +8,7 @@ PSQL="/awips2/psql/bin/psql" JAVA="/awips2/java/bin/java" # 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 ADD COLUMN minx double precision, ADD COLUMN miny double precision;" diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java index 726eec2750..9c0100e3a9 100644 --- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java @@ -190,11 +190,6 @@ public class SatelliteDecoder { if (unit != null) { 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 intValue = 1900 + byteBuffer.get(8); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java index 70bfb704c3..24596b8a10 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java @@ -149,24 +149,6 @@ public class SatelliteRecord extends PersistablePluginDataObject implements @DynamicSerializeElement 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 */ @Column @DynamicSerializeElement @@ -248,22 +230,6 @@ public class SatelliteRecord extends PersistablePluginDataObject implements 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() { return satHeight; } diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java index 16c82ceba2..a1779128dc 100644 --- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java +++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java @@ -175,11 +175,8 @@ public class RegionalSatDecoder extends AbstractDecoder { // read the number of records int numRecords = netCdfFile.findDimension("y").getLength(); - record.setNumRecords(numRecords); - // read the size of each record int recordSize = netCdfFile.findDimension("x").getLength(); - record.setSizeRecords(recordSize); // read the valid time in seconds and store the time in milliseconds long time = netCdfFile.findVariable("validTime").readScalarLong(); // time