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

More updates to the Satellite Menus (VIRRS and legacy UNIWISC data)

Browse source 
-Moved NPP/VIIRS/NUCAPS menus/bundles/etc from CAVE to EDEX side
-Updated menus to have the new menu items and reorganized the satellite menu a bit
This commit is contained in:
ucar-tmeyer 2023-06-20 18:51:27 +00:00
parent 4b747b5fe5
commit 733cd56165
24 changed files with 89 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.uf.viz.npp.nucaps/build.properties
View file

@ -1,6 +1,5 @@
output.com.raytheon.uf.viz.npp.nucaps.jar = bin/
bin.includes = META-INF/,\
localization/,\
plugin.xml,\
com.raytheon.uf.viz.npp.nucaps.jar
source.com.raytheon.uf.viz.npp.nucaps.jar = src/

1
cave/com.raytheon.uf.viz.npp.viirs/build.properties
View file

@ -1,7 +1,6 @@
output.com.raytheon.uf.viz.npp.viirs.jar = bin/
bin.includes = META-INF/,\
plugin.xml,\
localization/,\
res/,\
com.raytheon.uf.viz.npp.viirs.jar
source.com.raytheon.uf.viz.npp.viirs.jar = src/

1
cave/com.raytheon.uf.viz.npp/build.properties
View file

@ -1,5 +1,4 @@
output.com.raytheon.uf.viz.npp.jar = bin/
bin.includes = META-INF/,\
localization/,\
com.raytheon.uf.viz.npp.jar
source.com.raytheon.uf.viz.npp.jar = src/

1
edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="separator" id="Separator"/>
<contribute xsi:type="titleItem" titleText="------ Legacy Satellitle Data ------" id="legacySat"/>
<contribute xsi:type="subMenu" menuText="Legacy Satellite Data">
<contribute xsi:type="titleItem" titleText="------ Composite Imagery ------" id="CompositeImagery" />

2
edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
View file

@ -3,7 +3,7 @@
<include installTo="menu:satellite?before=GOESR"
fileName="menus/satellite/goesr/goesrMenu.xml">
</include>
<include installTo="menu:satellite?after=GOESR"
<include installTo="menu:satellite"
fileName="menus/satellite/baseSatellite.xml">
</include>
</menuContributionFile>

26
edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml Normal file
View file

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!--
This is an absolute override file, indicating that a higher priority
version of the file will completely replace a lower priority version
of the file.
-->
<bundle>
<displayList>
<displays xsi:type="mapRenderableDisplay"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties />
<resourceData xsi:type="nucapsSoundingMapResourceData">
<metadataMap>
<mapping key="pluginName">
<constraint constraintValue="nucaps"
constraintType="EQUALS" />
</mapping>
</metadataMap>
</resourceData>
</resource>
</descriptor>
</displays>
</displayList>
</bundle>

2
cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
View file

@ -30,7 +30,7 @@
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties />
<resourceData xsi:type="nucapsSoundingMapResourceData">
<resourceData xsi:type="nppSoundingMapResourceData">
<nsharpResourceData>${soundingResourceData}</nsharpResourceData>
<resourceName>${name;Unknown}</resourceName>
<metadataMap>

0
cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/index.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml Normal file → Executable file
View file

0
cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/nucapsMenuItems.xml Normal file → Executable file
View file

0
cave/com.raytheon.uf.viz.npp.nucaps/localization/nucaps/nucapsConfig.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/nucaps/nucapsConfig.xml
View file

0
cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/singlePanelComposite.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/singlePanelComposite.xml
View file

7
cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml
View file

@ -42,12 +42,13 @@
<mapping key="parameter">
<constraint constraintValue="0.7Ref" constraintType="EQUALS"/>
</mapping>
<mapping key="region">
<constraint constraintValue="${region}" constraintType="EQUALS"/>
</mapping>
<mapping key="pluginName">
<constraint constraintValue="viirs" constraintType="EQUALS"/>
</mapping>
<mapping key="region">
<constraint constraintValue="${region}" constraintType="EQUALS"/>
</mapping>
</metadataMap>
</resourceData>
</resource>

0
cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsImagery.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsImagery.xml
View file

0
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml Normal file → Executable file
View file

23
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml Normal file → Executable file
View file

@ -30,14 +30,6 @@
menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64J">
<substitute key="parameter" value="0.64Ref"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="0.865 μm Imagery Band 2 (CH 02)" id="Img0.865J">
<substitute key="parameter" value="0.865Ref"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="1.61 μm Imagery Band 3 (CH I3 (R))" id="Img1.61J">
<substitute key="parameter" value="1.61Ref"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74J">
<substitute key="parameter" value="3.74BT"/>
@ -46,21 +38,8 @@
menuText="11.45 μm Imagery Band 5 (CH 05)" id="Img11.45J">
<substitute key="parameter" value="11.45BT"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="Moderate Band 14 (8.55u)" id="Mod8.55J">
<substitute key="parameter" value="8.55BT"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="Moderate Band 15 (10.763u)" id="Mod10.763J">
<substitute key="parameter" value="10.763BT"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="Moderate Band 16 (12.013u)" id="Mod12.013J">
<substitute key="parameter" value="12.013BT"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="0.7 μm Near Constant Contrast" id="NCC0.7J">
menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
<substitute key="channelType" value="Moderate"/>
</contribute>
</menuTemplate>

2
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml Normal file → Executable file
View file

@ -27,7 +27,7 @@
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" id="VIIRSTitleJPSS" titleText="------ Imagery ------"/>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="0.7 μm Near Constant Contrast" id="NCC0.7J">
menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
<substitute key="channelType" value="Moderate"/>
</contribute>
</menuTemplate>

2
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml Normal file → Executable file
View file

@ -27,7 +27,7 @@
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" id="VIIRSTitle" titleText="------ Imagery ------"/>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="0.7 μm Near Constant Contrast" id="NCC0.7">
menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
<substitute key="channelType" value="Moderate"/>
</contribute>

7
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems_AK.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
View file

@ -30,6 +30,7 @@
menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64">
<substitute key="parameter" value="0.64Ref"/>
</contribute>
<!--
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="0.865 μm Imagery Band 2 (CH 02)" id="Img0.865">
<substitute key="parameter" value="0.865Ref"/>
@ -38,6 +39,7 @@
menuText="1.61 μm Imagery Band 3 (CH I3 (R))" id="Img1.61">
<substitute key="parameter" value="1.61Ref"/>
</contribute>
-->
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74">
<substitute key="parameter" value="3.74BT"/>
@ -57,7 +59,7 @@
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="Moderate Band 13 (4.05u)" id="Mod4.05">
<substitute key="parameter" value="4.05BT"/>
</contribute> -->
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
menuText="Moderate Band 14 (8.55u)" id="Mod8.55">
<substitute key="parameter" value="8.55BT"/>
@ -70,8 +72,9 @@
menuText="Moderate Band 16 (12.013u)" id="Mod12.013">
<substitute key="parameter" value="12.013BT"/>
</contribute>
-->
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="0.7 μm Near Constant Contrast" id="NCC0.7">
menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
<substitute key="channelType" value="Moderate"/>
</contribute>

68
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml Normal file → Executable file
View file

@ -45,45 +45,51 @@
Lee Byerle 1/2/2018
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="titleItem" titleText="------ VIIRS ------" id="ImageryLine"/>
<contribute xsi:type="subMenu" menuText="S-NPP CONUS" id="CONUSid">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
<substitute key="region" value="CONUS"/>
</contribute>
</contribute>
<contribute xsi:type="titleItem" titleText="------ S-NPP ------" id="ImageryLine"/>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="S-NPP CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="CONUS"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="S-NPP Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="Pacific"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="S-NPP Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="Puerto Rico"/>
</contribute>
<contribute xsi:type="subMenu" menuText="S-NPP Alaska" id="Alaskaid">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems_AK.xml">
<substitute key="region" value="Alaska"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="S-NPP Pacific" id="Pacificid">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
<substitute key="region" value="Pacific"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="S-NPP Puerto Rico" id="PuertoRicoid">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
<substitute key="region" value="Puerto Rico"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="NOAA-20 CONUS" id="CONUSidJPSS">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
<substitute key="region" value="CONUSJPSS"/>
</contribute>
</contribute>
<contribute xsi:type="titleItem" titleText="------ NOAA-20 ------" id="ImageryLine"/>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="NOAA-20 CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="CONUSJPSS"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="NOAA-20 Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="PacificJPSS"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
menuText="NOAA-20 Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
<substitute key="channelType" value="Moderate"/>
<substitute key="region" value="Puerto_RicoJPSS"/>
</contribute>
<contribute xsi:type="subMenu" menuText="NOAA-20 Alaska" id="AlaskaidJPSS">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml">
<substitute key="region" value="AlaskaJPSS"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="NOAA-20 Pacific" id="PacificidJPSS">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
<substitute key="region" value="PacificJPSS"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="NOAA-20 Puerto Rico" id="PuertoRicoidJPSS">
<contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
<substitute key="region" value="Puerto_RicoJPSS"/>
</contribute>
</contribute>
</menuTemplate>

0
cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsRGBBundleItems.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsRGBBundleItems.xml Normal file → Executable file
View file

3
edexOsgi/com.raytheon.uf.edex.plugin.npp/build.properties
View file

@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
.,\
utility/

2
cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml Normal file → Executable file
View file

@ -24,5 +24,5 @@
of the file.
-->
<menuContributionFile>
<include installTo="menu:satellite?before=GROUP5" fileName="menus/npp/nppMenuItems.xml" />
<include installTo="menu:satellite" fileName="menus/npp/nppMenuItems.xml" />
</menuContributionFile>

12
cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml → edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
View file

@ -24,12 +24,10 @@
of the file.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20">
<contribute xsi:type="separator" id="Imagery"
visible="false" />
<contribute xsi:type="titleItem" id="SoundingsTitle"
titleText="------ Soundings ------" />
<contribute xsi:type="separator" id="Soundings"
visible="false" />
<contribute xsi:type="separator" id="MySeparatorId" />
<contribute xsi:type="titleItem" titleText="------ Polar Orbiting Satellites ------" id="polarSat"/>
<contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20 VIIRS Imagery">
<contribute xsi:type="separator" id="Imagery" visible="false" />
</contribute>
</menuTemplate>

2
edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
View file

@ -13,7 +13,7 @@ Require-Bundle: com.raytheon.edex.common,
com.raytheon.edex.plugin.satellite,
org.apache.commons.codec,
javax.xml.bind,
ar.com.hjg.pngj;bundle-version="2.1.1"
ar.com.hjg.pngj
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: com.raytheon.uf.common.localization,
com.raytheon.uf.common.menus,