From ca98d09e62cf40ac48118b5a15489a7775ba1ab1 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Wed, 13 Jul 2022 11:50:38 -0400
Subject: [PATCH 1/3] Update blog entry list

---
 docs/appendix/educational-resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/appendix/educational-resources.md b/docs/appendix/educational-resources.md
index a8390282b3..ccc52f7fff 100644
--- a/docs/appendix/educational-resources.md
+++ b/docs/appendix/educational-resources.md
@@ -142,3 +142,4 @@ A full list of all released blogs can be found below:
 - [Get to Know EDEX](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-get-to-know)
 - [EDEX Data Retention](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-edex-data-retention)
 - [Adding ECMWF Data to EDEX](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-adding-ecmwf-data)
+- [Ingesting GOES Satellite Data](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-ingesting-goes-satellite)
\ No newline at end of file

From 2ad71b46b966544140c14f4e50ac041e5f323f94 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Mon, 25 Jul 2022 15:23:37 -0400
Subject: [PATCH 2/3] Minor update to add back in the Marine WWAs

---
 .../com.raytheon.viz.warnings/localization/bundles/AllWWA.xml | 2 +-
 .../localization/bundles/MarineWWA.xml                        | 4 ++--
 2 files changed, 3 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 078d6049c9..6a78b19cc9 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
@@ -123,7 +123,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Tropical/Marine Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y"/>
+                                        <constraint constraintType="IN" constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,MA.A,MA.S,MA.W,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
index 8ca823951f..f2c719def0 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
@@ -23,7 +23,7 @@
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
 							<mapping key="phensig">
-                                <constraint constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y" constraintType="IN" />
+                                <constraint constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,MA.A,MA.S,MA.W,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y" constraintType="IN" />
                                 
 							</mapping>
 							<mapping key="pluginName">
@@ -35,4 +35,4 @@
 			</descriptor>
 		</displays>
 	</displayList>
-</bundle>
\ No newline at end of file
+</bundle>

From 276751944c20e96401ba9fc973d8acd8f57d38d9 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Mon, 25 Jul 2022 15:24:13 -0400
Subject: [PATCH 3/3] Change the purge retention for RAP13 to longer so can
 load the 0 forecast hours with other realtime data

---
 .../utility/common_static/base/purge/gridPurgeRules.xml      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
index 5e218e3591..58f6cc951e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
@@ -21,6 +21,11 @@
     <versionsToKeep>2</versionsToKeep>
     <period>07-00:00:00</period>
   </defaultRule>
+  <rule>
+    <keyValue>RAP13</keyValue>
+    <versionsToKeep>24</versionsToKeep>
+    <modTimeToWait>00-00:15:00</modTimeToWait>
+  </rule>
   <rule>
     <keyValue>LAPS</keyValue>
     <versionsToKeep>30</versionsToKeep>