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-12-01 09:44:14 -07:00
commit 996754de3b
12 changed files with 311 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaic.xml
View file

@ -24,6 +24,9 @@
<constraint constraintValue="${product}" <constraint constraintValue="${product}"
constraintType="IN" /> constraintType="IN" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
</mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
constraintType="EQUALS" /> constraintType="EQUALS" />
@ -32,6 +35,7 @@
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
<resource> <resource>
<loadProperties loadWithoutData="true"> <loadProperties loadWithoutData="true">
<capabilities> <capabilities>
@ -49,6 +53,9 @@
<constraint constraintValue="${product}" <constraint constraintValue="${product}"
constraintType="IN" /> constraintType="IN" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
constraintType="EQUALS" /> constraintType="EQUALS" />
@ -59,8 +66,11 @@
</metadataMap> </metadataMap>
</resourceData> </resourceData>
</resource> </resource>
</resourceFactory>
</resourceData> </resourceData>
</resource> </resource>
<timeMatcher xsi:type="d2DTimeMatcher" deltaFilter="0" forecastFilter="0"/>
<numberOfFrames>1</numberOfFrames>
</descriptor> </descriptor>
</displays> </displays>
</displayList> </displayList>

16
cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicTwoPanel.xml
View file

@ -53,6 +53,9 @@
<metadataMap> <metadataMap>
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="${product1}" constraintType="EQUALS"/> <constraint constraintValue="${product1}" constraintType="EQUALS"/>
</mapping>
<mapping key="icao">
<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
</mapping> </mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
@ -62,6 +65,7 @@
<constraint constraintValue="radar" constraintType="EQUALS"/> <constraint constraintValue="radar" constraintType="EQUALS"/>
</mapping> </mapping>
</metadataMap> </metadataMap>
<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
<resource> <resource>
<loadProperties loadWithoutData="true"> <loadProperties loadWithoutData="true">
<capabilities> <capabilities>
@ -79,6 +83,9 @@
<constraint constraintValue="${product1}" <constraint constraintValue="${product1}"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
constraintType="EQUALS" /> constraintType="EQUALS" />
@ -89,6 +96,7 @@
</metadataMap> </metadataMap>
</resourceData> </resourceData>
</resource> </resource>
</resourceFactory>
</resourceData> </resourceData>
</resource> </resource>
</descriptor> </descriptor>
@ -115,6 +123,9 @@
<metadataMap> <metadataMap>
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="${product2}" constraintType="EQUALS"/> <constraint constraintValue="${product2}" constraintType="EQUALS"/>
</mapping>
<mapping key="icao">
<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
</mapping> </mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
@ -124,6 +135,7 @@
<constraint constraintValue="radar" constraintType="EQUALS"/> <constraint constraintValue="radar" constraintType="EQUALS"/>
</mapping> </mapping>
</metadataMap> </metadataMap>
<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
<resource> <resource>
<loadProperties loadWithoutData="true"> <loadProperties loadWithoutData="true">
<capabilities> <capabilities>
@ -141,6 +153,9 @@
<constraint constraintValue="${product2}" <constraint constraintValue="${product2}"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="primaryElevationAngle"> <mapping key="primaryElevationAngle">
<constraint constraintValue="${elevation}" <constraint constraintValue="${elevation}"
constraintType="EQUALS" /> constraintType="EQUALS" />
@ -151,6 +166,7 @@
</metadataMap> </metadataMap>
</resourceData> </resourceData>
</resource> </resource>
</resourceFactory>
</resourceData> </resourceData>
</resource> </resource>
</descriptor> </descriptor>

17
cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarMosaicVILCompRefl.xml
View file

@ -42,10 +42,14 @@
<constraint constraintValue="37,36,57" <constraint constraintValue="37,36,57"
constraintType="IN" /> constraintType="IN" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="${mosaicIcaoList}" constraintType="IN" />
</mapping>
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
<resourceFactory xsi:type="radarMosaicResourceFactory" values="${mosaicIcaoList}" key="kxxx">
<resource> <resource>
<loadProperties> <loadProperties>
<capabilities> <capabilities>
@ -59,6 +63,9 @@
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="37,36,57" constraintType="IN" /> <constraint constraintValue="37,36,57" constraintType="IN" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
@ -77,6 +84,9 @@
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="37" constraintType="EQUALS" /> <constraint constraintValue="37" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
@ -97,6 +107,9 @@
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="36" constraintType="EQUALS" /> <constraint constraintValue="36" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
@ -117,6 +130,9 @@
<mapping key="productCode"> <mapping key="productCode">
<constraint constraintValue="57" constraintType="EQUALS" /> <constraint constraintValue="57" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="icao">
<constraint constraintValue="kxxx" constraintType="EQUALS" />
</mapping>
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="radar" constraintType="EQUALS" /> <constraint constraintValue="radar" constraintType="EQUALS" />
</mapping> </mapping>
@ -125,6 +141,7 @@
</resource> </resource>
</resourceData> </resourceData>
</resource> </resource>
</resourceFactory>
</resourceData> </resourceData>
</resource> </resource>
</descriptor> </descriptor>

36
cave/com.raytheon.viz.radar/localization/menus/radar/baseLocalRadarMenu.xml
View file

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="${icao}">
<contribute xsi:type="subinclude" subMenu="${icao} 4-bit/Legacy Prods" fileName="menus/radar/base4BitProducts.xml" />
<contribute xsi:type="subinclude" subMenu="${icao} Dual Pol Prods" fileName="menus/radar/baseDualPolProds.xml" />
<contribute xsi:type="subinclude" subMenu="${icao} 1 Deg Azimuth 8-bit Prods" fileName="menus/radar/base1DegAzimuth8BitProds.xml" />
<contribute xsi:type="subinclude" fileName="menus/radar/baseReflectivityMotion.xml" />
<contribute xsi:type="subinclude" subMenu="${icao} four panel" fileName="menus/radar/baseRadar4Panel.xml" />
<contribute xsi:type="subinclude" fileName="menus/radar/baseRadarBestRes.xml" />
<contribute xsi:type="subinclude" subMenu="${icao} Precip" fileName="menus/radar/baseRadarPrecip.xml" />
<contribute xsi:type="subinclude" subMenu="${icao} Derived" fileName="menus/radar/baseRadarDerived.xml"/>
<contribute xsi:type="subinclude" subMenu="${icao} Graphics" fileName="menus/radar/baseRadarGraphics.xml"/>
<contribute xsi:type="subinclude" fileName="menus/radar/baseRadarSpecWidthAndOther.xml"/>
<contribute xsi:type="subinclude" subMenu="${icao} Data Quality" fileName="menus/radar/baseRadarDataQuality.xml" />
<contribute xsi:type="subinclude" fileName="menus/radar/baseRadarApplications.xml" />
</contribute>
</menuTemplate>

2
cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarMenu.xml
View file

@ -121,7 +121,7 @@
<contribute xsi:type="separator" id="RadarDialRadarsSeparator" /> <contribute xsi:type="separator" id="RadarDialRadarsSeparator" />
<contribute xsi:type="subMenu" menuText="NEXRAD Stations" <contribute xsi:type="subMenu" menuText="NEXRAD Stations"
id="RadarMenuDialRadarsSubMenu"> id="RadarMenuDialRadarsSubMenu">
<contribute xsi:type="subinclude" fileName="menus/radar/dialRadars.xml" /> <contribute xsi:type="subinclude" fileName="menus/radar/allRadars.xml" />
</contribute> </contribute>
<contribute xsi:type="subMenu" menuText="TDWR Stations" <contribute xsi:type="subMenu" menuText="TDWR Stations"
id="RadarMenuDialRadarsSubMenu"> id="RadarMenuDialRadarsSubMenu">

208
cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/terminal/baseRadarTerminalBestResBaseProducts.xml
View file

@ -822,264 +822,160 @@
</contribute> </contribute>
<contribute xsi:type="subMenu" menuText="${icao} SW" <contribute xsi:type="subMenu" menuText="${icao} SW"
id="${icao}TerminalSpectrumWidth"> id="${icao}TerminalSpectrumWidth">
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev0} SW" id="${icao}Terminal${elev0}SpecWidth" suppressErrors="${suppressErrors0}"> menuText="${elev0} SW" id="${icao}Terminal${elev0}SpecWidth" suppressErrors="${suppressErrors0}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev0}--${elev0}" /> <substitute key="elevation" value="${elev0}--${elev0}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev1} SW" id="${icao}Terminal${elev1}SpecWidth" suppressErrors="${suppressErrors1}"> menuText="${elev1} SW" id="${icao}Terminal${elev1}SpecWidth" suppressErrors="${suppressErrors1}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev1}--${elev1}" /> <substitute key="elevation" value="${elev1}--${elev1}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev2} SW" id="${icao}Terminal${elev2}SpecWidth" suppressErrors="${suppressErrors2}"> menuText="${elev2} SW" id="${icao}Terminal${elev2}SpecWidth" suppressErrors="${suppressErrors2}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev2}--${elev2}" /> <substitute key="elevation" value="${elev2}--${elev2}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev3} SW" id="${icao}Terminal${elev3}SpecWidth" suppressErrors="${suppressErrors3}"> menuText="${elev3} SW" id="${icao}Terminal${elev3}SpecWidth" suppressErrors="${suppressErrors3}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev3}--${elev3}" /> <substitute key="elevation" value="${elev3}--${elev3}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev4} SW" id="${icao}Terminal${elev4}SpecWidth" suppressErrors="${suppressErrors4}"> menuText="${elev4} SW" id="${icao}Terminal${elev4}SpecWidth" suppressErrors="${suppressErrors4}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev4}--${elev4}" /> <substitute key="elevation" value="${elev4}--${elev4}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev5} SW" id="${icao}Terminal${elev5}SpecWidth" suppressErrors="${suppressErrors5}"> menuText="${elev5} SW" id="${icao}Terminal${elev5}SpecWidth" suppressErrors="${suppressErrors5}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev5}--${elev5}" /> <substitute key="elevation" value="${elev5}--${elev5}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev6} SW" id="${icao}Terminal${elev6}SpecWidth" suppressErrors="${suppressErrors6}"> menuText="${elev6} SW" id="${icao}Terminal${elev6}SpecWidth" suppressErrors="${suppressErrors6}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev6}--${elev6}" /> <substitute key="elevation" value="${elev6}--${elev6}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev7} SW" id="${icao}Terminal${elev7}SpecWidth" suppressErrors="${suppressErrors7}"> menuText="${elev7} SW" id="${icao}Terminal${elev7}SpecWidth" suppressErrors="${suppressErrors7}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev7}--${elev7}" /> <substitute key="elevation" value="${elev7}--${elev7}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev8} SW" id="${icao}Terminal${elev8}SpecWidth" suppressErrors="${suppressErrors8}"> menuText="${elev8} SW" id="${icao}Terminal${elev8}SpecWidth" suppressErrors="${suppressErrors8}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev8}--${elev8}" /> <substitute key="elevation" value="${elev8}--${elev8}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev9} SW" id="${icao}Terminal${elev9}SpecWidth" suppressErrors="${suppressErrors9}"> menuText="${elev9} SW" id="${icao}Terminal${elev9}SpecWidth" suppressErrors="${suppressErrors9}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev9}--${elev9}" /> <substitute key="elevation" value="${elev9}--${elev9}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev10} SW" id="${icao}Terminal${elev10}SpecWidth" suppressErrors="${suppressErrors10}"> menuText="${elev10} SW" id="${icao}Terminal${elev10}SpecWidth" suppressErrors="${suppressErrors10}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev10}--${elev10}" /> <substitute key="elevation" value="${elev10}--${elev10}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev11} SW" id="${icao}Terminal${elev11}SpecWidth" suppressErrors="${suppressErrors11}"> menuText="${elev11} SW" id="${icao}Terminal${elev11}SpecWidth" suppressErrors="${suppressErrors11}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev11}--${elev11}" /> <substitute key="elevation" value="${elev11}--${elev11}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev12} SW" id="${icao}Terminal${elev12}SpecWidth" suppressErrors="${suppressErrors12}"> menuText="${elev12} SW" id="${icao}Terminal${elev12}SpecWidth" suppressErrors="${suppressErrors12}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev12}--${elev12}" /> <substitute key="elevation" value="${elev12}--${elev12}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev13} SW" id="${icao}Terminal${elev13}SpecWidth" suppressErrors="${suppressErrors13}"> menuText="${elev13} SW" id="${icao}Terminal${elev13}SpecWidth" suppressErrors="${suppressErrors13}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev13}--${elev13}" /> <substitute key="elevation" value="${elev13}--${elev13}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev14} SW" id="${icao}Terminal${elev14}SpecWidth" suppressErrors="${suppressErrors14}"> menuText="${elev14} SW" id="${icao}Terminal${elev14}SpecWidth" suppressErrors="${suppressErrors14}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev14}--${elev14}" /> <substitute key="elevation" value="${elev14}--${elev14}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev15} SW" id="${icao}Terminal${elev15}SpecWidth" suppressErrors="${suppressErrors15}"> menuText="${elev15} SW" id="${icao}Terminal${elev15}SpecWidth" suppressErrors="${suppressErrors15}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev15}--${elev15}" /> <substitute key="elevation" value="${elev15}--${elev15}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev16} SW" id="${icao}Terminal${elev16}SpecWidth" suppressErrors="${suppressErrors16}"> menuText="${elev16} SW" id="${icao}Terminal${elev16}SpecWidth" suppressErrors="${suppressErrors16}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev16}--${elev16}" /> <substitute key="elevation" value="${elev16}--${elev16}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev17} SW" id="${icao}Terminal${elev17}SpecWidth" suppressErrors="${suppressErrors17}"> menuText="${elev17} SW" id="${icao}Terminal${elev17}SpecWidth" suppressErrors="${suppressErrors17}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev17}--${elev17}" /> <substitute key="elevation" value="${elev17}--${elev17}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev18} SW" id="${icao}Terminal${elev18}SpecWidth" suppressErrors="${suppressErrors18}"> menuText="${elev18} SW" id="${icao}Terminal${elev18}SpecWidth" suppressErrors="${suppressErrors18}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev18}--${elev18}" /> <substitute key="elevation" value="${elev18}--${elev18}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev19} SW" id="${icao}Terminal${elev19}SpecWidth" suppressErrors="${suppressErrors19}"> menuText="${elev19} SW" id="${icao}Terminal${elev19}SpecWidth" suppressErrors="${suppressErrors19}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev19}--${elev19}" /> <substitute key="elevation" value="${elev19}--${elev19}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev20} SW" id="${icao}Terminal${elev20}SpecWidth" suppressErrors="${suppressErrors20}"> menuText="${elev20} SW" id="${icao}Terminal${elev20}SpecWidth" suppressErrors="${suppressErrors20}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev20}--${elev20}" /> <substitute key="elevation" value="${elev20}--${elev20}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev21} SW" id="${icao}Terminal${elev21}SpecWidth" suppressErrors="${suppressErrors21}"> menuText="${elev21} SW" id="${icao}Terminal${elev21}SpecWidth" suppressErrors="${suppressErrors21}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev21}--${elev21}" /> <substitute key="elevation" value="${elev21}--${elev21}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev22} SW" id="${icao}Terminal${elev22}SpecWidth" suppressErrors="${suppressErrors22}"> menuText="${elev22} SW" id="${icao}Terminal${elev22}SpecWidth" suppressErrors="${suppressErrors22}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev22}--${elev22}" /> <substitute key="elevation" value="${elev22}--${elev22}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev23} SW" id="${icao}Terminal${elev23}SpecWidth" suppressErrors="${suppressErrors23}"> menuText="${elev23} SW" id="${icao}Terminal${elev23}SpecWidth" suppressErrors="${suppressErrors23}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev23}--${elev23}" /> <substitute key="elevation" value="${elev23}--${elev23}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="${elev24} SW" id="${icao}Terminal${elev24}SpecWidth" suppressErrors="${suppressErrors24}"> menuText="${elev24} SW" id="${icao}Terminal${elev24}SpecWidth" suppressErrors="${suppressErrors24}">
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="${elev24}--${elev24}" /> <substitute key="elevation" value="${elev24}--${elev24}" />
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarBestRes.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultRadar.xml"
menuText="All SW" id="${icao}TerminalAllSpecWidth" > menuText="All SW" id="${icao}TerminalAllSpecWidth" >
<substitute key="icao" value="${icao}" /> <substitute key="icao" value="${icao}" />
<substitute key="product1" value="184" /> <substitute key="product" value="185" />
<substitute key="product2" value="185" />
<substitute key="product3" value="" />
<substitute key="product4" value="" />
<substitute key="mode" value="" />
<substitute key="elevation" value="0.0--360.0" /> <substitute key="elevation" value="0.0--360.0" />
</contribute> </contribute>
</contribute> </contribute>

24
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfig.java
View file

@ -32,21 +32,21 @@ import javax.xml.bind.annotation.XmlRootElement;
* Archive data information for retention, purging and archiving. An example: * Archive data information for retention, purging and archiving. An example:
* *
* <pre> * <pre>
* &lt;archive> * <archive>
* &lt;name>Raw&lt;/name> * <name>Raw</name>
* &lt;rootDir>/data_store/&lt;/rootDir> * <rootDir>/data_store/</rootDir>
* &lt;!-- default retention hours for a category. --> * <!-- default retention hours for a category. -->
* &lt;defaultRetentionHours>168&lt;/defaultRetentionHours> * <defaultRetentionHours>168</defaultRetentionHours>
* &lt;category> * <category>
* &lt;name>Model grib&lt;/name> * <name>Model grib</name>
* ... * ...
* &lt;/category> * </category>
* &lt;category> * <category>
* &lt;name>Model grib2&lt;/name> * <name>Model grib2</name>
* ... * ...
* &lt;/category> * </category>
* ... * ...
* &lt;archive> * <archive>
* </pre> * </pre>
* *
* <pre> * <pre>

6
edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties
View file

@ -3,17 +3,17 @@ archive.enable=false
# runs database and hdf5 archive for archive server to pull data from # runs database and hdf5 archive for archive server to pull data from
archive.cron=0+40+*+*+*+? archive.cron=0+40+*+*+*+?
# path to store processed archive data # path to store processed archive data
archive.path=/awips2/archive archive.path=/awips2/edex/data/archive
# enable archive purge # enable archive purge
archive.purge.enable=true archive.purge.enable=false
# when to purge archives # when to purge archives
archive.purge.cron=0+5+0/2+*+*+? archive.purge.cron=0+5+0/2+*+*+?
# compress database records # compress database records
archive.compression.enable=false archive.compression.enable=false
# To change Default case directory. # To change Default case directory.
#archive.case.directory=/awips2/edex/data/archiver/ archive.case.directory=/awips2/cave/cases
# to disable a specific archive, use property archive.disable=pluginName,pluginName... # to disable a specific archive, use property archive.disable=pluginName,pluginName...
#archive.disable=grid,text,acars #archive.disable=grid,text,acars

2
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/useradmin/ArchiveCaseCreationAuthRequestHandler.java
View file

@ -45,7 +45,7 @@ public class ArchiveCaseCreationAuthRequestHandler extends
private final String CASE_DIR_KEY = "archive.case.directory"; private final String CASE_DIR_KEY = "archive.case.directory";
private final String CASE_DIR_DEFAULT = "/awips2/edex/data/archiver/"; private final String CASE_DIR_DEFAULT = "/awips2/edex/data/archive/cases";
@Override @Override
public ArchiveAdminAuthRequest handleRequest(ArchiveAdminAuthRequest request) public ArchiveAdminAuthRequest handleRequest(ArchiveAdminAuthRequest request)

66
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
View file

@ -1,23 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- <!--
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
@ -141,15 +122,30 @@
--> -->
<archive> <archive>
<name>Processed</name> <name>Processed</name>
<rootDir>/archive/</rootDir> <rootDir>/awips2/edex/data/archive/</rootDir>
<defaultRetentionHours>168</defaultRetentionHours> <defaultRetentionHours>168</defaultRetentionHours>
<category> <category>
<name>Decision Assistance</name> <name>Radar</name>
<selectedRetentionHours>168</selectedRetentionHours> <selectedRetentionHours>168</selectedRetentionHours>
<dataSet> <dataSet>
<dirPattern>(cwat|fog|ffmp|fssobs|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*</dirPattern> <dirPattern>radar/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern>
<displayLabel>{1}</displayLabel> <displayLabel>{1}</displayLabel>
<dateGroupIndices>2,3,4,5</dateGroupIndices> <dateGroupIndices>3,4,5,6</dateGroupIndices>
</dataSet>
</category>
<category>
<name>Model</name>
<selectedRetentionHours>168</selectedRetentionHours>
<dataSet>
<dirPattern>(grid)/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})-.*</dirPattern>
<displayLabel>{2}</displayLabel>
<dateGroupIndices>4,5,6,7</dateGroupIndices>
</dataSet>
<dataSet>
<dirPattern>(modelsounding)/(.*)/.*/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*</dirPattern>
<dirPattern>(bufrmos)(.*)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern>
<displayLabel>{1} - {2}</displayLabel>
<dateGroupIndices>3,4,5,6</dateGroupIndices>
</dataSet> </dataSet>
</category> </category>
<category> <category>
@ -175,21 +171,6 @@
<dateGroupIndices>2,3,4,5</dateGroupIndices> <dateGroupIndices>2,3,4,5</dateGroupIndices>
</dataSet> </dataSet>
</category> </category>
<category>
<name>Model</name>
<selectedRetentionHours>168</selectedRetentionHours>
<dataSet>
<dirPattern>(grid)/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})-.*</dirPattern>
<displayLabel>{2}</displayLabel>
<dateGroupIndices>4,5,6,7</dateGroupIndices>
</dataSet>
<dataSet>
<dirPattern>(modelsounding)/(.*)/.*/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*</dirPattern>
<dirPattern>(bufrmos)(.*)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern>
<displayLabel>{1} - {2}</displayLabel>
<dateGroupIndices>3,4,5,6</dateGroupIndices>
</dataSet>
</category>
<category> <category>
<name>Products</name> <name>Products</name>
<selectedRetentionHours>168</selectedRetentionHours> <selectedRetentionHours>168</selectedRetentionHours>
@ -204,7 +185,7 @@
<name>Observation</name> <name>Observation</name>
<selectedRetentionHours>168</selectedRetentionHours> <selectedRetentionHours>168</selectedRetentionHours>
<dataSet> <dataSet>
<dirPattern>(acars|airep|binlightning|bufrascat|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|pirep|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern> <dirPattern>(acars|airep|binlightning|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|pirep|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern>
<dirPattern>(sfcobs)/.*/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern> <dirPattern>(sfcobs)/.*/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern>
<displayLabel>{1}</displayLabel> <displayLabel>{1}</displayLabel>
<dateGroupIndices>2,3,4,5</dateGroupIndices> <dateGroupIndices>2,3,4,5</dateGroupIndices>
@ -235,13 +216,12 @@
</dataSet> </dataSet>
</category> </category>
<category> <category>
<!-- Find mosaic dataset and add here. --> <name>Decision Assistance</name>
<name>radar</name>
<selectedRetentionHours>168</selectedRetentionHours> <selectedRetentionHours>168</selectedRetentionHours>
<dataSet> <dataSet>
<dirPattern>radar/(.*)/(.*)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})</dirPattern> <dirPattern>(cwat|fog|ffmp|fssobs|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*</dirPattern>
<displayLabel>{1}</displayLabel> <displayLabel>{1}</displayLabel>
<dateGroupIndices>3,4,5,6</dateGroupIndices> <dateGroupIndices>2,3,4,5</dateGroupIndices>
</dataSet> </dataSet>
</category> </category>
</archive> </archive>

8
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/roles/archiveAdminRoles.xml
View file

@ -1,16 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<nwsRoleData xmlns:ns2="group"> <nwsRoleData xmlns:ns2="group">
<application>Data Archiving</application> <application>Data Archiving</application>
<!-- Archive Retention permission.-->
<permission id="archive.retention"> <permission id="archive.retention">
<description> <description>
This permission allows the user to access Archive Retention. This permission allows the user to access Archive Retention.
</description> </description>
</permission> </permission>
<!-- Archive Case Creation permission. -->
<permission id="archive.casecreation"> <permission id="archive.casecreation">
<description> <description>
This permission allows the user to access Archive Case Creation. This permission allows the user to access Archive Case Creation.
</description> </description>
</permission> </permission>
<!--
<user userId="ALL">
<userPermission>archive.retention</userPermission>
<userPermission>archive.casecreation</userPermission>
</user>
-->
</nwsRoleData> </nwsRoleData>

3
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
View file

@ -46,6 +46,7 @@
# Sep 14, 2015 4868 rjpeter Updated writePartialHDFData to create the dataset if # Sep 14, 2015 4868 rjpeter Updated writePartialHDFData to create the dataset if
# it doesn't exist. # it doesn't exist.
# Oct 20, 2015 4982 nabowle Verify datatypes match when replacing data. # Oct 20, 2015 4982 nabowle Verify datatypes match when replacing data.
# Nov 30, 2016 mjames@ucar Change == None to is None (for numpy array).
# #
import h5py, os, numpy, pypies, re, logging, shutil, time, types, traceback import h5py, os, numpy, pypies, re, logging, shutil, time, types, traceback
@ -162,7 +163,7 @@ class H5pyDataStore(IDataStore.IDataStore):
recMaxDims = rec.getMaxSizes() recMaxDims = rec.getMaxSizes()
for i in range(nDims): for i in range(nDims):
szDims1[i] = szDims[nDims - i - 1] szDims1[i] = szDims[nDims - i - 1]
if recMaxDims == None or recMaxDims[i] == 0: if recMaxDims is None or recMaxDims[i] == 0:
maxDims[i] = None maxDims[i] = None
else: else:
maxDims[i] = recMaxDims[i] maxDims[i] = recMaxDims[i]