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

cleanup sat product names and nwsauth/collab/useradmin plugins

Browse source 
Former-commit-id: a333d34383
This commit is contained in:
mjames-upc 2015-12-30 15:24:14 -07:00
parent b56a332fc4
commit 6b39bbeac0
6 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml
View file

@ -27,7 +27,7 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Water Vapor" id="waterVapor"> menuText="Water Vapor" id="waterVapor">
<substitute key="element" value="Imager 6.7-6.5 micron WV"/> <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/> <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"

8
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml
View file

@ -34,7 +34,7 @@
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic IR" id="Arctic-3.9"> menuText="Arctic IR" id="Arctic-3.9">
<substitute key="element" value="Imager 3.5-4.0 micron IR"/> <substitute key="element" value="Imager 3.5-4.0 micro IR (Fog)"/>
<substitute key="entity" value="COMP" /> <substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" /> <substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/IR/Fog"/> <substitute key="colormap" value="Sat/IR/Fog"/>
@ -48,7 +48,7 @@
</contribute> </contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Arctic WV" id="Arctic-WV"> menuText="Arctic WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron WV"/> <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" /> <substitute key="entity" value="COMP" />
<substitute key="sector" value="Arctic" /> <substitute key="sector" value="Arctic" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/> <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
@ -58,7 +58,7 @@
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica IR" id="Arctic-IR1"> menuText="Antarctica IR" id="Arctic-IR1">
<substitute key="element" value="Imager 3.5-4.0 micron IR"/> <substitute key="element" value="Imager 3.5-4.0 micro IR (Fog)"/>
<substitute key="entity" value="COMP" /> <substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctic" /> <substitute key="sector" value="Antarctic" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
@ -72,7 +72,7 @@
</contribute> </contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica WV" id="Arctic-WV"> menuText="Antarctica WV" id="Arctic-WV">
<substitute key="element" value="Imager 6.7-6.5 micron WV"/> <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="entity" value="COMP" /> <substitute key="entity" value="COMP" />
<substitute key="sector" value="Antarctica" /> <substitute key="sector" value="Antarctica" />
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/> <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>

4
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseUniwiscComposite.xml
View file

@ -36,7 +36,7 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="4km GOES East WV" id="waterVapor"> menuText="4km GOES East WV" id="waterVapor">
<substitute key="element" value="Imager 6.7-6.5 micron WV"/> <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="sector" value="GOES-East"/> <substitute key="sector" value="GOES-East"/>
<substitute key="entity" value="GOES13"/> <substitute key="entity" value="GOES13"/>
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/> <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>
@ -57,7 +57,7 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="4km GOES West WV" id="waterVapor"> menuText="4km GOES West WV" id="waterVapor">
<substitute key="element" value="Imager 6.7-6.5 micron WV"/> <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)"/>
<substitute key="sector" value="GOES-West"/> <substitute key="sector" value="GOES-West"/>
<substitute key="entity" value="GOES15"/> <substitute key="entity" value="GOES15"/>
<substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/> <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor"/>

2
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
View file

@ -40,7 +40,7 @@
</styleRule> </styleRule>
<styleRule> <styleRule>
<paramLevelMatches> <paramLevelMatches>
<parameter>Imager 6.7-6.5 micron WV</parameter> <parameter>Imager 6.7-6.5 micron IR (WV)</parameter>
<parameter>Sounder 6.51 micron imagery</parameter> <parameter>Sounder 6.51 micron imagery</parameter>
<parameter>Sounder 7.02 micron imagery</parameter> <parameter>Sounder 7.02 micron imagery</parameter>
<parameter>Sounder 7.43 micron imagery</parameter> <parameter>Sounder 7.43 micron imagery</parameter>

20
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
View file

@ -45,39 +45,39 @@
<!-- GOES13 --> <!-- GOES13 -->
<entry><key ss="180" band="1"/><value name="Imager Visible" /></entry> <entry><key ss="180" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="180" band="2"/><value name="Imager 3.5-4.0 micron IR" units="IRPixel" /></entry> <entry><key ss="180" band="2"/><value name="Imager 3.5-4.0 micro IR (Fog)" units="IRPixel" /></entry>
<entry><key ss="180" band="3"/><value name="Imager 6.7-6.5 micron WV" units="IRPixel" /></entry> <entry><key ss="180" band="3"/><value name="Imager 6.7-6.5 micron IR (WV)" units="IRPixel" /></entry>
<entry><key ss="180" band="4"/><value name="Imager 11 micron IR" /></entry> <entry><key ss="180" band="4"/><value name="Imager 11 micron IR" /></entry>
<entry><key ss="180" band="5"/><value name="Imager 12 micron IR" /></entry> <entry><key ss="180" band="5"/><value name="Imager 12 micron IR" /></entry>
<entry><key ss="180" band="6"/><value name="Imager 13 micron IR" /></entry> <entry><key ss="180" band="6"/><value name="Imager 13 micron IR" /></entry>
<!-- GOES15 --> <!-- GOES15 -->
<entry><key ss="184" band="1"/><value name="Imager Visible" /></entry> <entry><key ss="184" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="184" band="2"/><value name="Imager 3.5-4.0 micron IR" units="IRPixel" /></entry> <entry><key ss="184" band="2"/><value name="Imager 3.5-4.0 micro IR (Fog)" units="IRPixel" /></entry>
<entry><key ss="184" band="3"/><value name="Imager 6.7-6.5 micron WV" units="IRPixel" /></entry> <entry><key ss="184" band="3"/><value name="Imager 6.7-6.5 micron IR (WV)" units="IRPixel" /></entry>
<entry><key ss="184" band="4"/><value name="Imager 11 micron IR" /></entry> <entry><key ss="184" band="4"/><value name="Imager 11 micron IR" /></entry>
<entry><key ss="184" band="5"/><value name="Imager 12 micron IR" /></entry> <entry><key ss="184" band="5"/><value name="Imager 12 micron IR" /></entry>
<entry><key ss="184" band="6"/><value name="Imager 13 micron IR" /></entry> <entry><key ss="184" band="6"/><value name="Imager 13 micron IR" /></entry>
<!-- Arctic --> <!-- Arctic -->
<entry><key ss="401" band="1"/><value name="Imager Visible" /></entry> <entry><key ss="401" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="401" band="2"/><value name="Imager 3.5-4.0 micron IR" units="IRPixel" /> /></entry> <entry><key ss="401" band="2"/><value name="Imager 3.5-4.0 micro IR (Fog)" units="IRPixel" /> /></entry>
<entry><key ss="401" band="3"/><value name="Imager 6.7-6.5 micron WV" units="IRPixel" /></entry> <entry><key ss="401" band="3"/><value name="Imager 6.7-6.5 micron IR (WV)" units="IRPixel" /></entry>
<entry><key ss="401" band="4"/><value name="Imager 11 micron IR" /></entry> <entry><key ss="401" band="4"/><value name="Imager 11 micron IR" /></entry>
<entry><key ss="401" band="5"/><value name="Imager 12 micron IR" /></entry> <entry><key ss="401" band="5"/><value name="Imager 12 micron IR" /></entry>
<!-- Antarctic --> <!-- Antarctic -->
<entry><key ss="72" band="1"/><value name="Imager Visible" /></entry> <entry><key ss="72" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="72" band="3"/><value name="Imager 6.7-6.5 micron WV" units="IRPixel" /></entry> <entry><key ss="72" band="3"/><value name="Imager 6.7-6.5 micron IR (WV)" units="IRPixel" /></entry>
<entry><key ss="72" band="4"/><value name="Imager 11 micron IR" /></entry> <entry><key ss="72" band="4"/><value name="Imager 11 micron IR" /></entry>
<!-- SOUNDER --> <!-- SOUNDER -->
<entry><key ss="185" band="1"/><value name="Imager Visible" /></entry> <entry><key ss="185" band="1"/><value name="Imager Visible" /></entry>
<entry><key ss="185" band="2"/><value name="Imager 11 micron IR" units="IRPixel" /></entry> <entry><key ss="185" band="2"/><value name="Imager 11 micron IR" units="IRPixel" /></entry>
<entry><key ss="185" band="3"/><value name="Imager 12 micron IR" units="IRPixel" /></entry> <entry><key ss="185" band="3"/><value name="Imager 12 micron IR" units="IRPixel" /></entry>
<entry><key ss="185" band="4"/><value name="Imager 6.7-6.5 micron WV" /></entry> <entry><key ss="185" band="4"/><value name="Imager 6.7-6.5 micron IR (WV)" /></entry>
<entry><key ss="185" band="5"/><value name="Imager 3.5-4.0 micron IR" /></entry> <entry><key ss="185" band="5"/><value name="Imager 3.5-4.0 micro IR (Fog)" /></entry>
<entry><key ss="185" band="6"/><value name="Imager 3.5-4.0 micron IR" /></entry> <entry><key ss="185" band="6"/><value name="Imager 3.5-4.0 micro IR (Fog)" /></entry>
<!-- UNIWISC GOES Sounder --> <!-- UNIWISC GOES Sounder -->
<entry><key ss="71" band="27"/><value name="Gridded Cloud Top Pressure or Height" /></entry> <entry><key ss="71" band="27"/><value name="Gridded Cloud Top Pressure or Height" /></entry>

7
rpms/awips2.cave/deploy.builder/build.sh
View file

@ -194,8 +194,7 @@ function buildFeatureRPMs()
[ "${feature}" = "com.raytheon.uf.viz.base.feature" ] || [ "${feature}" = "com.raytheon.uf.viz.base.feature" ] ||
[ "${feature}" = "com.raytheon.uf.viz.localization.perspective.feature" ] || [ "${feature}" = "com.raytheon.uf.viz.localization.perspective.feature" ] ||
[ "${feature}" = "com.raytheon.uf.viz.archive.feature" ] || [ "${feature}" = "com.raytheon.uf.viz.archive.feature" ] ||
[ "${feature}" = "com.raytheon.viz.satellite.feature" ] || [ "${feature}" = "com.raytheon.viz.satellite.feature" ]; then
[ "${feature}" = "com.raytheon.uf.viz.nwsauth.feature" ]; then
_component_name="" _component_name=""
_downstream_requires="awips2-common-base" _downstream_requires="awips2-common-base"
@ -217,10 +216,6 @@ function buildFeatureRPMs()
_component_name="awips2-cave-viz-satellite" _component_name="awips2-cave-viz-satellite"
_downstream_requires="awips2-common-base awips2-cave-viz-base awips2-cave-viz-core" _downstream_requires="awips2-common-base awips2-cave-viz-base awips2-cave-viz-core"
fi fi
if [ "${feature}" = "com.raytheon.uf.viz.nwsauth.feature" ]; then
_component_name="awips2-cave-viz-nwsauth"
_downstream_requires="awips2-common-base awips2-cave-viz-base"
fi
echo 'export COMPONENT_NAME="${_component_name}"' > \ echo 'export COMPONENT_NAME="${_component_name}"' > \
${CONST_SETUP_DIR}/feature.setup ${CONST_SETUP_DIR}/feature.setup