diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/AutoSPE.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/AutoSPE.xml index 1b7c87eeff..cce76c1c58 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/AutoSPE.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/AutoSPE.xml @@ -1,23 +1,4 @@ - @@ -26,10 +7,15 @@ - + + + 0.127 + 304.8 + + - + PLAN_VIEW @@ -39,10 +25,10 @@ - + - + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGLmosaic.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGLmosaic.xml index 0f9e0d2455..e54b430bb6 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGLmosaic.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGLmosaic.xml @@ -1,28 +1,30 @@ - + + + PLAN_VIEW + + + + + + + + + + + + + + RFC Boundaries + mapdata.rfc
+ the_geom + + @@ -47,8 +49,7 @@ - + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGmosaic.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGmosaic.xml index 35f73b8673..9eac424d6e 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGmosaic.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/hydro/FFGmosaic.xml @@ -1,23 +1,4 @@ - diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN-PPBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN-PPBN.xml deleted file mode 100644 index f122e71ea4..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN-PPBN.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN.xml deleted file mode 100644 index 91b59844f5..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPAN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPBN.xml deleted file mode 100644 index d3f1dedfd5..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPBN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPNN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPNN.xml deleted file mode 100644 index e79e28fb30..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PPNN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN-PTBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN-PTBN.xml deleted file mode 100644 index 09bba2fa24..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN-PTBN.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN.xml deleted file mode 100644 index 07757d5702..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTAN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTBN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTBN.xml deleted file mode 100644 index 4a15424b97..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTBN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTNN.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTNN.xml deleted file mode 100644 index 5218fe15e1..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/cpc/PTNN.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPC6hrQPF.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPC6hrQPF.xml deleted file mode 100644 index 1fe33c40e8..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPC6hrQPF.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml index 752566fbc9..b2e13a48f1 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml @@ -1,27 +1,4 @@ - - @@ -42,7 +19,46 @@ isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-Precip.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-Precip.xml index ce67dfdd2d..c73c0039ec 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-Precip.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD-Precip.xml @@ -31,7 +31,7 @@ isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true"> - + @@ -66,7 +66,7 @@ - + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml deleted file mode 100644 index 8bcd30aa79..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${frameCount} - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml index 175c9e932c..db9ace1d99 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml @@ -1,63 +1,90 @@ - - + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + PLAN_VIEW + + + + + + + + + + + + + + + + + 0.20320001 + 4064.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 36 - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD168hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD168hr.xml new file mode 100644 index 0000000000..31054e5e34 --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD168hr.xml @@ -0,0 +1,85 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + 0.20320001 + 4064.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD48hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD48hr.xml deleted file mode 100644 index 7261691bae..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD48hr.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml index 738730c258..c3c7bbdce1 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml @@ -1,63 +1,85 @@ - - + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + PLAN_VIEW + + + + + + + + 0.20320001 + 431.8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 36 - \ No newline at end of file + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPE.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPE.xml index d66f425f6e..25012692fa 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPE.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPE.xml @@ -1,82 +1,66 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + menuText="1 hr RFC Local Mosaic" id="1HrRFC"> + menuText="6 hr RFC Local Mosaic" id="6HrRFC"> + menuText="24 hr RFC Local Mosaic" id="24HrRFC"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPF.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPF.xml deleted file mode 100644 index cc93eee487..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/hydro/baseHydroQPF.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml deleted file mode 100644 index 7fe43c3109..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml index 75dfcd9a39..2aa7ed9c19 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/ccfp.xml @@ -1,27 +1,4 @@ - - 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 fd3f0ca487..482bedb481 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,26 +1,141 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml index 3aa21b0388..0b89b971ed 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml @@ -1,32 +1,52 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml deleted file mode 100644 index 0df2a340f9..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml deleted file mode 100644 index be5e3fc2bd..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/outlookGrids.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml index 1761cdb25e..dce026f99a 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml @@ -1,13 +1,7 @@ - - - - - - - - - + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml deleted file mode 100644 index d5a2b000d5..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml index 269ea1b44f..8f9d19efaf 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml @@ -1,22 +1,10 @@ - - - - - - - - - + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/ncepMenu.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/ncepMenu.xml deleted file mode 100644 index 5edffa9710..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/ncepMenu.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml index fb4329fa35..272e9c1bf4 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/nco/baseNCO.xml @@ -1,27 +1,4 @@ - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -87,5 +86,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml index b27e2b623b..a747adfe62 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml @@ -1,30 +1,210 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml deleted file mode 100644 index 6fd8ac83b1..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml index df4ee35b7b..06feed3483 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml @@ -1,23 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml index 9affdddb27..6795b5dd5e 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAviation.xml @@ -1,7 +1,23 @@ + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java index c956209b78..c5bc083823 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java @@ -94,8 +94,8 @@ public class D2D5Pane implements IPerspectiveFactory { } } - int numViews = ChangeD2DLayoutAction.getViewCount() > 0 ? 4 - : 0; + int numViews = ChangeD2DLayoutAction.getViewCount() > 0 ? 0 + : 4; String lastAdded = null; diff --git a/cave/com.raytheon.uf.viz.profiler/localization/bundles/UpperAirProfiler.xml b/cave/com.raytheon.uf.viz.profiler/localization/bundles/UpperAirProfiler.xml index 80470508b7..206d72a634 100644 --- a/cave/com.raytheon.uf.viz.profiler/localization/bundles/UpperAirProfiler.xml +++ b/cave/com.raytheon.uf.viz.profiler/localization/bundles/UpperAirProfiler.xml @@ -1,57 +1,25 @@ - - - + - + - + - + - + - + diff --git a/cave/com.raytheon.uf.viz.profiler/localization/bundles/profilerAvailability.xml b/cave/com.raytheon.uf.viz.profiler/localization/bundles/profilerAvailability.xml index f4171711ef..7bbb8d0f76 100644 --- a/cave/com.raytheon.uf.viz.profiler/localization/bundles/profilerAvailability.xml +++ b/cave/com.raytheon.uf.viz.profiler/localization/bundles/profilerAvailability.xml @@ -1,5 +1,4 @@ - - - - diff --git a/cave/com.raytheon.uf.viz.profiler/localization/menus/profiler/profilerLocations.xml b/cave/com.raytheon.uf.viz.profiler/localization/menus/profiler/profilerLocations.xml deleted file mode 100644 index 2d91495f44..0000000000 --- a/cave/com.raytheon.uf.viz.profiler/localization/menus/profiler/profilerLocations.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseWestNPN.xml b/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseWestNPN.xml index a313948813..69c7bfecf8 100644 --- a/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseWestNPN.xml +++ b/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseWestNPN.xml @@ -1,25 +1,12 @@ - + + + + + @@ -79,5 +66,6 @@ editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor"> + \ No newline at end of file diff --git a/cave/com.raytheon.viz.lightning/localization/menus/glm/glmLightningMenuItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/glm/glmLightningMenuItems.xml index 79627f2361..0405f17490 100755 --- a/cave/com.raytheon.viz.lightning/localization/menus/glm/glmLightningMenuItems.xml +++ b/cave/com.raytheon.viz.lightning/localization/menus/glm/glmLightningMenuItems.xml @@ -1,40 +1,4 @@ - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml index 49d4975cb2..db8337c2cf 100644 --- a/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml +++ b/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml @@ -3,8 +3,25 @@ - + + + + + + + + + + + + + + + * * @author bsteffen * @version 1.0 */ +public class MetarTempResource extends AbstractVizResource { -public class MetarTempResource extends - AbstractVizResource implements - IResourceDataChanged, IPlotModelGeneratorCaller, IProgDiscListener { + private static final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(MetarTempResource.class); private RGB color = new RGB(126, 126, 126); @@ -156,6 +164,7 @@ public class MetarTempResource extends if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } + processUpdates(monitor); if (monitor.isCanceled()) { return Status.CANCEL_STATUS; @@ -170,8 +179,10 @@ public class MetarTempResource extends private LinkedBlockingQueue removes = new LinkedBlockingQueue(); + private boolean reproject = false; + private Map> data = new HashMap<>(); - + private IFont font = null; protected MetarTempResource(MetarTempResourceData resourceData, @@ -251,7 +262,7 @@ public class MetarTempResource extends ColorMapParameters params = new ColorMapParameters(); try { - params.setColorMap(ColorMapLoader.loadColorMap("colortemp")); + params.setColorMap(ColorMapLoader.loadColorMap("Grid/Gridded Data")); } catch (ColorMapException e) { throw new VizException(e); } @@ -259,54 +270,95 @@ public class MetarTempResource extends DataMappingPreferences preferences = new DataMappingPreferences(); DataMappingEntry entry = new DataMappingEntry(); - entry.setDisplayValue(20.); + entry.setDisplayValue(-50.); entry.setPixelValue(0.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(30.); + entry.setDisplayValue(-40.); entry.setPixelValue(1.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(40.); + entry.setDisplayValue(-30.); entry.setPixelValue(2.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(50.5); + entry.setDisplayValue(-20.); entry.setPixelValue(3.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(60.); + entry.setDisplayValue(-10.); entry.setPixelValue(4.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(70.); + entry.setDisplayValue(0.0); entry.setPixelValue(5.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(80.); + entry.setDisplayValue(10.); entry.setPixelValue(6.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(90.); + entry.setDisplayValue(20.); entry.setPixelValue(7.0); preferences.addEntry(entry); entry = new DataMappingEntry(); - entry.setDisplayValue(100.); + entry.setDisplayValue(30.); entry.setPixelValue(8.0); preferences.addEntry(entry); + entry = new DataMappingEntry(); + entry.setDisplayValue(40.); + entry.setPixelValue(9.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(50.); + entry.setPixelValue(10.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(60.); + entry.setPixelValue(11.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(70.); + entry.setPixelValue(12.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(80.); + entry.setPixelValue(13.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(90.); + entry.setPixelValue(14.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(100.); + entry.setPixelValue(15.0); + preferences.addEntry(entry); + + entry = new DataMappingEntry(); + entry.setDisplayValue(110.); + entry.setPixelValue(16.0); + preferences.addEntry(entry); + + params.setDisplayUnit(Unit.ONE); params.setDataMapping(preferences); params.setColorMapMin(0); - params.setColorMapMax(8); + params.setColorMapMax(17); getCapability(ColorMapCapability.class).setColorMapParameters(params); @@ -333,7 +385,7 @@ public class MetarTempResource extends } } } - + @Override public String getName() { return "Surface Temps [F]"; @@ -346,6 +398,13 @@ public class MetarTempResource extends dataProcessJob.schedule(); } + @Override + public void project(CoordinateReferenceSystem crs) throws VizException { + // This will be handled asynchronously by the update job + reproject = true; + dataProcessJob.schedule(); + } + @Override public String inspect(ReferencedCoordinate coord) throws VizException { Coordinate pixel = null; @@ -393,7 +452,46 @@ public class MetarTempResource extends } return "No Data"; } - + + /** + * + * Re-project to the new crs. Returns true to reload the frame. + * + * @return boolean + */ + private boolean processReproject() { + + if (reproject) { + reproject = false; + + GridEnvelope2D envelope = GridGeometry2D.wrap( + descriptor.getGridGeometry()).getGridRange2D(); + + synchronized (data) { + for (GenericProgressiveDisclosure disclosure : data + .values()) { + List dataList = disclosure.getAll(); + Iterator it = dataList.iterator(); + while (it.hasNext()) { + RenderableTempData temp = it.next(); + Coordinate latLon = temp.getLatLon(); + double[] px = descriptor.worldToPixel(new double[] { + latLon.x, latLon.y }); + if (envelope.contains(px[0], px[1])) { + temp.string.setCoordinates(px[0], px[1], px[2]); + } else { + it.remove(); + } + } + } + } + + return true; + } + issueRefresh(); + return false; + } + private void processRemoves() { synchronized (data) { while (!removes.isEmpty()) { @@ -404,7 +502,89 @@ public class MetarTempResource extends } } + private void processUpdates(IProgressMonitor monitor) { + if (updates.isEmpty()) { + return; + } + HashMap rcMap = resourceData + .getMetadataMap(); + rcMap = new HashMap(rcMap); + RequestConstraint rc = new RequestConstraint(null, ConstraintType.IN); + long earliestTime = Long.MAX_VALUE; + Set newStations = new HashSet(); + // Get the envelope and math transform to ensure we only bother + // processing updates on screen. + MathTransform toDescriptor = null; + try { + toDescriptor = MapUtil.getTransformFromLatLon(descriptor.getCRS()); + } catch (FactoryException e) { + statusHandler + .handle(Priority.PROBLEM, + "Error processing updates for MetarTemps, Ignoring all updates.", + e); + updates.clear(); + return; + } + + Envelope2D envelope = new Envelope2D(descriptor.getGridGeometry() + .getEnvelope()); + + while (!updates.isEmpty()) { + PluginDataObject pdo = updates.poll(); + try { + Map map = DataURIUtil.createDataURIMap(pdo); + double lon = ((Number) map.get("location.longitude")).doubleValue(); + double lat = ((Number) map.get("location.latitude")).doubleValue(); + DirectPosition2D dp = new DirectPosition2D(lon, lat); + toDescriptor.transform(dp, dp); + if (envelope.contains((DirectPosition) dp)) { + newStations.add(map.get("location.stationId").toString()); + long validTime = pdo.getDataTime().getMatchValid(); + if (validTime < earliestTime) { + earliestTime = validTime; + } + } + } catch (Exception e) { + statusHandler.handle(Priority.PROBLEM, + "Error processing updates for MetarTemps, Ignoring an update.", e); + } + } + + if (newStations.isEmpty()) { + return; + } + + rc.setConstraintValueList(newStations.toArray(new String[0])); + + rcMap.put("location.stationId", rc); + + MetarTempDataContainer container = new MetarTempDataContainer( + rcMap); + + for (Entry> entry : data + .entrySet()) { + DataTime time = entry.getKey(); + if (time.getMatchValid() < earliestTime) { + // No need to reprocess times after the earliest update. + continue; + } + GenericProgressiveDisclosure newValue = new GenericProgressiveDisclosure<>(); + for (RenderableTempData data : entry.getValue().getAll()) { + if (!newStations.contains(data.getStationName())) { + newValue.add(data); + } + } + entry.setValue(newValue); + addData(time, container.getBaseTempData(time)); + if (monitor.isCanceled()) { + return; + } + } + } + private void processNewFrames(IProgressMonitor monitor) { + // load data in two steps, first load base data then any derived data. + // Always try to load the current frame, then nearby frames. MetarTempDataContainer container = new MetarTempDataContainer( resourceData.getMetadataMap(), descriptor.getGridGeometry().getEnvelope()); @@ -412,10 +592,24 @@ public class MetarTempResource extends Set baseOnly = new HashSet(); boolean modified = true; while (modified) { + // don't want to miss a reproject if retrieval takes awhile. + + if (processReproject()) { + // We must create a new container and re request all the data + // for the new area. + data.clear(); + reprojectedFrames = new HashSet(data.keySet()); + container = new MetarTempDataContainer( + resourceData.getMetadataMap(), descriptor + .getGridGeometry().getEnvelope()); + } + if (monitor.isCanceled()) { return; } modified = false; + // If the current frame changes while we are processing we will + // begin requesting data for the new frame FramesInfo frameInfo = descriptor.getFramesInfo(); DataTime[] times = frameInfo.getTimeMap().get( MetarTempResource.this); @@ -435,12 +629,30 @@ public class MetarTempResource extends .getBaseTempData(next); addData(next, baseData); baseOnly.add(next); + modified = true; + break; + } + if (baseOnly.contains(next)) { + List derivedData = container + .getBaseTempData(next); + addData(next, derivedData); + baseOnly.remove(next); reprojectedFrames.remove(next); modified = true; break; } } } + issueRefresh(); + } + + synchronized (data) { + // This will only happen if frames were removed while we were + // processing. Don't leave any half created frames + for (DataTime time : baseOnly) { + this.dataTimes.remove(time); + this.data.remove(time); + } } } @@ -470,17 +682,19 @@ public class MetarTempResource extends GenericProgressiveDisclosure newTemps = new GenericProgressiveDisclosure(); + //RGB color = getCapability(ColorableCapability.class).getColor(); + GridEnvelope2D envelope = GridGeometry2D.wrap( descriptor.getGridGeometry()).getGridRange2D(); for (int i = 0; i < temps.size(); i++) { - TempData temperature = temps.get(i); + TempData tempFromTenths = temps.get(i); RenderableTempData data = null; - if (temperature instanceof RenderableTempData) { - data = (RenderableTempData) temperature; + if (tempFromTenths instanceof RenderableTempData) { + data = (RenderableTempData) tempFromTenths; } else { double[] px = descriptor.worldToPixel(new double[] { - temperature.getLatLon().x, temperature.getLatLon().y }); + tempFromTenths.getLatLon().x, tempFromTenths.getLatLon().y }); if (!envelope.contains(px[0], px[1])) { continue; } @@ -491,7 +705,7 @@ public class MetarTempResource extends string.setCoordinates(px[0], px[1], px[2]); string.verticalAlignment = VerticalAlignment.MIDDLE; string.horizontalAlignment = HorizontalAlignment.CENTER; - data = new RenderableTempData(temperature, string); + data = new RenderableTempData(tempFromTenths, string); } newTemps.add(data); } @@ -504,33 +718,9 @@ public class MetarTempResource extends issueRefresh(); } + private String formatValues(Double tempValue) { return String.format("%6.0f", tempValue).substring(1); } - - @Override - public void disclosureComplete(DataTime time, List disclosed) { - // TODO Auto-generated method stub - } - - @Override - public void modelGenerated(PlotInfo[] key, IImage image) { - // TODO Auto-generated method stub - } - - @Override - public void clearImages() { - // TODO Auto-generated method stub - } - - @Override - public void messageGenerated(PlotInfo[] key, String message) { - // TODO Auto-generated method stub - } - - @Override - public void resourceChanged(ChangeType type, Object object) { - // TODO Auto-generated method stub - } -} +} \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml index 07d668c892..61641dcc2d 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml @@ -1,28 +1,4 @@ - - - - - - - - diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml index 366ef28705..c9b0283f18 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml @@ -1,28 +1,4 @@ - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml index a64eec6fdb..171211de95 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml @@ -1,27 +1,4 @@ - - @@ -1208,7 +1185,11 @@ --> + tpHPCndfd TP + TP6hr + TP120hr + TP168hr CP St-Pr TP1hr @@ -1223,7 +1204,7 @@ 0.005 12 - Grid/Gridded Data + Radar/UPC One Hour Precip 0.01 0.03 0.1 0.3 1 3 10