Issue #1869 Remove DataURI column from sat plot types.

Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: 0acecd7e4397543ca31c1bca719831fef8e65d95

cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java

@@ -157,12 +157,8 @@ public class PlotResourceData extends AbstractRequestableResourceData {
          * In the future if stationId can be set to anything that is even a
          * little unique we can get rid of this
          */
-        pluginProps.put("bufrssmi", new PluginPlotProperties(true, false));
         pluginProps.put("bufrquikscat", new PluginPlotProperties(true, false));
-        pluginProps.put("bufrascat", new PluginPlotProperties(true, false));
         pluginProps.put("radar", new PluginPlotProperties(true, false));
-        pluginProps.put("bufrhdw", new PluginPlotProperties(true, false));
-        pluginProps.put("bufrmthdw", new PluginPlotProperties(true, false));
         pluginProps.put("lsr", new PluginPlotProperties(true, false));
         pluginProps.put("tcg", new PluginPlotProperties(true, false));
         pluginProps.put("svrwx", new PluginPlotProperties(true, false));
@@ -190,7 +186,10 @@ public class PlotResourceData extends AbstractRequestableResourceData {
         pluginProps.put("bufrmosNGM", new PluginPlotProperties());
         pluginProps.put("ldadmesonet", new PluginPlotProperties());
         pluginProps.put("qc", new PluginPlotProperties());
-
+        pluginProps.put("bufrascat", new PluginPlotProperties());
+        pluginProps.put("bufrhdw", new PluginPlotProperties());
+        pluginProps.put("bufrmthdw", new PluginPlotProperties());
+        pluginProps.put("bufrssmi", new PluginPlotProperties());
 
         ParsedURL.registerHandler(new LocalizationParsedURLHandler());
     }

cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/ScatterometerPlotInfoRetriever.java

@@ -19,6 +19,7 @@
  **/
 package com.raytheon.viz.pointdata.rsc.retrieve;
 
+import java.util.Arrays;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -51,15 +52,17 @@ import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 
 /**
- * Abstract class for retrieving available products and returning them as
+ * Retrieves available PlotInfo objects for ascat asynchronously and in fixed
- * PlotInfo objects.
+ * size sets so they can be displayed during data retrieval.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 9, 2009            bsteffen     Initial creation
+ * Oct 09, 2009            bsteffen    Initial creation
+ * May 17, 2013 1869       bsteffen    Remove DataURI column from sat plot
+ *                                     types.
  * 
  * </pre>
  * 
@@ -106,6 +109,18 @@ public class ScatterometerPlotInfoRetriever extends PointDataPlotInfoRetriever {
 
     }
 
+    private static class ScatterometerPlotInfo extends PlotInfo {
+
+        public final int id;
+
+        public ScatterometerPlotInfo(PlotInfo pi, int id) {
+            super(pi.stationId, pi.latitude, pi.longitude, pi.dataTime,
+                    pi.dataURI);
+            this.id = id;
+        }
+
+    }
+
     @XmlTransient
     private Job job = new Job("Retrieving Scatterometer Locations") {
 
@@ -139,7 +154,7 @@ public class ScatterometerPlotInfoRetriever extends PointDataPlotInfoRetriever {
                     }
                     if (stations != null && stations.size() == MAX_RESULT_SIZE) {
                         for (PlotInfo station : stations) {
-                            int id = Integer.parseInt(station.stationId);
+                            int id = ((ScatterometerPlotInfo) station).id;
                             if (id < request.maxId) {
                                 request.maxId = id;
                             }
@@ -192,6 +207,11 @@ public class ScatterometerPlotInfoRetriever extends PointDataPlotInfoRetriever {
     @XmlTransient
     private Deque<Request> backgroundQueue = new LinkedList<Request>();
 
+    public ScatterometerPlotInfoRetriever() {
+        needsDataUri = false;
+        onlyRefTime = true;
+    }
+
     @Override
     protected void addColumns(DbQuery dq) {
         dq.setMaxResults(MAX_RESULT_SIZE);
@@ -209,8 +229,8 @@ public class ScatterometerPlotInfoRetriever extends PointDataPlotInfoRetriever {
      */
     @Override
     protected PlotInfo getPlotInfo(Object[] data) {
-        PlotInfo info = super.getPlotInfo(data);
+        PlotInfo info = super.getPlotInfo(Arrays.copyOf(data, data.length - 1));
-        info.stationId = data[data.length - 1].toString();
+        info = new ScatterometerPlotInfo(info, (Integer) data[data.length - 1]);
         return info;
     }
 

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml

@@ -261,13 +261,11 @@
 		<contribute xsi:type="bundleItem" file="bundles/SSMIWindPlot.xml" 
                menuText="SSM/I Wind Speeds" id="SSMIDataLine"
                productInterval="3600" productOffset="1800">
-	        <dataURI>/bufrssmi/%</dataURI>
 	        <substitute key="svg" value="ssmiWindPlotDesign.svg"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
                menuText="SSM/I Precip. Water" id="SSMIDataLine"
                productInterval="3600" productOffset="1800">
-	        <dataURI>/bufrssmi/%</dataURI>
 	        <substitute key="svg" value="ssmiPWPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Precipitable Water (kg/m**2)"/>
 	        <substitute key="offset" value="1800"/>
@@ -275,7 +273,6 @@
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
                menuText="SSM/I Sea Temperature" id="SSMIDataLine"
                productInterval="3600" productOffset="1800">
-	        <dataURI>/bufrssmi/%</dataURI>
 	        <substitute key="svg" value="ssmiSTPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Sea Temperature (C)"/>
 	        <substitute key="offset" value="1800"/>
@@ -283,7 +280,6 @@
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
                menuText="SSM/I VIL" id="SSMIDataLine"
                productInterval="3600" productOffset="1800">
-	        <dataURI>/bufrssmi/%</dataURI>
 	        <substitute key="svg" value="ssmiVILPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Vert. Integ. Water (kg/(m**2))"/>
 	        <substitute key="offset" value="1800"/>
@@ -292,7 +288,6 @@
        <contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
                menuText="GOES Sounding Availability" id="goesSoundingAvailability"
                productInterval="3600" productOffset="1800">
-        <dataURI>/goessounding/%</dataURI>
         <substitute key="pluginName" value="goessounding"/>
         <substitute key="plotSource" value="GOES Sounding Availability"/>
         <substitute key="offset" value="1800"/>
@@ -300,7 +295,6 @@
 	<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
                menuText="POES Sounding Availability" id="poesSoundingAvailability"
                productInterval="3600" productOffset="1800">
-        <dataURI>/poessounding/%</dataURI>
         <substitute key="pluginName" value="poessounding"/>
         <substitute key="plotSource" value="POES Sounding Availability"/>
         <substitute key="offset" value="1800"/>

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml

@@ -21,7 +21,6 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		   	<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                         menuText="Blended Rain Rate" id="rainfallRate">
-	                <dataURI>/satellite/%/NESDIS/POES-NPOESS/Supernational/Rain_fall_rate</dataURI>
 	                <substitute key="element" value="Rain fall rate"/>
 	                <substitute key="entity" value="POES-NPOESS"/>
 	                <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
@@ -30,42 +29,36 @@
             id="GOESLine"/>
     	<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Lifted Index" id="liftedIndex">
-	        <dataURI>/satellite/%/NESDIS/Composite/Supernational/Sounder_Based_Derived_Lifted_Index_(LI)</dataURI>
 	        <substitute key="element" value="Sounder Based Derived Lifted Index (LI)"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Lifted Index/Lifted Index Default"/>
 	    </contribute>
         <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Total Precip Water" id="totalPrecipWater">
-	        <dataURI>/satellite/%/NESDIS/Composite/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW)</dataURI>
 	        <substitute key="element" value="Sounder Based Derived Precipitable Water (PW)"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Precip Water/Precip Water Default"/>
 	    </contribute>
         <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Amount" id="cloud Amount">
-	        <dataURI>/satellite/%/NESDIS/Composite/Supernational/Gridded_Cloud_Amount</dataURI>
 	        <substitute key="element" value="Gridded Cloud Amount"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Cloud Amount Default"/>
 	    </contribute>
         <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Cloud Top Height" id="cloudTopHeight">
-	        <dataURI>/satellite/%/NESDIS/Composite/Supernational/Gridded_Cloud_Top_Pressure_or_Height</dataURI>
 	        <substitute key="element" value="Gridded Cloud Top Pressure or Height"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Cloud Top Height"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Skin Temperature" id="skinTemp">
-	        <dataURI>/satellite/%/NESDIS/Composite/Supernational/Sounder_Based_Derived_Surface_Skin_Temp_(SFC_Skin)</dataURI>
 	        <substitute key="element" value="Sounder Based Derived Surface Skin Temp (SFC Skin)"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Skin Temp/Skin Temp Default"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml"
 			menuText="Low Cloud Base" id="lowCloudBase">
-			<dataURI>/satellite/%/NESDIS/GOES%/%/Low_cloud_base_imagery</dataURI>
 			<substitute key="element" value="Low cloud base imagery" />
 			<substitute key="sector0" value="West CONUS" />
 			<substitute key="sector1" value="East CONUS" />
@@ -75,7 +68,6 @@
 	    <contribute xsi:type="titleItem" titleText="------ DMSP SSM/I ------" id="DMSPLine"/>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Total Precip Water" id="totalPrecipWater">
-	        <dataURI>/satellite/%/NESDIS/DMSP/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW)</dataURI>
 	        <substitute key="element" value="Sounder Based Derived Precipitable Water (PW)"/>
 	        <substitute key="entity" value="DMSP"/>
 	        <substitute key="colormap" value="Sat/Precip Water/Precip Water - Polar)"/>
@@ -83,7 +75,6 @@
 	    <contribute xsi:type="titleItem" titleText="------ POES AMSU ------" id="POESAMSULine"/>
 		<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Total Precip Water" id="totalPrecipWater">
-	        <dataURI>/satellite/%/NESDIS/POES-NPOESS/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW)</dataURI>
 	        <substitute key="element" value="Sounder Based Derived Precipitable Water (PW)"/>
 	        <substitute key="entity" value="POES-NPOESS"/>
 	        <substitute key="colormap" value="Sat/Precip Water/Precip Water - Polar)"/>
@@ -92,14 +83,12 @@
 					titleText="------ AMSU and SSM/I + GPS ------" id="blendedofAMSUAndSSMIDataLine"/>
 			<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Blended Total Precip Water" id="blendedTotalPrecipWater">
-		        <dataURI>/satellite/%/NESDIS/Miscellaneous/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW)</dataURI>
 		    	<substitute key="element" value="Sounder Based Derived Precipitable Water (PW)"/>
 		        <substitute key="entity" value="Miscellaneous"/>
 		        <substitute key="colormap" value="Sat/Precip Water/Blended Total Precip Water"/>
 		    </contribute>
 			<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Percent of Normal TPW" id="percentofNormalTPW">
-		        <dataURI>/satellite/%/NESDIS/Miscellaneous/Supernational/Percent_of_Normal_TPW</dataURI>
 		        <substitute key="element" value="Percent of Normal TPW"/>
 		        <substitute key="entity" value="Miscellaneous"/>
 		        <substitute key="colormap" value="Sat/Precip Water/Percent of Normal TPW"/>

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml

@@ -24,25 +24,21 @@
 		   titleText="------ 4 Sat Composite ------" id="NHLine"/>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="IR Window" id="irWindow">
-        <dataURI>/satellite/%/NESDIS/Composite/NH_Composite_-_Meteosat-GOES_E-GOES_W-GMS/Imager_11_micron_IR</dataURI>
         <substitute key="element" value="Imager 11 micron IR"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Water Vapor" id="waterVapor">
-        <dataURI>/satellite/%/NESDIS/Composite/NH_Composite_-_Meteosat-GOES_E-GOES_W-GMS/Imager_6.7-6.5_micron_IR_(WV)</dataURI>
         <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
         <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                 menuText="Visible" id="visible">
-        <dataURI>/satellite/%/NESDIS/Composite/NH_Composite_-_Meteosat-GOES_E-GOES_W-GMS/Imager_Visible</dataURI>
         <substitute key="element" value="Imager Visible"/>
         <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DerivedSatellite.xml"
                 menuText="WV/IR" id="WV/IR">
-        <dataURI>/satellite/%/NESDIS/Composite/NH_Composite_-_Meteosat-GOES_E-GOES_W-GMS/Imager_6.7-6.5_micron_IR_(WV)</dataURI>
         <substitute key="element" value="satDivWVIR"/>
         <substitute key="colormap" value="Sat/IR/IR WV"/>
     </contribute> 

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml

@@ -24,49 +24,41 @@
 		   titleText="------ NH/NA/US every image------" id="NHLine"/>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml" 
                 menuText="IR Window" id="irWindow">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_11_micron_IR</dataURI>
         <substitute key="element" value="Imager 11 micron IR"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml" 
                 menuText="Water Vapor" id="waterVapor">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_6.7-6.5_micron_IR_(WV)</dataURI>
         <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
         <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml" 
                 menuText="Visible" id="visible">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_Visible</dataURI>
         <substitute key="element" value="Imager Visible"/>
         <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="3.9u" id="3.9u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_3.9_micron_IR</dataURI>
         <substitute key="element" value="Imager 3.9 micron IR"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="13u" id="13u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_13_micron_(IR)</dataURI>
         <substitute key="element" value="Imager 13 micron (IR)"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml" 
                 menuText="11u-3.9u" id="11-3.9u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_3.9_micron_IR</dataURI>
         <substitute key="element" value="satDif11u3_9uIR"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
 	<contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml"
                 menuText="11u-13u" id="11u-13u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_13_micron_(IR)</dataURI>
         <substitute key="element" value="satDif11u13uIR"/>
         <substitute key="colormap" value="Grid/gridded data"/>
     </contribute> 
 	<contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml"
                 menuText="WV/IR" id="WV/IR">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_6.7-6.5_micron_IR_(WV)</dataURI>
         <substitute key="element" value="satDivWVIR"/>
         <substitute key="colormap" value="Sat/IR/IR WV"/>
     </contribute> 

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml

@@ -21,7 +21,6 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		   	<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
                         menuText="Blended Rain Rate" id="rainfallRate">
-	                <dataURI>/satellite/%/NESDIS/POES-NPOESS/Supernational/Rain_fall_rate</dataURI>
 	                <substitute key="element" value="Rain fall rate"/>
 	                <substitute key="entity" value="POES-NPOESS"/>
 	                <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
@@ -31,14 +30,12 @@
 					
 			<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Blended Total Precip Water" id="blendedTotalPrecipWater">
-		        <dataURI>/satellite/%/NESDIS/Miscellaneous/Supernational/Sounder_Based_Derived_Precipitable_Water_(PW)</dataURI>
 		    	<substitute key="element" value="Sounder Based Derived Precipitable Water (PW)"/>
 		        <substitute key="entity" value="Miscellaneous"/>
 		        <substitute key="colormap" value="Sat/Precip Water/Blended Total Precip Water"/>
 		    </contribute>
 			<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Percent of Normal TPW" id="percentofNormalTPW">
-		        <dataURI>/satellite/%/NESDIS/Miscellaneous/Supernational/Percent_of_Normal_TPW</dataURI>
 		        <substitute key="element" value="Percent of Normal TPW"/>
 		        <substitute key="entity" value="Miscellaneous"/>
 		        <substitute key="colormap" value="Sat/Precip Water/Percent of Normal TPW"/>

cave/com.raytheon.viz.satellite/localization/menus/satellite/basePOESImagery.xml

@@ -23,21 +23,16 @@
 			titleText="------ POES Imagery ------" id="POESLine"/>		
 	    <contribute xsi:type="bundleItem" file="bundles/POESSatellite.xml" 
                menuText="IR Window" id="irWindow">
-	        <dataURI>/satellite/%/NESDIS/NOAA18/%/Polar_IR</dataURI>
 	        <substitute key="element" value="Polar IR"/>	
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/POESSatellite.xml" 
                menuText="Visible" id="visible">
-	        <dataURI>/satellite/%/NESDIS/NOAA18/%/Polar_Vis</dataURI>
 	        <substitute key="element" value="Polar Vis"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/POESSatellite.xml" 
                 menuText="3.7u" id="3.7u">
-        	<dataURI>/satellite/%/NESDIS/NOAA18/%/Polar_3.7u</dataURI>
         	<substitute key="element" value="Polar 3.7u"/>
     	</contribute>
     	<contribute xsi:type="bundleItem" file="bundles/DerivedPOESSatellite.xml" 
-                menuText="11-3.7u" id="11-3.7u">
+                menuText="11-3.7u" id="11-3.7u" />
-        	<dataURI>/satellite/%/NESDIS/NOAA18/%/Polar_IR</dataURI>
-    	</contribute>
 </menuTemplate>

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml

@@ -39,19 +39,16 @@
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="3.9u" id="3.9u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_3.9_micron_IR</dataURI>
         <substitute key="element" value="Imager 3.9 micron IR"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="13u" id="13u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_13_micron_(IR)</dataURI>
         <substitute key="element" value="Imager 13 micron (IR)"/>
         <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
     </contribute>
     <contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml" 
                 menuText="11u-3.9u" id="11-3.9u">
-        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_3.9_micron_IR</dataURI>
         <substitute key="element" value="satDif11u3_9uIR"/>
         <substitute key="colormap" value="Sat/VIS/CA (Low Light Vis)"/>
     </contribute>

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml

@@ -25,49 +25,41 @@
 			titleText="------ GE and GW CONUS Sounder Imagery ------" id="SounderLine"/>
         <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="IR Window" id="irWindow">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_11.03_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 11.03 micron imagery"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="Water Vapor (6.5u)" id="waterVapor6.5u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_6.51_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 6.51 micron imagery"/>
 	        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="Water Vapor (7.0u)" id="waterVapor7.0u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_7.02_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 7.02 micron imagery"/>
 	        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 	    </contribute>
         <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
                 menuText="Water Vapor (7.4u)" id="waterVapor7.4u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_7.43_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 7.43 micron imagery"/>
 	        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="Visible" id="visible">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_Visible_imagery</dataURI>
 	        <substitute key="element" value="Sounder Visible imagery"/>
 	        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="4.0u" id="4.0u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_3.98_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 3.98 micron imagery"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="4.5u" id="4.5u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_4.45_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 4.45 micron imagery"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
 	                menuText="14.1u" id="14.1u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Sounder_14.06_micron_imagery</dataURI>
 	        <substitute key="element" value="Sounder 14.06 micron imagery"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>
@@ -77,56 +69,48 @@
 		<contribute xsi:type="subMenu" menuText="N. Atlantic and Gulf of Mexico">
 	        <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="IR Window" id="irWindow">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_Regional/Imager_11_micron_IR</dataURI>
 		        <substitute key="element" value="Imager 11 micron IR"/>
 		        <substitute key="sector" value="Puerto Rico Regional"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="Water Vapor (6.5u)" id="waterVapor6.5u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_6.51_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 6.51 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
 		                menuText="Water Vapor (7.0u)" id="waterVapor7.0u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_7.02_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 7.02 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 	        <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Water Vapor (7.4u)" id="waterVapor7.4u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_7.43_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 7.43 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="Visible" id="visible">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_Regional/Imager_Visible</dataURI>
 		        <substitute key="element" value="Imager Visible"/>
 		        <substitute key="sector" value="Puerto Rico Regional"/>
 		        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
 		                menuText="4.0u" id="4.0u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_3.98_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 3.98 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="4.5u" id="4.5u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_4.45_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 4.45 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="14.1u" id="14.1u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Puerto_Rico_National/Sounder_14.06_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 14.06 micron imagery"/>
 		        <substitute key="sector" value="Puerto Rico National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
@@ -135,56 +119,48 @@
 	    <contribute xsi:type="subMenu" menuText="N. Pacific">
 	        <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="IR Window" id="irWindow">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_Regional/Imager_11_micron_IR</dataURI>
 		        <substitute key="element" value="Imager 11 micron IR"/>
 		        <substitute key="sector" value="Hawaii Regional"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="Water Vapor (6.5u)" id="waterVapor6.5u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_6.51_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 6.51 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
 		                menuText="Water Vapor (7.0u)" id="waterVapor7.0u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_7.02_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 7.02 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 	        <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Water Vapor (7.4u)" id="waterVapor7.4u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_7.43_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 7.43 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="Visible" id="visible">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_Regional/Imager_Visible</dataURI>
 		        <substitute key="element" value="Imager Visible"/>
 		        <substitute key="sector" value="Hawaii Regional"/>
 		        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
 		                menuText="4.0u" id="4.0u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_3.98_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 3.98 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="4.5u" id="4.5u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_4.45_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 4.45 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 		    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 		                menuText="14.1u" id="14.1u">
-		        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii_National/Sounder_14.06_micron_imagery</dataURI>
 		        <substitute key="element" value="Sounder 14.06 micron imagery"/>
 		        <substitute key="sector" value="Hawaii National"/>
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>

cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml

@@ -21,25 +21,21 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml" 
 	                menuText="IR Window" id="irWindow">
-	        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii%/Imager_11_micron_IR</dataURI>
 	        <substitute key="element" value="Imager 11 micron IR"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"  
                 menuText="Water Vapor" id="waterVapor">
-	        <dataURI>/satellite/%/NESDIS/GOES%/Hawaii%/Imager_6.7-6.5_micron_IR_(WV)</dataURI>
 	        <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
 	        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
     	</contribute>
     	<contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"  
                 menuText="Visible" id="visible">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_Visible</dataURI>
 	        <substitute key="element" value="Imager Visible"/>      
 	        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"  
                 menuText="13u" id="13u">
-	        <dataURI>/satellite/%/NESDIS/GOES%/%/Imager_13_micron_(IR)</dataURI>
 	        <substitute key="element" value="Imager 13 micron (IR)"/>
 	        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 	    </contribute>

deltaScripts/13.5.1/dropDataURI.sh

@@ -35,8 +35,11 @@ function dropDatauriAndAddConstraint {
 
 echo "INFO: Dropping dataURI columns."
 
+# GFE already has constraints right so just drop the column and vaccuum
 dropDatauri gfe
 ${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE gfe"
+
+# Remap the constraints for these type
 dropDatauriAndAddConstraint bufrmosavn bufrmosavn_location_id_reftime_forecasttime_key "(location_id, reftime, forecasttime)"
 dropDatauriAndAddConstraint bufrmoshpc bufrmoshpc_location_id_reftime_forecasttime_key "(location_id, reftime, forecasttime)"
 dropDatauriAndAddConstraint goessounding goessounding_stationid_reftime_latitude_longitude_key "(stationid, reftime, latitude, longitude)"
@@ -44,4 +47,15 @@ dropDatauriAndAddConstraint poessounding poessounding_stationid_reftime_latitude
 dropDatauriAndAddConstraint ldadmesonet ldadmesonet_stationid_reftime_reportType_dataProvider_latitude_longitude_key "(stationid, reftime, reportType, dataProvider, latitude, longitude)"
 dropDatauriAndAddConstraint qc qc_stationid_reftime_qctype_latitude_longitude_key "(stationid, reftime, qcType, latitude, longitude)"
 
+# These type need a unique stationid so set one before dropping datauri.
+${PSQL} -U awips -d metadata -c "update bufrascat set stationid = to_char(longitude, 'FM999.999') || ':' || to_char(latitude, 'FM999.999')"
+dropDatauriAndAddConstraint bufrascat bufrascat_stationid_reftime_satid_latitude_longitude_key "(stationid, reftime, satid, latitude, longitude)"
+${PSQL} -U awips -d metadata -c "update bufrssmi set stationid = to_char(longitude, 'FM999.999') || ':' || to_char(latitude, 'FM999.999')"
+dropDatauriAndAddConstraint bufrssmi bufrssmi_stationid_reftime_satid_latitude_longitude_key "(stationid, reftime, satid, latitude, longitude)"
+${PSQL} -U awips -d metadata -c "update bufrhdw set stationid = to_char(longitude, 'FM999.999') || ':' || to_char(latitude, 'FM999.999')"
+dropDatauriAndAddConstraint bufrhdw bufrhdw_stationid_reftime_sattype_pressure_latitude_longitude_key "(stationid, reftime, sattype, pressure, latitude, longitude)"
+${PSQL} -U awips -d metadata -c "update bufrmthdw set stationid = to_char(longitude, 'FM999.999') || ':' || to_char(latitude, 'FM999.999')"
+dropDatauriAndAddConstraint bufrmthdw bufrmthdw_stationid_reftime_sattype_pressure_latitude_longitude_key "(stationid, reftime, sattype, pressure, latitude, longitude)"
+
+
 echo "INFO: dataURI columns dropped successfully"

edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/src/com/raytheon/uf/common/dataplugin/bufrascat/AScatObs.java

@@ -20,10 +20,7 @@
 package com.raytheon.uf.common.dataplugin.bufrascat;
 
 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;
@@ -54,18 +45,21 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.vividsolutions.jts.geom.Geometry;
 
 /**
- * TODO Add Description
+ * PluginDataObject for ascat data.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 18, 2009       2624 jkorman     Initial creation
+ * Jun 18, 2009 2624       jkorman     Initial creation
- * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * 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.
  * 
  * </pre>
  * 
@@ -74,7 +68,8 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrascatseq")
-@Table(name = "bufrascat", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
+@Table(name = "bufrascat", uniqueConstraints = { @UniqueConstraint(columnNames = {
+        "stationid", "refTime", "satId", "latitude", "longitude" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -85,11 +80,9 @@ import com.vividsolutions.jts.geom.Geometry;
 				@Index(name = "bufrascat_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class AScatObs extends PersistablePluginDataObject implements
-		ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+        ISpatialEnabled, IPointData, IPersistable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -98,49 +91,40 @@ public class AScatObs extends PersistablePluginDataObject implements
 	private PointDataView pointDataView;
 
 	@DataURI(position = 1)
-	@XmlAttribute
 	@DynamicSerializeElement
 	private Integer satId;
 
 	@Embedded
 	@DataURI(position = 2, embedded = true)
-	@XmlElement
 	@DynamicSerializeElement
 	private SurfaceObsLocation location;
 
 	// Text of the WMO header
 	@Column(length = 32)
 	@DynamicSerializeElement
-	@XmlElement
 	private String wmoHeader;
 
-	@XmlAttribute
 	@DynamicSerializeElement
 	@Transient
 	private Integer orbitNumber;
 
 	// The observation time.
-	@XmlAttribute
 	@DynamicSerializeElement
 	@Transient
 	private Calendar validTime;
 
-	@XmlAttribute
 	@DynamicSerializeElement
 	@Transient
 	private Double windDir;
 
 	@DataURI(position = 3)
-	@XmlAttribute
 	@DynamicSerializeElement
 	private Float windSpd;
 
-	@XmlAttribute
 	@DynamicSerializeElement
 	@Transient
 	private Double probRain;
 
-	@XmlAttribute
 	@DynamicSerializeElement
 	@Transient
 	private Integer rainIndex;
@@ -348,36 +332,11 @@ public class AScatObs extends PersistablePluginDataObject implements
 		validTime = time;
 	}
 
-	@Override
-	public IDecoderGettable getDecoderGettable() {
-		return null;
-	}
-
 	@Override
 	public ISpatialObject getSpatialObject() {
 		return 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<Amount> getValues(String paramName) {
-		return null;
-	}
-
 	/**
      * 
      */
@@ -393,10 +352,5 @@ public class AScatObs extends PersistablePluginDataObject implements
 	public void setPointDataView(PointDataView pointDataView) {
 		this.pointDataView = pointDataView;
 	}
-    @Override
+
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
 }

edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/BufrHDWObs.java

@@ -20,10 +20,7 @@
 package com.raytheon.uf.common.dataplugin.bufrhdw;
 
 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 high density winds data.
  * 
  * <pre>
  * 
@@ -61,10 +52,13 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 18, 2009            jkorman     Initial creation
- * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * 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.
  * 
  * </pre>
  * 
@@ -73,7 +67,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrhdwseq")
-@Table(name = "bufrhdw", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
+@Table(name = "bufrhdw", 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 = "bufrhdw_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
 		}
 )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BufrHDWObs 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 BufrHDWObs 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 BufrHDWObs extends PersistablePluginDataObject implements
 		validTime = time;
 	}
 
-	@Override
-	public IDecoderGettable getDecoderGettable() {
-		return null;
-	}
-
 	/**
 	 * @return the satType
 	 */
@@ -601,26 +566,6 @@ public class BufrHDWObs 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<Amount> 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();
-    }
 }

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.
  * 
  * <pre>
  * 
@@ -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 04, 2013 1846       bkowal      Added an index on refTime and
- * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
+ *                                     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.
  * 
  * </pre>
  * 
@@ -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<Amount> 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();
-    }
 }

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,
+Import-Package: com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.status,
  com.raytheon.uf.edex.decodertools.time,
  com.raytheon.uf.edex.pointdata

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.
  * 
  * <pre>
  * 
@@ -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 04, 2013 1846       bkowal      Added an index on refTime and
- * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
+ *                                     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.
  * 
  * </pre>
  * 
@@ -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<Amount> 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();
-    }
 }

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.
  * 
  * </pre>
  * 
@@ -65,6 +69,16 @@ public class SurfaceObsLocation implements ISpatialObject, Cloneable {
 
     private static final long serialVersionUID = 1L;
 
+    private static final ThreadLocal<DecimalFormat> LATLON_FORMAT = new ThreadLocal<DecimalFormat>(){
+
+        @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.
      * 

edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/pointdata/bufrascatdb.xml

@@ -22,6 +22,6 @@
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
   <parameter name="windSpd" queryName="windSpd" type="FLOAT" unit="m/s" fillValue="-9999"/>
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
   <parameter name="satelliteID" queryName="satId" type="INT" />
 </pointDataDbDescription>

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.
  * 
  * <pre>
  * 
  * 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.
  * 
  * </pre>
  * 
@@ -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);
                 }
             }

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.
  * 
  * </pre>
  * 
@@ -135,6 +137,7 @@ public class AScatDataAdapter extends BUFRPointDataAdapter<AScatObs> {
 
                     SurfaceObsLocation location = new SurfaceObsLocation();
                     location.assignLocation(lat, lon);
+                    location.generateCoordinateStationId();
                     obsData.setLocation(location);
 
                     int rainFlag = getInt(dataList.get(10),

edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/pointdata/bufrhdwdb.xml

@@ -22,5 +22,5 @@
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
   <parameter name="pressure" queryName="pressure" type="FLOAT" unit="Pa" />
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
 </pointDataDbDescription>

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.
  * 
  * <pre>
  * 
  * 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.
  * 
  * </pre>
  * 
@@ -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);
                 }
             }

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.
  * 
  * </pre>
  * 
@@ -219,6 +221,7 @@ public class HDWDataAdapter extends BUFRPointDataAdapter<BufrHDWObs> {
             SurfaceObsLocation location = new SurfaceObsLocation();
             location.setLatitude(lat);
             location.setLongitude(lon);
+            location.generateCoordinateStationId();
             pointData.setLocation(location);
 
             // ****************************************

edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/pointdata/bufrmthdwdb.xml

@@ -22,5 +22,5 @@
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
   <parameter name="pressure" queryName="pressure" type="FLOAT" unit="Pa" />
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
 </pointDataDbDescription>

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.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 26, 2010            jkorman     Initial creation
- *
+ * May 17, 2013 1869       bsteffen    Remove DataURI column from sat plot
+ *                                     types.
+ * 
  * </pre>
- *
+ * 
  * @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);
                 }
             }

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.
  * 
  * </pre>
  * 
@@ -224,6 +226,7 @@ public class MTHDWDataAdapter extends BUFRPointDataAdapter<BufrMTHDWObs> {
             SurfaceObsLocation location = new SurfaceObsLocation();
             location.setLatitude(lat);
             location.setLongitude(lon);
+            location.generateCoordinateStationId();
             pointData.setLocation(location);
             // ****************************************
             // Now pickup the rest of the data.

edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/pointdata/bufrssmidb.xml

@@ -21,6 +21,6 @@
 <pointDataDbDescription>
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
   <parameter name="satelliteID" queryName="satId" type="INT" />
 </pointDataDbDescription>

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.
  * 
  * <pre>
  * 
  * 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.
  * 
  * </pre>
  * 
@@ -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 {

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.
+ * Mar 03, 2008 969        jkorman     Initial implementation.
- * 20090706           2538 jsanchez    Added latitude,longitude to point data.
+ * Jul 06, 2009 2538       jsanchez    Added latitude,longitude to point data.
+ * May 17, 2013 1869       bsteffen    Remove DataURI column from sat plot
+ *                                     types.
  * 
  * </pre>
  * 
@@ -305,6 +307,7 @@ public class SSMIDataAdapter extends BUFRPointDataAdapter<SSMIScanData> {
 
                     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);