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

ASM #14647 - Model names in NSHARP different from common name.

Browse source 
Change-Id: Id9564aaa4ae17ede4eae45034f4e4302f4c5fc0f

Former-commit-id: c662248004a559e9689d994a6f912d3487664f80
This commit is contained in:
Michael Gamazaychikov 2016-03-01 09:32:48 -05:00
parent 3bcda66074
commit 22ea2a19d9
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResourceData.java
View file

@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* May 08, 2014 2060 njensen Constructor sets alert parser
* Jul 23, 2014 3410 bclement added unpackResultLocation()
* Aug 05, 2015 4486 rjpeter Changed Timestamp to Date.
* Mar 01, 2016 RM14647 mgamazayhikov Added soundingTitle.
* </pre>
*
* @author bsteffen
@ -78,6 +79,9 @@ public abstract class D2DNSharpResourceData extends
@XmlAttribute
protected String soundingType = "UNKNOWN";
@XmlAttribute
protected String soundingTitle = "UNKNOWN";
@XmlElement
protected Coordinate coordinate;
@ -94,6 +98,12 @@ public abstract class D2DNSharpResourceData extends
this.soundingType = soundingType;
}
public D2DNSharpResourceData(String soundingType, String soundingTitle) {
this();
this.soundingType = soundingType;
this.soundingTitle = soundingTitle;
}
@Override
protected AbstractVizResource<?, ?> constructResource(
LoadProperties loadProperties, PluginDataObject[] objects)
@ -194,6 +204,9 @@ public abstract class D2DNSharpResourceData extends
protected NsharpStationInfo createStationInfo(DataTime time) {
NsharpStationInfo stnInfo = new NsharpStationInfo();
stnInfo.setSndType(soundingType);
if (!soundingTitle.equalsIgnoreCase("UNKNOWN")){
stnInfo.setSndType(soundingTitle);
}
Date refTime = new Date(time.getRefTime().getTime());
stnInfo.setReftime(refTime);
Date fcstTime = refTime;

5
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/GribNSharpResourceData.java
View file

@ -58,6 +58,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
* 04/27/2015 RM#6674&7787 Chin Chen support model sounding query data interpolation and nearest point option
* Aug 03, 2015 3861 bsteffen Automatically determine sounding type from
* request constraints.
* Mar 01, 2016 RM14647 mgamazayhikov Added constructor.
*
* </pre>
*
@ -80,6 +81,10 @@ public class GribNSharpResourceData extends D2DNSharpResourceData {
super(soundingType);
}
public GribNSharpResourceData(String soundingType, String soundingTitle) {
super(soundingType,soundingTitle);
}
@Override
protected void preparePointInfo() throws VizException {
/* Always keep the type in sync with what is in the metadata map. */

5
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/vb/NSharpProductCreator.java
View file

@ -49,6 +49,8 @@ import com.raytheon.viz.volumebrowser.vbui.VolumeBrowserDialogSettings;
* Date Ticket# Engineer Description
* ------------- -------- --------- --------------------------
* Aug 03, 2015 3861 bsteffen Initial Creation
* Mar 01, 2016 RM14647 mgamazayhikov Added argument to GribNSharpResourceData
* constructor.
*
* </pre>
*
@ -73,7 +75,8 @@ public class NSharpProductCreator extends AbstractProductCreator {
return new GoesSndNSharpResourceData();
} else {
D2DNSharpResourceData tmpData = new GribNSharpResourceData(
catalogEntry.getSelectedData().getSourcesKey());
catalogEntry.getSelectedData().getSourcesKey(),
catalogEntry.getSelectedData().getSourcesText());
tmpData.setCoordinate(PointLineUtil
.getPointCoordinate(catalogEntry));
String pointName = catalogEntry.getSelectedData().getPlanesKey();