diff --git a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ElevationInfo.java b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ElevationInfo.java
index 995017446c..31d3760c90 100644
--- a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ElevationInfo.java
+++ b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ElevationInfo.java
@@ -27,6 +27,21 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Scanner;
+/**
+ * TODO Add Description
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * 03/07/2013 DR15495 zwang Load elevation info for SSSS radars
+ *
+ *
+ *
+ * @author dfriedman
+ * @version 1.0
+ */
public class ElevationInfo {
// TODO: check all handling of -1/null vcp
@@ -90,6 +105,15 @@ public class ElevationInfo {
fs.close();
}
+ // Load SSSS radar elevation lists
+ s = ElevationInfo.class.getResourceAsStream("ssssElevationLists.txt");
+ fs = new Scanner(s);
+ try {
+ Loader.loadSsssElevationInfo(fs, staticInfo);
+ } finally {
+ fs.close();
+ }
+
s = ElevationInfo.class.getResourceAsStream("tdwrElevations.txt");
fs = new Scanner(s);
try {
diff --git a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/Loader.java b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/Loader.java
index ab3952e2a4..f8cd82aae3 100644
--- a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/Loader.java
+++ b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/Loader.java
@@ -39,6 +39,21 @@ import com.raytheon.rcm.products.ElevationInfo.VCPInfo;
import com.raytheon.rcm.products.RadarProduct.Format;
import com.raytheon.rcm.products.RadarProduct.Param;
+/**
+ * TODO Add Description
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * 03/07/2013 DR15495 zwang Load elevation info for SSSS radars
+ *
+ *
+ *
+ * @author dfriedman
+ * @version 1.0
+ */
public class Loader {
static List loadRadarInfoData(Scanner fs) {
@@ -216,6 +231,43 @@ public class Loader {
}
}
+ public static void loadSsssElevationInfo(Scanner fs,
+ HashMap staticInfo) {
+ Pattern p = Pattern.compile("^k*VCP(\\d+)$");
+ while (fs.hasNext()) {
+ String line = fs.nextLine();
+ Scanner ls = new Scanner(line);
+ if (skipComments(ls))
+ continue;
+ try {
+ String radarID = ls.next();
+ String id = ls.next();
+ int vcp = 0;
+ ls.next(); // Unused op mode
+ int nElevs = ls.nextInt();
+ int[] elevs = new int[nElevs];
+ for (int i = 0; i < elevs.length; ++i)
+ elevs[i] = (int) (ls.nextDouble() * 10.0);
+
+ Matcher m = p.matcher(id);
+ if (m.matches())
+ vcp = Integer.parseInt(m.group(1));
+ else if (id.equals("OTR"))
+ vcp = ElevationInfo.OTR_OR_RMR_CODE;
+ else
+ /* RMR is the same as OTR. We do not care about the TDWR
+ * entries, we will use the radar-specific one. Actually,
+ * we shouldn't bother with VCP80 and VCP90 either (TODO: ?)
+ */
+ continue;
+ Sel sel = new Sel(radarID, vcp);
+ staticInfo.put(sel, elevs);
+ } catch (NoSuchElementException e) {
+ // TODO:
+ }
+ }
+ }
+
public static void loadTdwrElevationInfo(Scanner fs,
HashMap staticInfo) {
ArrayList elevs = new ArrayList(25);
diff --git a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/radarInfo.txt b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/radarInfo.txt
index 103afdfe13..b2f5dcfb31 100644
--- a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/radarInfo.txt
+++ b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/radarInfo.txt
@@ -123,6 +123,7 @@
136|256 | 0 | 4.0 | 0 | SO | SuperOb (SO) | SuperOb | | | | | | | | | |82
137| 16 | 9 | 1.0 | 230 | ULR | User Selectable Lyr Refl (ULR)| Radial | | | | | | | | | |88
139| 0 | 0 | 0.0 | 230 | MRU | Rapid Update Mesocyclone (MRU)| Graphic | y | | | | | | | | |91
+140| 0 | 0 | 0.0 | 230 | GFM | Gust Front MIGFA (GFM) | Generic | | | | | | | | | |28
141| 0 | 0 | 0.0 | 230 | MD | Mesocyclone (MD) | Graphic | | | | | | | | | |92
143| 0 | 0 | 0.0 | 230 | TRU | TVS Rapid Update (TRU) | Graphic | y | | | | | | | | |93
149| 0 | 0 | 0.0 | 230 | DMD | Digital Meso Detection (DMD) | Generic | y | | | | | | | | |94
diff --git a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ssssElevationLists.txt b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ssssElevationLists.txt
new file mode 100644
index 0000000000..2d959cc0c0
--- /dev/null
+++ b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/products/ssssElevationLists.txt
@@ -0,0 +1,28 @@
+#This file stores elevation lists for SSSS radars
+#This file stores the elevation angle lists for the OTR, RPS and RMR.
+#
+#The format is,
+#radarID, List-Name type number-of-values value1 value2... valueN
+#radarID: klgx is the only radar for now
+#List-Name: Name for a angle set. It can be OTR, RMR or VCPxx.
+#type: Type of the list. for VCP is the storm or clear-air. For the OTR and
+# RMR is none.
+#number-of-values: How many angles is in this list.
+#valuen: A elevation angle value.
+#
+#Keep one list one line!
+# klgx
+#For the OTR of WSR-88D
+klgx OTR none 40 0.2 0.5 0.9 1.3 1.5 1.8 2.1 2.4 2.5 2.9 3.1 3.4 3.5 3.8 4.0 4.3 4.5 4.8 5.1 5.3 6.0 6.1 6.2 6.4 7.5 7.7 8.0 8.7 9.7 9.9 10.0 12.0 12.2 12.5 14.0 14.6 15.5 15.6 16.7 19.5
+#For RMR of WSR-88D
+klgx RMR none 40 0.2 0.5 0.9 1.3 1.5 1.8 2.1 2.4 2.5 2.9 3.1 3.4 3.5 3.8 4.0 4.3 4.5 4.8 5.1 5.3 6.0 6.1 6.2 6.4 7.5 7.7 8.0 8.7 9.7 9.9 10.0 12.0 12.2 12.5 14.0 14.6 15.5 15.6 16.7 19.5
+#For RPS of WSR-88D
+klgx VCP11 storm 15 0.2 0.5 1.5 2.4 3.4 4.3 5.3 6.2 7.5 8.7 10.0 12.0 14.0 16.7 19.5
+klgx VCP12 storm 15 0.2 0.5 0.9 1.3 1.8 2.4 3.1 4.0 5.1 6.4 8.0 10.0 12.5 15.6 19.5
+klgx VCP21 storm 10 0.2 0.5 1.5 2.4 3.4 4.3 6.0 9.9 14.6 19.5
+klgx VCP121 storm 10 0.2 0.5 1.5 2.4 3.4 4.3 6.0 9.9 14.6 19.5
+klgx VCP211 storm 15 0.2 0.5 1.5 2.4 3.4 4.3 5.3 6.2 7.5 8.7 10.0 12.0 14.0 16.7 19.5
+klgx VCP212 storm 15 0.2 0.5 0.9 1.3 1.8 2.4 3.1 4.0 5.1 6.4 8.0 10.0 12.5 15.6 19.5
+klgx VCP221 storm 10 0.2 0.5 1.5 2.4 3.4 4.3 6.0 9.9 14.6 19.5
+klgx VCP31 clear-air 6 0.2 0.5 1.5 2.5 3.5 4.5
+klgx VCP32 clear-air 6 0.2 0.5 1.5 2.5 3.5 4.5
diff --git a/cave/build/static/common/cave/etc/aviation/python/CCFPMonitor.py b/cave/build/static/common/cave/etc/aviation/python/CCFPMonitor.py
index 7337190d73..dcdc42b0cb 100644
--- a/cave/build/static/common/cave/etc/aviation/python/CCFPMonitor.py
+++ b/cave/build/static/common/cave/etc/aviation/python/CCFPMonitor.py
@@ -59,7 +59,7 @@
# Relationship Type: In Response to
# Status: TEST
# Title: AvnFPS: tpo indicator not monitoring properly
-#
+#
#
import logging, time
import Avn, AvnLib, Globals, MonitorP
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/Blue.cmap b/cave/build/static/common/cave/etc/colormaps/solar/Blue.cmap
new file mode 100644
index 0000000000..031fd3c574
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/Blue.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/Gray.cmap b/cave/build/static/common/cave/etc/colormaps/solar/Gray.cmap
new file mode 100644
index 0000000000..f8b759c86f
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/Gray.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/Green.cmap b/cave/build/static/common/cave/etc/colormaps/solar/Green.cmap
new file mode 100644
index 0000000000..7bcdadcb95
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/Green.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/Orange.cmap b/cave/build/static/common/cave/etc/colormaps/solar/Orange.cmap
new file mode 100644
index 0000000000..996a09e378
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/Orange.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_131.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_131.cmap
new file mode 100644
index 0000000000..aa8f673b09
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_131.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1600.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1600.cmap
new file mode 100644
index 0000000000..a9afc963d8
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1600.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1700.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1700.cmap
new file mode 100644
index 0000000000..9beac7cc9e
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_1700.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_171.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_171.cmap
new file mode 100644
index 0000000000..04e3285e8f
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_171.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_193.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_193.cmap
new file mode 100644
index 0000000000..15b198380a
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_193.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_211.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_211.cmap
new file mode 100644
index 0000000000..3ad4f95928
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_211.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_304.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_304.cmap
new file mode 100644
index 0000000000..a082d39753
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_304.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_335.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_335.cmap
new file mode 100644
index 0000000000..d7dcba2e3b
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_335.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_4500.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_4500.cmap
new file mode 100644
index 0000000000..2b98bca045
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_4500.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_94.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_94.cmap
new file mode 100644
index 0000000000..f51a815e60
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_AIA_94.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SDO_Thematic.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SDO_Thematic.cmap
new file mode 100644
index 0000000000..eda4e65399
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SDO_Thematic.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_171.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_171.cmap
new file mode 100644
index 0000000000..6545547496
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_171.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_195.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_195.cmap
new file mode 100644
index 0000000000..75eef587f7
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_195.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_284.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_284.cmap
new file mode 100644
index 0000000000..2645be0878
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_284.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_304.cmap b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_304.cmap
new file mode 100644
index 0000000000..8ab0dc8cbe
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/SOHO_EIT_304.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/colormaps/solar/Yellow.cmap b/cave/build/static/common/cave/etc/colormaps/solar/Yellow.cmap
new file mode 100644
index 0000000000..c333a25cde
--- /dev/null
+++ b/cave/build/static/common/cave/etc/colormaps/solar/Yellow.cmap
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py b/cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
index 504da304cf..4672b7593c 100644
--- a/cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
+++ b/cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
@@ -31,6 +31,11 @@
# Author: Tom LeFebvre
# Contributor: Pablo Santos
# ----------------------------------------------------------------------------
+# SOFTWARE HISTORY
+# Date Ticket# Engineer Description
+# ------------ ---------- ----------- --------------------------
+# 3/6/2013 15658 ryu Merge in change from AWIPS I DR 21414, which fixed
+# makeMaxWindGrid() for when center is outside domain.
# The MenuItems list defines the GFE menu item(s) under which the
# Procedure is to appear.
@@ -1336,52 +1341,16 @@ class Procedure (SmartScript.SmartScript):
startTime = interpFcstList[0]["validTime"]
endTime = startTime + (123 * 3600) # 123 hours later
- fcstIndex = 0
- while fcstIndex < len(interpFcstList)-1:
- f1 = interpFcstList[fcstIndex]
- f2 = interpFcstList[fcstIndex + 1]
-
- f1Time = interpFcstList[fcstIndex]['validTime']
- f2Time = interpFcstList[fcstIndex + 1]['validTime']
-
- print "Interpolating from:", time.asctime(time.gmtime(f1Time)), \
- "to", time.asctime(time.gmtime(f2Time))
-
- lat1, lon1 = f1['centerLocation']
- lat2, lon2 = f2['centerLocation']
-
- x1, y1 = self.getGridCell(lat1, lon1)
- x2, y2 = self.getGridCell(lat2, lon2)
-
- if x1 is None or y1 is None or x2 is None or y2 is None:
- fcstIndex += 1
- continue
-
- dx = abs(x2 - x1)
- dy = abs(y2 - y1)
-
- dmax = max(dx, dy)
-
- newInterval = float(interval) / dmax
-
- newFcstList = self.interpolateWindFcst(f1, f2, newInterval)
-
- print "Created", len(newFcstList), "new wind forecasts."
-
- for f in newFcstList:
- mag, dir = self.makeRankine(f, latGrid, lonGrid, pieSlices, radiiFactor)
-
- maxWindGrid = where(greater(mag, maxWindGrid), mag, maxWindGrid)
-
- fcstIndex += 1
-
- if f2["validTime"] >= endTime:
- break
start = AbsTime.AbsTime(startTime)
end = AbsTime.AbsTime(endTime)
timeRange = TimeRange.TimeRange(start, end)
+ # Used getGrids to calculate the maximum wind grid.
+ #
+ # Fetch the max of the wind grids just generated as this is very fast.
+ maxWindGrid, maxDirGrid = self.getGrids("Fcst", "Wind", "SFC", timeRange, mode="Max")
+
maxWindGrid = self.smoothGrid(maxWindGrid, 3)
self.createGrid("Fcst", "TCMMaxWindComposite", "SCALAR", maxWindGrid, timeRange,
@@ -1485,7 +1454,7 @@ class Procedure (SmartScript.SmartScript):
# # Use this method to fetch a product from the text database
if productID == "preTCM":
- textProduct = self.getTextProductFromFile("/tmp/Irene.txt")
+ textProduct = self.getTextProductFromFile("/tmp/Isaac.txt")
decoder = TCMDecoder()
decoder.decodeTCMProduct(textProduct, self.dialogEyeDiameter)
fcstList = decoder.getFcstList()
@@ -1588,14 +1557,6 @@ class Procedure (SmartScript.SmartScript):
# get the lat, lon grids
latGrid, lonGrid = self.getLatLonGrids()
- # interpolate through forecast period to very high resolution and make
- # a composite maxWind grid from those wind grids
- if maxwindswath is "Yes":
- t1 = time.time()
- self.makeMaxWindGrid(interpFcstList, interval, latGrid, lonGrid, pieSlices,
- radiiFactor)
- print time.time() - t1, "seconds to generate Max wind composite."
-
# make a grid for each interpolate forecast
gridCount = 0
for f in interpFcstList:
@@ -1621,6 +1582,14 @@ class Procedure (SmartScript.SmartScript):
print "TCMWindTool:", productID, "- Generated",gridCount, \
"out of", len(interpFcstList), "grids", time.asctime(time.gmtime(timeRange.startTime().unixTime()))
+ # interpolate through forecast period to very high resolution and make
+ # a composite maxWind grid from those wind grids
+ if maxwindswath is "Yes":
+ t1 = time.time()
+ self.makeMaxWindGrid(interpFcstList, interval, latGrid, lonGrid, pieSlices,
+ radiiFactor)
+ print time.time() - t1, "seconds to generate Max wind composite."
+
if msg != "":
self.statusBarMsg(msg, "S")
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py b/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py
index 0cea29c727..d15deaa24a 100644
--- a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py
+++ b/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py
@@ -2,19 +2,19 @@
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-#
+#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
-#
+#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
-#
+#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
@@ -119,7 +119,7 @@ nnn = r'(?:[A-Z]{2}[ZC])?\d{3}'
purge = r'(?P\d{6})-'
ugc = r'\n(?P' + r'[A-Z]{2}[Z|C](?:(?:\d{3})|(?:ALL))' + r'(?:[->]\n?' + nnn + \
r')*-\n?' + purge + el + r')'
-cityh = r'-\n(?P(?:\s*\n)*(?:INCLUDING THE (?:CITIES|CITY) OF...)?)'
+cityh = r'(?<=-\n(?!.*-\n))(?P(?:.*\n))'
body = r'(?P(?:^.*\n)*?)'
#body = r'.*'
@@ -192,20 +192,20 @@ class ProductParser:
#l = headline_re.finditer(str)
l = single_head_re.finditer(str)
for m in l:
- if m is not None:
+ if m is not None:
#print 'phl m = ', m
newstart = start + m.start()
m = headline_re.match(m.group(0))
if m is not None:
hdlns.append(self.dumpMatch(m, newstart))
-
+
#print 'hdlns = ', hdlns
rval['headInfo'] = hdlns
def dumpMatch(self, m, offset=0, rval=None):
if rval is None:
rval = {}
-
+
#print 'dumpmatch m = ', m.groupdict()
for k in m.groupdict().keys():
if m.start(k) != -1 and m.start(k) != m.end(k):
@@ -234,7 +234,7 @@ class ProductParser:
segs = []
l = ugch_re.finditer(self._str)
-
+
for m in l:
if m is not None:
m1 = cityh_re.search(self._str, m.end())
@@ -250,7 +250,7 @@ class ProductParser:
else:
continue
m4 = head_re.search(self._str, m.end(), m3.end())
-
+
d = self.dumpMatch(m)
d = self.dumpMatch(m2, rval=d)
d = self.dumpMatch(m3, rval=d)
@@ -266,7 +266,7 @@ class ProductParser:
else:
d['city'] = (self.tkc(m2.start()),
self.tkc(m2.start()))
-
+
if m4 is not None:
#print 'm4 = ', m4.group()
d = self.dumpMatch(m4, rval=d)
@@ -284,7 +284,7 @@ class ProductParser:
rval['frames'] = frames
return rval
-
+
def parseFromJava(self, text):
self._str = text
self._ci = None
@@ -295,13 +295,13 @@ class ProductParser:
lc.append(count)
count += l
self._totals = lc
-
+
#print 'text START ----------------------'
#print text
#print 'text END ------------------------'
-
+
result = self.parse()
-
+
#print 'result = ', result
-
+
return JUtil.pyDictToJavaMap(result)
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr
index b42d0485f2..eabbcb81ec 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_al.attr
@@ -17,7 +17,7 @@ FINT = .01;.1;.25;.5;.75;1;1.25;1.5;1.75;2;2.25;2.5;2.75;3;3.25;3.5;3.75;4
FLINE = 0;21-30;14-20;5
HILO = 31;0/x#2////y
HLSYM = 1.5
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 0
TITLE = 1/-1/~ 24-HR OBS PRECIP (RFC, 40km avg) !0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr
index 0699452f56..b2a012d72d 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/24-hr_obs_pcpn_spc_al.attr
@@ -17,7 +17,7 @@ FINT = .01;.10;.25;.5;1;1.5;2;2.5;3;3.5;4;4.5;5;6;8;10.0
FLINE = 0;11;18;8;6;25;21;22;7;30;4;24;20;17;15;14;31
HILO = 0
HLSYM = 0
-!CLRBAR= 1//CL/0;.5/.75;.01
+!CLRBAR = 1//CL/0;.5/.75;.01
WIND =
TITLE = 1/-1/COOPERATIVE RAINFALL REPORTS FOR 24 hrs ENDING 12 UTC: ~
COLORS =
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr
index 546475c7b9..e7ec607a54 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_h2o_transport_nam.attr
@@ -22,7 +22,7 @@ FINT = 6;12;18;24;30;36
FLINE = 0;23;22;21;14;15;2
HILO = 0 !5/H#;L#!0
HLSYM = 0 !1;1//22;22/2;2/hw!0
-!CLRBAR= 1/V/LL!0
+!CLRBAR = 1/V/LL!0
WIND = 16/0.9/2/211/0.5
TITLE = 1/-1/~ @ MOISTURE TRANSPORT, HGHT, BL THTAE!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr
index dd271a577d..70e6cee265 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/850mb_wind_pw_ncf_nam.attr
@@ -18,7 +18,7 @@ FINT =
FLINE =
HILO = 0
HLSYM = 0
-!CLRBAR= 0
+!CLRBAR = 0
WIND = 9/0.9/2/112
TITLE = 1/-1/~ 850mb WIND (KTS) and PRECIP WATER
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA212-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA212-standard.xml
new file mode 100644
index 0000000000..ac3448e7e4
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA212-standard.xml
@@ -0,0 +1,6 @@
+
+
+ ETA212
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA218-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA218-standard.xml
new file mode 100644
index 0000000000..3033633970
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ETA218-standard.xml
@@ -0,0 +1,6 @@
+
+
+ ETA218
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/GFS212-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/GFS212-standard.xml
new file mode 100644
index 0000000000..c65ca5b07f
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/GFS212-standard.xml
@@ -0,0 +1,6 @@
+
+
+ GFS212
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC130-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC130-standard.xml
new file mode 100644
index 0000000000..73229772be
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC130-standard.xml
@@ -0,0 +1,6 @@
+
+
+ RUC130
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC236-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC236-standard.xml
new file mode 100644
index 0000000000..59be806285
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/RUC236-standard.xml
@@ -0,0 +1,6 @@
+
+
+ RUC236
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SREF212-standard.xml b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SREF212-standard.xml
new file mode 100644
index 0000000000..93edbc974d
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/SREF212-standard.xml
@@ -0,0 +1,6 @@
+
+
+ SREF212
+ standard
+ 1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,200mb_div_isotachs,200mb_hght_wind,250mb_ageo_div_isotachs,250mb_hght_wind,250mb_wind_and_rel_vort,300mb_div_isotachs,500mb_hght_absv,500mb_hght_absv_adv,500mb_hght_absv_wind,500mb_hght_color,500mb_hght_geoabsv,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_rh_omega,700mb_hght_tmp_wind,850-700_thkn,850mb_hght_tmp_wind,pmsl,pmsl_thkn,pmsl_and_bl_wind_global,300-200mb_pv,400-200mb_pv,400-250mb_pv_global,500-250mb_pv,500-300mb_pv
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr
index 300557f096..0648c61eb1 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_nam.attr
@@ -19,7 +19,7 @@ FINT = 1000;2000;3000;4000;5000
FLINE = 0;23;30;15;2;5
HILO = 0!0
HLSYM = 1;1//22;22/2;2/hw
-!CLRBAR= 1/V/LL!0
+!CLRBAR = 1/V/LL!0
WIND = 0
TITLE = 1/-1/~ 0-180 MB AGL BEST CAPE (jkg-1) & CIN (cyan)!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr
index 47be90b0d6..6127c7ab79 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bestcape_cin_ncf_nam.attr
@@ -19,7 +19,7 @@ FINT = 0
FLINE = 0
HILO = 0!0
HLSYM = 0
-!CLRBAR= 0
+!CLRBAR = 0
WIND = 0
TITLE = 1/-1/~ BEST CAPE (0-180 MB AGL)(jkg-1) & CIN (cyan)!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr
index f32edecc58..a2ade5506d 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_nam.attr
@@ -20,7 +20,7 @@ FINT = -9;-7;-5;-3;-1
FLINE = 2;15;21;22;23;0
HILO = !!!!6/H#;L#/1020-1070;900-1016
HLSYM = 1;1/2//4;1.5/0
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 10/0.75/1.5/112
TITLE = 1/-1/~ BL (18MB AGL)MOISTURE CONVERGENCE, WIND (KTS) and THTAE!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr
index 10b4d59247..cc5c0ff048 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_h2o_conv_ncf_nam.attr
@@ -19,7 +19,7 @@ FINT = 0
FLINE = 0
HILO = 0
HLSYM = 0
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 10/0.75/1.5/112
TITLE = 1/-1/~ BL (18MB AGL) MOIST CONV, WIND (KTS) and THTAE!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr
index 74ddcee305..9f19cc2152 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_cmc.attr
@@ -17,7 +17,7 @@ FINT =
FLINE =
HILO = 0
HLSYM = 0
-!CLRBAR= 1/V/LL
+!CLRBAR = 1/V/LL
WIND =
TITLE = 1/-1/~ BL THTE!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr
index 3bedab10c5..11ae503949 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/bl_thte_ncf_nam.attr
@@ -17,7 +17,7 @@ FINT = 0
FLINE = 0
HILO = 0
HLSYM = 0
-!CLRBAR= 1
+!CLRBAR = 1
WIND =
TITLE = 1/-1/~ BL (18MB AGL) THTAE!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr
index 19678e8f3a..056f3bc65a 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/marine_fronts_nam.attr
@@ -17,7 +17,7 @@ FINT = -9;-7;-5;-3;-1 !
FLINE = 2;15;21;22;23;0 !
HILO =
HLSYM =
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 9/0.7/1.5/112
TITLE = 1/-1/~ 1000-850mb THK, BL MOISTURE CONVERGENCE & WIND = (KT)!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr
index a44fbbb2a1..941fbdc23d 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pcpn_potential_ncf_nam.attr
@@ -18,7 +18,7 @@ FINT =
FLINE =
HILO = 0
HLSYM = 0
-!CLRBAR= 1
+!CLRBAR = 1
WIND =
TITLE = 1/-2/~ PCPN POTENTIAL (PW X (1000-470 MB RH)) INCHES OF PW!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr
index 5259aad4d3..c4ea3e4454 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850_thk_nam.attr
@@ -19,7 +19,7 @@ FINT =
FLINE =
HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y
HLSYM = 2;1.5//21//hw
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 9/0.7/2/112
TITLE = 1/-1/~ PMSL, 1000-850mb THKN & BL (0-30 MB AGL) WIND (KTS)!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr
index d439a29384..f106140b21 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_1000-850thk_nam.attr
@@ -17,7 +17,7 @@ FINT =
FLINE =
HILO = !26;2/H#;L#/1020-1070;900-1012/3/30;30/y
HLSYM = 1;1//22;22/1.4;1.4/hw
-!CLRBAR= 1
+!CLRBAR = 1
WIND =
TITLE = 1/-1/~ PMSL, 1000-850mb THKN !0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr
index 69c47ebd18..1c7f333bd4 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_only_nogaps.attr
@@ -11,7 +11,7 @@ FINT =
FLINE =
HILO = 26;2/H#;L#/1020-1070;900-1012
HLSYM = 1;1//22;22/1.4;1.4/hw
-!CLRBAR= 0
+!CLRBAR = 0
WIND =
TITLE = 1/-1/~ PMSL
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr
index 663470829c..e19c13c445 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/pmsl_thkn_wind_mono_nam.attr
@@ -18,7 +18,7 @@ FINT =
FLINE =
HILO = !! 23;23/H#;L#/1018-1070;900-1012//30;30/y
HLSYM = 2;1.5//21//hw
-!CLRBAR= 1
+!CLRBAR = 1
WIND = 23/0.8/1/112
TITLE = 23/-1/~ PMSL, 1000-500 MB THICKNESS, BL WIND =!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr
index 9c6a51e1c5..06f45ee336 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/precip_type_vv_ncf_nam.attr
@@ -18,7 +18,7 @@ FINT = 50;200!50;200!50;200!50;200
FLINE = 0;23;23!0;25;25!0;30;30!0;15;15
HILO = 0
HLSYM = 0
-!CLRBAR= 1/V/LL!0
+!CLRBAR = 1/V/LL!0
WIND = 9/0.7/2/112
TITLE = 1/-1/~ Precip Type, 1000-470 MB RH & 700-500 MB Vertical Velocity!0
COLORS = 2
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr
index e1ffea18ca..8ab03d4191 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/ransnocsi_500-850.attr
@@ -7,7 +7,7 @@
!
GLEVEL = 850:700!700!700!850!850!30:0!30:0!850:500
GVCORD = PRES!PRES!PRES!PRES!PRES!pdly!pdly!PRES
-SKIP =
+SKIP=
FILTER=y
SCALE = 0!0!0!0!0!0!0!6
GDPFUN = lav(relh)!tmpc!tmpc!tmpc!tmpc!tmpc!tmpc!sm9s(pvor(thte,wnd))
@@ -18,6 +18,6 @@ FINT = 70;80;90
FLINE = 0;24;23;22
HILO =
HLSYM =
-!CLRBAR = 1
+!CLRBAR= 1
WIND =
TITLE = 1/-2/~ 850-700 RH,T(BL y,850 r,700 cyan),850-500 EPV|~ 850-700 RH, R/S T, EPV!0
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr
index a496b4f80d..f23db375f7 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_feet.attr
@@ -6,7 +6,7 @@
! T. Piper/GSC 5/99 Added -1 line position for TITLE =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! nww3 ! gfs
+GDFILE = nww3 ! nww3 ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr
index 3b8e5bcd3d..efdb8ef792 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_and_mslp_meters.attr
@@ -6,7 +6,7 @@
! T. Piper/GSC 5/99 Added -1 line position for TITLE =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! nww3 ! gfs
+GDFILE = nww3 ! nww3 ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr
index a0aac8f2d6..a7666239e6 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet.attr
@@ -7,7 +7,7 @@
! J.L.Partain/MPC 5/01 Set filter=n and added SKIP =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! gfs ! gfs
+GDFILE = nww3 ! gfs ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0/-1;1
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr
index 364039968d..db1198e689 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_feet_nw.attr
@@ -7,7 +7,7 @@
! J.L.Partain/MPC 5/01 Set filter=n and added SKIP =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! gfs
+GDFILE = nww3 ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0/-1;1
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr
index 26279bb66f..2ea7733a54 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters.attr
@@ -7,7 +7,7 @@
! J.L.Partain/MPC 5/01 Set filter=n and added SKIP =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! gfs ! gfs
+GDFILE = nww3 ! gfs ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0/-1;1
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr
index c5f015481e..37a3cdf9a5 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/sig_wave_gridded_mslp_meters_nw.attr
@@ -7,7 +7,7 @@
! J.L.Partain/MPC 5/01 Set filter=n and added SKIP =
! T. Lee/SAIC 2/04 Changed AVN to GFS
!
-GDFILE nww3 ! gfs
+GDFILE = nww3 ! gfs
GLEVEL = 0
GVCORD = none
SKIP = 0/-1;1
diff --git a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr
index 3d9ae179cf..db076cd132 100644
--- a/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr
+++ b/cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/svrwx_nam.attr
@@ -20,6 +20,6 @@ FINT = 0;50 !50;56;62;68;74
FLINE = 0;8;0 !0;23;22;30;14;2
HILO = 0!0!0!0!5/H#;L#/1080-2000;900-1012!0
HLSYM = !!!!!1.5;1.5//22/3/hw!
-!CLRBAR= 0!1/V/LL!0
+!CLRBAR = 0!1/V/LL!0
WIND = !!!!!!9/0.8/2/112!6/.3/2/221/.4
TITLE = 1/-2/~ BL (0-30 MB AGL)DWPT & WIND =, 700mb TEMP, RH & WND, EMSL!0
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImage.xml
index d01d4d9462..5a6bc97d7a 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImage.xml
@@ -1,10 +1,10 @@
-
+
-
+
@@ -16,12 +16,12 @@
-
+
-
+
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImageMultipane.xml b/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImageMultipane.xml
index 1d106b482f..7bc8c390f9 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImageMultipane.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/GoesSXIImageMultipane.xml
@@ -1,5 +1,5 @@
-
+
@@ -17,12 +17,12 @@
-
+
-
+
-
+
@@ -56,12 +56,12 @@
-
+
-
+
-
+
@@ -95,12 +95,12 @@
-
+
-
+
-
+
@@ -134,12 +134,12 @@
-
+
-
+
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/HalphaImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/HalphaImage.xml
index d0ffa5b1b2..cbc22adaf2 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/HalphaImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/HalphaImage.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -17,21 +17,24 @@
-
+
-
+
-
+
+
+
+
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIAImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIAImage.xml
index 5edd004cea..c2002f28f1 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIAImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIAImage.xml
@@ -1,5 +1,5 @@
-
+
@@ -16,13 +16,13 @@
-
+
-
+
-
-
+
+
@@ -33,7 +33,7 @@
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIA_MultiImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIA_MultiImage.xml
index 049d69142c..2ab51dfb98 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIA_MultiImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_AIA_MultiImage.xml
@@ -1,10 +1,10 @@
-
+
-
+
-
+
@@ -16,16 +16,16 @@
-
+
-
+
-
-
+
+
-
+
@@ -34,7 +34,7 @@
-
+
@@ -46,16 +46,16 @@
-
+
-
+
-
-
+
+
-
+
@@ -64,7 +64,7 @@
-
+
@@ -76,16 +76,16 @@
-
+
-
+
-
-
+
+
-
+
@@ -93,7 +93,7 @@
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_HMIImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_HMIImage.xml
index 809ea1e37d..85828a6b8c 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/SDO_HMIImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/SDO_HMIImage.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -17,13 +17,13 @@
-
+
-
+
-
-
+
+
@@ -31,7 +31,7 @@
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/SOHOEitImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/SOHOEitImage.xml
index 461eccbce3..740046bf1e 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/SOHOEitImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/SOHOEitImage.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -17,12 +17,12 @@
-
+
-
+
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/SOHOLascoImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/SOHOLascoImage.xml
index 71e31c389f..c94b1e05cf 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/SOHOLascoImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/SOHOLascoImage.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -17,24 +17,21 @@
-
+
-
+
-
+
-
-
-
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/Bundles/STEREOImage.xml b/cave/build/static/common/cave/etc/ncep/Bundles/STEREOImage.xml
index 005cb2f958..206d1e04fa 100644
--- a/cave/build/static/common/cave/etc/ncep/Bundles/STEREOImage.xml
+++ b/cave/build/static/common/cave/etc/ncep/Bundles/STEREOImage.xml
@@ -1,10 +1,11 @@
-
+
-
+
+
@@ -17,33 +18,31 @@
-
+
-
+
-
-
+
+
-
-
-
-
+
-
+
+
@@ -55,27 +54,26 @@
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosETA/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosETA/standard.xml
index 5bdaa5f0b2..4a04c3ec0e 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosETA/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosETA/standard.xml
@@ -1,31 +1,31 @@
-
+
LR
-
+
UR
-
+
TC
-
+
LL
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/12hrpop.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/12hrpop.xml
index ca0447d468..a3314e1771 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/12hrpop.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/12hrpop.xml
@@ -1,7 +1,7 @@
-
+
UR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/6hrpop.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/6hrpop.xml
index 3acbca874e..921189ab50 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/6hrpop.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/6hrpop.xml
@@ -1,7 +1,7 @@
-
+
UR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/fosb.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/fosb.xml
index ddf3ab8381..b57e59c65e 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/fosb.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/fosb.xml
@@ -1,7 +1,7 @@
-
+
UL
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/misc.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/misc.xml
index c22f0fc486..a2d2384b00 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/misc.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/misc.xml
@@ -1,83 +1,83 @@
-
+
BC
-
+
LL
-
+
TC
-
+
LR
-
+
TC
-
+
BC
-
+
TC
-
+
BC
-
+
UR
-
+
UR
-
+
LR
-
+
LL
-
+
UL
-
+
BC
-
+
TC
-
+
LR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/standard.xml
index 7e1e149183..f4466e4f11 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosGFS/standard.xml
@@ -1,52 +1,52 @@
-
+
UL
-
+
UR
-
+
TC
-
+
LL
-
+
LR
-
+
BC
-
+
UL
-
+
UR
-
+
TC
-
+
LL
-
+
LR
-
+
UR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosLAMP/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosLAMP/standard.xml
index ff96fa5276..416f55409b 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosLAMP/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosLAMP/standard.xml
@@ -1,38 +1,38 @@
-
+
UL
-
+
LL
-
+
SC
-
+
LR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml
index f7c3b9546d..d26d9416a3 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosMRF/standard.xml
@@ -1,16 +1,16 @@
-
+
LR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosNGM/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosNGM/standard.xml
index b5641eb14a..6f0cb0ab79 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosNGM/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrmosNGM/standard.xml
@@ -1,14 +1,14 @@
-
+
UL
-
+
LL
-
+
LR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrua/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrua/standard.xml
index 7f7db0bd60..129423f520 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/bufrua/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/bufrua/standard.xml
@@ -5,23 +5,23 @@
plugin="bufrua" name="standard"
svgTemplate="standardPlotModelTemplate.svg">
-
+
UL
-
+
UR
-
+
LL
-
+
LR
-
+
WD
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/modelsounding/basicNAM.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/modelsounding/basicNAM.xml
index ecc003f6cb..c5f902b362 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/modelsounding/basicNAM.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/modelsounding/basicNAM.xml
@@ -1,49 +1,49 @@
-
+
MC
-
+
UL
-
+
LL
-
+
ML
-
+
MR
-
+
TR
-
+
BR
-
+
LC
-
+
BC
-
+
TC
-
-
-
+
UL
-
+
LL
-
-
+
MR
-
+
LR
-
-
-
+
UC
-
+
UR
-
+
MC
-
+
LC
-
+
UL
-
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/ncpafm/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/ncpafm/standard.xml
index 23cd2b455e..18cc22ee5d 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/ncpafm/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/ncpafm/standard.xml
@@ -1,50 +1,50 @@
-
+
TC
-
+
UL
-
+
UC
-
+
UR
-
+
ML
-
+
MR
-
+
LL
-
+
LC
-
+
WD
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/ncpirep/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/ncpirep/standard.xml
index db0b3c9f70..55214b2228 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/ncpirep/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/ncpirep/standard.xml
@@ -9,21 +9,21 @@
params have been commented out since all the parameters
have not been implemented yet for airep
-->
-
-
+
UC
-
+
MC
-
+
LC
-
+
UL
-
+
UR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/ncscd/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/ncscd/standard.xml
index 5df78b487b..77135efff6 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/ncscd/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/ncscd/standard.xml
@@ -1,34 +1,34 @@
-
+
UL
-
+
ML
-
+
LL
-
+
UR
-
+
LR
-
+
BC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/simple.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/simple.xml
index dbd95ad9a8..54995b61a1 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/simple.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/simple.xml
@@ -1,38 +1,38 @@
-
+
UL
-
+
LL
-
+
SC
-
+
WD
-
-
+
LR
-
+
TC
-
+
UR
-
+
LM
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/standard.xml
index a1a967caad..ae6797c545 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/standard.xml
@@ -1,14 +1,14 @@
-
+
SC
-
+
ML
-
+
LR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_flt_condition.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_flt_condition.xml
index 0e6ff9cdfa..a2a51d9cb4 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_flt_condition.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_flt_condition.xml
@@ -1,30 +1,30 @@
-
+
UL
-
+
LL
-
+
SC
-
+
UR
-
+
LR
-
+
TC
-
+
BC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_prob.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_prob.xml
index 949ee03688..6a56946958 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_prob.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/nctaf/tempo_prob.xml
@@ -1,30 +1,30 @@
-
+
UL
-
+
LL
-
+
SC
-
+
UR
-
+
LR
-
+
TC
-
+
BC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/ncuair/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/ncuair/standard.xml
index 4d351e8460..31fac65b46 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/ncuair/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/ncuair/standard.xml
@@ -5,23 +5,23 @@
plugin="ncuair" name="standard"
svgTemplate="standardPlotModelTemplate.svg">
-
+
UL
-
+
UR
-
+
LL
-
+
LR
-
+
WD
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/simple.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/simple.xml
index 6681d64d69..5d84f376fb 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/simple.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/simple.xml
@@ -4,7 +4,7 @@
plugin="obs"
svgTemplate="standardPlotModelTemplate.svg">
-
+
UL
@@ -12,7 +12,7 @@
ML
-
+
LL
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard.xml
index 4678fb19fc..040e40e359 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard.xml
@@ -1,40 +1,40 @@
-
+
UL
-
+
LL
-
+
BC
-
+
LR
-
+
UR
-
+
SC
-
+
WD
-
+
ML
-
+
MR
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard2.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard2.xml
index 45944bc6d7..4ee3b750b5 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard2.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/obs/standard2.xml
@@ -1,42 +1,42 @@
-
+
UL
-
+
LL
-
+
BC
-
+
LR
-
+
UR
-
+
SC
-
+
WD
-
+
ML
-
+
MR
-
+
LC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/bouys.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/bouys.xml
index 5cbd00d02d..a5a33c96a3 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/bouys.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/bouys.xml
@@ -1,18 +1,18 @@
-
+
WD
-
+
UL
-
+
UR
-
+
ML
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/ship_standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/ship_standard.xml
index d6e3e566d6..4f6986941e 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/ship_standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/ship_standard.xml
@@ -1,44 +1,44 @@
-
+
UL
-
+
ML
-
+
LL
-
+
SC
-
+
WD
-
+
UR
-
+
MR
-
+
LR
-
+
TC
-
+
BC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/synop_standard.xml b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/synop_standard.xml
index 8d1b41bbdf..e75555d3ec 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/synop_standard.xml
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/sfcobs/synop_standard.xml
@@ -1,42 +1,42 @@
-
+
UL
-
+
ML
-
+
LL
-
+
SC
-
+
WD
-
+
UR
-
+
MR
-
+
LR
-
+
BC
-
+
LC
diff --git a/cave/build/static/common/cave/etc/ncep/PlotModels/standardPlotModelTemplate.svg b/cave/build/static/common/cave/etc/ncep/PlotModels/standardPlotModelTemplate.svg
index 1fd72b0a35..2b6e038fc3 100644
--- a/cave/build/static/common/cave/etc/ncep/PlotModels/standardPlotModelTemplate.svg
+++ b/cave/build/static/common/cave/etc/ncep/PlotModels/standardPlotModelTemplate.svg
@@ -10,35 +10,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
@font-face { font-family: "WindSymbolFont";
src: url(../ncep/PlotModels/WindSymbols.svg#WindSymbols); }
- @font-face { font-family: "StandardFont";
- src: url(../ncep/PlotModels/Standard.svg#Standard); }
-
- @font-face { font-family: "CourierNormalFont";
- src: url(../ncep/PlotModels/CourierNormal.svg#CourierNormal); }
- @font-face { font-family: "CourierItalicFont";
- src: url(../ncep/PlotModels/CourierItalic.svg#CourierItalic); }
- @font-face { font-family: "CourierBoldFont";
- src: url(../ncep/PlotModels/CourierBold.svg#CourierBold); }
- @font-face { font-family: "CourierBold-ItalicFont";
- src: url(../ncep/PlotModels/CourierBoldItalic.svg#CourierBoldItalic); }
-
- @font-face { font-family: "TimesNormalFont";
- src: url(../ncep/PlotModels/TimesNormal.svg#TimesNormal); }
- @font-face { font-family: "TimesItalicFont";
- src: url(../ncep/PlotModels/TimesItalic.svg#TimesItalic); }
- @font-face { font-family: "TimesBoldFont";
- src: url(../ncep/PlotModels/TimesBold.svg#TimesBold); }
- @font-face { font-family: "TimesBold-ItalicFont";
- src: url(../ncep/PlotModels/TimesBoldItalic.svg#TimesBoldItalic); }
-
- @font-face { font-family: "HelveticaNormalFont";
- src: url(../ncep/PlotModels/HelveticaNormal.svg#HelveticaNormal); }
- @font-face { font-family: "HelveticaItalicFont";
- src: url(../ncep/PlotModels/HelveticaItalic.svg#HelveticaItalic); }
- @font-face { font-family: "HelveticaBoldFont";
- src: url(../ncep/PlotModels/HelveticaBold.svg#HelveticaBold); }
- @font-face { font-family: "HelveticaBold-ItalicFont";
- src: url(../ncep/PlotModels/HelveticaBoldItalic.svg#HelveticaBoldItalic); }
@font-face { font-family: "WxSymbolFont";
src: url(../ncep/PlotModels/NcWxSymbols.svg#NcWxSymbols); }
@@ -61,21 +32,21 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
-->
- err
- err
- err
+
+
+
- err
- err
+
+
- err
+
- err
- err
+
+
- err
- err
- err
+
+
+
arrow
@@ -85,5 +56,5 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
-
+
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA212/ETA212.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA212/ETA212.xml
new file mode 100644
index 0000000000..23f6279210
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA212/ETA212.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ ETA212
+ GRID
+
+GDFILE=ETA212
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA218/ETA218.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA218/ETA218.xml
new file mode 100644
index 0000000000..b074bcd6a9
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/ETA218/ETA218.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ ETA218
+ GRID
+
+GDFILE=ETA218
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/GFS212/GFS212.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/GFS212/GFS212.xml
new file mode 100644
index 0000000000..86e3ac6c57
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/GFS212/GFS212.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ GFS212
+ GRID
+
+GDFILE=GFS212
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC130/RUC130.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC130/RUC130.xml
new file mode 100644
index 0000000000..a4fab7c883
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC130/RUC130.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ RUC130
+ GRID
+
+GDFILE=RUC130
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC236/RUC236.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC236/RUC236.xml
new file mode 100644
index 0000000000..aeb6a04d60
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/RUC236/RUC236.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ RUC236
+ GRID
+
+GDFILE=RUC236
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/SREF212/SREF212.xml b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/SREF212/SREF212.xml
new file mode 100644
index 0000000000..a63a74c709
--- /dev/null
+++ b/cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/SREF212/SREF212.xml
@@ -0,0 +1,21 @@
+
+
+ true
+ true
+ SREF212
+ GRID
+
+GDFILE=SREF212
+pluginName=grid
+
+ Forecast,SBN
+ ModelFcstGridContours
+
+
+ CLOSEST_BEFORE_OR_AFTER
+ 60
+ USE_DATA_TIMES
+ 10
+ 384
+ BasicWX_US
+
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
index 2f39fbe43a..ef99c516d4 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
@@ -106,8 +106,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Changes for non-blocking AttributeThresholdDlg.
* Changes for non-blocking LoadSaveConfigDlg.
* Jan 23, 2013 14907 gzhang GUID not in Thresholds menu even ColorCell true
+ * Mar 01, 2013 13228 gzhang Adding field rowName for VGB in County
*
- *
* @author lvenable
* @version 1.0
*/
@@ -235,7 +235,9 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
private FFMPTableDataLoader dataRetrieveThread = null;
private boolean groupLabelFlag = true;
-
+
+ private String rowName="";// DR 13228
+
public FfmpBasinTableDlg(Shell parent, FFMPTableData tData,
FFMPResource resource) {
super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.INDEPENDENT_SHELL
@@ -1707,7 +1709,7 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
|| allOnlySmallBasinsMI.getSelection()) {
groupLbl.setText(name);
}
-
+ rowName=name;// DR 13228
shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
fireScreenRecenterEvent(pfaf, 1);
}
@@ -2171,4 +2173,9 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
groupLbl.setText("");
}
}
+
+ // DR 13228
+ public String getRowName(){
+ return this.rowName;
+ }
}
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
index 3e9d644cff..d2c7d9ffba 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
@@ -64,8 +64,8 @@ import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FfmpTableConfigData;
* ------------ ---------- ----------- --------------------------
* Jul 20, 2009 dhladky Initial creation
* Jan 25, 2012 DR 13839 gzhang Use paintTime for QPF
+ * Mar 01, 2013 DR 13228 gzhang Get VGB county info for row name
*
- *
* @author dhladky
* @version 1.0
*/
@@ -209,7 +209,7 @@ public class FFMPDataGenerator {
for (Long id : ft
.getVirtualGageBasinLookupIds(
siteKey,
- key)) {
+ key,huc,resource.basinTableDlg.getRowName()/* DR 13228 */)) {
setFFMPRow(
virtualBasin
.get(id),
@@ -281,7 +281,7 @@ public class FFMPDataGenerator {
for (Long id : ft
.getVirtualGageBasinLookupIds(
siteKey,
- key)) {
+ key,huc,resource.basinTableDlg.getRowName()/* DR 13228 */)) {
setFFMPRow(
virtualBasin
.get(id),
@@ -305,7 +305,7 @@ public class FFMPDataGenerator {
return tData;
}
- private void setFFMPRow(FFMPBasin cBasin, FFMPTableData tData,
+ private void setFFMPRow(/*FFMPVirtualGageBasinMetaData md,*/FFMPBasin cBasin, FFMPTableData tData,
boolean isVGB, String domain) {
try {
if (cBasin instanceof FFMPVirtualGageBasin) {
diff --git a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
index 6720e6148c..6b24a835ff 100644
--- a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
@@ -358,4 +358,11 @@
version="0.0.0"
fragment="true"/>
+
+
diff --git a/cave/com.raytheon.uf.viz.npp.crimss/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.npp.crimss/META-INF/MANIFEST.MF
index c0299fc9b0..5400bdff33 100644
--- a/cave/com.raytheon.uf.viz.npp.crimss/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.npp.crimss/META-INF/MANIFEST.MF
@@ -46,7 +46,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
gov.noaa.nws.ncep.edex.common.sounding,
gov.noaa.nws.ncep.ui.nsharp,
gov.noaa.nws.ncep.ui.nsharp.natives,
- gov.noaa.nws.ncep.ui.nsharp.skewt,
javax.measure.converter,
javax.measure.unit,
org.eclipse.swt.graphics,
diff --git a/cave/com.raytheon.uf.viz.npp.crimss/src/com/raytheon/uf/viz/npp/crimss/CrimssDataDefinition.java b/cave/com.raytheon.uf.viz.npp.crimss/src/com/raytheon/uf/viz/npp/crimss/CrimssDataDefinition.java
index 59d1f33848..3613914da5 100644
--- a/cave/com.raytheon.uf.viz.npp.crimss/src/com/raytheon/uf/viz/npp/crimss/CrimssDataDefinition.java
+++ b/cave/com.raytheon.uf.viz.npp.crimss/src/com/raytheon/uf/viz/npp/crimss/CrimssDataDefinition.java
@@ -19,7 +19,7 @@
**/
package com.raytheon.uf.viz.npp.crimss;
-import gov.noaa.nws.ncep.ui.nsharp.skewt.NsharpSkewTEditor;
+import gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor;
import java.util.ArrayList;
import java.util.Arrays;
@@ -211,7 +211,7 @@ public class CrimssDataDefinition
*/
@Override
protected IDisplayPaneContainer openNewEditor(String editorId) {
- if (NsharpSkewTEditor.EDITOR_ID.equals(editorId)) {
+ if (NsharpEditor.EDITOR_ID.equals(editorId)) {
return UiUtil.createEditor(editorId, new D2DNSharpDisplay());
} else {
return super.openNewEditor(editorId);
diff --git a/cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/ProductMenu.xml b/cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/ProductMenu.xml
index fb6803d571..88b2f1b6e6 100644
--- a/cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/ProductMenu.xml
+++ b/cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/ProductMenu.xml
@@ -60,6 +60,7 @@