getValues(String paramName) {
- return null;
- }
-
/**
*
*/
@@ -680,10 +625,5 @@ public class BufrHDWObs extends PersistablePluginDataObject implements
}
return true;
}
- @Override
- @Column
- @Access(AccessType.PROPERTY)
- public String getDataURI() {
- return super.getDataURI();
- }
+
}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java
index ce565330ca..70694a43fe 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java
@@ -20,10 +20,7 @@
package com.raytheon.uf.common.dataplugin.bufrmthdw;
import java.util.Calendar;
-import java.util.Collection;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@@ -31,15 +28,9 @@ 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.PluginDataObject;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -53,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/**
- * TODO Add Description
+ * PluginDataObject for MTSAT high density winds data.
*
*
*
@@ -61,10 +52,13 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 26, 2010 jkorman Initial creation
- * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime
- * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
+ * Apr 04, 2013 1846 bkowal Added an index on refTime and
+ * forecastTime
+ * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -73,7 +67,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/
@Entity
@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmthdwseq")
-@Table(name = "bufrmthdw", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
+@Table(name = "bufrmthdw", uniqueConstraints = { @UniqueConstraint(columnNames = {
+ "stationid", "refTime", "sattype", "pressure", "latitude", "longitude" }) })
/*
* Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used.
@@ -84,28 +79,23 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Index(name = "bufrmthdw_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
}
)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class BufrMTHDWObs extends PersistablePluginDataObject implements
- ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+ ISpatialEnabled, IPointData, IPersistable {
private static final long serialVersionUID = 1L;
// The observation time.
@DataURI(position = 1)
- @XmlAttribute
@DynamicSerializeElement
private String satType;
@DataURI(position = 2)
- @XmlAttribute
@DynamicSerializeElement
private Double pressure;
@Embedded
@DataURI(position = 3, embedded = true)
- @XmlElement
@DynamicSerializeElement
private SurfaceObsLocation location;
@@ -116,101 +106,81 @@ public class BufrMTHDWObs extends PersistablePluginDataObject implements
// Text of the WMO header
@Column(length = 32)
@DynamicSerializeElement
- @XmlElement
private String wmoHeader;
// The observation time.
@Column
- @XmlAttribute
@DynamicSerializeElement
private Calendar validTime;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double windDir;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double windSpd;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double satelliteID;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double originatingID;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double satelliteClass;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double sgmtSzX;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double sgmtSzY;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer satelliteInstr;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer satelliteWindMethod;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double satelliteFreq;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double satelliteBandWidth;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double coldestTemp;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer heightMethod;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer tracerCorrelation;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer landSea;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Double satelliteZenith;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer firstGuess;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer timeSignificance;
@@ -253,11 +223,6 @@ public class BufrMTHDWObs extends PersistablePluginDataObject implements
validTime = time;
}
- @Override
- public IDecoderGettable getDecoderGettable() {
- return null;
- }
-
/**
* @return the satType
*/
@@ -601,26 +566,6 @@ public class BufrMTHDWObs extends PersistablePluginDataObject implements
return null;
}
- @Override
- public String getString(String paramName) {
- return null;
- }
-
- @Override
- public String[] getStrings(String paramName) {
- return null;
- }
-
- @Override
- public Amount getValue(String paramName) {
- return null;
- }
-
- @Override
- public Collection getValues(String paramName) {
- return null;
- }
-
/**
*
*/
@@ -680,10 +625,5 @@ public class BufrMTHDWObs extends PersistablePluginDataObject implements
}
return true;
}
- @Override
- @Column
- @Access(AccessType.PROPERTY)
- public String getDataURI() {
- return super.getDataURI();
- }
+
}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
index d7956e67b6..63ad7a8fb8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Require-Bundle: com.raytheon.edex.common,
org.apache.commons.logging,
javax.persistence,
javax.measure
-Import-Package: com.raytheon.uf.common.dataplugin.bufrssmi,
- com.raytheon.uf.common.pointdata,
+Import-Package: com.raytheon.uf.common.pointdata,
com.raytheon.uf.common.status,
com.raytheon.uf.edex.decodertools.time,
com.raytheon.uf.edex.pointdata
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java
index 0ca80165f9..0ff6dd03bb 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java
@@ -20,10 +20,7 @@
package com.raytheon.uf.common.dataplugin.bufrssmi;
import java.util.Calendar;
-import java.util.Collection;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@@ -31,15 +28,10 @@ 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.PluginDataObject;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -54,7 +46,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
import com.vividsolutions.jts.geom.Geometry;
/**
- * TODO Add Description
+ * PluginDataObject for Special Sensor Microwave/Imager data.
*
*
*
@@ -62,10 +54,13 @@ import com.vividsolutions.jts.geom.Geometry;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 18, 2009 jkorman Initial creation
- * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime
- * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
+ * Apr 04, 2013 1846 bkowal Added an index on refTime and
+ * forecastTime
+ * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -74,7 +69,8 @@ import com.vividsolutions.jts.geom.Geometry;
*/
@Entity
@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrssmiseq")
-@Table(name = "bufrssmi", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
+@Table(name = "bufrssmi", uniqueConstraints = { @UniqueConstraint(columnNames = {
+ "stationid", "refTime", "satId", "latitude", "longitude" }) })
/*
* Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used.
@@ -86,10 +82,8 @@ import com.vividsolutions.jts.geom.Geometry;
}
)
@DynamicSerialize
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
public class SSMIScanData extends PersistablePluginDataObject implements
- ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+ ISpatialEnabled, IPointData, IPersistable {
private static final long serialVersionUID = 1L;
@@ -100,28 +94,23 @@ public class SSMIScanData extends PersistablePluginDataObject implements
@Embedded
@DataURI(position = 2, embedded = true)
- @XmlElement
@DynamicSerializeElement
private SurfaceObsLocation location;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer orbitNumber;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer scanNumber;
- @XmlAttribute
@DynamicSerializeElement
@Transient
private Integer posNumber;
// The profiler observation time.
@Column
- @XmlAttribute
@DynamicSerializeElement
private Calendar timeObs;
@@ -132,7 +121,6 @@ public class SSMIScanData extends PersistablePluginDataObject implements
// Text of the WMO header
@Column(length = 32)
@DynamicSerializeElement
- @XmlElement
private String wmoHeader;
/**
@@ -293,11 +281,6 @@ public class SSMIScanData extends PersistablePluginDataObject implements
this.wmoHeader = wmoHeader;
}
- @Override
- public IDecoderGettable getDecoderGettable() {
- return null;
- }
-
@Override
public SurfaceObsLocation getSpatialObject() {
return location;
@@ -311,26 +294,6 @@ public class SSMIScanData extends PersistablePluginDataObject implements
this.location = location;
}
- @Override
- public String getString(String paramName) {
- return null;
- }
-
- @Override
- public String[] getStrings(String paramName) {
- return null;
- }
-
- @Override
- public Amount getValue(String paramName) {
- return null;
- }
-
- @Override
- public Collection getValues(String paramName) {
- return null;
- }
-
/**
*
*/
@@ -408,10 +371,4 @@ public class SSMIScanData extends PersistablePluginDataObject implements
return true;
}
- @Override
- @Column
- @Access(AccessType.PROPERTY)
- public String getDataURI() {
- return super.getDataURI();
- }
}
diff --git a/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java b/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
index 53d3e5060e..02a5b30c8c 100644
--- a/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
+++ b/edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
@@ -19,6 +19,8 @@
**/
package com.raytheon.uf.common.pointdata.spatial;
+import java.text.DecimalFormat;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.xml.bind.annotation.XmlAccessType;
@@ -51,7 +53,9 @@ import com.vividsolutions.jts.geom.Point;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 20071026 391 jkorman Initial Coding.
+ * Oct 26, 2007 391 jkorman Initial Coding.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -65,6 +69,16 @@ public class SurfaceObsLocation implements ISpatialObject, Cloneable {
private static final long serialVersionUID = 1L;
+ private static final ThreadLocal LATLON_FORMAT = new ThreadLocal(){
+
+ @Override
+ protected DecimalFormat initialValue() {
+ return new DecimalFormat(
+ "###.###");
+ }
+
+ };
+
// Elevation of this location in meters.
@XmlAttribute
@DynamicSerializeElement
@@ -184,6 +198,15 @@ public class SurfaceObsLocation implements ISpatialObject, Cloneable {
this.stationId = stationId;
}
+ /**
+ * Generate a stationId from the lat/lon values.
+ */
+ public void generateCoordinateStationId() {
+ DecimalFormat format = LATLON_FORMAT.get();
+ this.stationId = format.format(longitude) + ":"
+ + format.format(latitude);
+ }
+
/**
* Is this location a station lookup.
*
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/pointdata/bufrascatdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/pointdata/bufrascatdb.xml
index d715ac9e28..c916d20f09 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/pointdata/bufrascatdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/pointdata/bufrascatdb.xml
@@ -22,6 +22,6 @@
-
+
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/AScatDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/AScatDecoder.java
index 6d8cd92d15..9acbcf291d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/AScatDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/AScatDecoder.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.bufrascat.AScatObs;
import com.raytheon.uf.common.pointdata.PointDataDescription;
import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
@@ -35,14 +34,16 @@ import com.raytheon.uf.edex.plugin.bufrascat.decoder.AScatDataAdapter;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
- *
+ * Decoder for ascat data.
*
*
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Jan 21, 2009 1939 jkorman Initial creation
+ * Jan 21, 2009 1939 jkorman Initial creation
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -99,12 +100,6 @@ public class AScatDecoder extends AbstractBUFRDecoder {
if (ascatObs != null) {
ascatObs.setTraceId(traceId);
- try {
- ascatObs.constructDataURI();
- } catch (PluginException e) {
- logger.error(traceId + "- Unable to construct dataURI",
- e);
- }
decodedData.add(ascatObs);
}
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/decoder/AScatDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/decoder/AScatDataAdapter.java
index 5a782a2048..292a81bb32 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/decoder/AScatDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/src/com/raytheon/uf/edex/plugin/bufrascat/decoder/AScatDataAdapter.java
@@ -45,7 +45,9 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 20080303 969 jkorman Initial implementation.
+ * Mar 03, 2008 969 jkorman Initial implementation.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -135,6 +137,7 @@ public class AScatDataAdapter extends BUFRPointDataAdapter {
SurfaceObsLocation location = new SurfaceObsLocation();
location.assignLocation(lat, lon);
+ location.generateCoordinateStationId();
obsData.setLocation(location);
int rainFlag = getInt(dataList.get(10),
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/pointdata/bufrhdwdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/pointdata/bufrhdwdb.xml
index b1b0e8c772..d3b6acade1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/pointdata/bufrhdwdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/pointdata/bufrhdwdb.xml
@@ -22,5 +22,5 @@
-
+
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
index c3624ecce7..e650461481 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.bufrhdw.BufrHDWObs;
import com.raytheon.uf.common.dataplugin.bufrhdw.dao.BufrHDWObsDao;
import com.raytheon.uf.common.pointdata.PointDataDescription;
@@ -35,14 +34,16 @@ import com.raytheon.uf.edex.plugin.bufrhdw.decoder.HDWDataAdapter;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
- *
+ * Decoder for High Density Wind data.
*
*
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Jan 21, 2009 1939 jkorman Initial creation
+ * Jan 21, 2009 1939 jkorman Initial creation
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -92,12 +93,6 @@ public class HDWDecoder extends AbstractBUFRDecoder {
BufrHDWObs hdwObs = adapter.createData(iterator, wmoHeader);
if (hdwObs != null) {
hdwObs.setTraceId(traceId);
- try {
- hdwObs.constructDataURI();
- } catch (PluginException e) {
- logger.error(traceId
- + "- Unable to construct dataURI", e);
- }
decodedData.add(hdwObs);
}
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/decoder/HDWDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/decoder/HDWDataAdapter.java
index 90f27a7b5e..efb4b7fa05 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/decoder/HDWDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/decoder/HDWDataAdapter.java
@@ -46,7 +46,9 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 20080303 969 jkorman Initial implementation.
+ * Mar 03, 2008 969 jkorman Initial implementation.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -219,6 +221,7 @@ public class HDWDataAdapter extends BUFRPointDataAdapter {
SurfaceObsLocation location = new SurfaceObsLocation();
location.setLatitude(lat);
location.setLongitude(lon);
+ location.generateCoordinateStationId();
pointData.setLocation(location);
// ****************************************
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/pointdata/bufrmthdwdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/pointdata/bufrmthdwdb.xml
index b1b0e8c772..d3b6acade1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/pointdata/bufrmthdwdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/pointdata/bufrmthdwdb.xml
@@ -22,5 +22,5 @@
-
+
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
index 1862c90f9e..0773a1f9d6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
@@ -23,9 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import com.raytheon.edex.esb.Headers;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.bufrmthdw.BufrMTHDWObs;
import com.raytheon.uf.common.dataplugin.bufrmthdw.dao.BufrMTHDWObsDao;
import com.raytheon.uf.common.pointdata.PointDataDescription;
@@ -37,20 +35,22 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
- * TODO Add Description
+ * Decoder for MTSAT High Density Wind data.
*
*
- *
+ *
* SOFTWARE HISTORY
- *
+ *
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 26, 2010 jkorman Initial creation
- *
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
+ *
*
- *
+ *
* @author jkorman
- * @version 1.0
+ * @version 1.0
*/
public class MTHDWDecoder extends AbstractBUFRDecoder {
@@ -95,12 +95,6 @@ public class MTHDWDecoder extends AbstractBUFRDecoder {
BufrMTHDWObs hdwObs = adapter.createData(iterator, wmoHeader);
if (hdwObs != null) {
hdwObs.setTraceId(traceId);
- try {
- hdwObs.constructDataURI();
- } catch (PluginException e) {
- logger.error(traceId
- + "- Unable to construct dataURI", e);
- }
decodedData.add(hdwObs);
}
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/decoder/MTHDWDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/decoder/MTHDWDataAdapter.java
index 0643f727ed..d8cc115695 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/decoder/MTHDWDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/decoder/MTHDWDataAdapter.java
@@ -48,6 +48,8 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 26, 2010 jkorman Initial creation
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -224,6 +226,7 @@ public class MTHDWDataAdapter extends BUFRPointDataAdapter {
SurfaceObsLocation location = new SurfaceObsLocation();
location.setLatitude(lat);
location.setLongitude(lon);
+ location.generateCoordinateStationId();
pointData.setLocation(location);
// ****************************************
// Now pickup the rest of the data.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/pointdata/bufrssmidb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/pointdata/bufrssmidb.xml
index 951c84d20e..d25d6ebc30 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/pointdata/bufrssmidb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/pointdata/bufrssmidb.xml
@@ -21,6 +21,6 @@
-
+
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
index cdf4e49e2d..05a11d0d16 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.bufrssmi.SSMIScanData;
import com.raytheon.uf.common.dataplugin.bufrssmi.dao.SSMIScanDataDao;
import com.raytheon.uf.common.pointdata.PointDataDescription;
@@ -36,13 +35,16 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
*
+ * Decoder for Special Sensor Microwave/Imager data.
*
*
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Jan 21, 2009 1939 jkorman Initial creation
+ * Jan 21, 2009 1939 jkorman Initial creation
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -96,12 +98,6 @@ public class SSMIDecoder extends AbstractBUFRDecoder {
if (ssmiObs != null) {
for(SSMIScanData d : ssmiObs) {
d.setTraceId(traceId);
- try {
- d.constructDataURI();
- } catch (PluginException e) {
- logger.error(traceId
- + "- Unable to construct dataURI", e);
- }
decodedData.add(d);
}
} else {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
index 84964116fd..3ed5ec1706 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
@@ -49,8 +49,10 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 20080303 969 jkorman Initial implementation.
- * 20090706 2538 jsanchez Added latitude,longitude to point data.
+ * Mar 03, 2008 969 jkorman Initial implementation.
+ * Jul 06, 2009 2538 jsanchez Added latitude,longitude to point data.
+ * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot
+ * types.
*
*
*
@@ -305,6 +307,7 @@ public class SSMIDataAdapter extends BUFRPointDataAdapter {
SurfaceObsLocation location = new SurfaceObsLocation();
location.assignLocation(lat, lon);
+ location.generateCoordinateStationId();
pointData.setLocation(location);
setViewData("surfaceTag", view, locList.get(2));
int posNum = getInt(locList.get(3), -9999);