From ad3a11479fb90f5f87d7e82e5efb870427f0dec2 Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Fri, 27 Oct 2023 16:11:46 +0000
Subject: [PATCH] Add in FR.W and RF.W phensigs to fire weather plots

---
 cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml  | 2 +-
 cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml | 2 +-
 .../com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml | 2 +-
 .../utility/common_static/base/warngen/phensigColors.xml        | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
index 6a78b19cc9..05fc01fdf7 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
@@ -150,7 +150,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Other Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EH.A,EH.W,FG.Y,FW.A,FW.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y"/>
+                                        <constraint constraintType="IN" constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EH.A,EH.W,FG.Y,FW.A,FW.W,RF.W,FR.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml
index 57cde11062..2dbf8d65a7 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml
@@ -23,7 +23,7 @@
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
 							<mapping key="phensig">
-								<constraint constraintValue="FW.A,FW.W" constraintType="IN" />
+								<constraint constraintValue="FW.A,FW.W,RF.W,FR.W" constraintType="IN" />
 							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml
index 08abfd0060..0753df5e05 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml
@@ -23,7 +23,7 @@
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
 							<mapping key="phensig">
-                                <constraint constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EC.A,EC.W,EH.A,EH.W,FG.Y,FW.A,FW.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y,WC.A,WC.W,WC.Y,ZF.Y,ZR.Y" constraintType="IN" />
+                                <constraint constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EC.A,EC.W,EH.A,EH.W,FG.Y,FW.A,FW.W,RF.W,FR.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y,WC.A,WC.W,WC.Y,ZF.Y,ZR.Y" constraintType="IN" />
                                 
 							</mapping>
 							<mapping key="pluginName">
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
index 849f301767..9b4ccc99cf 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
@@ -34,7 +34,9 @@
 	  <entry><key>FL.Y</key><value color="#00ff7f" name="Flood Advisory"></value></entry>
 	  <entry><key>FR.Y</key><value color="cornflowerblue" name="Frost Advisory"></value></entry>
 	  <entry><key>FW.A</key><value color="navajowhite" name="Fire Weather Watch"></value></entry>
+	  <entry><key>FR.W</key><value color="deeppink" name="Fire Warning"></value></entry>
 	  <entry><key>FW.W</key><value color="deeppink" name="Red Flag Warning"></value></entry>
+	  <entry><key>RF.W</key><value color="deeppink" name="Red Flag Warning"></value></entry>
 	  <entry><key>FZ.A</key><value color="royalblue" name="Freeze Watch"></value></entry>
 	  <entry><key>FZ.W</key><value color="cyan" name="Freeze Warning"></value></entry>
 	  <entry><key>GL.A</key><value color="pink" name="Gale Watch"></value></entry>