(keys.size());
- for (String key : keys) {
- if (key.equals(GridConstants.DATASET_ID)) {
- newKeys.add("modelInfo.modelName");
- } else if (key.equals(GridConstants.MASTER_LEVEL_NAME)) {
- newKeys.add("modelInfo.level.masterLevel.name");
- } else if (key.equals(GridConstants.PARAMETER_ABBREVIATION)) {
- newKeys.add("modelInfo.parameterAbbreviation");
- } else if (key.equals(GridConstants.LEVEL_ONE)) {
- newKeys.add("modelInfo.level.levelonevalue");
- } else if (key.equals(GridConstants.LEVEL_TWO)) {
- newKeys.add("modelInfo.level.leveltwovalue");
- } else {
- newKeys.add(key);
- }
- }
- return newKeys;
- }
-
- public String getGroup(GribRecord record) {
- StringBuilder datauri = new StringBuilder("/grid/");
- datauri.append(record.getDataTime().toString().replace(" ", "_"));
- datauri.append("/");
- datauri.append(record.getModelInfo().getModelName());
- // secondaryid
- datauri.append("/");
- if (record.getGridVersion() != 0) {
- datauri.append("Version");
- datauri.append(record.getGridVersion());
- } else {
- datauri.append("null");
- }
- datauri.append("/");
- if (record.getModelInfo().getPerturbationNumber() != null) {
- switch (record.getModelInfo().getPerturbationNumber()) {
- case 1:
- datauri.append("ctl1");
- break;
- case 2:
- datauri.append("ctl2");
- break;
- case 3:
- datauri.append("n1");
- break;
- case 4:
- datauri.append("p1");
- break;
- case 5:
- datauri.append("n2");
- break;
- case 6:
- datauri.append("p2");
- break;
- case 7:
- datauri.append("n3");
- break;
- case 8:
- datauri.append("p3");
- break;
- case 9:
- datauri.append("n4");
- break;
- case 10:
- datauri.append("p4");
- break;
- case 11:
- datauri.append("n5");
- break;
- case 12:
- datauri.append("p5");
- break;
- default:
- datauri.append("null");
- }
- } else {
- datauri.append("null");
- }
- datauri.append("/");
- datauri.append(record.getModelInfo().getLocation().getId());
- datauri.append("/");
- datauri.append(record.getModelInfo().getParameterAbbreviation());
- datauri.append("/");
- datauri.append(record.getModelInfo().getLevelName());
- datauri.append("/");
- datauri.append(record.getModelInfo().getLevelOneValue());
- datauri.append("/");
- datauri.append(record.getModelInfo().getLevelTwoValue());
- return datauri.toString();
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
deleted file mode 100644
index 3af072fc9d..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
+++ /dev/null
@@ -1,678 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.uf.common.dataplugin.grib;
-
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.hibernate.annotations.Index;
-
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
-import com.raytheon.uf.common.dataplugin.IPrecomputedRange;
-import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.annotations.DataURI;
-import com.raytheon.uf.common.dataplugin.persist.IHDFFilePathProvider;
-import com.raytheon.uf.common.dataplugin.persist.IPersistable;
-import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
-import com.raytheon.uf.common.geospatial.ISpatialEnabled;
-import com.raytheon.uf.common.geospatial.ISpatialObject;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-/**
- * Deprecated, use grid
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 07, 2009 1994 bphillip Initial Creation
- * Apr 04, 2013 1846 bkowal Added an index on refTime and
- * forecastTime
- * Apr 08, 2013 1293 bkowal Removed references to hdffileid.
- * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
- * May 07, 2013 1869 bsteffen Remove dataURI column from
- * PluginDataObject.
- * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
- *
- *
- *
- * @author bphillip
- * @version 1
- */
-@Entity
-@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "gribseq")
-@Table(name = "grib", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
-/*
- * Both refTime and forecastTime are included in the refTimeIndex since
- * forecastTime is unlikely to be used.
- */
-@org.hibernate.annotations.Table(appliesTo = "grib", indexes = { @Index(name = "grib_refTimeIndex", columnNames = {
- "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-@DynamicSerialize
-@Deprecated
-public class GribRecord extends PersistablePluginDataObject implements
- IPersistable, ISpatialEnabled, IPrecomputedRange {
-
- private static final long serialVersionUID = 1L;
-
- /** GRIB master tables version number (currently 2) (See Table 1.0) */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private int masterTableVersion;
-
- /**
- * Version number of GRIB local tables used to augment Master Tables (See
- * Table 1.1)
- */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private int localTableVersion;
-
- /** Significance of reference time (See Table 1.2) */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private int refTimeSignificance;
-
- /** Production status of processed data in the GRIB message (See Table 1.3) */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private int productionStatus;
-
- /** Type of processed data in this GRIB message (See Table 1.4) */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private int processedDataType;
-
- /** Denotes if local section is present */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private boolean localSectionUsed;
-
- /** The values extracted from the local section */
- @Transient
- @DynamicSerializeElement
- private int[] localSection;
-
- /**
- * Denotes if this is a thinned grid, therefore containing a list of thinned
- * points per row
- */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private boolean thinnedGrid;
-
- /**
- * The number of points in each row of a quasi-regular grid, if applicable
- */
- @Transient
- @DynamicSerializeElement
- private int[] thinnedPts;
-
- /**
- * Denotes if this grid is a hybrid level grid, therefore containing a list
- * of hybrid level information
- */
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private boolean hybridGrid;
-
- /**
- * The values of the optional coordinate list provided with hybrid level
- * parameters
- */
- @Transient
- @DynamicSerializeElement
- private float[] hybridCoordList;
-
- /** The model information */
- @ManyToOne(cascade = { CascadeType.REFRESH })
- @PrimaryKeyJoinColumn
- @DataURI(position = 1, embedded = true)
- @XmlElement
- @DynamicSerializeElement
- private GribModel modelInfo;
-
- private boolean isVector = false;
-
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- @DataURI(position = 2)
- private int gridVersion = 0;
-
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private Integer resCompFlags;
-
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private double dataMin;
-
- @Column
- @XmlAttribute
- @DynamicSerializeElement
- private double dataMax;
-
- /**
- * Creates an empty GribRecord
- */
- public GribRecord() {
-
- }
-
- /**
- * Creates a GribRecord from the provided uri
- *
- * @param uri
- * The dataURI used to construct the record
- */
- public GribRecord(String uri) {
- super(uri);
- }
-
- /**
- * Copy constructor
- */
- public GribRecord(GribRecord recordToCopy) {
- if (recordToCopy.dataTime != null) {
- this.dataTime = recordToCopy.dataTime.clone();
- }
- this.dataURI = recordToCopy.dataURI;
- this.id = recordToCopy.id;
- this.identifier = recordToCopy.identifier;
- if (recordToCopy.insertTime != null) {
- this.insertTime = (Calendar) recordToCopy.insertTime.clone();
- }
- this.messageData = recordToCopy.messageData;
- this.gridVersion = recordToCopy.gridVersion;
- if (recordToCopy.hybridCoordList != null) {
- this.hybridCoordList = Arrays.copyOf(recordToCopy.hybridCoordList,
- recordToCopy.hybridCoordList.length);
- }
- this.hybridGrid = recordToCopy.hybridGrid;
- this.isVector = recordToCopy.isVector;
- if (recordToCopy.localSection != null) {
- this.localSection = Arrays.copyOf(recordToCopy.localSection,
- recordToCopy.localSection.length);
- }
- this.localSectionUsed = recordToCopy.localSectionUsed;
- this.localTableVersion = recordToCopy.localTableVersion;
- this.masterTableVersion = recordToCopy.masterTableVersion;
- this.modelInfo = new GribModel(recordToCopy.getModelInfo());
- this.processedDataType = recordToCopy.processedDataType;
- this.productionStatus = recordToCopy.productionStatus;
- this.refTimeSignificance = recordToCopy.refTimeSignificance;
- this.resCompFlags = recordToCopy.resCompFlags;
- this.thinnedGrid = recordToCopy.thinnedGrid;
- if (recordToCopy.thinnedPts != null) {
- this.thinnedPts = Arrays.copyOf(recordToCopy.thinnedPts,
- recordToCopy.thinnedPts.length);
- }
- }
-
- @Override
- public IHDFFilePathProvider getHDFPathProvider() {
- return GribPathProvider.getInstance();
- }
-
- @Override
- public IDecoderGettable getDecoderGettable() {
- return null;
- }
-
- @Override
- public Date getPersistenceTime() {
- Calendar c = getInsertTime();
- if (c == null) {
- return null;
- }
-
- return c.getTime();
- }
-
- @Override
- public void setPersistenceTime(Date persistTime) {
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
- c.setTime(persistTime);
- setInsertTime(c);
- }
-
- @Override
- public ISpatialObject getSpatialObject() {
- return modelInfo.getLocation();
- }
-
- /**
- * Gets the model information
- *
- * @return The model information
- */
- public GribModel getModelInfo() {
- return modelInfo;
- }
-
- /**
- * Sets the model information
- *
- * @param modelInfo
- * The model information
- */
- public void setModelInfo(GribModel modelInfo) {
- this.modelInfo = modelInfo;
- }
-
- /**
- * Gets the master table version
- *
- * @return The master table version
- */
- public int getMasterTableVersion() {
- return masterTableVersion;
- }
-
- /**
- * Sets the master table version
- *
- * @param masterTableVersion
- * The master table version
- */
- public void setMasterTableVersion(int masterTableVersion) {
- this.masterTableVersion = masterTableVersion;
- }
-
- /**
- * Gets the local table version
- *
- * @return The local table version
- */
- public int getLocalTableVersion() {
- return localTableVersion;
- }
-
- /**
- * Sets the local table version
- *
- * @param localTableVersion
- * The local table version
- */
- public void setLocalTableVersion(int localTableVersion) {
- this.localTableVersion = localTableVersion;
- }
-
- /**
- * Gets the reference time significance
- *
- * @return The reference time significance
- */
- public int getRefTimeSignificance() {
- return refTimeSignificance;
- }
-
- /**
- * Sets the reference time significance
- *
- * @param refTimeSignificance
- * The reference time significance
- */
- public void setRefTimeSignificance(int refTimeSignificance) {
- this.refTimeSignificance = refTimeSignificance;
- }
-
- /**
- * Gets the production status
- *
- * @return The production status
- */
- public int getProductionStatus() {
- return productionStatus;
- }
-
- /**
- * Sets the production status
- *
- * @param productionStatus
- * The production status
- */
- public void setProductionStatus(int productionStatus) {
- this.productionStatus = productionStatus;
- }
-
- /**
- * Gets ths processed data type
- *
- * @return The processed data type
- */
- public int getProcessedDataType() {
- return processedDataType;
- }
-
- /**
- * Sets the processed data type
- *
- * @param processedDataType
- * The processed data type
- */
- public void setProcessedDataType(int processedDataType) {
- this.processedDataType = processedDataType;
- }
-
- /**
- * Gets if local section is present
- *
- * @return localSectionUsed
- */
- public boolean isLocalSectionUsed() {
- return localSectionUsed;
- }
-
- /**
- * Sets localSectionUsed
- *
- * @param localSectionUsed
- * True if localsection if used, else false
- */
- public void setLocalSectionUsed(boolean localSectionUsed) {
- this.localSectionUsed = localSectionUsed;
- }
-
- /**
- * Gets the local section data
- *
- * @return The local section data
- */
- public int[] getLocalSection() {
- return localSection;
- }
-
- /**
- * Sets the local section data
- *
- * @param localSection
- * The local section data
- */
- public void setLocalSection(int[] localSection) {
- this.localSection = localSection;
- }
-
- /**
- * Gets the Hybrid coordinate list
- *
- * @return The hybrid coordinate list
- */
- public float[] getHybridCoordList() {
- return hybridCoordList;
- }
-
- /**
- * Sets the hybrid coordinate list
- *
- * @param hybridCoordList
- * The hybrid coordinate list
- */
- public void setHybridCoordList(float[] hybridCoordList) {
- this.hybridCoordList = hybridCoordList;
- }
-
- /**
- * Gets the number of points in each row for a thinned grid
- *
- * @return The thinned row points
- */
- public int[] getThinnedPts() {
- return thinnedPts;
- }
-
- /**
- * Sets the number of points in each row for a thinned grid
- *
- * @param thinnedPts
- * The thinned row points
- */
- public void setThinnedPts(int[] thinnedPts) {
- this.thinnedPts = thinnedPts;
- }
-
- public boolean isThinnedGrid() {
- return thinnedGrid;
- }
-
- public void setThinnedGrid(boolean thinnedGrid) {
- this.thinnedGrid = thinnedGrid;
- }
-
- public boolean isHybridGrid() {
- return hybridGrid;
- }
-
- public void setHybridGrid(boolean hybridGrid) {
- this.hybridGrid = hybridGrid;
- }
-
- public boolean isVector() {
- return this.isVector;
- }
-
- public void setVector(boolean isVector) {
- this.isVector = isVector;
- }
-
- public int getGridVersion() {
- return gridVersion;
- }
-
- public void setGridVersion(int gridVersion) {
- this.gridVersion = gridVersion;
- }
-
- public Integer getResCompFlags() {
- return resCompFlags;
- }
-
- public void setResCompFlags(Integer resCompFlags) {
- this.resCompFlags = resCompFlags;
- }
-
- @Override
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return the dataMin
- */
- @Override
- public double getDataMin() {
- return dataMin;
- }
-
- /**
- * @param dataMin
- * the dataMin to set
- */
- public void setDataMin(double dataMin) {
- this.dataMin = dataMin;
- }
-
- /**
- * @return the dataMax
- */
- @Override
- public double getDataMax() {
- return dataMax;
- }
-
- /**
- * @param dataMax
- * the dataMax to set
- */
- public void setDataMax(double dataMax) {
- this.dataMax = dataMax;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = (prime * result) + gridVersion;
- result = (prime * result) + Arrays.hashCode(hybridCoordList);
- result = (prime * result) + (hybridGrid ? 1231 : 1237);
- result = (prime * result) + (isVector ? 1231 : 1237);
- result = (prime * result) + Arrays.hashCode(localSection);
- result = (prime * result) + (localSectionUsed ? 1231 : 1237);
- result = (prime * result) + localTableVersion;
- result = (prime * result) + masterTableVersion;
- result = (prime * result)
- + ((modelInfo == null) ? 0 : modelInfo.hashCode());
- result = (prime * result) + processedDataType;
- result = (prime * result) + productionStatus;
- result = (prime * result) + refTimeSignificance;
- result = (prime * result)
- + ((resCompFlags == null) ? 0 : resCompFlags.hashCode());
- result = (prime * result) + (thinnedGrid ? 1231 : 1237);
- result = (prime * result) + Arrays.hashCode(thinnedPts);
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- GribRecord other = (GribRecord) obj;
- if (!this.dataTime.getRefTimeAsCalendar().equals(
- other.getDataTime().getRefTimeAsCalendar())) {
- // if the reftimes are not equal equality is false
- return false;
- } else if (this.dataTime.getFcstTime() != other.getDataTime()
- .getFcstTime()) {
- // if the reftimes are equal but the forecast times are not then
- // equality is false
- return false;
- }
-
- if (gridVersion != other.gridVersion) {
- return false;
- }
- if (!Arrays.equals(hybridCoordList, other.hybridCoordList)) {
- return false;
- }
- if (hybridGrid != other.hybridGrid) {
- return false;
- }
- if (isVector != other.isVector) {
- return false;
- }
- if (!Arrays.equals(localSection, other.localSection)) {
- return false;
- }
- if (localSectionUsed != other.localSectionUsed) {
- return false;
- }
- if (localTableVersion != other.localTableVersion) {
- return false;
- }
- if (masterTableVersion != other.masterTableVersion) {
- return false;
- }
- if (modelInfo == null) {
- if (other.modelInfo != null) {
- return false;
- }
- } else if (!modelInfo.equals(other.modelInfo)) {
- return false;
- }
- if (processedDataType != other.processedDataType) {
- return false;
- }
- if (productionStatus != other.productionStatus) {
- return false;
- }
- if (refTimeSignificance != other.refTimeSignificance) {
- return false;
- }
- if (resCompFlags == null) {
- if (other.resCompFlags != null) {
- return false;
- }
- } else if (!resCompFlags.equals(other.resCompFlags)) {
- return false;
- }
- if (thinnedGrid != other.thinnedGrid) {
- return false;
- }
- if (!Arrays.equals(thinnedPts, other.thinnedPts)) {
- return false;
- }
- return true;
- }
-
- @Override
- @Column
- @Access(AccessType.PROPERTY)
- public String getDataURI() {
- return super.getDataURI();
- }
-
- @Override
- public String getPluginName() {
- return "grib";
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftContainer.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftContainer.java
deleted file mode 100644
index a9b42bd1f1..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftContainer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib;
-
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-/**
- * TODO Add Description
- *
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 9, 2010 brockwoo Initial creation
- *
- *
- *
- * @author brockwoo
- * @version 1.0
- */
-@DynamicSerialize
-public class GribThriftContainer {
-
- @DynamicSerializeElement
- private int numOfRecords;
-
- @DynamicSerializeElement
- private GribThriftRecord[] records;
-
- public GribThriftContainer() {
- this.numOfRecords = 0;
- }
-
- public int getNumOfRecords() {
- return numOfRecords;
- }
-
- public void setNumOfRecords(int numOfRecords) {
- this.numOfRecords = numOfRecords;
- }
-
- public GribThriftRecord[] getRecords() {
- return records;
- }
-
- public void setRecords(GribThriftRecord[] records) {
- this.records = records;
- this.numOfRecords = this.records.length;
- }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftRecord.java
deleted file mode 100644
index c20389b20d..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribThriftRecord.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib;
-
-import com.raytheon.uf.common.dataplugin.grib.request.GridDataRequestMessage;
-import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
-import com.raytheon.uf.common.datastorage.records.IDataRecord;
-import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-/**
- * TODO Add Description
- *
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 9, 2010 brockwoo Initial creation
- *
- *
- *
- * @author brockwoo
- * @version 1.0
- */
-@DynamicSerialize
-public class GribThriftRecord {
-
- @DynamicSerializeElement
- private GridDataRequestMessage message;
-
- @DynamicSerializeElement
- private float[] data;
-
- @DynamicSerializeElement
- private boolean localSection = false;
-
- @DynamicSerializeElement
- private int[] localSectionData;
-
- @DynamicSerializeElement
- private boolean hybridGrid = false;
-
- @DynamicSerializeElement
- private float[] hybridGridData;
-
- @DynamicSerializeElement
- private boolean thinnedGrid = false;
-
- @DynamicSerializeElement
- private int[] thinnedGridData;
-
- public GridDataRequestMessage getMessage() {
- return message;
- }
-
- public void setMessage(GridDataRequestMessage message) {
- this.message = message;
- }
-
- public float[] getData() {
- return data;
- }
-
- public void setData(float[] data) {
- this.data = data;
- }
-
- public boolean isLocalSection() {
- return localSection;
- }
-
- public void setLocalSection(boolean localSection) {
- this.localSection = localSection;
- }
-
- public int[] getLocalSectionData() {
- return localSectionData;
- }
-
- public void setLocalSectionData(int[] localSectionData) {
- this.localSectionData = localSectionData;
- }
-
- public boolean isHybridGrid() {
- return hybridGrid;
- }
-
- public void setHybridGrid(boolean hybridGrid) {
- this.hybridGrid = hybridGrid;
- }
-
- public float[] getHybridGridData() {
- return hybridGridData;
- }
-
- public void setHybridGridData(float[] hybridGridData) {
- this.hybridGridData = hybridGridData;
- }
-
- public boolean isThinnedGrid() {
- return thinnedGrid;
- }
-
- public void setThinnedGrid(boolean thinnedGrid) {
- this.thinnedGrid = thinnedGrid;
- }
-
- public int[] getThinnedGridData() {
- return thinnedGridData;
- }
-
- public void setThinnedGridData(int[] thinnedGridData) {
- this.thinnedGridData = thinnedGridData;
- }
-
- public void setDataFields(IDataRecord[] data) {
- if (data[0] != null) {
- this.data = ((FloatDataRecord) data[0]).getFloatData();
- }
- if (data[1] != null) {
- this.localSectionData = ((IntegerDataRecord) data[1]).getIntData();
- this.localSection = true;
- }
- if (data[2] != null) {
- this.hybridGridData = ((FloatDataRecord) data[2]).getFloatData();
- this.hybridGrid = true;
- }
- if (data[3] != null) {
- this.thinnedGridData = ((IntegerDataRecord) data[3]).getIntData();
- this.thinnedGrid = true;
- }
- }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.java
deleted file mode 100644
index 1054cab501..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib.request;
-
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.raytheon.uf.common.serialization.comm.IServerRequest;
-
-/**
- * Request object used to delete all stored data for the specified model name.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * May 25, 2012 dgilling Initial creation
- *
- *
- *
- * @author dgilling
- * @version 1.0
- */
-
-@DynamicSerialize
-public class DeleteAllModelDataRequest implements IServerRequest {
-
- @DynamicSerializeElement
- private String modelName;
-
- public DeleteAllModelDataRequest() {
- this(null);
- }
-
- public DeleteAllModelDataRequest(String modelName) {
- this.modelName = modelName;
- }
-
- public String getModelName() {
- return modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("DeleteAllModelDataRequest [modelName=");
- builder.append(modelName);
- builder.append("]");
- return builder.toString();
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GetCoveragesRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GetCoveragesRequest.java
deleted file mode 100644
index 9e49b88000..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GetCoveragesRequest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib.request;
-
-import java.util.List;
-
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.raytheon.uf.common.serialization.comm.IServerRequest;
-
-/**
- *
- * Deprecated, use grid
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Dec 20, 2011 bsteffen Initial creation
- *
- *
- *
- * @author bsteffen
- * @version 1.0
- */
-@DynamicSerialize
-@Deprecated
-public class GetCoveragesRequest implements IServerRequest {
- @DynamicSerializeElement
- private List modelNames;
-
- public List getModelNames() {
- return modelNames;
- }
-
- public void setModelNames(List modelNames) {
- this.modelNames = modelNames;
- }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GridDataRequestMessage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GridDataRequestMessage.java
deleted file mode 100644
index 12f6aedfb7..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/request/GridDataRequestMessage.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib.request;
-
-import com.raytheon.uf.common.dataplugin.grid.GridRecord;
-import com.raytheon.uf.common.dataplugin.level.Level;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.raytheon.uf.common.serialization.comm.IServerRequest;
-import com.raytheon.uf.common.time.DataTime;
-
-/**
- * TODO Add Description
- *
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 12, 2010 brockwoo Initial creation
- *
- *
- *
- * @author brockwoo
- * @version 1.0
- */
-@DynamicSerialize
-public class GridDataRequestMessage implements IServerRequest {
-
- public static final long MISSING = -999l;
-
- @DynamicSerializeElement
- private String modelName;
-
- @DynamicSerializeElement
- private double levelOne = Level.INVALID_VALUE;
-
- @DynamicSerializeElement
- private double levelTwo = Level.INVALID_VALUE;
-
- @DynamicSerializeElement
- private String levelType;
-
- @DynamicSerializeElement
- private long startTime = -999l;
-
- @DynamicSerializeElement
- private int forecastTime = 0;
-
- @DynamicSerializeElement
- private String parameterAbbreviation;
-
- @DynamicSerializeElement
- private String ensemble;
-
- @DynamicSerializeElement
- private int version = -999;
-
- public String getModelName() {
- return modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public double getLevelOne() {
- return levelOne;
- }
-
- public void setLevelOne(double levelOne) {
- this.levelOne = levelOne;
- }
-
- public double getLevelTwo() {
- return levelTwo;
- }
-
- public void setLevelTwo(double levelTwo) {
- this.levelTwo = levelTwo;
- }
-
- public String getLevelType() {
- return levelType;
- }
-
- public void setLevelType(String levelType) {
- this.levelType = levelType;
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public void setStartTime(long startTime) {
- this.startTime = startTime;
- }
-
- public int getForecastTime() {
- return forecastTime;
- }
-
- public void setForecastTime(int forecastTime) {
- this.forecastTime = forecastTime;
- }
-
- public String getParameterAbbreviation() {
- return parameterAbbreviation;
- }
-
- public void setParameterAbbreviation(String parameterAbbreviation) {
- this.parameterAbbreviation = parameterAbbreviation;
- }
-
- public String getEnsemble() {
- return ensemble;
- }
-
- public void setEnsemble(String ensemble) {
- this.ensemble = ensemble;
- }
-
- public int getVersion() {
- return version;
- }
-
- public void setVersion(int version) {
- this.version = version;
- }
-
- public void setInfoFromRecord(GridRecord record) {
- DataTime time = record.getDataTime();
- this.modelName = record.getDatasetId();
- this.levelOne = record.getLevel().getLevelonevalue();
- this.levelTwo = record.getLevel().getLeveltwovalue();
- this.levelType = record.getLevel().getMasterLevel().getName();
- this.parameterAbbreviation = record.getParameter().getAbbreviation();
- if (record.getEnsembleId() != null) {
- this.ensemble = record.getEnsembleId();
- }
- this.startTime = time.getRefTime().getTime();
- this.forecastTime = time.getFcstTime();
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/test/com/raytheon/uf/common/dataplugin/grib/CoverageTest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/test/com/raytheon/uf/common/dataplugin/grib/CoverageTest.java
deleted file mode 100644
index 4cc4121c99..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/test/com/raytheon/uf/common/dataplugin/grib/CoverageTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.grib;
-
-import org.opengis.metadata.spatial.PixelOrientation;
-
-import com.raytheon.uf.common.geospatial.MapUtil;
-import com.raytheon.uf.common.gridcoverage.Corner;
-import com.raytheon.uf.common.gridcoverage.LambertConformalGridCoverage;
-import com.raytheon.uf.common.gridcoverage.exception.GridCoverageException;
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * TODO Add Description
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 4, 2011 randerso Initial creation
- *
- *
- *
- * @author randerso
- * @version 1.0
- */
-
-public class CoverageTest {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
-
- LambertConformalGridCoverage cov = new LambertConformalGridCoverage();
- cov.setNx(93);
- cov.setNy(65);
- cov.setFirstGridPointCorner(Corner.LowerLeft);
- cov.setDx(81.2705);
- cov.setDy(81.2705);
- cov.setLatin1(25);
- cov.setLatin2(25);
- cov.setLov(-95);
- cov.setLa1(12.19);
- cov.setLo1(-133.459);
- cov.setMajorAxis(6371229.0);
- cov.setMinorAxis(6371229.0);
- cov.setSpacingUnit("km");
-
- try {
- cov.initialize();
-
- Coordinate c = new Coordinate(0, 0);
- PixelOrientation orient = PixelOrientation.UPPER_LEFT;
- Coordinate ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.x = cov.getNx();
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.y = cov.getNy();
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.x = 0;
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.x = 64 - 1;
- c.y = cov.getNy() - 11;
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.x = 73 - 1;
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.y = cov.getNy() - 20;
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- c.x = 64 - 1;
- ll = MapUtil.gridCoordinateToLatLon(c, orient, cov);
- System.out.println("grid cell: " + c + " lonLat: " + ll);
-
- } catch (GridCoverageException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.grib.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.grib.feature/feature.xml
index 77563eda3c..a6e8103cf5 100644
--- a/edexOsgi/com.raytheon.uf.edex.grib.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.grib.feature/feature.xml
@@ -17,13 +17,6 @@
[Enter License Description here.]
-
-
-