Merge branch 'unidata_14.4.1' of github.com:Unidata/awips2 into unidata_14.4.1

Former-commit-id: 65fd72667f
This commit is contained in:
mjames-upc 2015-09-07 18:49:43 -06:00
commit 98ce80da5f
2 changed files with 95 additions and 68 deletions

View file

@ -20,74 +20,6 @@
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="--- UNIWISC Imagery ---" id="UniwiscImagery" />
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="GOES Sounder - Ozone" id="GOES-Sounder-Ozone">
<substitute key="element" value="Sounder Based Total Column Ozone"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/Ozone/Ozone"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 11 micron IR" id="Arctic-IR1">
<substitute key="element" value="Imager 11 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 12 micron IR" id="Arctic-IR2">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 3.5-4.0 micro IR (Fog)" id="Arctic-Fog">
<substitute key="element" value="Imager 3.5-4.0 micro IR (Fog)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/Fog"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - IR" id="Arctic-IR1">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctica" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"
menuText="IR Window" id="irWindow">
<substitute key="timeMatchMode" value="${blendedTimeMatchMode;ALL_IMAGES}"/>
@ -140,4 +72,66 @@
<substitute key="element2" value="Imager Visible"/>
<substitute key="element3" value="Imager 6.7-6.5 micron IR (WV)"/>
</contribute>
<contribute xsi:type="subMenu" menuText="Arctic Composites">
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 11 micron IR" id="Arctic-IR1">
<substitute key="element" value="Imager 11 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 12 micron IR" id="Arctic-IR2">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic - 3.5-4.0 micro IR (Fog)" id="Arctic-Fog">
<substitute key="element" value="Imager 3.5-4.0 micro IR (Fog)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/Fog"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="Antarctica Composites">
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - VIS" id="Arctic-Vis">
<substitute key="element" value="Imager Visible"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - IR" id="Arctic-IR1">
<substitute key="element" value="Imager 12 micron IR"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica - WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctica" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute>
</contribute>
</menuTemplate>

View file

@ -64,6 +64,39 @@
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<contribute xsi:type="titleItem" titleText="------ Uniwisc Sounder Imagery ------" id="SounderLine"/>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Ozone" id="GOES-Sounder-Ozone">
<substitute key="element" value="Sounder Based Total Column Ozone"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/Ozone/Ozone"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Derived Lifted Index" id="GOES-Sounder-LI">
<substitute key="element" value="Sounder Based Derived Lifted Index"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/Ozone/Ozone"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Precipitable Water" id="GOES-Sounder-PW">
<substitute key="element" value="Sounder Based Derived Precipitable Water"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/Precip Water/Precip Water - Polar"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="CAPE" id="GOES-Sounder-Cape">
<substitute key="element" value="CAPE"/>
<substitute key="entity" value="SOUNDER" />
<substitute key="sector" value="GOES-Sounder" />
<substitute key="colormap" value="Sat/IR/IR WV"/>
</contribute>
<contribute xsi:type="titleItem"
titleText="------ OCONUS Sounder Imagery------" id="OconusSndrLine"/>
<contribute xsi:type="subMenu" menuText="N. Atlantic and Gulf of Mexico">