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

Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.2.2-osx

Browse source
This commit is contained in:
Michael James 2016-09-30 15:09:38 -06:00
commit a380e5db1d
11 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
rpms/legal/Master_Rights_File.pdf → FOSS_COTS_License.pdf
View file

Binary file not shown.

4
cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml
View file

@ -19,6 +19,10 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
menuText="Hurricane Track Summaries" id="hurricaneTrackSummary">
<substitute key="productType" value="TCMAT1,TCMAT2,TCMAT3,TCMAT4,TCMAT5,TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
</contribute>
<contribute xsi:type="subMenu" menuText="Hurricane"
id="ncepHydro.tpc.hurricane">
<contribute xsi:type="subinclude" fileName="menus/ncepHydro/tpc/hurricane.xml"/>

19
cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
View file

@ -19,23 +19,6 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="------ Track Summaries ------"
id="TrackSummaryLine" />
<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
menuText="Atlantic" id="atlanticTrackSummary">
<substitute key="productType" value="TCMAT1,TCMAT2,TCMAT3,TCMAT4,TCMAT5" />
<substitute key="legend" value="Atlantic" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
menuText="E Pacific" id="easternPacificTrackSummary">
<substitute key="productType" value="TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5" />
<substitute key="legend" value="E Pacific" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
menuText="W Pacific" id="westernPacificTrackSummary">
<substitute key="productType" value="TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
<substitute key="legend" value="W Pacific" />
</contribute>
<contribute xsi:type="subMenu" menuText="Hourly Forecasts">
<contribute xsi:type="bundleItem" file="bundles/HourlyForecastPlot.xml"
menuText="AT1" id="AT1">
@ -144,4 +127,4 @@
<contribute xsi:type="bundleItem" file="bundles/ncepHydro/CHGQLMGuidancePlot.xml"
menuText="CHGQLM guidance" id="CHGQLMguidance" useReferenceTime="true">
</contribute>
</menuTemplate>
</menuTemplate>

2
cave/com.raytheon.uf.viz.tcs/localization/bundles/TrackSummaryPlot.xml
View file

@ -27,7 +27,7 @@
<loadProperties loadWithoutData="true">
<capabilities/>
</loadProperties>
<resourceData xsi:type="tcsResourceData" plotSource="${legend} Hurricane Tracks"
<resourceData xsi:type="tcsResourceData" plotSource="Hurricane Tracks"
isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
<metadataMap>
<mapping key="pluginName">

6
cave/com.raytheon.viz.hydro/localization/menus/hydro/index.xml
View file

@ -19,10 +19,10 @@
further_licensing_information.
-->
<menuContributionFile>
<include installTo="menu:ncepHydro?after=SPC"
<include installTo="menu:ncepHydro?after=TPC"
fileName="menus/hydro/baseHydroQPE.xml"
subMenu="QPE"/>
<include installTo="menu:ncepHydro?after=SPC"
<include installTo="menu:ncepHydro?after=TPC"
fileName="menus/hydro/baseHydroQPF.xml"
subMenu="QPF"/>
<include installTo="menu:ncepHydro?before=HydroMenuEnd"
@ -38,4 +38,4 @@
<include installTo="menu:ncepHydro?after=HYDRO"
fileName="menus/hydro/baseHydroApps.xml"/>
-->
</menuContributionFile>
</menuContributionFile>

7
cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
View file

@ -82,10 +82,5 @@
<substitute key="posOffset" value="1800"/>
<substitute key="negOffset" value="1800"/>
</contribute>
<contribute xsi:type="separator" id="msasSeparator"/>
<contribute xsi:type="titleItem"
titleText="------ MSAS Obs------" id="msasLine"/>
<contribute xsi:type="subinclude" fileName="menus/obs/baseMSASObs.xml"/>
</contribute>
</menuTemplate>
</menuTemplate>

4
cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
View file

@ -165,10 +165,6 @@
<substitute key="negOffset" value="43200"/>
</contribute>
<contribute xsi:type="separator" id="msasSeparator"/>
<contribute xsi:type="titleItem"
titleText="------ MSAS Obs------" id="msasLine"/>
<contribute xsi:type="subinclude" fileName="menus/obs/baseMSASObs.xml"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Redbook.xml"
menuText="MSLP Analysis" id="MSLPressureAnalysis">

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ConvectionProbability.xml
View file

@ -57,7 +57,7 @@
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
<capabilities>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="densityCapability" density="1.0"/>
<capability xsi:type="densityCapability" density="0.25"/>
<capability xsi:type="magnificationCapability" magnification="1.0"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>

2
cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningProbability.xml
View file

@ -57,7 +57,7 @@
<perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
<capabilities>
<capability xsi:type="colorableCapability" colorAsString="white"/>
<capability xsi:type="densityCapability" density="1.0"/>
<capability xsi:type="densityCapability" density="0.25"/>
<capability xsi:type="magnificationCapability" magnification="1.0"/>
<capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
<capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>

2
rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
View file

@ -92,7 +92,7 @@ EXEC "rtstats -h rtstats.unidata.ucar.edu"
#
# DEFAULT
#
REQUEST NEXRAD3 ".*/p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA).*" idd.unidata.ucar.edu
REQUEST NEXRAD3 ".*/p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA|NVW|NTV|NST|NME|NHI|NSS).*" idd.unidata.ucar.edu
REQUEST FNEXRAD|IDS|DDPLUS|UNIWISC ".*" idd.unidata.ucar.edu
REQUEST NGRID ".*" idd.unidata.ucar.edu
REQUEST NOTHER "^TIP... KNES.*" idd.unidata.ucar.edu

2
rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
View file

@ -122,7 +122,7 @@ FNEXRAD ^rad/NEXRCOMP/(...)/(...)_(........)_(....)
#
# Partial Feed (best for performance on most systems)
#
NEXRAD3 ^SDUS[23578]. .... (......) /p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA)(...)
NEXRAD3 ^SDUS[23578]. .... (......) /p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA|NVW|NTV|NST|NME|NHI|NSS)(...)
FILE -overwrite -close -edex /awips2/data_store/radar/\3/\2/\3_\2_\1_(seq).rad
##
## ACARS (restricted to NWS use only)