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

Merge RM4097 and RM7787 AWIPS2_Dev_Baseline changes from 14.4.1-n to 16.1.1

Browse source 
Former-commit-id: 9a945f3336fba72c4aacc2dab08a51a2ccd1b631
This commit is contained in:
Joshua Huber 2015-06-15 19:14:41 +00:00
parent b71932137a
commit 0ebe445a16
5 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/build/p2-build.xml
View file

@ -244,6 +244,10 @@
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.npp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.ncep.npp.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature" value="com.raytheon.uf.viz.d2d.skewt.feature" />
</antcall>

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

@ -22,6 +22,8 @@ package com.raytheon.uf.viz.d2d.nsharp.rsc;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingCube;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer;
import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile;
import gov.noaa.nws.ncep.ui.nsharp.NsharpConfigManager;
import gov.noaa.nws.ncep.ui.nsharp.NsharpConfigStore;
import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo;
import gov.noaa.nws.ncep.viz.common.soundingQuery.NcSoundingQuery;
@ -49,6 +51,8 @@ import com.raytheon.uf.viz.core.exception.VizException;
* Jul 26, 2011 bsteffen Initial creation
* Feb 15, 2013 1638 mschenke Got rid of viz/edex topo classes
* and moved into common
* 04/27/2015 RM#6674&7787 Chin Chen support model sounding query data interpolation and nearest point option
*
*
* </pre>
*
@ -82,9 +86,18 @@ public class GribNSharpResourceData extends D2DNSharpResourceData {
float[][] latLon = { { (float) coordinate.y, (float) coordinate.x } };
String refTimeStr = formatTimestamp(stnInfo.getReftime());
String validTimeStr = formatTimestamp(stnInfo.getRangestarttime());
//RM#6674
NsharpConfigManager mgr =NsharpConfigManager.getInstance();
NsharpConfigStore configStore = mgr.retrieveNsharpConfigStoreFromFs();
boolean gridInterpolation;
if(configStore != null){
gridInterpolation = configStore.getGraphProperty().isGridInterpolation();
}
else
gridInterpolation = true; //by default
NcSoundingCube cube = NcSoundingQuery.mdlSoundingQueryByLatLon(
refTimeStr, validTimeStr, latLon, "grid", getSoundingType(),
false, "-1");
false, "-1", gridInterpolation);
if ((cube != null) && !cube.getSoundingProfileList().isEmpty()) {
NcSoundingProfile profileList = cube.getSoundingProfileList()
.get(0);

3
cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF
View file

@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.datacube
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.npp.viirs.rsc
Export-Package: com.raytheon.uf.viz.npp.viirs.rsc,
com.raytheon.uf.viz.npp.viirs.style
Import-Package: com.raytheon.uf.common.inventory.data,
com.raytheon.uf.common.inventory.exception,
com.raytheon.uf.common.inventory,

4
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -201,6 +201,10 @@
id="gov.noaa.gsd.viz.hazards.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.ncep.npp.feature"
version="0.0.0"/>
<requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
</requires>

9
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
View file

@ -25,6 +25,12 @@
<region>Alaska</region>
</regionInfo>
<!-- Global region -->
<regionInfo id="TIPG">
<region>Global</region>
</regionInfo>
<regionInfo id="TIPC">
<region>CONUS</region>
</regionInfo>
@ -131,9 +137,10 @@
</channelInfo>
<!-- DNB replace id when known -->
<channelInfo id="??">
<channelInfo id="10">
<channelType>Moderate</channelType>
<wavelength>0.7</wavelength>
<channel>10</channel>
<resolution>750.0</resolution>
</channelInfo>
</viirsHeaderMapping>