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

Merge "Issue #2596 - Add check for null coordinates." into development

Browse source 
Former-commit-id: c871e4c872 [formerly 6e60748b41 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]
Former-commit-id: 6e60748b41
Former-commit-id: 1620d0fb22
This commit is contained in:
Lee Venable 2014-02-18 18:08:10 -06:00 • committed by Gerrit Code Review
commit 0db46dd5fb
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
View file

@ -126,7 +126,8 @@ import com.vividsolutions.jts.index.strtree.STRtree;
* May 16, 2011 9356 djingtao When timeseries is disposed, launch a new timesereis after double click
* or right click to select TimeSeries
* Jan 30, 2013 15646 wkwock Fix middle button drag map incorrect
* Feb 05, 2013 1578 rferrel Changes for non-blocking singleton TimeSeriesDlg.
* Feb 05, 2013 1578 rferrel Changes for non-blocking singleton TimeSeriesDlg.
* Feb 18, 2014 2596 mpduff Check for null coordinates.
*
* </pre>
*
@ -143,9 +144,9 @@ public class MultiPointResource extends
private static class HydroImageMakerCallback implements
IRenderedImageCallback {
private String dispClass;
private final String dispClass;
private RGB color;
private final RGB color;
private HydroImageMakerCallback(String dispClass, RGB color) {
this.dispClass = dispClass;
@ -208,9 +209,9 @@ public class MultiPointResource extends
private static final RGB LABEL_COLOR = RGBColors.getRGBColor("White");
private Map<String, Map<RGB, IImage>> imageMap = new HashMap<String, Map<RGB, IImage>>();
private final Map<String, Map<RGB, IImage>> imageMap = new HashMap<String, Map<RGB, IImage>>();
private Map<String, GageData> dataMap = new HashMap<String, GageData>();
private final Map<String, GageData> dataMap = new HashMap<String, GageData>();
private STRtree strTree = new STRtree();
@ -895,6 +896,7 @@ public class MultiPointResource extends
public Map<String, Object> interrogate(ReferencedCoordinate rcoord)
throws VizException {
List<GageData> gageDataList = pdcManager.getObsReportList();
try {
GageData selected = null;
Coordinate coord = rcoord.asLatLon();
@ -905,7 +907,7 @@ public class MultiPointResource extends
if ((gageDataList != null) && (gageDataList.size() > 0)) {
for (GageData gd : gageDataList) {
if (gd.isUse()) {
if (gd.isUse() && gd.getCoordinate() != null) {
double[] gagePoint = descriptor
.worldToPixel(new double[] {
gd.getCoordinate().x,