xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #189 convert hydro and hydrocommon to grid.

Browse source 
Former-commit-id: a5c60f0f13 [formerly 3e0da6d171] [formerly 8d150d404c] [formerly 3e93e8980b [formerly 8d150d404c [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44]
Former-commit-id: 3a1ba7bd87
This commit is contained in:
Ben Steffensmeier 2012-10-01 14:05:40 -05:00
parent 9b5abe464b
commit f976af446f
9 changed files with 121 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
View file

@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
javax.measure;bundle-version="1.0.0", javax.measure;bundle-version="1.0.0",
com.raytheon.uf.viz.app.launcher;bundle-version="1.11.4", com.raytheon.uf.viz.app.launcher;bundle-version="1.11.4",
com.raytheon.uf.common.hydro;bundle-version="1.11.13", com.raytheon.uf.common.hydro;bundle-version="1.11.13",
com.raytheon.uf.common.dataplugin.grib;bundle-version="1.11.17", com.raytheon.uf.common.dataplugin.grid,
com.raytheon.edex.meteolib;bundle-version="1.11.17", com.raytheon.edex.meteolib;bundle-version="1.11.17",
com.raytheon.viz.grid;bundle-version="1.11.17", com.raytheon.viz.grid;bundle-version="1.11.17",
com.raytheon.uf.common.dissemination;bundle-version="1.0.0", com.raytheon.uf.common.dissemination;bundle-version="1.0.0",

60
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDataManager.java
View file

@ -21,7 +21,6 @@ package com.raytheon.viz.hydro.flashfloodguidance;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -29,17 +28,19 @@ import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grib.GribRecord; import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.datastorage.StorageException; import com.raytheon.uf.common.datastorage.StorageException;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.catalog.DbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery; import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage; import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.hydro.Activator;
import com.raytheon.viz.hydrocommon.HydroConstants; import com.raytheon.viz.hydrocommon.HydroConstants;
import com.raytheon.viz.hydrocommon.constants.StatusConstants;
/** /**
* Class for managing database query calls. FlashFloodGuidanceDataManager.java * Class for managing database query calls. FlashFloodGuidanceDataManager.java
@ -62,11 +63,8 @@ public class FlashFloodGuidanceDataManager {
/** Instance of this class */ /** Instance of this class */
private static FlashFloodGuidanceDataManager instance = null; private static FlashFloodGuidanceDataManager instance = null;
/** Query to find available gridded data */
private static final String AVAILABLE_DATA_QUERY = "select grib_models.modelname, grib_models.parameterabbreviation, grib.reftime, grib.datauri, grib.id from grib, grib_models where grib_models.modelname like 'FFG%' and grib_models.id = grib.modelinfo_id and grib.gridversion = 0 order by grib_models.modelname, grib_models.parameterabbreviation, grib.reftime asc";
private static final String LINESEGS_QUERY = "select hrap_row, hrap_beg_col, " private static final String LINESEGS_QUERY = "select hrap_row, hrap_beg_col, "
+ "hrap_end_col, area from linesegs"; + "hrap_end_col, area from linesegs";
/** RFC Site name to RFC lookup map */ /** RFC Site name to RFC lookup map */
public static Map<String, String> RFCMAP = new HashMap<String, String>(); public static Map<String, String> RFCMAP = new HashMap<String, String>();
@ -130,15 +128,28 @@ public class FlashFloodGuidanceDataManager {
* *
* @return ArrayList<Object[]> of data * @return ArrayList<Object[]> of data
*/ */
public ArrayList<Object[]> getGriddedDataList() { public List<Object[]> getGriddedDataList() {
ArrayList<Object[]> rs = null; List<Object[]> rs = null;
/** Query to find available gridded data */
DbQuery query = new DbQuery(GridRecord.class, "metadata");
query.addColumn(GridConstants.DATASET_ID);
query.addColumn(GridConstants.PARAMETER_ABBREVIATION);
query.addColumn("dataTime.refTime");
query.addColumn("dataURI");
query.addColumn("id");
query.addConstraint(GridConstants.DATASET_ID, new RequestConstraint(
"FFG%", ConstraintType.LIKE));
query.addConstraint(GridConstants.SECONDARY_ID, "Version0");
query.addOrderBy(GridConstants.DATASET_ID);
query.addOrderBy(GridConstants.PARAMETER_ABBREVIATION);
query.addOrderBy("dataTime.refTime");
try { try {
rs = (ArrayList<Object[]>) DirectDbQuery.executeQuery( rs = query.performQuery();
AVAILABLE_DATA_QUERY, "metadata", QueryLanguage.SQL);
} catch (VizException e) { } catch (VizException e) {
e.printStackTrace();
statusHandler.handle(Priority.PROBLEM, "Data Query:" statusHandler.handle(Priority.PROBLEM, "Data Query:"
+ " Error querying Metadata for FFG data."); + " Error querying Metadata for FFG data.");
} }
return rs; return rs;
@ -163,20 +174,20 @@ public class FlashFloodGuidanceDataManager {
return null; return null;
} }
public GribRecord getGribRecord(String uri) throws PluginException, public GridRecord getGridRecord(String uri) throws PluginException,
FileNotFoundException, StorageException { FileNotFoundException, StorageException {
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("from " query.append("from "
+ com.raytheon.uf.common.dataplugin.grib.GribRecord.class + com.raytheon.uf.common.dataplugin.grid.GridRecord.class
.getName()); .getName());
GribRecord gr = null; GridRecord gr = null;
try { try {
List<Object[]> results = DirectDbQuery.executeQuery(query List<Object[]> results = DirectDbQuery.executeQuery(
.toString(), "metadata", QueryLanguage.HQL); query.toString(), "metadata", QueryLanguage.HQL);
gr = (GribRecord) results.get(0)[0]; gr = (GridRecord) results.get(0)[0];
} catch (VizException e) { } catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, "FFG Query" statusHandler.handle(Priority.PROBLEM, "FFG Query"
+ " Error querying for areal FFG"); + " Error querying for areal FFG");
} }
return gr; return gr;
@ -190,7 +201,7 @@ public class FlashFloodGuidanceDataManager {
HydroConstants.IHFS, QueryLanguage.SQL); HydroConstants.IHFS, QueryLanguage.SQL);
} catch (VizException e) { } catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, "FFG Query" statusHandler.handle(Priority.PROBLEM, "FFG Query"
+ " Error querying GeoArea table"); + " Error querying GeoArea table");
} }
return rs; return rs;
@ -202,7 +213,7 @@ public class FlashFloodGuidanceDataManager {
sdf.setTimeZone(TimeZone.getTimeZone("GMT")); sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
String date = sdf.format(refTime); String date = sdf.format(refTime);
duration = duration / (1000*60*60); duration = duration / (1000 * 60 * 60);
int dur = 1001; int dur = 1001;
if (duration == 1) { if (duration == 1) {
dur = 1001; dur = 1001;
@ -226,7 +237,7 @@ public class FlashFloodGuidanceDataManager {
HydroConstants.IHFS, QueryLanguage.SQL); HydroConstants.IHFS, QueryLanguage.SQL);
} catch (VizException e) { } catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, "FFG Query" statusHandler.handle(Priority.PROBLEM, "FFG Query"
+ " Error querying ContingencyValue table"); + " Error querying ContingencyValue table");
e.printStackTrace(); e.printStackTrace();
} }
@ -239,7 +250,6 @@ public class FlashFloodGuidanceDataManager {
String where = " where pe='PP' and ts='CF' and lid in (select area_id from " + String where = " where pe='PP' and ts='CF' and lid in (select area_id from " +
"GeoArea where boundary_type = '" + boundaryType.toUpperCase() + "GeoArea where boundary_type = '" + boundaryType.toUpperCase() +
"') order by validtime desc, dur asc"; "') order by validtime desc, dur asc";
String sql = "select distinct(validtime), dur from contingencyvalue"; String sql = "select distinct(validtime), dur from contingencyvalue";
try { try {
@ -247,7 +257,7 @@ public class FlashFloodGuidanceDataManager {
HydroConstants.IHFS, QueryLanguage.SQL); HydroConstants.IHFS, QueryLanguage.SQL);
} catch (VizException e) { } catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, "FFG Query" statusHandler.handle(Priority.PROBLEM, "FFG Query"
+ " Error querying ContingencyValue table"); + " Error querying ContingencyValue table");
e.printStackTrace(); e.printStackTrace();
} }

30
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
View file

@ -787,7 +787,7 @@ public class FlashFloodGuidanceDlg extends CaveSWTDialog {
/* Check the FFG mode. */ /* Check the FFG mode. */
if (ffgAreaCbo.getItem(ffgAreaCbo.getSelectionIndex()).equals("RFC")) { if (ffgAreaCbo.getItem(ffgAreaCbo.getSelectionIndex()).equals("RFC")) {
ArrayList<Object[]> rs = dman.getGriddedDataList(); java.util.List<Object[]> rs = dman.getGriddedDataList();
if ((rs != null) && (rs.size() > 0)) { if ((rs != null) && (rs.size() > 0)) {
for (Object[] oa : rs) { for (Object[] oa : rs) {
@ -904,16 +904,21 @@ public class FlashFloodGuidanceDlg extends CaveSWTDialog {
String fileWfo = xmrg.getName().substring(0, 3); String fileWfo = xmrg.getName().substring(0, 3);
int index = xmrg.getName().indexOf("20"); int index = xmrg.getName().indexOf("20");
/* Parse the filename for duration and time stamp here. */ /* Parse the filename for duration and time stamp here. */
String year = xmrg.getName().substring(index, index + 4); String year = xmrg.getName()
String month = xmrg.getName().substring(index + 4, index + 6); .substring(index, index + 4);
String day = xmrg.getName().substring(index + 6, index + 8); String month = xmrg.getName().substring(index + 4,
String hour = xmrg.getName().substring(index + 8, index + 10); index + 6);
String durString = xmrg.getName().substring(index + 10, index + 12); String day = xmrg.getName().substring(index + 6,
// String year = xmrg.getName().substring(3, 7); index + 8);
// String month = xmrg.getName().substring(7, 9); String hour = xmrg.getName().substring(index + 8,
// String day = xmrg.getName().substring(9, 11); index + 10);
// String hour = xmrg.getName().substring(11, 13); String durString = xmrg.getName().substring(index + 10,
// String durString = xmrg.getName().substring(13, 15); index + 12);
// String year = xmrg.getName().substring(3, 7);
// String month = xmrg.getName().substring(7, 9);
// String day = xmrg.getName().substring(9, 11);
// String hour = xmrg.getName().substring(11, 13);
// String durString = xmrg.getName().substring(13, 15);
Calendar cal = Calendar.getInstance(TimeZone Calendar cal = Calendar.getInstance(TimeZone
.getTimeZone("GMT")); .getTimeZone("GMT"));
@ -1126,7 +1131,8 @@ public class FlashFloodGuidanceDlg extends CaveSWTDialog {
String day = parts[2]; String day = parts[2];
String date = parts[3]; String date = parts[3];
String hour = parts[4]; String hour = parts[4];
duration = Integer.parseInt(durationStr) * FFGConstants.SECONDS_PER_HOUR; duration = Integer.parseInt(durationStr)
* FFGConstants.SECONDS_PER_HOUR;
String paramAbr = "FFG" + durationStr + "24hr"; String paramAbr = "FFG" + durationStr + "24hr";

5
cave/com.raytheon.viz.hydrocommon/META-INF/MANIFEST.MF
View file

@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.colormap;bundle-version="1.11.13", com.raytheon.uf.common.colormap;bundle-version="1.11.13",
com.raytheon.uf.common.mpe;bundle-version="1.11.13", com.raytheon.uf.common.mpe;bundle-version="1.11.13",
com.raytheon.uf.viz.core.maps;bundle-version="1.0.0", com.raytheon.uf.viz.core.maps;bundle-version="1.0.0",
com.raytheon.uf.common.dataplugin.grib, com.raytheon.uf.common.dataplugin.grid,
com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174", com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174",
com.raytheon.uf.common.gridcoverage;bundle-version="1.0.0" com.raytheon.uf.common.gridcoverage;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
@ -46,6 +46,5 @@ Export-Package: com.raytheon.viz.hydrocommon,
com.raytheon.viz.hydrocommon.util, com.raytheon.viz.hydrocommon.util,
com.raytheon.viz.hydrocommon.whfslib, com.raytheon.viz.hydrocommon.whfslib,
com.raytheon.viz.hydrocommon.whfslib.colorthreshold com.raytheon.viz.hydrocommon.whfslib.colorthreshold
Import-Package: com.raytheon.uf.common.dataplugin.grib, Import-Package: com.raytheon.uf.common.ohd,
com.raytheon.uf.common.ohd,
com.raytheon.viz.grid.rsc com.raytheon.viz.grid.rsc

25
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
View file

@ -35,7 +35,8 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grib.GribRecord; import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint; import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord; import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@ -298,13 +299,12 @@ public class HydroDisplayManager {
// Get the Grib data // Get the Grib data
Map<String, RequestConstraint> reqMap = new HashMap<String, RequestConstraint>(); Map<String, RequestConstraint> reqMap = new HashMap<String, RequestConstraint>();
reqMap.put("pluginName", new RequestConstraint("grib")); reqMap.put(GridConstants.PLUGIN_NAME, new RequestConstraint(GridConstants.GRID));
reqMap.put("modelInfo.parameterAbbreviation", reqMap.put(GridConstants.PARAMETER_ABBREVIATION,
new RequestConstraint(paramAbr)); new RequestConstraint(paramAbr));
reqMap.put("dataTime.refTime", reqMap.put("dataTime.refTime",
new RequestConstraint(sdf.format(date))); new RequestConstraint(sdf.format(date)));
reqMap.put("modelInfo.modelName", new RequestConstraint("FFG-" reqMap.put(GridConstants.DATASET_ID, new RequestConstraint("FFG-" + rfc));
+ rfc));
try { try {
LayerProperty lp = new LayerProperty(); LayerProperty lp = new LayerProperty();
@ -312,10 +312,10 @@ public class HydroDisplayManager {
lp.setEntryQueryParameters(reqMap, false); lp.setEntryQueryParameters(reqMap, false);
List<Object> dataList = DataCubeContainer.getData(lp, 30); List<Object> dataList = DataCubeContainer.getData(lp, 30);
GribRecord gr = null; GridRecord gr = null;
int i = 0; int i = 0;
for (Object o : dataList) { for (Object o : dataList) {
gr = (GribRecord) o; gr = (GridRecord) o;
IDataRecord[] recArr = DataCubeContainer IDataRecord[] recArr = DataCubeContainer
.getDataRecord((PluginDataObject) o); .getDataRecord((PluginDataObject) o);
gr.setMessageData(((FloatDataRecord) recArr[0]) gr.setMessageData(((FloatDataRecord) recArr[0])
@ -465,13 +465,12 @@ public class HydroDisplayManager {
// Get the Grib data // Get the Grib data
Map<String, RequestConstraint> reqMap = new HashMap<String, RequestConstraint>(); Map<String, RequestConstraint> reqMap = new HashMap<String, RequestConstraint>();
reqMap.put("pluginName", new RequestConstraint("grib")); reqMap.put(GridConstants.PLUGIN_NAME, new RequestConstraint(GridConstants.GRID));
reqMap.put("modelInfo.parameterAbbreviation", reqMap.put(GridConstants.PARAMETER_ABBREVIATION,
new RequestConstraint(paramAbr)); new RequestConstraint(paramAbr));
reqMap.put("dataTime.refTime", reqMap.put("dataTime.refTime",
new RequestConstraint(sdf.format(date))); new RequestConstraint(sdf.format(date)));
reqMap.put("modelInfo.modelName", new RequestConstraint("FFG-" reqMap.put(GridConstants.DATASET_ID, new RequestConstraint("FFG-" + rfc));
+ rfc));
try { try {
LayerProperty lp = new LayerProperty(); LayerProperty lp = new LayerProperty();
@ -479,10 +478,10 @@ public class HydroDisplayManager {
lp.setEntryQueryParameters(reqMap, false); lp.setEntryQueryParameters(reqMap, false);
List<Object> dataList = DataCubeContainer.getData(lp, 30); List<Object> dataList = DataCubeContainer.getData(lp, 30);
GribRecord gr = null; GridRecord gr = null;
int i = 0; int i = 0;
for (Object o : dataList) { for (Object o : dataList) {
gr = (GribRecord) o; gr = (GridRecord) o;
IDataRecord[] recArr = DataCubeContainer IDataRecord[] recArr = DataCubeContainer
.getDataRecord((PluginDataObject) o); .getDataRecord((PluginDataObject) o);
gr.setMessageData(((FloatDataRecord) recArr[0]) gr.setMessageData(((FloatDataRecord) recArr[0])

20
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/FFGGridResource.java
View file

@ -43,10 +43,10 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.PixelInCell; import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.colormap.Color; import com.raytheon.uf.common.colormap.Color;
import com.raytheon.uf.common.colormap.ColorMap; import com.raytheon.uf.common.colormap.ColorMap;
import com.raytheon.uf.common.dataplugin.grib.GribRecord; import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.hydro.spatial.HRAP; import com.raytheon.uf.common.hydro.spatial.HRAP;
@ -128,7 +128,7 @@ public class FFGGridResource extends
private boolean isInterpolated; private boolean isInterpolated;
private GribRecord gr; private GridRecord gr;
private Rectangle rfcExtent; private Rectangle rfcExtent;
@ -147,7 +147,7 @@ public class FFGGridResource extends
} }
private void loadData() { private void loadData() {
gr = resourceData.getGribRecord(); gr = resourceData.getGridRecord();
if (gr == null) { if (gr == null) {
return; return;
@ -201,7 +201,7 @@ public class FFGGridResource extends
parameters.setDataMin(0); parameters.setDataMin(0);
cvt = parameters.getDataToImageConverter(); cvt = parameters.getDataToImageConverter();
gridGeometry = gr.getModelInfo().getLocation().getGridGeometry(); gridGeometry = gr.getLocation().getGridGeometry();
try { try {
data = new float[((float[]) gr.getMessageData()).length]; data = new float[((float[]) gr.getMessageData()).length];
@ -222,10 +222,10 @@ public class FFGGridResource extends
HRAP hrap; HRAP hrap;
Coordinate org = MapUtil.gridCoordinateToLatLon( Coordinate org = MapUtil.gridCoordinateToLatLon(
new Coordinate(0, 0), PixelOrientation.LOWER_LEFT, new Coordinate(0, 0), PixelOrientation.LOWER_LEFT,
gr.getSpatialObject()); gr.getLocation());
int nx = gr.getSpatialObject().getNx(); int nx = gr.getLocation().getNx();
int ny = gr.getSpatialObject().getNy(); int ny = gr.getLocation().getNy();
hrap = HRAP.getInstance(); hrap = HRAP.getInstance();
@ -348,8 +348,8 @@ public class FFGGridResource extends
Map<String, Object> values = new HashMap<String, Object>(); Map<String, Object> values = new HashMap<String, Object>();
try { try {
int nx = gr.getSpatialObject().getNx(); int nx = gr.getLocation().getNx();
int ny = gr.getSpatialObject().getNy(); int ny = gr.getLocation().getNy();
Coordinate gridCell = coord.asGridCell(HRAP.getInstance() Coordinate gridCell = coord.asGridCell(HRAP.getInstance()
.getGridGeometry(), PixelInCell.CELL_CORNER); .getGridGeometry(), PixelInCell.CELL_CORNER);

18
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/FFGGridResourceData.java
View file

@ -23,7 +23,7 @@ import java.util.Date;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.dataplugin.grib.GribRecord; import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData; import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
@ -48,12 +48,12 @@ import com.raytheon.viz.hydrocommon.constants.FFGConstants.ResolutionLevel;
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlType(name="ffgGridResourceData") @XmlType(name = "ffgGridResourceData")
public class FFGGridResourceData extends AbstractResourceData { public class FFGGridResourceData extends AbstractResourceData {
private int duration; private int duration;
private GribRecord gribRecord; private GridRecord gridRecord;
private ResolutionLevel resolution; private ResolutionLevel resolution;
@ -63,10 +63,10 @@ public class FFGGridResourceData extends AbstractResourceData {
} }
public FFGGridResourceData(int duration, GribRecord gr, public FFGGridResourceData(int duration, GridRecord gr,
ResolutionLevel resolution, Date dataDate) { ResolutionLevel resolution, Date dataDate) {
this.setDuration(duration); this.setDuration(duration);
this.setGribRecord(gr); this.setGridRecord(gr);
this.setResolution(resolution); this.setResolution(resolution);
this.setDataDate(dataDate); this.setDataDate(dataDate);
} }
@ -118,15 +118,15 @@ public class FFGGridResourceData extends AbstractResourceData {
/** /**
* @param gribRecord the gribRecord to set * @param gribRecord the gribRecord to set
*/ */
public void setGribRecord(GribRecord gribRecord) { public void setGridRecord(GridRecord gridRecord) {
this.gribRecord = gribRecord; this.gridRecord = gridRecord;
} }
/** /**
* @return the gribRecord * @return the gribRecord
*/ */
public GribRecord getGribRecord() { public GridRecord getGridRecord() {
return gribRecord; return gridRecord;
} }
/** /**

14
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/RFCGriddedBasinFFGResource.java
View file

@ -41,10 +41,10 @@ import org.opengis.metadata.spatial.PixelOrientation;
import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.datum.PixelInCell; import org.opengis.referencing.datum.PixelInCell;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.colormap.Color; import com.raytheon.uf.common.colormap.Color;
import com.raytheon.uf.common.colormap.ColorMap; import com.raytheon.uf.common.colormap.ColorMap;
import com.raytheon.uf.common.dataplugin.grib.GribRecord; import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.hydro.spatial.HRAP; import com.raytheon.uf.common.hydro.spatial.HRAP;
@ -116,7 +116,7 @@ public class RFCGriddedBasinFFGResource extends
private Rectangle rfcExtent; private Rectangle rfcExtent;
private GribRecord gr; private GridRecord gr;
private float minArea = 9.0f; private float minArea = 9.0f;
@ -148,7 +148,7 @@ public class RFCGriddedBasinFFGResource extends
private void loadData() { private void loadData() {
initColorMapParams(); initColorMapParams();
gridGeometry = gr.getModelInfo().getLocation().getGridGeometry(); gridGeometry = gr.getLocation().getGridGeometry();
try { try {
data = new float[((float[]) gr.getMessageData()).length]; data = new float[((float[]) gr.getMessageData()).length];
@ -161,10 +161,10 @@ public class RFCGriddedBasinFFGResource extends
HRAP hrap; HRAP hrap;
Coordinate org = MapUtil.gridCoordinateToLatLon( Coordinate org = MapUtil.gridCoordinateToLatLon(
new Coordinate(0, 0), PixelOrientation.CENTER, new Coordinate(0, 0), PixelOrientation.CENTER,
gr.getSpatialObject()); gr.getLocation());
int nx = gr.getSpatialObject().getNx(); int nx = gr.getLocation().getNx();
int ny = gr.getSpatialObject().getNy(); int ny = gr.getLocation().getNy();
hrap = HRAP.getInstance(); hrap = HRAP.getInstance();

12
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/RFCGriddedBasinFFGResourceData.java
View file

@ -22,8 +22,8 @@ package com.raytheon.viz.hydrocommon.resource;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.dataplugin.grib.GribRecord;
import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData; import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
@ -51,12 +51,14 @@ import com.raytheon.viz.hydrocommon.constants.FFGConstants.ResolutionLevel;
public class RFCGriddedBasinFFGResourceData extends AbstractResourceData { public class RFCGriddedBasinFFGResourceData extends AbstractResourceData {
private ResolutionLevel resolution; private ResolutionLevel resolution;
private int duration; private int duration;
private Date dataDate; private Date dataDate;
private GribRecord gr; private GridRecord gr;
public RFCGriddedBasinFFGResourceData(int duration, GribRecord gr, public RFCGriddedBasinFFGResourceData(int duration, GridRecord gr,
ResolutionLevel resolution, Date dataDate) { ResolutionLevel resolution, Date dataDate) {
this.duration = duration; this.duration = duration;
this.gr = gr; this.gr = gr;
@ -126,14 +128,14 @@ public class RFCGriddedBasinFFGResourceData extends AbstractResourceData {
/** /**
* @return the gr * @return the gr
*/ */
public GribRecord getGr() { public GridRecord getGr() {
return gr; return gr;
} }
/** /**
* @param gr the gr to set * @param gr the gr to set
*/ */
public void setGr(GribRecord gr) { public void setGr(GridRecord gr) {
this.gr = gr; this.gr = gr;
} }