From d4ef865375944b0ba4cdaec7c62d9f50db58b8db Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Mon, 6 Oct 2014 15:33:12 -0500
Subject: [PATCH] Omaha #3300 Merge conflict resolution with old Vbsources.xml.

Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
---
 .../volumebrowser/VbSources/sfcGrid.xml         |  4 +++-
 .../volumebrowser/VbSources/volume.xml          | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index ffd19ba020..6dd685674f 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -24,6 +24,7 @@
     <vbSource key="AK-NamDNG5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AK-NICICE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AK-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="AK-RTMA3" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AKWAVE239" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AKwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AKwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
@@ -37,6 +38,7 @@
     <vbSource key="EPwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="estofsUS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="estofsPR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="GFE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFS199" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFSLAMPTstorm" name="GFSLAMP-Grid" category="SfcGrid"
@@ -95,7 +97,7 @@
         subCategory="Global" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTOFS-GulfAlaska" category="SfcGrid/RTOFS/forecast"
         subCategory="Global" views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast"
+    <vbSource  key="RTOFS-Honolulu" category="SfcGrid/RTOFS/forecast"
         subCategory="Global" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTOFS-HudsonBaffin" category="SfcGrid/RTOFS/forecast"
         subCategory="Global" views="PLANVIEW TIMESERIES" />
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
index 0bf69fb88b..443cd05b16 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
@@ -43,6 +43,21 @@
     <vbSource key="GEFS" category="Volume" />
     <vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />
     <vbSource key="AVN-NorthernHemisphere" category="Volume" />
+    <vbSource key="HFR-EAST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_EAST_DELAWARE_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_EAST_FLORIDA_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_EAST_NORTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_EAST_SOUTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_EAST_VIRGINIA_1KM" category="Volume"  views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_HAWAII_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_HAWAII_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-WEST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_CENCAL_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_NORTH_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_SANFRAN_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_SOCAL_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_LOSANGELES_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_WEST_LOSOSOS_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
     <vbSource key="HiResW-ARW-AK" category="Volume" />
     <vbSource key="HiResW-ARW-East" category="Volume" />
     <vbSource key="HiResW-ARW-GU" category="Volume" />
@@ -64,7 +79,6 @@
     <vbSource key="ETA" category="Volume" />
     <vbSource key="ETA207" category="Volume" />
     <vbSource key="NOGAPS" category="Volume" />
-    <vbSource key="radar" name="Radar" category="Volume" />
     <vbSource key="RUC130" category="Volume" />
     <vbSource key="RAP200" category="Volume" />
     <vbSource key="RUC236" category="Volume" />
@@ -74,4 +88,5 @@
     <vbSource key="GFS161" category="Volume" />
     <vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES" />
     <vbSource key="UKMET-NorthernHemisphere" category="Volume" />
+    <vbSource key="radar" name="Radar" category="Volume" />
 </vbSourceList>
\ No newline at end of file