From c6aaa554cbcb8e3368b47aa0de361f171f0220f2 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Thu, 18 Apr 2019 15:17:54 -0600 Subject: [PATCH] glm, dmw, sat product updates --- .../localization/menus/ncepHydro/baseNCEP.xml | 10 +- .../localization/bundles/LightningPlot.xml | 28 +- .../localization/bundles/LightningSeq.xml | 38 +- .../lightning/glmLightningBundleItems.xml | 24 + .../menus/lightning/glmlightningMenuItems.xml | 6 +- .../lightning/gridLightningBundleItems.xml | 19 - .../lightning/gridLightningMenuItems.xml | 19 - ...st_Smoke_Detection_Low_Med_High_bundle.xml | 134 +++++ ...goes16ConusWithLegacy_CH02_p64u_bundle.xml | 102 ++++ ...goes16ConusWithLegacy_CH07_3.9u_bundle.xml | 102 ++++ ...goes16ConusWithLegacy_CH08_6.2u_bundle.xml | 102 ++++ .../goes16ConusWithLegacy_CH16_13u_bundle.xml | 102 ++++ .../goes16ConusWithLegacy_IRWindow_bundle.xml | 106 ++++ .../goesr/goesSST_degF_degC_bundle.xml | 101 ++++ .../satellite/goesr/goesVAA_bundle.xml | 101 ++++ .../goesr/goesr-dmwBundleByChannel.xml | 57 +- .../goesr/goesr-dmwBundleByPressure.xml | 76 +-- .../satellite/goesr/goesrBestResRegion.xml | 169 ++++++ .../satellite/goesr/goesrRGBRecipe.xml | 115 ++++ .../satellite/goesr/goesrRGBRecipeGLSL.xml | 110 ++++ .../himawari/ahi-dmwBundleByChannel.xml | 6 +- .../himawari/ahi-dmwBundleByPressure.xml | 6 +- .../glm_window/goesrLevel2GLMgrid_5MIN.xml | 47 ++ .../satellite/goesr/dmw/goesr-dmw-index.xml | 47 ++ .../satellite/goesr/dmw/goesr-dmwMenu.xml | 52 +- .../goesr/dmw/goesr-dmwMenuByChannel.xml | 47 -- .../goesr/dmw/goesr-dmwMenuByFilter.xml | 232 ++++++++- .../goesr/dmw/goesr-dmwMenuByPressure.xml | 116 ----- .../goesr/dmw/goesr-dmwMenuByScene.xml | 58 +-- .../menus/satellite/goesr/goesr-index.xml | 71 +++ .../satellite/goesr/goesr/goesr-index.xml | 38 ++ .../goesr/goesrBestResConusByChannel.xml | 123 +++++ .../goesr/goesrBestResRegionByChannel.xml | 123 +++++ .../satellite/goesr/goesr/goesrByChannel.xml | 91 ++++ .../goesr/goesr/goesrBySectorByChannel.xml | 99 ++++ .../goesr/goesrBySectorLocallyDerived.xml | 99 ++++ .../goesr/goesrBySectorRGBComposites.xml | 99 ++++ .../goesr/goesr/goesrConusWithLegacy.xml | 51 ++ .../satellite/goesr/goesr/goesrLevel2.xml | 160 ++++++ .../goesr/goesr/goesrLevel2Conus.xml | 85 +++ .../satellite/goesr/goesr/goesrLevel2Fire.xml | 42 ++ .../goesr/goesr/goesrLevel2FullDisk.xml | 102 ++++ .../satellite/goesr/goesr/goesrLevel2Meso.xml | 75 +++ .../goesr/goesr/goesrLevel2Stability.xml | 52 ++ .../goesr/goesr/goesrLevel2Volcano.xml | 51 ++ .../goesr/goesr/goesrLocallyDerived.xml | 66 +++ .../menus/satellite/goesr/goesr/goesrMenu.xml | 40 ++ .../goesr/goesr/goesrRGBComposites.xml | 422 +++++++++++++++ .../menus/satellite/goesr/goesrByChannel.xml | 13 +- .../goesr/goesrBySectorByChannel.xml | 117 +++++ .../goesr/goesrBySectorLocallyDerived.xml | 121 +++++ .../goesr/goesrBySectorRGBComposites.xml | 121 +++++ .../satellite/goesr/goesrConusWithLegacy.xml | 56 ++ .../menus/satellite/goesr/goesrGLM.xml | 67 +++ .../satellite/goesr/goesrLevel2Conus.xml | 147 ++++++ .../menus/satellite/goesr/goesrLevel2Fire.xml | 57 ++ .../satellite/goesr/goesrLevel2FullDisk.xml | 177 +++++++ .../menus/satellite/goesr/goesrLevel2Meso.xml | 128 +++++ .../satellite/goesr/goesrLevel2Stability.xml | 71 +++ .../satellite/goesr/goesrLevel2Volcano.xml | 60 +++ .../menus/satellite/goesr/goesrMenu.xml | 33 +- .../satellite/goesr/goesrRGBComposites.xml | 490 ++++++++++++++++++ .../satellite/himawari/dmw/ahi-dmw-index.xml | 13 +- .../himawari/dmw/ahi-dmwMenuByChannel.xml | 54 +- .../himawari/dmw/ahi-dmwMenuByFilter.xml | 10 +- .../dmw/ahi-dmwMenuByMandatoryLevels.xml | 70 +-- .../himawari/dmw/ahi-dmwMenuByPressure.xml | 76 +-- .../satellite/himawari/himawari-index.xml | 9 +- .../satellite/himawari/himawariByChannel.xml | 151 +++--- .../menus/satellite/himawari/himawariMenu.xml | 16 +- .../localization/menus/satellite/index.xml | 2 +- edexOsgi/build.edex/build.xml | 8 +- .../base/distribution/nucaps.xml | 28 +- .../base/viirs/viirsHeaderMapping.xml | 113 +++- .../gini/lookuptables/creatingEntities.xml | 24 +- 75 files changed, 5512 insertions(+), 741 deletions(-) create mode 100644 cave/com.raytheon.viz.lightning/localization/menus/lightning/glmLightningBundleItems.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/GOES_Dust_Smoke_Detection_Low_Med_High_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH02_p64u_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH07_3.9u_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH08_6.2u_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH16_13u_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_IRWindow_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesSST_degF_degC_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesVAA_bundle.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrBestResRegion.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipe.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipeGLSL.xml create mode 100755 cave/com.raytheon.viz.satellite/localization/menus/satellite/glm_window/goesrLevel2GLMgrid_5MIN.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmw-index.xml delete mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml delete mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr-index.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesr-index.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResConusByChannel.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResRegionByChannel.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrByChannel.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorByChannel.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorLocallyDerived.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorRGBComposites.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrConusWithLegacy.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Conus.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Fire.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2FullDisk.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Meso.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Stability.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Volcano.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLocallyDerived.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrMenu.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrRGBComposites.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorByChannel.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorLocallyDerived.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorRGBComposites.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrConusWithLegacy.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrGLM.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Conus.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Fire.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2FullDisk.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Meso.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Stability.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Volcano.xml create mode 100644 cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/baseNCEP.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/baseNCEP.xml index 012727308f..5501632b5b 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/baseNCEP.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/baseNCEP.xml @@ -1,6 +1,10 @@ - + + + + + @@ -14,8 +18,6 @@ - - @@ -618,4 +620,4 @@ id="ncepHydro.nco.soundingDerivedPlots.bottom" visible="false" /> - \ No newline at end of file + diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot.xml index dc4083aa2c..ea2d323ab8 100644 --- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot.xml +++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot.xml @@ -1,34 +1,14 @@ - - + + + + diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml index 8abd5808f6..1b5ed5a0ac 100644 --- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml +++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml @@ -1,28 +1,4 @@ - - @@ -30,7 +6,8 @@ - + + PLAN_VIEW @@ -54,7 +31,8 @@ - + + PLAN_VIEW @@ -79,6 +57,7 @@ + PLAN_VIEW @@ -103,6 +82,7 @@ + PLAN_VIEW @@ -126,7 +106,8 @@ - + + PLAN_VIEW @@ -150,7 +131,8 @@ - + + PLAN_VIEW diff --git a/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmLightningBundleItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmLightningBundleItems.xml new file mode 100644 index 0000000000..d1d944517f --- /dev/null +++ b/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmLightningBundleItems.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmlightningMenuItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmlightningMenuItems.xml index 42e6b0386f..1011b83de0 100644 --- a/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmlightningMenuItems.xml +++ b/cave/com.raytheon.viz.lightning/localization/menus/lightning/glmlightningMenuItems.xml @@ -2,7 +2,7 @@ + fileName="menus/lightning/glmLightningBundleItems.xml"> @@ -16,7 +16,7 @@ + fileName="menus/lightning/glmLightningBundleItems.xml"> @@ -31,7 +31,7 @@ + fileName="menus/lightning/glmLightningBundleItems.xml"> diff --git a/cave/com.raytheon.viz.lightning/localization/menus/lightning/gridLightningBundleItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/lightning/gridLightningBundleItems.xml index e664a21b47..35f5c075ff 100644 --- a/cave/com.raytheon.viz.lightning/localization/menus/lightning/gridLightningBundleItems.xml +++ b/cave/com.raytheon.viz.lightning/localization/menus/lightning/gridLightningBundleItems.xml @@ -1,23 +1,4 @@ - - diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/GOES_Dust_Smoke_Detection_Low_Med_High_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/GOES_Dust_Smoke_Detection_Low_Med_High_bundle.xml new file mode 100644 index 0000000000..cb8fa20b45 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/GOES_Dust_Smoke_Detection_Low_Med_High_bundle.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH02_p64u_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH02_p64u_bundle.xml new file mode 100644 index 0000000000..457e0eef72 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH02_p64u_bundle.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH07_3.9u_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH07_3.9u_bundle.xml new file mode 100644 index 0000000000..4ca26e4ae3 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH07_3.9u_bundle.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH08_6.2u_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH08_6.2u_bundle.xml new file mode 100644 index 0000000000..ebee2ae602 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH08_6.2u_bundle.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH16_13u_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH16_13u_bundle.xml new file mode 100644 index 0000000000..54407af87c --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_CH16_13u_bundle.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_IRWindow_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_IRWindow_bundle.xml new file mode 100644 index 0000000000..38c4713b33 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goes16ConusWithLegacy_IRWindow_bundle.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + 0.0 + 254.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesSST_degF_degC_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesSST_degF_degC_bundle.xml new file mode 100644 index 0000000000..94166eac76 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesSST_degF_degC_bundle.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesVAA_bundle.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesVAA_bundle.xml new file mode 100644 index 0000000000..d8ada6babe --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesVAA_bundle.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByChannel.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByChannel.xml index 18652ed925..c9632309e2 100644 --- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByChannel.xml @@ -1,58 +1,12 @@ - - - - - - - - + - - + - - + - - + - diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml index 7d24ce71eb..6a71e60cf5 100644 --- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesr-dmwBundleByPressure.xml @@ -4,15 +4,14 @@ - - + + - + @@ -26,8 +25,8 @@ - - + + @@ -35,70 +34,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrBestResRegion.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrBestResRegion.xml new file mode 100644 index 0000000000..894b72d937 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrBestResRegion.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipe.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipe.xml new file mode 100644 index 0000000000..deddc47785 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipe.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + ${productName} + + RED + + + + + + + + + + + + + + + + + + + GREEN + + + + + + + + + + + + + + + + + + + BLUE + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipeGLSL.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipeGLSL.xml new file mode 100644 index 0000000000..1c6537cc7f --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/goesr/goesrRGBRecipeGLSL.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + ${sector} ${productName} + + RED + + + + + + + + + + + + + + + + + + + GREEN + + + + + + + + + + + + + + + + + + + BLUE + + + + + + + + + + + + + + + + + + + ${redMin} + ${redMax} + ${redGamma} + ${redUnit} + + + ${greenMin} + ${greenMax} + ${greenGamma} + ${greenUnit} + + + ${blueMin} + ${blueMax} + ${blueGamma} + ${blueUnit} + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByChannel.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByChannel.xml index 6e12b0ff2d..102d3d708e 100644 --- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByChannel.xml @@ -1,5 +1,9 @@ - + diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByPressure.xml b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByPressure.xml index c9baa39327..6d29fe9a4e 100644 --- a/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByPressure.xml +++ b/cave/com.raytheon.viz.satellite/localization/bundles/satellite/himawari/ahi-dmwBundleByPressure.xml @@ -1,5 +1,9 @@ - + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/glm_window/goesrLevel2GLMgrid_5MIN.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/glm_window/goesrLevel2GLMgrid_5MIN.xml new file mode 100755 index 0000000000..956fa24da3 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/glm_window/goesrLevel2GLMgrid_5MIN.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + --> + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmw-index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmw-index.xml new file mode 100644 index 0000000000..ff3c432971 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmw-index.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml index 673392e3b0..b1d1791058 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenu.xml @@ -1,25 +1,39 @@ + + + + - - - - + + + + + + - - - - + + + - - - - - - - - + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml deleted file mode 100644 index da013dc976..0000000000 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByChannel.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml index 023c48f5a7..62a60bbe05 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByFilter.xml @@ -1,18 +1,230 @@ - - - - + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml deleted file mode 100644 index 74e0858379..0000000000 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByPressure.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByScene.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByScene.xml index 8d246b0746..d6d84f7376 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByScene.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/dmw/goesr-dmwMenuByScene.xml @@ -1,66 +1,14 @@ - - - - - - - - + - + - - - - - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr-index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr-index.xml new file mode 100644 index 0000000000..0f13bdf964 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr-index.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesr-index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesr-index.xml new file mode 100644 index 0000000000..9588554993 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesr-index.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResConusByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResConusByChannel.xml new file mode 100644 index 0000000000..f3e5fc7c1d --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResConusByChannel.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResRegionByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResRegionByChannel.xml new file mode 100644 index 0000000000..64f16f8f2e --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBestResRegionByChannel.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrByChannel.xml new file mode 100644 index 0000000000..c13ac7af91 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrByChannel.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorByChannel.xml new file mode 100644 index 0000000000..947eef8085 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorByChannel.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorLocallyDerived.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorLocallyDerived.xml new file mode 100644 index 0000000000..2d6511f90f --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorLocallyDerived.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorRGBComposites.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorRGBComposites.xml new file mode 100644 index 0000000000..b790fef0df --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrBySectorRGBComposites.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrConusWithLegacy.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrConusWithLegacy.xml new file mode 100644 index 0000000000..84d0dda0b9 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrConusWithLegacy.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2.xml new file mode 100644 index 0000000000..06a02ec43a --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= +>>>>>>> origin/master_18.2.2 + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Conus.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Conus.xml new file mode 100644 index 0000000000..30d4464ea2 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Conus.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Fire.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Fire.xml new file mode 100644 index 0000000000..474eed2503 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Fire.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2FullDisk.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2FullDisk.xml new file mode 100644 index 0000000000..5083a57b5f --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2FullDisk.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Meso.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Meso.xml new file mode 100644 index 0000000000..5d2cc04146 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Meso.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Stability.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Stability.xml new file mode 100644 index 0000000000..8526cf144e --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Stability.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Volcano.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Volcano.xml new file mode 100644 index 0000000000..8eba9e71d5 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLevel2Volcano.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLocallyDerived.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLocallyDerived.xml new file mode 100644 index 0000000000..d9fc044b47 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrLocallyDerived.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrMenu.xml new file mode 100644 index 0000000000..86b910729e --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrMenu.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrRGBComposites.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrRGBComposites.xml new file mode 100644 index 0000000000..b241488510 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesr/goesrRGBComposites.xml @@ -0,0 +1,422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml index 95dae362fd..8ecaac16ae 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrByChannel.xml @@ -65,8 +65,6 @@ - - - @@ -83,7 +80,6 @@ - @@ -91,13 +87,12 @@ - + + + - - - - + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorByChannel.xml new file mode 100644 index 0000000000..618ca46da0 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorByChannel.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorLocallyDerived.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorLocallyDerived.xml new file mode 100644 index 0000000000..075d897894 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorLocallyDerived.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorRGBComposites.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorRGBComposites.xml new file mode 100644 index 0000000000..7b5f2f441c --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrBySectorRGBComposites.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrConusWithLegacy.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrConusWithLegacy.xml new file mode 100644 index 0000000000..583a293182 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrConusWithLegacy.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrGLM.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrGLM.xml new file mode 100644 index 0000000000..c267268642 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrGLM.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Conus.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Conus.xml new file mode 100644 index 0000000000..bc00f3cd74 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Conus.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Fire.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Fire.xml new file mode 100644 index 0000000000..1fe4a963ff --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Fire.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2FullDisk.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2FullDisk.xml new file mode 100644 index 0000000000..3c3f41d9cd --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2FullDisk.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Meso.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Meso.xml new file mode 100644 index 0000000000..632fabf6d5 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Meso.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Stability.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Stability.xml new file mode 100644 index 0000000000..00e399271a --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Stability.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Volcano.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Volcano.xml new file mode 100644 index 0000000000..ca2b14219a --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrLevel2Volcano.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml index ead1583f90..e362e82f52 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrMenu.xml @@ -54,67 +54,92 @@ fileName="menus/satellite/goesr/goesrByChannel.xml"> + + - + + - + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml new file mode 100644 index 0000000000..e272efb462 --- /dev/null +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrRGBComposites.xml @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmw-index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmw-index.xml index a770fea004..5769286995 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmw-index.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmw-index.xml @@ -1,5 +1,9 @@ - + @@ -18,12 +22,9 @@ - - + - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByChannel.xml index f7f81d64e7..516b5e722a 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByChannel.xml @@ -2,23 +2,27 @@ - + @@ -40,43 +44,41 @@ - - - + + - - + + - - + + - - + + - - + + - - - - - + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByFilter.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByFilter.xml index 7018cc3492..8fdb384e0f 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByFilter.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByFilter.xml @@ -1,5 +1,9 @@ - + @@ -16,7 +20,6 @@ - @@ -45,5 +48,4 @@ - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByMandatoryLevels.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByMandatoryLevels.xml index 51e8bf9f04..939b1792aa 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByMandatoryLevels.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByMandatoryLevels.xml @@ -1,5 +1,9 @@ - + @@ -20,87 +24,85 @@ - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByPressure.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByPressure.xml index 923a3461b0..99b2f207dd 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByPressure.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/dmw/ahi-dmwMenuByPressure.xml @@ -2,23 +2,27 @@ - + @@ -39,13 +43,12 @@ - - - + + @@ -53,75 +56,74 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawari-index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawari-index.xml index cd78eaad4e..6fd7b4e968 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawari-index.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawari-index.xml @@ -18,9 +18,14 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> + - + - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariByChannel.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariByChannel.xml index c545b31eb0..530ac978bc 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariByChannel.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariByChannel.xml @@ -17,86 +17,75 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. - --> + --> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariMenu.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariMenu.xml index f016cd33b3..e9c1725b9b 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariMenu.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariMenu.xml @@ -18,10 +18,14 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> + - - - - - + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml index 0f4dcaf2c0..e578c522c3 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml @@ -1,7 +1,7 @@ + fileName="menus/satellite/goesr/goesrMenu.xml"> diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml index fbd54f0d4c..25e333a332 100644 --- a/edexOsgi/build.edex/build.xml +++ b/edexOsgi/build.edex/build.xml @@ -57,13 +57,16 @@ + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/distribution/nucaps.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/distribution/nucaps.xml index cf69f724a2..6f594f4d77 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/distribution/nucaps.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/distribution/nucaps.xml @@ -1,29 +1,7 @@ - - - - ^IUTN0[0-9] KNES* + ^IUTN[01][0-9] KNES* diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml index 15fadda491..afac077f18 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml @@ -2,27 +2,50 @@ - - + + + + @@ -31,24 +54,45 @@ Alaska - - - Global - + + + AlaskaJPSS + + + + + + Global + CONUS + + + CONUSJPSS + + Pacific + + + PacificJPSS + + Puerto Rico + + + Puerto_RicoJPSS + + Global @@ -61,7 +105,7 @@ 1 375.0 - + Imagery @@ -69,7 +113,7 @@ 2 375.0 - + Imagery @@ -77,7 +121,7 @@ 3 375.0 - + Imagery @@ -86,7 +130,7 @@ K 375.0 - + Imagery @@ -95,14 +139,22 @@ K 375.0 - - + + NCC 0.7 0 750.0 + + + + Moderate + 0.672 + 5 + 750.0 + @@ -111,7 +163,7 @@ 1 750.0 - + Moderate @@ -119,7 +171,7 @@ 2 750.0 - + Moderate @@ -129,6 +181,17 @@ 750.0 + + + + Moderate + 8.55 + 6 + K + 750.0 + + + Moderate @@ -137,7 +200,7 @@ K 750.0 - + Moderate @@ -146,5 +209,13 @@ K 750.0 - + + + + + Moderate + 0.7 + 10 + 750.0 + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml index 8ab492837a..a8fc578d63 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml @@ -1,25 +1,25 @@ - + - - + + - - - - - - - - + + + + + + + + - +