diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotData.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotData.java
index b7ebd3e731..a569a8d684 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotData.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotData.java
@@ -40,6 +40,7 @@ import com.raytheon.uf.viz.datacube.CubeUtil;
* ------------ ---------- ----------- --------------------------
* Jul 19, 2011 njensen Initial creation.
* Jul 12, 2013 2096 mpduff Add method to check if parameter is valid.
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
*
*
*
@@ -72,7 +73,6 @@ public class PlotData {
pv.dimension = dimensions;
switch (t) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
if (dimensions == 2) {
@@ -114,7 +114,6 @@ public class PlotData {
pv.dimension = dimensions;
switch (t) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
if (dimensions == 2) {
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
index e08ba93a99..a5c6783215 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
@@ -92,6 +92,7 @@ import com.raytheon.viz.pointdata.rsc.PlotResourceData;
* Nov 20, 2013 2033 njensen Fix detecting plotModels dirs from multiple plugins
* Mar 21, 2014 2868 njensen Refactored python usage to PythonJobCoordinator
* Jun 06, 2014 2061 bsteffen Rename and add support for data formats in sampling.
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
*
*
*
@@ -774,7 +775,6 @@ public class PlotModelFactory {
dimensions = ob.getDimensions(param);
switch (ob.getType(param)) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
if (dimensions == 1) {
@@ -985,7 +985,6 @@ public class PlotModelFactory {
String[] fields = null;
switch (ob.getType(element.parameter)) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
if (dimensions == 1) {
@@ -1041,7 +1040,6 @@ public class PlotModelFactory {
String parameter = element.parameter;
switch (ob.getType(parameter)) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
Number value = ob.getNumber(parameter);
@@ -1117,7 +1115,6 @@ public class PlotModelFactory {
String sValue = null;
switch (ob.getType(element.parameter)) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
Number value = ob.getNumber(element.parameter);
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/ldadmesonet.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/ldadmesonet.xml
index 6503c07eb3..9b449af6d5 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/ldadmesonet.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/ldadmesonet.xml
@@ -21,7 +21,7 @@
-
@@ -36,7 +36,7 @@
fillValue="-2147483647.0" />
-
-
-
@@ -108,11 +108,11 @@
-
-
-
@@ -203,7 +203,7 @@
-
-
@@ -254,7 +254,7 @@
-
@@ -277,7 +277,7 @@
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/msas.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/msas.xml
index 1a721c14b7..9742619d23 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/msas.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/pointdata/pdd/msas.xml
@@ -39,8 +39,8 @@
-
-
+
+
@@ -54,7 +54,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,5 +165,5 @@
-
+
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.gempak/src/gov/noaa/nws/ncep/edex/plugin/gempak/handler/StationDataRequestHandler.java b/ncep/gov.noaa.nws.ncep.edex.plugin.gempak/src/gov/noaa/nws/ncep/edex/plugin/gempak/handler/StationDataRequestHandler.java
index 33cd17e5e7..e018c5d74a 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.gempak/src/gov/noaa/nws/ncep/edex/plugin/gempak/handler/StationDataRequestHandler.java
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.gempak/src/gov/noaa/nws/ncep/edex/plugin/gempak/handler/StationDataRequestHandler.java
@@ -11,6 +11,22 @@ import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.serialization.comm.IRequestHandler;
import com.raytheon.uf.edex.pointdata.PointDataQuery;
+/**
+ * Executes point data queries for station data
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * ??? ??? ??? Initial creation
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
+ *
+ *
+ *
+ * @version 1.0
+ */
public class StationDataRequestHandler implements
IRequestHandler {
@@ -59,7 +75,6 @@ public class StationDataRequestHandler implements
Type t = pdv.getType(param);
switch (t) {
case FLOAT:
- case DOUBLE:
case INT:
case LONG:
if (dimensions == 2) {
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelDataRequestJob.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelDataRequestJob.java
index e12926c1f6..2ed5cd8784 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelDataRequestJob.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelDataRequestJob.java
@@ -55,9 +55,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.pointdata.ParameterDescription;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataDescription.Type;
@@ -86,6 +86,7 @@ import com.raytheon.viz.pointdata.PointDataRequest;
* Apr 22, 2011 njensen Initial creation
* 09/2012 896 sgurung Refactored raytheon's class PlotModelDataRequestJob and added
* code from ncep's PlotModelGenerator2
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
*
*
*
@@ -624,14 +625,14 @@ public class NcPlotModelDataRequestJob extends Job {
metPrm.setMissingDataSentinel(
pDesc.getFillValue().floatValue() );
break;
- case DOUBLE :
- metPrm.setMissingDataSentinel(
- pDesc.getFillValue() );
- break;
case INT :
metPrm.setMissingDataSentinel(
pDesc.getFillValue().intValue() );
break;
+ case LONG:
+ metPrm.setMissingDataSentinel(pDesc.getFillValue()
+ .longValue());
+ break;
case STRING :
break;
}
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
index 3b282d6f15..5557defb87 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
@@ -42,9 +42,9 @@ import java.util.concurrent.Semaphore;
import javax.measure.unit.NonSI;
-import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.pointdata.ParameterDescription;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataDescription.Type;
@@ -69,6 +69,7 @@ import com.raytheon.viz.pointdata.PointDataRequest;
* 02/26/2014 1061 B. Hebbard Don't block on JobPool cancel, so CAVE doesn't freeze if resource unloaded during long retrieval
* 04/01/2014 1040 B. Hebbard In requestUpperAirData, (1) clear displayStationPlotBoolList for each new station, (2) call cond filter check with newInstance vs. metPrm
* 04/08/2014 1127 B. Hebbard In requestSurfaceData, exclude only those obs returned from HDF5 that don't match desired time; fix dataTime association; removed redundant dataTimes from constraint
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
*/
public class NcPlotModelHdf5DataRequestor {
@@ -1555,9 +1556,9 @@ public class NcPlotModelHdf5DataRequestor {
metPrm.setMissingDataSentinel(pDesc
.getFillValue().floatValue());
break;
- case DOUBLE:
+ case LONG:
metPrm.setMissingDataSentinel(pDesc
- .getFillValue());
+ .getFillValue().longValue());
break;
case INT:
metPrm.setMissingDataSentinel(pDesc
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
index 265adda8a3..5ceea08774 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
@@ -21,14 +21,8 @@
package gov.noaa.nws.ncep.viz.rsc.plotdata.plotModels;
import gov.noaa.nws.ncep.edex.common.metparameters.AbstractMetParameter;
-//import gov.noaa.nws.ncep.edex.common.metparameters.PressureLevel;
-//import gov.noaa.nws.ncep.edex.common.metparameters.RelativeHumidity;
-//import gov.noaa.nws.ncep.edex.common.metparameters.StationElevation;
-//import gov.noaa.nws.ncep.edex.common.metparameters.StationID;
import gov.noaa.nws.ncep.edex.common.metparameters.Amount;
-//import gov.noaa.nws.ncep.edex.common.metparameters.Amount;
import gov.noaa.nws.ncep.edex.common.metparameters.MetParameterFactory;
-//import gov.noaa.nws.ncep.edex.common.metparameters.StationName;
import gov.noaa.nws.ncep.edex.common.metparameters.MetParameterFactory.NotDerivableException;
import gov.noaa.nws.ncep.edex.common.metparameters.StationElevation;
import gov.noaa.nws.ncep.edex.common.metparameters.StationID;
@@ -37,8 +31,6 @@ import gov.noaa.nws.ncep.edex.common.metparameters.StationLongitude;
import gov.noaa.nws.ncep.edex.common.metparameters.StationNumber;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingCube;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingCube.QueryStatus;
-//import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer;
-//import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer.DataType;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer2;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile;
import gov.noaa.nws.ncep.viz.common.soundingQuery.NcSoundingQuery2;
@@ -66,9 +58,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.pointdata.ParameterDescription;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataDescription.Type;
@@ -85,6 +77,15 @@ import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
import com.raytheon.viz.pointdata.PlotInfo;
import com.raytheon.viz.pointdata.PointDataRequest;
+//import gov.noaa.nws.ncep.edex.common.metparameters.PressureLevel;
+//import gov.noaa.nws.ncep.edex.common.metparameters.RelativeHumidity;
+//import gov.noaa.nws.ncep.edex.common.metparameters.StationElevation;
+//import gov.noaa.nws.ncep.edex.common.metparameters.StationID;
+//import gov.noaa.nws.ncep.edex.common.metparameters.Amount;
+//import gov.noaa.nws.ncep.edex.common.metparameters.StationName;
+//import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer;
+//import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer.DataType;
+
/**
* A Eclipse Job thread that will listen for new stations on a queue and request
* the data to create the plots.
@@ -118,6 +119,7 @@ import com.raytheon.viz.pointdata.PointDataRequest;
* 04/02/2012 #615 sgurung Modified code to support conditional filtering: added conditionalFilterMap,
* applyConditionalFilters(), and modified constructor to take ConditionalFilter
* 12/19/2012 #947 ghull check for empty conditional filter before applying
+ * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
*
*
*
@@ -632,9 +634,9 @@ public class PlotModelGenerator2 extends Job {
metPrm.setMissingDataSentinel(
pDesc.getFillValue().floatValue() );
break;
- case DOUBLE :
- metPrm.setMissingDataSentinel(
- pDesc.getFillValue() );
+ case LONG:
+ metPrm.setMissingDataSentinel(pDesc
+ .getFillValue().longValue());
break;
case INT :
metPrm.setMissingDataSentinel(