Merge "Omaha #3410 removed duplicate fields from hdf5" into omaha_14.4.1

Former-commit-id: f3142d341c [formerly 7c71a9a7e57af9731310df2ceb0494f3f79adb89]
Former-commit-id: 6df1004c0d

edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/pointdata/lsr.xml

@@ -23,10 +23,7 @@
 -->
 <pointDataDescription>
   <parameter name="timeObs" numDims="1" type="LONG" />
-  <parameter name="latitude" numDims="1" type="FLOAT" unit="degree_N" />
-  <parameter name="longitude" numDims="1" type="FLOAT" unit="degree_E" />
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="dataURI" numDims="1" type="STRING" />
   <parameter name="eventType" numDims="1" type="INT" />
   <parameter name="eventUnit" numDims="1" type="STRING" />
   <parameter name="magnitude" numDims="1" type="FLOAT" />

edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/pointdata/lsrdb.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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" />
+</pointDataDbDescription>

edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/decoder/LSRParser.java

@@ -59,6 +59,7 @@ import com.raytheon.uf.edex.plugin.lsr.LocalStormReportDao;
  * Jan 13, 2013 2581       njensen     Improved error handling and logging
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
  * Jul 23, 2014 3410       bclement    location changed to floats
+ * Jul 30, 2014 3410       bclement    lat, lon and data uri moved to database point data desc
  * 
  * </pre>
  * 
@@ -240,8 +241,6 @@ public class LSRParser {
                 PointDataView view = pdc.append();
                 view.setLong("timeObs", report.getDataTime()
                         .getRefTimeAsCalendar().getTimeInMillis());
-                view.setFloat("latitude", (float) report.getLatitude());
-                view.setFloat("longitude", (float) report.getLongitude());
                 view.setString("wmoHeader", report.getWmoHeader());
 
                 view.setInt("eventType", report.getEventType().getValue());
@@ -256,8 +255,6 @@ public class LSRParser {
                 view.setInt("injuries", report.getInjuries());
                 view.setInt("fatalities", report.getFatalities());
 
-                view.setString("dataURI", report.getDataURI());
-
                 report.setPointDataView(view);
             }
         }

edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwx.xml

@@ -22,10 +22,7 @@
     SvrWx
 -->
 <pointDataDescription>
-  <parameter name="latitude" numDims="1" type="FLOAT" unit="degree_N" />
-  <parameter name="longitude" numDims="1" type="FLOAT" unit="degree_E" />
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="dataURI" numDims="1" type="STRING" /> 
   <parameter name="eventKey" numDims="1" type="STRING" />
   <parameter name="details" numDims="1" type="STRING" />
   <parameter name="greenTime" numDims="1" type="STRING" />

edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwxdb.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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" />
+</pointDataDbDescription>

edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java

@@ -58,6 +58,7 @@ import com.raytheon.uf.edex.plugin.svrwx.SvrWxRecordDao;
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed pluginName
  * Jun 25, 2014 3008       nabowle     Refactor for EventReport type
  * Jul 23, 2014 3410       bclement    location changed to floats
+ * Jul 30, 2014 3410       bclement    lat, lon and data uri moved to database point data desc
  * 
  * </pre>
  * 
@@ -198,10 +199,7 @@ public class SvrWxParser {
                 // Populate the point data.
                 PointDataView view = pdc.append();
 
-                view.setFloat("latitude", (float) report.getLatitude());
-                view.setFloat("longitude", (float) report.getLongitude());
                 view.setString("wmoHeader", report.getWmoHeader());
-                view.setString("dataURI", report.getDataURI());
                 view.setString("eventKey", report.getEventKey());
                 view.setString("details", report.getDetails());
                 view.setString("greenTime", report.getGreenTime());

edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcg.xml

@@ -23,10 +23,7 @@
 -->
 <pointDataDescription>
   <parameter name="validTime" numDims="1" type="LONG" />
-  <parameter name="latitude" numDims="1" type="FLOAT" unit="degree_N" />
-  <parameter name="longitude" numDims="1" type="FLOAT" unit="degree_E" />
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="dataURI" numDims="1" type="STRING" />
   
   <parameter name="stormType" numDims="1" type="STRING" />
   <parameter name="stormName" numDims="1" type="STRING" />

edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcgdb.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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" />
+</pointDataDbDescription>

edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java

@@ -53,6 +53,7 @@ import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
  *                                      handles time zones.
  * May 14, 2014 2536       bclement     moved WMO Header to common, removed constructDataURI() call
  * Jun 24, 2014 3235       nabowle      Switch to slf4j.
+ * Jul 30, 2014 3410       bclement     lat, lon and data uri moved to database point data desc
  * 
  * </pre>
  * 
@@ -185,10 +186,7 @@ public abstract class TCGDataAdapter {
                 PointDataView view = pdc.append();
                 view.setLong("validTime", report.getDataTime().getValidTime()
                         .getTimeInMillis());
-                view.setFloat("latitude", (float) report.getLatitude());
-                view.setFloat("longitude", (float) report.getLongitude());
                 view.setString("wmoHeader", report.getWmoHeader());
-                view.setString("dataURI", report.getDataURI());
 
                 view.setString("stormType", report.getType().toString());
                 view.setString("stormName", report.getStormName());

edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcs.xml

@@ -23,7 +23,6 @@
 -->
 <pointDataDescription>
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="dataURI" numDims="1" type="STRING" />
   <parameter name="productType" numDims="1" type="STRING" />
   <parameter name="name" numDims="1" type="STRING" />
   <parameter name="pressure" numDims="1" type="INT" unit="mbar"/>

edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcsdb.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pointDataDbDescription>
+  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+</pointDataDbDescription>

edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java

@@ -55,6 +55,7 @@ import com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao;
  * Jun 23, 2014 3272       nabowle      Throw UnrecognizedDataException in
  *                                      {@link #getDecodedData()} if there were
  *                                      no reports. Switch to slf4j.
+ * Jul 30, 2014 3410       bclement     data uri moved to database point data desc
  * 
  * </pre>
  * 
@@ -145,7 +146,6 @@ public abstract class TCSDataAdapter implements TCSConstants {
                     headReport = report;
                     view = getContainer(report).append();
                     view.setString(WMO_HEADER, report.getWmoHeader());
-                    view.setString(DATAURI, report.getDataURI());
                     view.setString(TYPE, report.getProductType());
                     view.setString(NAME, report.getName());
                     view.setInt(PRESSURE, report.getPressure());

ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmPointDataTransform.java

@@ -1,24 +1,18 @@
 package gov.noaa.nws.ncep.common.dataplugin.ncpafm;
 
+import gov.noaa.nws.ncep.common.dataplugin.ncpafm.dao.NcPafmDao;
+
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import gov.noaa.nws.ncep.common.dataplugin.ncpafm.dao.NcPafmDao;
-//import gov.noaa.nws.ncep.common.dataplugin.ncpafm.NcPafmLayerData;
-
-import com.raytheon.uf.common.pointdata.Dimension;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.pointdata.PointDataView;
-import com.raytheon.uf.common.time.DataTime;
+//import gov.noaa.nws.ncep.common.dataplugin.ncpafm.NcPafmLayerData;
 
 /**
  * Provides a transform from NcPafmRecords to PointDataContainer and vice versa.
@@ -31,6 +25,7 @@ import com.raytheon.uf.common.time.DataTime;
  * 30 Sep 2011  126        B. Hebbard  Initial creation (from ncpirep)
  * 14 Oct 2011  126        B. Hebbard  Change windDir and pwindDir from String to Float;
  *                                     decoder will do conversion (vs. resource) per GH/SJ
+ * Jul 30, 2014 3410        bclement   dataURI no longer stored in hdf5
  * </pre>
  * 
  * @author bhebbard
@@ -158,7 +153,6 @@ public class NcPafmPointDataTransform {
             NcPafmRecord record) {
         PointDataView pdv = container.append();
 
-        pdv.setString(DATAURI, record.getDataURI());
         pdv.setString(REPORT_TYPE, record.getReportType());
         
         NcPafmParameters npp = record.getPafmParms();

ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/dao/NcTafToPointData.java

@@ -14,6 +14,7 @@
  * 10/26/2011               sgurung         Added probable parameters (for TEMPO/PROB)
  * 11/03/2011               sgurung         Added additional parameters
  * 11/07/2011               sgurung         Added LOW_LEVEL_WIND_SHEAR
+ * Jul 30, 2014 3410        bclement        dataURI no longer stored in hdf5
  * 
  * </pre>
  * 
@@ -24,6 +25,14 @@
 
 package gov.noaa.nws.ncep.common.dataplugin.nctaf.dao;
 
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafIcingLayer;
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafRecord;
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafSkyCover;
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafTemperatureForecast;
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafTurbulenceLayer;
+import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafWeatherCondition;
+import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -35,14 +44,6 @@ import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.pointdata.PointDataView;
 
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafIcingLayer;
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafRecord;
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafSkyCover;
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafTemperatureForecast;
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafTurbulenceLayer;
-import gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafWeatherCondition;
-import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
-
 public class NcTafToPointData {
 	private static final String DATAURI = "DATAURI";
 	private static final String WMO_HEADER = "WMOHEADER";
@@ -233,9 +234,6 @@ public class NcTafToPointData {
             }
         }
         
-        if (record.getDataURI()!=null) 
-        	pdv.setString(DATAURI, record.getDataURI());
-        
         if (record.getWmoHeader()!=null)
         	pdv.setString(WMO_HEADER, record.getWmoHeader());
         

ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/dao/NcUairToPointData.java

@@ -16,6 +16,7 @@
  * 											remove xml serialization as well * 
  * 10/2011                  S. Gurung       Added changes related to getting stid/lat/lon/elev 
  * 										    from database instead of snstns.xml file
+ * Jul 30, 2014 3410        bclement        dataURI no longer stored in hdf5
  * 
  * </pre>
  * 
@@ -26,6 +27,12 @@
 
 package gov.noaa.nws.ncep.common.dataplugin.ncuair.dao;
 
+import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairLiftedIndex;
+import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairMaxWind;
+import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairObsLevels;
+import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairRecord;
+import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairTropopause;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,12 +44,6 @@ import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.pointdata.PointDataView;
 
-import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairLiftedIndex;
-import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairMaxWind;
-import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairObsLevels;
-import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairTropopause;
-import gov.noaa.nws.ncep.common.dataplugin.ncuair.NcUairRecord;
-
 public class NcUairToPointData {
 	private static final String RAW_DATA = "RAWDATA";
     private static final String UTC = "UTC";
@@ -257,7 +258,6 @@ public class NcUairToPointData {
         	pdv.setLong(SYNOPTIC_TIME, record.getSynopticTime().getTime().getTime());
         if(record.getIssueTime()!=null)
         	pdv.setLong(ISSUE_TIME, record.getIssueTime().getTime().getTime());
-    	pdv.setString(DATAURI, record.getDataURI());
     	pdv.setString(DATA_TYPE, record.getDataType());
         pdv.setString(REPORT_TYPE, record.getReportType());
         pdv.setString(WMO_HEADER, record.getWmoHeader());

ncep/gov.noaa.nws.ncep.common.dataplugin.pirep/src/gov/noaa/nws/ncep/common/dataplugin/pirep/PirepPointDataTransform.java

@@ -55,6 +55,7 @@ import com.raytheon.uf.common.time.DataTime;
  * 										Fixed visibility  .
  * Sep 05, 2013 2316        bsteffen    Unify pirep and ncpirep.
  * Jan 20, 2014             njensen     Fix storage of turbulence top height
+ * Jul 30, 2014 3410       bclement     lat, lon moved to database point data desc
  * </pre>
  * 
  * @author qzhou
@@ -205,8 +206,6 @@ public class PirepPointDataTransform {
         }else{
         	pdv.setString(CORRECTION_CODE," ");
         }
-        pdv.setFloat(LATITUDE, (float) record.getLatitude());
-        pdv.setFloat(LONGITUDE, (float) record.getLongitude());
         pdv.setFloat(FLIGHT_LEVEL, record.getFlightLevel());
         pdv.setLong(TIME_OBS, record.getDataTime().getRefTime().getTime());
         //pdv.setString(DATAURI, record.getDataURI());

ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/pointdata/ncpafm.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <pointDataDescription>
   
-  <parameter name="dataURI" numDims="1" type="STRING" size="128" />
   <parameter name="wmoHeader" numDims="1" type="STRING" size="8" />
   <parameter name="stationId" numDims="1" type="STRING" size="16" />
   <parameter name="reportType" numDims="1" type="STRING" />

ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/pointdata/nctaf.xml

@@ -18,7 +18,6 @@
     
   <!--<parameter name="RAWDATA" numDims="1" type="STRING" size="1000"/>  -->
   <parameter name="REPORTTYPE" numDims="1" type="STRING" size="8"/> 
-  <parameter name="DATAURI" numDims="1" type="STRING" size="256"/> 
   <parameter name="WMOHEADER" numDims="1" type="STRING" size="32" />
   <parameter name="TAFTEXT" numDims="1" type="STRING" size="1024" />
   <parameter name="STID" numDims="1" type="STRING" size="16"/>

ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/pointdata/ncuair.xml

@@ -13,7 +13,6 @@
   <parameter name="ISSUETIME" numDims="1" type="LONG" unit="seconds since 1-1-1970" />
   <parameter name="OBSTIME" numDims="1" type="LONG" unit="seconds since 1-1-1970" />
   <parameter name="SYNOPTIME" numDims="1" type="LONG" unit="seconds since 1-1-1970" />
-  <parameter name="DATAURI" numDims="1" type="STRING" size="128"/> 
   <parameter name="DATATYPE" numDims="1" type="STRING" size="8"/> 
   <parameter name="CORR" numDims="1" type="STRING" size="8"/>
   <parameter name="WMOHEADER" numDims="1" type="STRING" size="32" />

ncep/gov.noaa.nws.ncep.edex.plugin.pirep/res/pointdata/pirep.xml

@@ -16,11 +16,8 @@
   <parameter name="wmoHeader" numDims="1" type="STRING" size="8" />
   <parameter name="stationId" numDims="1" type="STRING" size="16" />
   <parameter name="flightLevel" numDims="1" type="INT" unit="ft" />
-  <parameter name="latitude" numDims="1" type="FLOAT" unit="degree" />
-  <parameter name="longitude" numDims="1" type="FLOAT" unit="degree" />
   <!-- correctionCode is corIndicator in  PirepRecord -->
   <parameter name="correctionCode" numDims="1" type="STRING" size="8" />
-  <parameter name="dataURI" numDims="1" type="STRING" size="128" />
   <parameter name="aircraftType" numDims="1" type="STRING" size="16" /> 
   <!--  temperature is temp and unit="Kelvin" in PirepRecord -->
   <parameter name="temperature" numDims="1" type="FLOAT" unit="Celsius" />

ncep/gov.noaa.nws.ncep.edex.plugin.pirep/res/pointdata/pirepdb.xml

@@ -2,6 +2,7 @@
 <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="refTime" queryName="dataTime.refTime" numDims="1" type="LONG" unit="ms"/>
   <parameter name="forecastHr" queryName="dataTime.fcstTime" numDims="1" type="INT" unit="h" dbunit="s"/>