diff --git a/docs/appendix/common-problems.md b/docs/appendix/common-problems.md
index 2b6d69d492..195ce7e4f0 100644
--- a/docs/appendix/common-problems.md
+++ b/docs/appendix/common-problems.md
@@ -23,6 +23,22 @@ For Mac users, the easiest way is to open a new terminal and run the following c
rm -rf ~/Library/caveData
+---
+
+## CAVE Map Display in Lower Left Quadrant - Windows
+
+If you start up CAVE in Windows and notice the map is showing up only in the bottom left quadrant of your display, you will just need to tweak a few display settings.
+
+
+
+Try following these steps to fix your issue:
+
+- Right-click on the CAVE.exe (or shortcut) icon, select Properties
+- Select the Compatibility tab
+- Click "Change High DPI Settings"
+- At the bottom enable "Override High DPI scaling behavior"
+- Change the dropdown from Application to System
+
---
## Disappearing Configurations
@@ -83,7 +99,7 @@ These errors are actually happening because the Windows machine is using IPv6, w
**1. Close all error windows and any open windows associated with CAVE.**
-**2. In the Windows 10 search field, search for "control panel".**
+**2. In the Windows search field, search for "control panel".**

@@ -110,6 +126,28 @@ These errors are actually happening because the Windows machine is using IPv6, w
---
+## CAVE Spring Start Up Error
+
+If you encounter the error below, please see one of our solution methods for resolving:
+```
+CAVE's Spring container did not initialize correctly and CAVE must shut down.
+```
+
+
+We have found the reason for this failure is because the host machine is set to use a language other than English (ie. Spanish, French, etc).
+
+To resolve this issue, either:
+
+- Switch your system to English, when using CAVE
+
+or
+
+- Use our [Virtual Machine option](../install/install-cave/#method-1-linux-virtual-machine). This option allows your actual machine to stay in whichever language you choose, while allowing you to run CAVE in an environment set to English. Although we list this installation under the Windows OS, this can also be done on Linux.
+
+!!! warning "The VM option has one notable drawback at the moment -- it cannot render RGB satellite products."
+
+---
+
## Products Not Loading Properly
This problem is most commonly seen with the direct Windows installation. It can also manifest in the Mac installation, and the root of the problem is not having Python installed properly for CAVE to use the packages.
diff --git a/docs/appendix/educational-resources.md b/docs/appendix/educational-resources.md
index ccc52f7fff..537927a859 100644
--- a/docs/appendix/educational-resources.md
+++ b/docs/appendix/educational-resources.md
@@ -61,6 +61,42 @@ If you experience any technical issues with our online course, please contact us
---
+## Python-AWIPS eLearning Course
+
+***Learn Python-AWIPS*** is our online educational course for those interested in learning about [Python-AWIPS](http://unidata.github.io/python-awips/).
+
+
+
+### Access
+
+Please create an account on Unidata eLearning, then self-enroll in Learn Python-AWIPS.
+
+### Content
+
+*Learn Python-AWIPS* s designed for new users of Python-AWIPS who have some background in both Python and CAVE. Through tutorials, challenges, and demonstrations, you will learn the basics for working with EDEX resources through Python.
+The following topics and capabilities are covered throughout the course:
+
+- Programmatically explore the resources available on an EDEX server
+- Make a request to an EDEX for data
+- See examples of data manipulation
+- Plot requested data
+
+### Prerequisites
+
+Required:
+
+ - [A supported web browser](https://articulate.com/support/article/System-Requirements-for-Rise#viewing-content)
+ - Python3
+ - Conda
+ - Git
+ - Python-AWIPS using the [Source Code with Examples Install instructions](http://unidata.github.io/python-awips/#source-code-with-examples-install)
+
+### Support
+
+If you experience any technical issues with our online course, please contact us at: **support-elearning@unidata.ucar.edu**
+
+---
+
## Python-AWIPS Example Notebooks
In addition to CAVE, AWIPS also has a Python package called ***python-awips*** which allows access to all data on an EDEX server. We have created a suite of Jupyter Notebooks as examples for how to use various functions of python-awips.
@@ -86,7 +122,30 @@ Our python-awips Notebooks span a wide range of topics, but generally cover the
---
-
+
+
+## YouTube Channel and Playlist
+
+Unidata has a YouTube channel where we publish videos about all of our software pacakges. Specifically we also have a playlist dedicated to AWIPS videos.
+
+### Access
+
+All [Unidata vidoes can be accessed here](https://www.youtube.com/c/unidatanews) on our channel.
+
+All AWIPS vidoes can be found on the [AWIPS Playlist](https://www.youtube.com/watch?v=4ax6SRyaYTc&list=PLQut5OXpV-0gk9CcjfInV9hNIEAld-Tpp).
+
+### Content
+
+Our AWIPS videos cover a wide range of topics, but include some of the following themes:
+
+- AWIPS topic overviews
+- Instructional videos (ex. how to install CAVE)
+- In-depth walkthroughs on CAVE functionality
+- Python-AWIPS notebook examples
+
+
+
+---
## AWIPS Tips Blog Series
@@ -109,6 +168,9 @@ A full list of all released blogs can be found below:
- [Access Learn AWIPS CAVE from Unidata eLearning](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-access-learn-awips)
- [AWIPS 18.2.1-5 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-5)
- [GLM DATA IDD/LDM Feed Updates](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-glm-data-idd)
+- [AWIPS 18.2.1-6 Software Release](https://www.unidata.ucar.edu/blogs/news/entry/awips-18-2-1-6)
+- [Unidata AWIPS Summer Internship 2022: Rhoen Fiutak](https://www.unidata.ucar.edu/blogs/news/entry/unidata-awips-summer-internship-2022)
+- [Announcing a New eLearning Course: Learn Python-AWIPS](https://www.unidata.ucar.edu/blogs/news/entry/announcing-a-new-elearning-course1)
#### CAVE
@@ -127,6 +189,9 @@ A full list of all released blogs can be found below:
- [Import Shapefiles in CAVE](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-import-shapefiles-in)
- [Create Objective Analysis Plots](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-create-objective-analysis)
- [Use Warngen to Draw Convective Warnings](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-use-warngen-to)
+- [Using Drawing Properties for WWA Display in CAVE](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-using-drawing-properties)
+- [Understanding Graphic vs Image Products in CAVE](https://www.unidata.ucar.edu/blogs/news/entry/understanding-graphic-vs-image-products)
+- [Getting to Know CAVE's Display Properties](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-getting-to-know)
#### Python-AWIPS
@@ -136,10 +201,12 @@ A full list of all released blogs can be found below:
- [Create a Colored Surface Temperature Plot](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-create-a-colored)
- [View WWA Polygons with Python-AWIPS](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-view-wwa-polygons)
- [Creating METAR Station Plots](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-creating-metar-station)
+- [Create Sounding Plots with Model Data](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-create-sounding-plots)
#### EDEX
- [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
+- [Ingesting GOES Satellite Data](https://www.unidata.ucar.edu/blogs/news/entry/awips-tips-ingesting-goes-satellite)
+- [Localization Levels in EDEX](https://www.unidata.ucar.edu/blogs/news/entry/localization-in-edex)
diff --git a/docs/cave/d2d-perspective.md b/docs/cave/d2d-perspective.md
index 03cce08e8d..9d64fc860a 100644
--- a/docs/cave/d2d-perspective.md
+++ b/docs/cave/d2d-perspective.md
@@ -152,7 +152,7 @@ Combined-image displays have been improved by removing the valid time for non-fo
### Display Properties
-This menu option opens the Display Properties dialog box. All the options available in this dialog box are also available on the Toolbar.
+This menu option opens the Display Properties dialog box. Most of the options available in this dialog box are also available on the [Toolbar](#top), while the rest are available in the [individual resource menus](##hold-right-click-resource-name-for-menu) if that resource uses these properties.

diff --git a/docs/edex/new-grid.md b/docs/edex/new-grid.md
index 4122022802..67a417b998 100644
--- a/docs/edex/new-grid.md
+++ b/docs/edex/new-grid.md
@@ -329,6 +329,21 @@ After you have confirmed that the grid was ingested with the given name, you can
---
+## Implementing a Production Process
+
+The [ingest method](#download-test-data) mentioned earlier is strictly meant to only be used during testing and development of ingesting new grid data. The reasoning is because the manual end point is very inefficent during its ingest. It creates copies of the data file and uses more resources than you'd want in a production process.
+
+Once you are satisfied with the data ingest and display in CAVE, then we highly recommend you implement a production process for ingest that does not involve the manual directory (`/awips2/data_store/ingest/`).
+
+The recommended way is to make use of a Python script we distribute with AWIPS (EDEX). This script is called `notifyAWIPS2-unidata.py` and located in th `/awips2/ldm/dev/` directory. If you are already using a script to manually gather the data, then adding an additional call like the one below, should ingest your data to EDEX in an efficient manner:
+```
+/awips2/ldm/dev/notifyAWIPS2-unidata.py [path-to-new-grib-file]
+```
+
+!!! note "Make sure the python script is executable. To do this you may have to run `chmod +x /awips2/ldm/dev/notifyAWIPS2-unidata.py`"
+
+---
+
## Using wgrib2
Mentioned in this page are a few command parameters for `wgrib2` such as `-grid`, `varX`, `-center`, `-subcenter`, and `-full_name`.
diff --git a/docs/images/CAVE_map.png b/docs/images/CAVE_map.png
new file mode 100755
index 0000000000..4f027b4977
Binary files /dev/null and b/docs/images/CAVE_map.png differ
diff --git a/docs/images/caveSpringError.png b/docs/images/caveSpringError.png
new file mode 100644
index 0000000000..0aa9de15e3
Binary files /dev/null and b/docs/images/caveSpringError.png differ
diff --git a/docs/images/learnPythonAwipsBanner.png b/docs/images/learnPythonAwipsBanner.png
new file mode 100644
index 0000000000..190603680b
Binary files /dev/null and b/docs/images/learnPythonAwipsBanner.png differ
diff --git a/docs/images/youtube-logo.png b/docs/images/youtube-logo.png
new file mode 100644
index 0000000000..7e2166cb6f
Binary files /dev/null and b/docs/images/youtube-logo.png differ
diff --git a/docs/index.md b/docs/index.md
index 1e80192a4e..62e4034df6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -19,7 +19,7 @@
[qpid]: http://qpid.apache.org
- The Advanced Weather Interactive Processing System (AWIPS) is a meteorological software package. It is used for decoding, displaying, and analyzing data, and was originally developed for the National Weather Service (NWS) by Raytheon. There is a division here at UCAR called the Unidata Program Center (UCP) which develops and supports a modified non-operational version of AWIPS for use in research and education by [UCAR member institutions](http://president.ucar.edu/governance/members/universities-representatives). This is released as open source software, free to download and use by anyone.
+ The Advanced Weather Interactive Processing System (AWIPS) is a meteorological software package. It is used for decoding, displaying, and analyzing data, and was originally developed for the National Weather Service (NWS) by Raytheon. There is a division here at UCAR called the Unidata Program Center (UPC) which develops and supports a modified non-operational version of AWIPS for use in research and education by [UCAR member institutions](http://president.ucar.edu/governance/members/universities-representatives). This is released as open source software, free to download and use by anyone.
AWIPS takes a unified approach to data ingest, where most data ingested into the system comes through the [LDM](#ldm) client pulling data feeds from the [Unidata IDD](https://www.unidata.ucar.edu/projects/#idd). Various raw data and product files (netCDF, grib, BUFR, ASCII text, gini, AREA) are decoded and stored as HDF5 files and Postgres metadata by [EDEX](install/install-edex), which serves products and data over http.
diff --git a/docs/install/install-cave.md b/docs/install/install-cave.md
index e218cd9748..cf70ced2dc 100644
--- a/docs/install/install-cave.md
+++ b/docs/install/install-cave.md
@@ -6,9 +6,9 @@ CAVE is the **C**ommon **A**WIPS **V**isualization **E**nvironment that is used
## Latest CAVE Versions
-- [**Linux: 18.2.1-5**](#linux)
-- [**Windows: 18.2.1-5**](#windows)
-- [**Mac: 18.2.1-5**](#macos)
+- [**Linux: 18.2.1-6**](#linux)
+- [**Windows: 18.2.1-6**](#windows)
+- [**Mac: 18.2.1-6**](#macos)
[**View release notes**](https://www.unidata.ucar.edu/blogs/news/tags/awips-release)
@@ -35,11 +35,12 @@ Regardless of what Operating System CAVE is running on, these general requiremen
## Linux
-**Latest Version: 18.2.1-5**
+**Latest Version: 18.2.1-6**
### System Requirements
- 64 bit CentOS/Red Hat 7
+- Bash shell environment
!!! note "While CentOS8 has reach End of Life as of Dec. 31, 2021, CentOS7 End of Life isn't until June 30, 2024."
@@ -62,7 +63,7 @@ To run CAVE either:
## Windows
-**Latest Version: 18.2.1-5**
+**Latest Version: 18.2.1-6**
For Windows, Unidata offers two installation options: a [**Linux Virtual Machine**](#method-1-linux-virtual-machine), or a [**Direct Windows Installation**](#method-2-direct-windows-install).
@@ -93,7 +94,7 @@ This method is recommended for beginners, or those with less computer knowledge
1. Download the zipped file containing the virtual machine: [**unidata_cave.zip** ](https://downloads.unidata.ucar.edu/awips2/current/windows/unidata_cave.zip)
2. Unzip the folder by right-clicking and selecting "Extract All". All files will be extracted into a new folder.
-3. Open VMWare Player and go to **Player** > **File...** > **Open** and locate the folder that was created from the downloaded zipped file. Select the file called **"CentOS 7 - Unidata CAVE 18-2-1-5.vmx"**.
+3. Open VMWare Player and go to **Player** > **File...** > **Open** and locate the folder that was created from the downloaded zipped file. Select the file called **"CentOS 7 - Unidata CAVE 18-2-1-6.vmx"**.
4. Run this new VM option. If it asks if it's been moved or copied, select **"I Copied It"**.
- There will be a user in the Linux machine named "awips" and the password is "awips"
- The root password is "unidataAWIPS" if ever needed
@@ -172,7 +173,7 @@ To run CAVE, either:
## macOS
-**Latest Version: 18.2.1-5**
+**Latest Version: 18.2.1-6**
### System Requirements
diff --git a/docs/install/install-edex.md b/docs/install/install-edex.md
index c9b7b43a31..3d08e849bc 100644
--- a/docs/install/install-edex.md
+++ b/docs/install/install-edex.md
@@ -1,12 +1,12 @@
# Install EDEX
-EDEX is the **E**nvironmental **D**ata **Ex**change system that represents the backend server for AWIPS. EDEX is only supported for Linux systems: CentOS and RHEL, and ideally, it should be on its own dedicated machine. It requires administrator priviledges to make root-level changes. EDEX can run on a single machine or be spread across multiple machines. To learn more about that please look at [Distributed EDEX, Installing Across Multiple Machines](/edex/distributed-computing/)
+EDEX is the **E**nvironmental **D**ata **Ex**change system that represents the backend server for AWIPS. EDEX is only supported for Linux systems: CentOS and RHEL, and ideally, it should be on its own dedicated machine. It requires administrator priviledges to make root-level changes. EDEX can run on a single machine or be spread across multiple machines. To learn more about that please look at [Distributed EDEX, Installing Across Multiple Machines](../../edex/distributed-computing/)
---
## Latest Version
-**18.2.1-5**
+**18.2.1-6**
[**View release notes**](https://www.unidata.ucar.edu/blogs/news/tags/awips-release)
@@ -19,6 +19,7 @@ EDEX is the **E**nvironmental **D**ata **Ex**change system that represents the b
!!! note "While CentOS8 has reach End of Life as of Dec. 31, 2021, CentOS7 End of Life isn't until June 30, 2024."
+- Bash shell environment
- 16+ CPU cores (each CPU core can run a decorder in parallel)
- 24GB RAM
- 700GB+ Disk Space
diff --git a/localization/utility/common_static/site/BOU/radar/radarsInUse.txt b/localization/utility/common_static/site/BOU/radar/radarsInUse.txt
index d33a2e8c50..233a6da115 100644
--- a/localization/utility/common_static/site/BOU/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/BOU/radar/radarsInUse.txt
@@ -1,6 +1,7 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kftg
+tden
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/BTV/radar/radarsInUse.txt b/localization/utility/common_static/site/BTV/radar/radarsInUse.txt
index a8d958d8d7..a110932a29 100644
--- a/localization/utility/common_static/site/BTV/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/BTV/radar/radarsInUse.txt
@@ -1,6 +1,7 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kcxx
+ktyx
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/BUF/radar/radarsInUse.txt b/localization/utility/common_static/site/BUF/radar/radarsInUse.txt
index 7610bf7506..ff1ff4f4b9 100644
--- a/localization/utility/common_static/site/BUF/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/BUF/radar/radarsInUse.txt
@@ -1,7 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kbuf
-ktvx
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/FGZ/radar/radarsInUse.txt b/localization/utility/common_static/site/FGZ/radar/radarsInUse.txt
index 5160dfcab5..a2257c8d18 100644
--- a/localization/utility/common_static/site/FGZ/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/FGZ/radar/radarsInUse.txt
@@ -1,6 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
-ksfx
+kfsx
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/FWD/radar/radarsInUse.txt b/localization/utility/common_static/site/FWD/radar/radarsInUse.txt
index deab56bb9e..4a5d9fe91c 100644
--- a/localization/utility/common_static/site/FWD/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/FWD/radar/radarsInUse.txt
@@ -1,6 +1,7 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kfws
+kgrk
tdal
tdfw
diff --git a/localization/utility/common_static/site/ICT/radar/radarsInUse.txt b/localization/utility/common_static/site/ICT/radar/radarsInUse.txt
index ca67939c3f..2b93b66664 100644
--- a/localization/utility/common_static/site/ICT/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/ICT/radar/radarsInUse.txt
@@ -1,6 +1,7 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kict
+tich
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/LIX/radar/radarsInUse.txt b/localization/utility/common_static/site/LIX/radar/radarsInUse.txt
index 83f532d684..bc0c991006 100644
--- a/localization/utility/common_static/site/LIX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/LIX/radar/radarsInUse.txt
@@ -1,7 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
klix
-kbix
tmsy
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/LOT/radar/radarsInUse.txt b/localization/utility/common_static/site/LOT/radar/radarsInUse.txt
index ea468eaa1f..a2fefc5175 100644
--- a/localization/utility/common_static/site/LOT/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/LOT/radar/radarsInUse.txt
@@ -2,6 +2,7 @@
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
klot
tmdw
+tord
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/LSX/radar/radarsInUse.txt b/localization/utility/common_static/site/LSX/radar/radarsInUse.txt
index 5a55b5e0ef..c0efdf9b4f 100644
--- a/localization/utility/common_static/site/LSX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/LSX/radar/radarsInUse.txt
@@ -1,6 +1,7 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
klsx
+tstl
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/LWX/radar/radarsInUse.txt b/localization/utility/common_static/site/LWX/radar/radarsInUse.txt
index 39da44e74e..532619fe65 100644
--- a/localization/utility/common_static/site/LWX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/LWX/radar/radarsInUse.txt
@@ -2,7 +2,9 @@
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
klwx
tiad
-
+tadw
+tbwi
+tdca
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/OAX/radar/radarsInUse.txt b/localization/utility/common_static/site/OAX/radar/radarsInUse.txt
index 57a0b14b71..25667a77b0 100644
--- a/localization/utility/common_static/site/OAX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/OAX/radar/radarsInUse.txt
@@ -3,7 +3,6 @@
koax
tmsp
ktlx
-tjua
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/OKX/radar/radarsInUse.txt b/localization/utility/common_static/site/OKX/radar/radarsInUse.txt
index 0f43146930..fb740d8dec 100644
--- a/localization/utility/common_static/site/OKX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/OKX/radar/radarsInUse.txt
@@ -2,7 +2,7 @@
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kokx
tewr
-tjkf
+tjfk
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/OUN/radar/radarsInUse.txt b/localization/utility/common_static/site/OUN/radar/radarsInUse.txt
index bdac8e5726..4a5b683855 100644
--- a/localization/utility/common_static/site/OUN/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/OUN/radar/radarsInUse.txt
@@ -4,7 +4,6 @@ ktlx
kvnx
kfdr
tokc
-tpsf
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/localization/utility/common_static/site/PSR/radar/radarsInUse.txt b/localization/utility/common_static/site/PSR/radar/radarsInUse.txt
index aabd8da5aa..de0ed6a01a 100644
--- a/localization/utility/common_static/site/PSR/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/PSR/radar/radarsInUse.txt
@@ -1,6 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
-kyuk
+kyux
kiwa
tphx
diff --git a/localization/utility/common_static/site/TFX/radar/radarsInUse.txt b/localization/utility/common_static/site/TFX/radar/radarsInUse.txt
index b5b5cd3e3f..3dfbfbcda3 100644
--- a/localization/utility/common_static/site/TFX/radar/radarsInUse.txt
+++ b/localization/utility/common_static/site/TFX/radar/radarsInUse.txt
@@ -1,6 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
-kftx
+ktfx
# DIAL_RADARS - MUST HAVE THIS LINE
diff --git a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
index 2cafd71016..eed9d51719 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
+++ b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
@@ -494,6 +494,7 @@
72614 K1V4 44.4200 -72.0200 217 16939
0 K1V6 38.4284 -105.106 1659 500
0 K1YT 46.6667 -120.45 438 500
+ 0 K2G2 40.36061 -80.70169 365 500
0 K2G9 40.03887 -79.01500 693 500
0 K2J3 32.98594 -82.38481 100 500
0 K2J5 32.89303 -81.96522 73 500
@@ -529,6 +530,7 @@
0 K33N 39.21869 -75.60047 17 500
0 K33V 40.74542 -106.27538 2486 500
0 K35A 34.68695 -81.64117 186 500
+ 0 K36K 37.96950 -101.25500 938 500
0 K3A6 34.40 -118.60 550 500
0 K3AU 37.67164 -97.07786 405 2500
0 K3D2 45.1357 -87.1881 236 2500
@@ -1166,7 +1168,7 @@
0 KDNA 31.87495 -106.69385 1254 500
0 KDNK 31.10 -93.00 114 500
0 KDNL 33.4700 -82.0300 130 10915
- 0 KDNN 34.72 -84.87 216 500
+ 0 KDNN 34.72294 -84.87024 216 500
0 KDNS 41.9800 -95.3800 388 15284
0 KDNV 40.20317 -87.58973 212 500
0 KDOE 46.27 -86.67 247 200
@@ -1449,6 +1451,7 @@
0 KGFK 47.9600 -97.1800 257 19695
0 KGFL 43.3600 -73.6200 100 20393
0 KGGE 33.3117 -79.3196 12 500
+ 0 KGGF 40.87066 -101.73388 1044 500
72247 KGGG 32.3800 -94.7100 111 15193
0 KGGI 41.7092 -92.7349 307 500
0 KGGP 40.711 -86.373 225 500
@@ -1778,6 +1781,7 @@
0 KK61 39.4712 -98.1288 432 500
0 KK62 38.70408 -84.39183 274 500
0 KK68 38.27736 -95.21523 301 500
+ 0 KK70 25.32432 -80.27573 2 500
0 KK78 38.90406 -97.23586 351 500
0 KK82 39.761 -98.793 548 500
0 KK83 39.90417 -95.77943 405 500
@@ -1905,6 +1909,7 @@
0 KLYV 43.621 -96.216 436 500
0 KLZU 33.978 -83.962 323 500
0 KLZZ 31.1062 -98.1959 370 500
+ 0 KM01 35.20069 -90.05398 69 500
0 KM02 36.12794 -87.42983 272 500
0 KM04 35.58337 -89.58722 85 500
0 KM08 35.21514 -89.04325 152 500
@@ -2791,7 +2796,7 @@
0 KUTA 34.681 -90.347 59 500
0 KUTS 30.7400 -95.5900 105 5387
0 KUUU 41.5400 -71.2800 52 21897
- 0 KUUV 38.2335 -91.1643 284 500
+ 0 KUUV 38.23347 -91.16428 284 500
0 KUVA 29.211 -99.744 287 500
0 KUXL 30.13144 -93.37617 3 500
0 KUYF 39.9327 -83.462 330 500
@@ -2850,6 +2855,7 @@
0 KW22 39.00 -80.274 498 500
0 KW29 38.9764 -76.3296 5 500
0 KW31 36.9604 -78.1851 160 2500
+ 0 KW40 35.22083 -78.03768 51 500
0 KW43 44.6629 -104.5678 1300 500
0 KW63 36.5958 -78.5601 128 2500
0 KW75 37.6024 -76.4467 9 2500
diff --git a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
index 4684a31c17..b2b7621c7e 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
@@ -1,5 +1,5 @@
# This is the BASE afos2awips.txt file.
-# For changes contact Wayne Martin.
+# For changes to this file, contact Wayne Martin.
AAATIBCAX WECA42 PHEB
ABQABVABQ UFUS45 KABQ
@@ -9298,6 +9298,7 @@ GTFTAFGPI FTUS45 KMSO
GTFTAFGTF FTUS45 KTFX
GTFTAFHAM FTUS45 KMSO
GTFTAFHLN FTUS45 KTFX
+GTFTAFHRF FTUS45 KMSO
GTFTAFHVR FTUS45 KTFX
GTFTAFLVM FTUS45 KBYZ
GTFTAFLWT FTUS45 KTFX
@@ -9618,9 +9619,9 @@ GUMOUATKK UXKA80 PTKK
GUMOUATKR UXKA80 PTKR
GUMOUATTP UXKA80 PTTP
GUMPFMMY FOMY50 PGUM
-GUMPFMPQ FOPQ50 PGUM
GUMPFMPQ1 FOPQ51 PGUM
GUMPFMPQ2 FOPQ52 PGUM
+GUMPFMPQ FOPQ50 PGUM
GUMPNSGUM NOPQ40 PGUM
GUMPNSKMR NOMH40 PKMR
GUMPNSPQ NOPQ40 PGUM
@@ -11702,7 +11703,6 @@ LAXSCDLOX CXUS66 KLOX
LAXSCDSGX CXUS66 KSGX
LAXSFPSGX FPUS66 KSGX
LAXSFTCA FPUS66 KLOX
-LAXSFTCA FPUS66 KSGX
LAXSFTLOX FPUS66 KLOX
LAXSFTSGX FPUS66 KSGX
LAXSGLNKX UMUS46 KSGX
@@ -13448,17 +13448,23 @@ MIACFWMLB WHUS42 KMLB
MIACFWTAE WHUS42 KTAE
MIACFWTBW WHUS42 KTBW
MIACGRJAX SXUS82 KJAX
+MIACLABKV CXUS52 KTBW
MIACLADAB CXUS52 KMLB
MIACLAFPR CXUS52 KMLB
+MIACLAGIF CXUS52 KTBW
MIACLALEE CXUS52 KMLB
MIACLAMCO CXUS52 KMLB
MIACLAMLB CXUS52 KMLB
+MIACLAPGD CXUS52 KTBW
MIACLASFB CXUS52 KMLB
+MIACLASPG CXUS52 KTBW
+MIACLATBW CXUS52 KTBW
MIACLAVRB CXUS52 KMLB
MIACLIAAF CDUS42 KTAE
MIACLIABY CDUS42 KTAE
MIACLIAMG CDUS42 KJAX
MIACLIAPF CDUS42 KMFL
+MIACLIBKV CDUS42 KTBW
MIACLICTY CDUS42 KTAE
MIACLIDAB CDUS42 KMLB
MIACLIDHN CDUS42 KTAE
@@ -13467,6 +13473,7 @@ MIACLIEYW CDUS42 KKEY
MIACLIFLL CDUS42 KMFL
MIACLIFMY CDUS42 KTBW
MIACLIFPR CDUS42 KMLB
+MIACLIGIF CDUS42 KTBW
MIACLIGNV CDUS42 KJAX
MIACLIJAX CDUS42 KJAX
MIACLILEE CDUS42 KMLB
@@ -13476,9 +13483,12 @@ MIACLIMIA CDUS42 KMFL
MIACLIMLB CDUS42 KMLB
MIACLIMTH CDUS42 KKEY
MIACLIPBI CDUS42 KMFL
+MIACLIPGD CDUS42 KTBW
MIACLISFB CDUS42 KMLB
+MIACLISPG CDSU42 KTBW
MIACLISRQ CDUS42 KTBW
MIACLISSI CDUS42 KJAX
+MIACLITBW CDSU42 KTBW
MIACLITLH CDUS42 KTAE
MIACLITPA CDUS42 KTBW
MIACLIVLD CDUS42 KTAE
@@ -13487,6 +13497,7 @@ MIACLMAAF CXUS52 KTAE
MIACLMABY CXUS52 KTAE
MIACLMAMG CXUS52 KJAX
MIACLMAPF CXUS52 KMFL
+MIACLMBKV CXUS52 KTBW
MIACLMCTY CXUS52 KTAE
MIACLMDAB CXUS52 KMLB
MIACLMDHN CXUS52 KTAE
@@ -13495,6 +13506,7 @@ MIACLMEYW CXUS52 KKEY
MIACLMFLL CXUS52 KMFL
MIACLMFMY CXUS52 KTBW
MIACLMFPR CXUS52 KMLB
+MIACLMGIF CXUS52 KTBW
MIACLMGNV CXUS52 KJAX
MIACLMJAX CXUS52 KJAX
MIACLMLEE CXUS52 KMLB
@@ -13504,7 +13516,9 @@ MIACLMMIA CXUS52 KMFL
MIACLMMLB CXUS52 KMLB
MIACLMMTH CXUS52 KKEY
MIACLMPBI CXUS52 KMFL
+MIACLMPGD CXUS52 KTBW
MIACLMSFB CXUS52 KMLB
+MIACLMSPG CXUS52 KTBW
MIACLMSRQ CXUS52 KTBW
MIACLMSSI CXUS52 KJAX
MIACLMTBW CXUS52 KTBW
@@ -13512,12 +13526,17 @@ MIACLMTLH CXUS52 KTAE
MIACLMTPA CXUS52 KTBW
MIACLMVLD CXUS52 KTAE
MIACLMVRB CXUS52 KMLB
+MIACLSBKV CXUS52 KTBW
MIACLSDAB CXUS52 KMLB
MIACLSFPR CXUS52 KMLB
+MIACLSGIF CXUS52 KTBW
MIACLSLEE CXUS52 KMLB
MIACLSMCO CXUS52 KMLB
MIACLSMLB CSUS52 KMLB
+MIACLSPGD CXUS52 KTBW
MIACLSSFB CXUS52 KMLB
+MIACLSSPG CXUS52 KTBW
+MIACLSTBW CXUS52 KTBW
MIACLSVRB CXUS52 KMLB
MIACMMMLB CSUS52 KMLB
MIACRSTAE FRUS42 KTAE
@@ -13984,6 +14003,7 @@ MIARERAAF SXUS72 KTAE
MIARERABY SXUS72 KTAE
MIARERAMG SXUS72 KJAX
MIARERAPF SXUS72 KMFL
+MIARERBKV SXUS72 KTBW
MIARERCRG SXUS72 KJAX
MIARERDAB SXUS72 KMLB
MIARERDHN SXUS72 KTAE
@@ -13992,6 +14012,7 @@ MIAREREYW SXUS72 KKEY
MIARERFLL SXUS72 KMFL
MIARERFMY SXUS72 KTBW
MIARERFPR SXUS72 KMLB
+MIARERGIF SXUS72 KTBW
MIARERGNV SXUS72 KJAX
MIARERJAX SXUS72 KJAX
MIARERLEE SXUS72 KMLB
@@ -14000,7 +14021,9 @@ MIARERMIA SXUS72 KMFL
MIARERMLB SXUS72 KMLB
MIARERMTH SXUS72 KKEY
MIARERPBI SXUS72 KMFL
+MIARERPGD SXUS72 KTBW
MIARERSFB SXUS72 KMLB
+MIARERSPG SXUS72 KTBW
MIARERSRQ SXUS72 KTBW
MIARERSSI SXUS72 KJAX
MIARERTBW SXUS72 KTBW
@@ -17044,7 +17067,9 @@ NFDOFFNT2 FZNT22 KWBC
NFDOFFPZ5 FZPN25 KWBC
NFDOFFPZ6 FZPN26 KWBC
NFDPMDEPD FXUS02 KWBC
+NFDPMDEPH FXPN30 KWNC
NFDPMDHI FXHW01 KWNH
+NFDPMDSPD FXUS01 KWBC
NFDPOECCA FXUS41 KWNC
NFDPOECCB FXUS42 KWNC
NFDPOECCC FXUS43 KWNC
@@ -17136,7 +17161,6 @@ NFDPOELTJ FXUS10 KWNC
NFDPOELTK FXUS11 KWNC
NFDPOELTL FXUS12 KWNC
NFDPOELTM FXUS13 KWNC
-NFDPMDSPD FXUS01 KWBC
NFDQPFERD FOUS30 KWBC
NFDQPFHSD FOUS11 KWBC
NFDQPFPFD FXUS04 KWBC
@@ -17801,8 +17825,8 @@ NMCFWOUNR SHUS63 KMWI
NMCFWOVEF SHUS65 KMWI
NMCGPHHX6 PTNT98 KWBC
NMCGPHHX8 PTNR98 KWBC
-NMCMAVAFC FOAK38 KWNO
NMCHMDNWC AGUS74 KWCO
+NMCMAVAFC FOAK38 KWNO
NMCMAVAFG FOAK39 KWNO
NMCMAVAJK FOAK37 KWNO
NMCMAVCND FOCN20 KWNO
@@ -19966,8 +19990,8 @@ PDXMSMEUG CSUS46 KPQR
PDXMSMMEH CSUS46 KPDT
PDXMSMMFR CSUS46 KMFR
PDXMSMPDT CSUS46 KPDT
-PDXMSMREO CSUS46 KBOI
PDXMSMPDX CSUS46 KPQR
+PDXMSMREO CSUS46 KBOI
PDXMSMSLE CSUS46 KPQR
PDXMSMSXT CSUS46 KMFR
PDXMSTAST CSUS86 KPQR
@@ -20951,6 +20975,7 @@ PHXDPAFSX SDUS85 KFGZ
PHXDPAIWA SDUS85 KPSR
PHXDPAYUX SDUS85 KPSR
PHXDSMALK CXUS45 KPSR
+PHXDSMDUG CXUS45 KTWC
PHXDSMFHU CXUS45 KPSR
PHXDSMFLG CXUS45 KFGZ
PHXDSMIGM CXUS45 KFGZ
@@ -21080,6 +21105,7 @@ PHXMISPSR AXUS45 KPSR
PHXMISTWC AXUS45 KTWC
PHXMRMIWA NOUS85 KPSR
PHXMSMALK CSUS45 KPSR
+PHXMSMDUG CSUS45 KTWC
PHXMSMFHU CSUS45 KPSR
PHXMSMFLG CSUS45 KFGZ
PHXMSMINW CSUS45 KFGZ
@@ -21094,6 +21120,7 @@ PHXMSTINW CSUS85 KFGZ
PHXMSTPHX CSUS85 KPSR
PHXMSTTUS CSUS85 KTWC
PHXMTR40G SAUS45 KFGZ
+PHXMTRDUG SAUS45 KTWC
PHXMTRFLG SAUS45 KFGZ
PHXMTRGCN SAUS45 KFGZ
PHXMTRIGM SAUS45 KFGZ
@@ -21176,6 +21203,7 @@ PHXRR5INW SRUS55 KFGZ
PHXRR5PSR SRUS55 KPSR
PHXRR5TWC SRUS55 KTWC
PHXRR6ALK SRUS65 KPSR
+PHXRR6DUG SRUS65 KTWC
PHXRR6FGZ SRUS65 KFGZ
PHXRR6FHU SRUS65 KPSR
PHXRR6FLG SRUS65 KFGZ
@@ -21188,6 +21216,7 @@ PHXRR6PSR SRUS65 KPSR
PHXRR6SAD SRUS65 KTWC
PHXRR6TWC SRUS65 KTWC
PHXRR7ALK SRUS75 KPSR
+PHXRR7DUG SRUS75 KTWC
PHXRR7FGZ SRUS75 KFGZ
PHXRR7FHU SRUS75 KFHU
PHXRR7IGM SRUS75 KFGZ
@@ -21467,6 +21496,7 @@ PITFLSPBZ WGUS81 KPBZ
PITFLSRHA WGUS81 KRHA
PITFLWPBZ WGUS41 KPBZ
PITFLWRHA WGUS42 KRHA
+PITFOPMA FGUD41 KRHA
PITFRWPBZ WOUS41 KPBZ
PITFTMPBZ NOUS61 KPBZ
PITFWEPBZ FEUS41 KPBZ
@@ -22301,6 +22331,7 @@ RDUOPUMHX FPUS82 KMHX
RDUOPURAH FPUS82 KRAH
RDUOSOILM SXUS52 KILM
RDUPFMILM FOUS52 KILM
+RDUPFMILM FOUS54 KILM
RDUPFMMHX FOUS52 KMHX
RDUPFMRAH FOUS52 KRAH
RDUPNSILM NOUS42 KILM
@@ -22315,6 +22346,7 @@ RDURCMRAX SDUS42 KRAH
RDURECILM SXUS42 KILM
RDURECMHX SXUS42 KMHX
RDURECRAH SXUS42 KRAH
+RDURERCRE SXUS72 KILM
RDURERFAY SXUS72 KRAH
RDURERFLO SXUS72 KILM
RDURERGSO SXUS72 KRAH
@@ -22322,7 +22354,6 @@ RDURERHAT SXUS72 KMHX
RDURERILM SXUS72 KILM
RDURERLBT SXUS72 KILM
RDURERMHX SXUS72 KMHX
-RDURERMYR SXUS72 KILM
RDURERRAH SXUS72 KRAH
RDURERRDU SXUS72 KRAH
RDURETRAN NZXX99 KRAH
@@ -22576,23 +22607,28 @@ RNOCF6EKO CXUS55 KLKN
RNOCF6ELY CXUS55 KLKN
RNOCF6IGM CXUS55 KVEF
RNOCF6LAS CXUS55 KVEF
+RNOCF6P68 CXUS56 KLKN
RNOCF6RNO CXUS55 KREV
RNOCF6TPH CXUS55 KLKN
RNOCF6WMC CXUS55 KLKN
RNOCLADVF CXUS55 KVEF
+RNOCLAP68 CXUS55 KLKN
RNOCLIDVF CDUS45 KVEF
RNOCLIEKO CDUS45 KLKN
RNOCLIELY CDUS45 KLKN
RNOCLILAS CDUS45 KVEF
+RNOCLIP68 CDUS45 KLKN
RNOCLIRNO CDUS45 KREV
RNOCLIWMC CDUS45 KLKN
RNOCLMDVF CXUS55 KVEF
RNOCLMEKO CXUS55 KLKN
RNOCLMELY CXUS55 KLKN
RNOCLMLAS CXUS55 KVEF
+RNOCLMP68 CXUS55 KLKN
RNOCLMRNO CXUS55 KREV
RNOCLMWMC CXUS55 KLKN
RNOCLSDVF CXUS55 KVEF
+RNOCLSP68 CXUS55 KLKN
RNOCMMRNO CSUS55 KREV
RNOCMMTVL CSUS55 KREV
RNOCMMWMC CSUS55 KLKN
@@ -23180,8 +23216,13 @@ SATCFWCRP WHUS44 KCRP
SATCFWHGX WHUS44 KHGX
SATCGRCRP SXUS84 KCRP
SATCLABRO CXUS53 KBRO
+SATCLACLL CXUS54 KHGX
+SATCLAGLS CXUS54 KHGX
+SATCLAHOU CXUS54 KHGX
SATCLAHRL CXUS53 KBRO
+SATCLAIAH CXUS54 KHGX
SATCLAMFE CXUS53 KBRO
+SATCLAPSX CXUS54 KHGX
SATCLIATT CDUS44 KEWX
SATCLIAUS CDUS44 KEWX
SATCLIBPT CDUS44 KLCH
@@ -23210,8 +23251,14 @@ SATCLMHRL CXUS54 KBRO
SATCLMIAH CXUS54 KHGX
SATCLMLRD CXUS54 KCRP
SATCLMMFE CXUS54 KBRO
+SATCLMPSX CXUS54 KHGX
SATCLMSAT CXUS54 KEWX
SATCLMVCT CXUS54 KCRP
+SATCLSCLL CXUS54 KHGX
+SATCLSGLS CXUS54 KHGX
+SATCLSHOU CXUS54 KHGX
+SATCLSIAH CXUS54 KHGX
+SATCLSPSX CXUS54 KHGX
SATCMMCRP CSUS54 KCRP
SATCWAHU1 FAUS21 KZHU
SATCWAHU2 FAUS22 KZHU
@@ -23498,6 +23545,7 @@ SATRERHRL SXUS74 KBRO
SATRERIAH SXUS74 KHGX
SATRERLRD SXUS74 KCRP
SATRERMFE SXUS74 KBRO
+SATRERPSX SXUS74 KHGX
SATRERSAT SXUS74 KEWX
SATRERVCT SXUS74 KCRP
SATRFDBRO FNUS64 KBRO
@@ -24054,9 +24102,9 @@ SDFREREVV SXUS73 KPAH
SDFRERJAK SXUS73 KJKL
SDFRERJKL SXUS73 KJKL
SDFRERLEX SXUS73 KLMK
-SDFRERMDH SXUS73 KPAH
SDFRERLMK SXUS73 KLMK
SDFRERLVL SXUS73 KLMK
+SDFRERMDH SXUS73 KPAH
SDFRERPAA SXUS73 KPAH
SDFRERPAH SXUS73 KPAH
SDFRERPOF SXUS73 KPAH
@@ -24787,6 +24835,7 @@ SFOCEMMTR WOUS46 KMTR
SFOCEMSTO WOUS46 KSTO
SFOCF6APC CXUS56 KMTR
SFOCF6BFL CXUS56 KHNX
+SFOCF6BLU CXUS56 KSTO
SFOCF6CCR CXUS56 KMTR
SFOCF6CEC CXUS56 KEKA
SFOCF6EKA CXUS56 KEKA
@@ -24801,12 +24850,14 @@ SFOCF6MRY CXUS56 KMTR
SFOCF6MYV CXUS56 KSTO
SFOCF6NUQ CXUS56 KMTR
SFOCF6OAK CXUS56 KMTR
+SFOCF6OVE CXUS56 KSTO
SFOCF6RBL CXUS56 KSTO
SFOCF6RDD CXUS56 KSTO
SFOCF6SAC CXUS56 KSTO
SFOCF6SCK CXUS56 KSTO
SFOCF6SFO CXUS56 KMTR
SFOCF6SJC CXUS56 KMTR
+SFOCF6SMF CXUS56 KSTO
SFOCF6SNS CXUS56 KMTR
SFOCF6STS CXUS56 KMTR
SFOCF6UKI CXUS56 KEKA
@@ -24827,6 +24878,7 @@ SFOCLASTS CXUS56 KMTR
SFOCLAWVI CXUS56 KMTR
SFOCLIAPC CDUS46 KMTR
SFOCLIBFL CDUS46 KHNX
+SFOCLIBLU CDUS46 KSTO
SFOCLICCR CDUS46 KMTR
SFOCLICEC CDUS46 KEKA
SFOCLIEKA CDUS46 KEKA
@@ -24841,14 +24893,18 @@ SFOCLIMRY CDUS46 KMTR
SFOCLIMYV CDUS46 KSTO
SFOCLINUQ CDUS46 KMTR
SFOCLIOAK CDUS46 KMTR
+SFOCLIOVE CDUS46 KSTO
+SFOCLIRBL CDUS46 KSTO
SFOCLIRDD CDUS46 KSTO
SFOCLISAC CDUS46 KSTO
SFOCLISCK CDUS46 KSTO
SFOCLISFO CDUS46 KMTR
+SFOCLISMF CDUS46 KSTO
SFOCLISNS CDUS46 KMTR
SFOCLISTO CDUS46 KSTO
SFOCLISTS CDUS46 KMTR
SFOCLIUKI CDUS46 KEKA
+SFOCLIVCB CDUS46 KSTO
SFOCLIWVI CDUS46 KMTR
SFOCLMAPC CXUS56 KMTR
SFOCLMBFL CXUS46 KHNX
@@ -25702,6 +25758,7 @@ SJUDSASJU ACCA82 TJSJ
SJUDSMIST CXCA42 TJSJ
SJUDSMISX CXCA42 TJSJ
SJUDSMJNR CXUS42 TJSJ
+SJUDSMSTX CXUS42 TJSJ
SJUDSWSJU WWCA52 TJSJ
SJUDSYSJU WWCA52 TJSJ
SJUEQWPR WOCA42 TJSJ
@@ -25764,11 +25821,13 @@ SJUMANSJU USUS42 TJSJ
SJUMISSJU AXUS42 TJSJ
SJUMONMSG NTXX98 TJSJ
SJUMSMJNR CSUS42 TJSJ
+SJUMSMSTX CSUS42 TJSJ
SJUMTRIST SAUS42 TJSJ
SJUMTRISX SAUS42 TJSJ
SJUMTRJNR SAUS42 TJSJ
SJUMTRJSJ SAUS42 TJSJ
SJUMTRSJU SAUS42 TJSJ
+SJUMTRSTX SAUS42 TJSJ
SJUMWSSJU FZCA72 TJSJ
SJUMWSSPN FZCA72 TJSJ
SJUMWWSJU WHCA72 TJSJ
@@ -25808,9 +25867,11 @@ SJURR5SJU SRPU52 TJSJ
SJURR6JNR SRUS62 TJSJ
SJURR6JNR SRUS72 TJSJ
SJURR6SJU SRCA62 TJSJ
+SJURR6STX SRUS62 TJSJ
SJURR7JNR SRUS72 TJSJ
SJURR7JSJ SRUS72 TJSJ
SJURR7SJU SRCA72 TJSJ
+SJURR7STX SRUS72 TJSJ
SJURR8SJU SRPU82 TJSJ
SJURR9SJU SRCA82 TJSJ
SJURTPPR ASCA62 TJSJ
diff --git a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
index 39f2f4b3f7..ed300b47c3 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
@@ -9909,6 +9909,7 @@ GTFTAFGPI
GTFTAFGTF
GTFTAFHAM
GTFTAFHLN
+GTFTAFHRF
GTFTAFHVR
GTFTAFLVM
GTFTAFLWT
@@ -19420,6 +19421,7 @@ MEMMTRJBR
MEMMTRJWN
MEMMTRLNP
MEMMTRLUG
+MEMMTRM01
MEMMTRM02
MEMMTRM04
MEMMTRM08
@@ -23486,23 +23488,30 @@ MIACFWMLB
MIACFWTAE
MIACFWTBW
MIACGRJAX
+MIACLABKV
MIACLADAB
MIACLAECP
MIACLAFPR
+MIACLAGIF
MIACLALEE
MIACLAMCO
MIACLAMLB
+MIACLAPGD
MIACLASFB
+MIACLASPG
+MIACLATBW
MIACLAVRB
MIACLIAAF
MIACLIAMG
MIACLIAPF
+MIACLIBKV
MIACLIDAB
MIACLIECP
MIACLIEYW
MIACLIFLL
MIACLIFMY
MIACLIFPR
+MIACLIGIF
MIACLIGNV
MIACLIJAX
MIACLILEE
@@ -23511,9 +23520,12 @@ MIACLIMIA
MIACLIMLB
MIACLIMTH
MIACLIPBI
+MIACLIPGD
MIACLISFB
+MIACLISPG
MIACLISRQ
MIACLISSI
+MIACLITBW
MIACLITLH
MIACLITPA
MIACLIVRB
@@ -23521,6 +23533,7 @@ MIACLMAAF
MIACLMABY
MIACLMAMG
MIACLMAPF
+MIACLMBKV
MIACLMDAB
MIACLMDHN
MIACLMECP
@@ -23528,6 +23541,7 @@ MIACLMEYW
MIACLMFLL
MIACLMFMY
MIACLMFPR
+MIACLMGIF
MIACLMGNV
MIACLMJAX
MIACLMLEE
@@ -23536,7 +23550,9 @@ MIACLMMIA
MIACLMMLB
MIACLMMTH
MIACLMPBI
+MIACLMPGD
MIACLMSFB
+MIACLMSPG
MIACLMSRQ
MIACLMSSI
MIACLMTBW
@@ -23545,13 +23561,18 @@ MIACLMTPA
MIACLMVLD
MIACLMVRB
MIACLQECP
+MIACLSBKV
MIACLSDAB
MIACLSECP
MIACLSFPR
+MIACLSGIF
MIACLSLEE
MIACLSMCO
MIACLSMLB
+MIACLSPGD
MIACLSSFB
+MIACLSSPG
+MIACLSTBW
MIACLSVRB
MIACMMMLB
MIACWFJAX
@@ -23857,6 +23878,7 @@ MIAMTRIMM
MIAMTRINF
MIAMTRISM
MIAMTRJAX
+MIAMTRK70
MIAMTRLAL
MIAMTRLCQ
MIAMTRLEE
@@ -24016,12 +24038,14 @@ MIARERAAF
MIARERABY
MIARERAMG
MIARERAPF
+MIARERBKV
MIARERCRG
MIARERDAB
MIARERECP
MIARERFLL
MIARERFMY
MIARERFPR
+MIARERGIF
MIARERGNV
MIARERJAX
MIARERLEE
@@ -24029,7 +24053,9 @@ MIARERMCO
MIARERMIA
MIARERMLB
MIARERPBI
+MIARERPGD
MIARERSFB
+MIARERSPG
MIARERSRQ
MIARERSSI
MIARERTBW
@@ -33337,6 +33363,7 @@ NFDADMNFD
NFDADMSDM
NFDHCMQPF
NFDNETNFD
+NFDPMDEPH
NMC18AA21
NMC18AA23
NMC18AA25
@@ -33390,10 +33417,10 @@ NMC24AU11
NMCADANMC
NMCADMAN1
NMCADMAN2
-NMCADMNWC
NMCADMAN3
NMCADMCE1
NMCADMNMC
+NMCADMNWC
NMCAHDNWC
NMCAPGASN
NMCARP01
@@ -34757,6 +34784,7 @@ OMAMTRCDR
OMAMTRCZD
OMAMTREAR
OMAMTRFNB
+OMAMTRGGF
OMAMTRGRI
OMAMTRGRN
OMAMTRHJH
@@ -36357,6 +36385,7 @@ PHXDMOAZ
PHXDMOFGZ
PHXDMOPSR
PHXDMOTWC
+PHXDSMDUG
PHXDSMFLG
PHXDSMINW
PHXDSMNYL
@@ -36482,6 +36511,7 @@ PHXMANYUM
PHXMISFGZ
PHXMISPSR
PHXMISTWC
+PHXMSMDUG
PHXMSMFLG
PHXMSMINW
PHXMSMNYL
@@ -36499,6 +36529,7 @@ PHXMTRCFT
PHXMTRCMR
PHXMTRD68
PHXMTRDMA
+PHXMTRDUG
PHXMTRFHU
PHXMTRFLG
PHXMTRGCN
@@ -36588,6 +36619,7 @@ PHXRR5FGZ
PHXRR5INW
PHXRR5PSR
PHXRR5TWC
+PHXRR6DUG
PHXRR6FLG
PHXRR6IGM
PHXRR6INW
@@ -36596,6 +36628,7 @@ PHXRR6PGA
PHXRR6PSR
PHXRR6SAD
PHXRR6TWC
+PHXRR7DUG
PHXRR7FGZ
PHXRR7IGM
PHXRR7INW
@@ -37011,6 +37044,7 @@ PITLSRPBZ
PITMANPBZ
PITMSMPIT
PITMTR29D
+PITMTR2G2
PITMTRAFJ
PITMTRAGC
PITMTRBTP
@@ -38038,6 +38072,7 @@ RDUMTRTQV
RDUMTRTTA
RDUMTRUDG
RDUMTRVUJ
+RDUMTRW40
RDUMWSILM
RDUMWSMHX
RDUMWWILM
@@ -38085,7 +38120,6 @@ RDURERHSE
RDURERILM
RDURERLBT
RDURERMHX
-RDURERMYR
RDURERRAH
RDURERRDU
RDURFDRAH
@@ -38978,7 +39012,12 @@ SATCFWCRP
SATCFWHGX
SATCGRCRP
SATCGRHGX
+SATCLACLL
+SATCLAGLS
+SATCLAHOU
+SATCLAIAH
SATCLALRD
+SATCLAPSX
SATCLIATT
SATCLIAUS
SATCLIBPT
@@ -39007,10 +39046,16 @@ SATCLMHRL
SATCLMIAH
SATCLMLRD
SATCLMMFE
+SATCLMPSX
SATCLMSAT
SATCLMVCT
SATCLQLRD
+SATCLSCLL
+SATCLSGLS
+SATCLSHOU
+SATCLSIAH
SATCLSLRD
+SATCLSPSX
SATCMMCRP
SATCWFBRO
SATCWFCRP
@@ -39358,6 +39403,7 @@ SATRERHRL
SATRERIAH
SATRERLRD
SATRERMFE
+SATRERPSX
SATRERSAT
SATRERVCT
SATRFDBRO
@@ -41665,6 +41711,7 @@ SJUDSMIST
SJUDSMISX
SJUDSMJNR
SJUDSMSJU
+SJUDSMSTX
SJUDSWSJU
SJUDSYSJU
SJUEQWPR
@@ -41726,6 +41773,7 @@ SJUMFMSJU
SJUMISSJU
SJUMSMJNR
SJUMSMSJU
+SJUMSMSTX
SJUMTRIST
SJUMTRISX
SJUMTRJBQ
@@ -41734,6 +41782,7 @@ SJUMTRJNR
SJUMTRJPS
SJUMTRJSJ
SJUMTRSJU
+SJUMTRSTX
SJUMWSSJU
SJUMWSSPN
SJUMWWSJU
@@ -41771,8 +41820,10 @@ SJURR4SJU
SJURR5SJU
SJURR6JNR
SJURR6SJU
+SJURR6STX
SJURR7JNR
SJURR7SJU
+SJURR7STX
SJURR8SJU
SJURR9SJU
SJURRSSJU
@@ -43399,6 +43450,7 @@ TOPMSMTOP
TOPMTR13K
TOPMTR19S
TOPMTR1K1
+TOPMTR36K
TOPMTR3AU
TOPMTR3K3
TOPMTR3K8
diff --git a/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt b/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt
index 0de50a9b4c..50e7130aad 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/maritimeStationInfo.txt
@@ -30,7 +30,7 @@
0000000000|41024| 33.83 | -78.48 | -0|Sunset Bch, NC Nearshore |US|BOY
0000000000|41025| 35.01 | -75.45 | 0|Diamond Shoals (Red Buoy), NC |US|BOY
0000000000|41027| 33.30 | -78.14 | -0|Caro-COOPS, Sunset Mid-Shelf |US|BOY
-0000000000|41029| 32.81 | -79.63 | -0|Capers, SC Nearshore |US|BOY
+0000000000|41029| 32.805| -79.622| -0|Capers, SC Nearshore |US|BOY
0000000000|41030| 32.52 | -79.34 | -0|Capers, SC Mid-shelf |US|BOY
0000000000|41031| 32.28 | -80.41 | -0|Fripp, SC Nearshore |US|BOY
0000000000|41033| 32.28 | -80.41 | -0|Caro-COOPS, Fripp Nearshore |US|BOY
@@ -46,7 +46,7 @@
0000000000|41048| 31.98 | -69.65 | 0|W of Bermuda |US|BOY
0000000000|41049| 27.5 | -62.94 | 0|Atlantic (South) |US|BOY
0000000000|41065| 32.802| -79.619| 0|CAP2WAVE, Capers Nearshore Waves |US|BOY
-0000000000|41066| 32.536| -79.660| 0|19 NM SE Charleston, SC Harbor CORMP|US|BOY
+0000000000|41066| 32.528| -79.661| 0|19 NM SE Charleston, SC Harbor CORMP|US|BOY
0000000000|41076| 32.536| -79.659| 0|CHR60WAVE |US|BOY
0000000000|41108| 33.721| -78.015| 0|Wilmington Harbor NC Scripps |US|BOY
0000000000|41110| 34.141| -77.709| -0|Masonboro Inlet, NC CORMP |US|BOY
@@ -430,10 +430,12 @@
0000000000|ACXS1| 32.56 | -80.45 | -0|ACE Basin NERR, SC |US|BOY
0000000000|ACYN4| 39.36 | -74.42 | -0|Atlantic City, NJ |US|BOY
0000000000|ADKA2| 51.86 |-176.63 | -0|Adak Island, AK |US|BOY
+0000000000|ADPA2| 51.869|-176.641| 8|Adak Port, AK Marine Exchange |US|BOY
0000000000|AGCM4| 42.621| -82.527| 177|Algonac, MI NOS |US|BOY
0000000000|AGMW3| 44.61 | -87.43 | -0|Algoma City Marina, WI |US|BOY
0000000000|AGXC1| 33.716|-118.246| -0|Angels Gate, CA NOS WLON (NDBC) |US|BOY
0000000000|AJXA2| 58.287|-134.398| 5|Juneau AJ Dock, AK Marine Exchange |US|BOY
+0000000000|AKXA2| 54.132|-165.782| 6|Akutan, AK Marine Exchange |US|BOY
0000000000|ALIA2| 56.898|-154.247| 0|Alitak, AK NOS 9457804 |US|BOY
0000000000|ALNM4| 45.04 | -83.44 | -0|Alpena, MI |US|BOY
0000000000|ALXN6| 44.330| -75.933| 0|Alexandria Bay, NY NOS 8311062 |US|BOY
@@ -446,6 +448,7 @@
0000000000|ANVC1| 38.91 |-123.71 | -0|Arena Cove, CA |US|BOY
0000000000|APAM2| 38.983| -76.48 | -0|8575512 Annapolis, MD NOS |US|BOY
0000000000|APCF1| 29.73 | -84.98 | -0|Apalachicola, FL NOS |US|BOY
+0000000000|APMA2| 61.239|-149.889| 6|Anchorage Port, AK Marine Exchange |US|BOY
0000000000|APNM4| 45.05 | -83.45 | 179|Alpena, MI Water Plant (GLERL) |US|BOY
0000000000|APRP7| 13.442| 144.653| -0|NWLON Apra Harbor, Guam 1630000 |US|BOY
0000000000|APXF1| 29.79 | -84.88 | -0|Apalachicola NERR, FL |US|BOY
@@ -468,6 +471,7 @@
0000000000|BDVF1| 25.476| -80.990| 0|Broad River, FL NPS |US|BOY
0000000000|BDXC1| 38.317|-123.071| -0|Bodega CA, UC Davis, Marine Lab |US|BOY
0000000000|BEPB6| 32.373| -64.703| -0|NWLON Bermuda Esso Pier, Bermuda |US|BOY
+0000000000|BEXA2| 60.791|-161.749| 5|Bethel, AK Marine Exchange |US|BOY
0000000000|BFTN7| 34.72 | -76.67 | -0|8656483, Beaufort, NC NOS |US|BOY
0000000000|BGCF1| 26.4 | -81.88 | -0|Big Carlos Pass, FL |US|BOY
0000000000|BGNN4| 40.64 | -74.15 | 9|Bergen Pt West Reach, NY |US|BOY
@@ -544,6 +548,7 @@
0000000000|CPNT2| 28.118| -97.022| -0|NWLON Copano Bay, TX |US|BOY
0000000000|CPTR1| 41.72 | -71.34 | 5|Conimicut Light, RI |US|BOY
0000000000|CPVM2| 38.995| -76.388| 3|Chesapeake Bay Vsby NOS CMAN |US|BOY
+0000000000|CPXA2| 53.843|-166.583| 5|Captains Bay, AK Marine Exchange |US|BOY
0000000000|CPXC1| 35.17 |-120.741| 16|Cal Poly Pier, CA |US|BOY
0000000000|CQUC1| 38.006|-122.23 | -0|Carquinez CA Cen/Northern CA OOS |US|BOY
0000000000|CRTA1| 30.308| -88.140| -0|Cedar Pt, AL |US|BOY
@@ -558,6 +563,7 @@
0000000000|DBLN6| 42.49 | -79.35 | 197|Dunkirk, NY/V |US|BOY
0000000000|DELD1| 39.582| -75.590| -0|NWLON Delaware City, DE |US|BOY
0000000000|DESW1| 47.68 |-124.49 | 39|Destruction Is., WA/D |US|BOY
+0000000000|DHXA2| 70.222|-148.419| 15|Deadhorse, AK Marine Exchange |US|BOY
0000000000|DISW3| 47.08 | -90.73 | 211|Devils Island, WI/D |US|BOY
0000000000|DKCM6| 30.355| -88.567| 0|Dock C, Pascagoula, MS NOS 8741501 |US|BOY
0000000000|DKKF1| 25.180| -80.490| 0|Duck Key, FL NPS |US|BOY
@@ -566,6 +572,9 @@
0000000000|DOMV2| 36.962| -76.425| -0|Dominion Term Assoc, VA 8638511 NOS |US|BOY
0000000000|DPHA1| 30.251| -88.078| -0|Dauphin Island Sea Lab, AL |US|BOY
0000000000|DPIA1| 30.25 | -88.07 | 8|Dauphin Island, AL/V |US|BOY
+0000000000|DPLA2| 53.884|-166.531| 5|Dutch Harbor APL, AK Marine Exchange|US|BOY
+0000000000|DPOA2| 53.903|-166.528| 5|Dutch Harbor Port Office, AK MAREX |US|BOY
+0000000000|DPXA2| 53.889|-166.542| 20|Dutch Harbor Pilot Station, AK MAREX|US|BOY
0000000000|DPXC1| 38.057|-122.259| -0|Davis Point, San Pablo Bay, CA |US|BOY
0000000000|DRFA2| 60.55 |-152.14 | 17|Drift River Terminal, AK/M |US|BOY
0000000000|DRSD1| 39.089| -75.437| -0|Delaware NERR, DE |US|BOY
@@ -636,7 +645,10 @@
0000000000|GLSM4| 44.02 | -83.54 | 180|CR GLOS, Gravelly Shoals Lt. MI |US|BOY
0000000000|GNJT2| 29.36 | -94.73 | -0|Galveston Bay (North Jetty), TX |US|BOY
0000000000|GPOM6| 30.230| -88.982| 0|Gulfport Outer Range, MS NOS 8744707|US|BOY
+0000000000|GBXA2| 63.777|-171.715| 10|Gambell, AK Marine Exchange |US|BOY
+0000000000|GEXA2| 58.213|-136.381| 11|George Island, AK Marine Exchange |US|BOY
0000000000|GPST2| 29.29 | -94.79 | 0|Galveston Pleas Pier, Gulf of Mexico|US|BOY
+0000000000|GPXA2| 58.062|-134.051| 12|Grave Point, AK Marine Exchange |US|BOY
0000000000|GRBL1| 29.101| -89.978| -0|Grand Isle Blocks, LA CSI/LSU |US|BOY
0000000000|GRIM4| 46.721| -87.412| 199|Granite Island, MI |US|BOY
0000000000|GRMM4| 46.68 | -85.97 | 186|GLOS, Grand Marais, MI |US|BOY
@@ -681,9 +693,10 @@
0000000000|JCRN4| 39.535| -74.464| -0|Jacques Cousteau NERR, NJ |US|BOY
0000000000|JKYF1| 25.050| -80.904| 0|Johnson Key, FL NPS |US|BOY
0000000000|JLXA2| 58.298|-134.404| 4|Juneau Library, AK Marine Exchange |US|BOY
-0000000000|JMLA2| 58.286|-134.39 | 17|Juneau AML Dock MEA |US|BOY
+0000000000|JMLA2| 58.286|-134.390| 6|Juneau AML, AK Marine Exchange |US|BOY
0000000000|JMPN7| 34.21 | -77.795| -0|NWLON Wrightsville Bch, NC Tide Gg |US|BOY
0000000000|JNEA2| 58.298|-134.412| -0|Juneau Tide Guage, AK NOS 9452210 |US|BOY
+0000000000|JNGA2| 58.290|-134.394| 5|Juneau ANG Dock, AK Marine Exchange |US|BOY
0000000000|JOXP4| 17.956| -66.239| -0|Jobos Bay NERR, Puerto Rico |US|BOY
0000000000|JPRN7| 35.91 | -75.59 | -0|Jennette's Pier/Nags Hd, NC COE WLON|US|BOY
0000000000|JXUF1| 30.354| -81.612| 3|Jacksonville University, FL NOS |US|BOY
@@ -692,9 +705,13 @@
0000000000|KECA2| 55.332|-131.626| -0|Ketchikan Tide Guage, AK NOS 9450460|US|BOY
0000000000|KEXA2| 55.352|-131.684| 4|Ketchikan Harbor, AK Marine Exchange|US|BOY
0000000000|KGCA2| 55.062|-162.327| 0|King Cove, AK NOS 9459881 |US|BOY
+0000000000|KGXA2| 57.777|-152.425| 15|Kodiak Gull Island, AK MAREX |US|BOY
0000000000|KLIH1| 20.90 |-156.47 | -0|Kahului, HI |US|BOY
+0000000000|KMXA2| 57.782|-152.434| 10|Kodiak Matson Crane, AK MAREX |US|BOY
0000000000|KNOH1| 21.288|-157.865| 0|Kilo Nalu Observatory, HI UHI |US|BOY
0000000000|KNSW3| 42.59 | -87.81 | 176|Kenosha, WI (GLERL) |US|BOY
+0000000000|KNXA2| 60.552|-151.273| 4|Kenai, AK Marine Exchange |US|BOY
+0000000000|KOZA2| 66.901|-162.589| 6|Kotzebue, AK Marine Exchange |US|BOY
0000000000|KPTN6| 40.81 | -73.765| 5|Kings Point, NY |US|BOY
0000000000|KPTV2| 37.17 | -75.99 | -0|8632200, Kiptopeke, VA NOS |US|BOY
0000000000|KTNF1| 29.82 | -83.59 | 3|Keaton Beach, FL/M |US|BOY
@@ -767,6 +784,7 @@
0000000000|MISN6| 41.05 | -73.12 | 0|South Middle Sound, NY |US|BOY
0000000000|MISP4| 18.090| -67.939| 0|Mona Island, PR 9759938 NOS |US|BOY
0000000000|MIST2| 27.838| -97.05 | 4|Aransas Ship Channel, NERRS CMAN |US|BOY
+0000000000|MIXA2| 57.837|-133.814| 19|Midway Island, AK Marine Exchange |US|BOY
0000000000|MKGM4| 43.227| -86.339| 185|Muskegon, MI (GLERL) |US|BOY
0000000000|MLRF1| 25.01 | -80.38 | 11|Molasses Reef, FL/V |US|BOY
0000000000|MLSC1| 36.81 |-121.79 | 12|Moss Landing, South Harbor, CA |US|BOY
@@ -809,13 +827,16 @@
0000000000|NKXA2| 58.255|-134.945| 12|Naked Island, AK Marine Exchange |US|BOY
0000000000|NLMA3| 35.458|-114.666| 197|Lake Mohave, North, NPS |US|BOY
0000000000|NLNC3| 41.36 | -72.09 | -0|New London, CT |US|BOY
+0000000000|NLXA2| 56.005|-161.177| 11|Nelson Lagoon, AK Marine Exchange |US|BOY
0000000000|NMTA2| 64.50 |-165.43 | -0|Nome, AK |US|BOY
+0000000000|NMXA2| 64.494|-165.440| 7|Nome, AK Marine Exchange |US|BOY
0000000000|NOSC3| 41.12 | -73.16 | 0|Northern Open Sound, CT |US|BOY
0000000000|NOXN7| 34.155| -77.851| 5|North Carolina NERR, NC |US|BOY
0000000000|NPDW3| 45.29 | -86.98 | 0|Northport Pier, WI/D |US|BOY
0000000000|NPSF1| 26.13 | -81.807| -0|Naples, FL NOS |US|BOY
0000000000|NRRF1| 25.338| -80.911| -0|North River, FL ENPWQS |US|BOY
0000000000|NSTP6|-14.280|-170.688| -0|NWLON Pago Pago, American Samoa |US|BOY
+0000000000|NSXA2| 60.740|-151.310| 48|Nikiski, AK Marine Exchange |US|BOY
0000000000|NTBC1| 34.408|-119.685| -0|NWLON Santa Barbara, CA 9411340 |US|BOY
0000000000|NTKM3| 41.29 | -70.1 | -0|Nantucket Island, MA |US|BOY
0000000000|NUET2| 27.833| -97.486| -0|Nueces Bay, TX TCOON |US|BOY
@@ -847,6 +868,7 @@
0000000000|OWXO1| 41.378| -82.508| 175|Old Woman Creek NERR, OH |US|BOY
0000000000|PACF1| 30.152| -85.667| 0|Panama City, FL NOS 8729108 |US|BOY
0000000000|PACT2| 27.633| -97.237| 0|Packery Channel, TX NOS 8775792 |US|BOY
+0000000000|PAUA2| 57.124|-170.271| 20|St Paul, AK Marine Exchange |US|BOY
0000000000|PAXA2| 58.159|-134.178| 14|Point Arden, AK Marine Exchange |US|BOY
0000000000|PBFW1| 48.464|-122.468| -0|Padilla Bay NERR, WA |US|BOY
0000000000|PBPA2| 58.20 |-134.15 | -0|Point Bishop, AK |US|BOY
@@ -856,7 +878,9 @@
0000000000|PCLM4| 47.28 | -88.53 | 198|Portage Canal, MI GLOS |US|BOY
0000000000|PCNT2| 28.45 | -96.40 | 0|Matagorda Bay, Port O'Connor, TX |US|BOY
0000000000|PCOC1| 38.06 |-122.04 | -0|Port Chicago, CA |US|BOY
+0000000000|PCXA2| 57.463|-134.867| 5|Point Craven, AK Marine Exchange |US|BOY
0000000000|PEGF1| 26.081| -80.116| 0|South Port Everglades, FL |US|BOY
+0000000000|PEXA2| 57.958|-136.227| 6|Pelican, AK Marine Exchange |US|BOY
0000000000|PFDC1| 33.735|-118.241| -0|Los Angeles Pier 400, CA WLON (NDBC)|US|BOY
0000000000|PFXC1| 33.748|-118.268| -0|Los Angeles Pier F CA NOS WLON |US|BOY
0000000000|PGBP7| 13.428| 144.797| -0|Pago Bay, Guam 1631428 NOS |US|BOY
@@ -962,6 +986,7 @@
0000000000|SGNW3| 43.75 | -87.69 | 189|Sheboygan, WI/D |US|BOY
0000000000|SGOF1| 29.41 | -84.86 | 20|Tyndall AFB Tower C, FL |US|BOY
0000000000|SGRN4| 40.117| -74.017| -0|SIT Sea Girt, NJ |US|BOY
+0000000000|SGXA2| 56.600|-169.541| 60|St George, AK Marine Exchange |US|BOY
0000000000|SHBL1| 29.868| -89.673| 0|Shell Beach, LA NOS 8761305 |US|BOY
0000000000|SHPF1| 30.06 | -84.29 | 0|Shell Point, FL |US|BOY
0000000000|SHXA2| 57.055|-135.349| 5|Sitka Harbor, AK Marine Exchange |US|BOY
@@ -991,20 +1016,25 @@
0000000000|SPGF1| 26.70 | -79.00 | 3|Settlement Point, GBI/M |US|BOY
0000000000|SPLL1| 28.87 | -90.48 | 0|South Pelto Block, LA CSI06 |US|BOY
0000000000|SPTM4| 44.713| -83.273| 184|NWSCR GLOS Sturgeon Pt Light, MI |US|BOY
+0000000000|SPXA2| 55.599|-132.203| 8|Ship Island, AK Marine Exchange |US|BOY
0000000000|SRBV3| 17.784| -64.762| 0|ICON, Salt River Bay, St Croix, VI |US|BOY
0000000000|SREF1| 25.352| -81.1 | -0|Shark River, FL ENPWQS |US|BOY
0000000000|SRLM4| 45.773| -84.137| -0|Spectacle Reef Light, MI GLERL/UofCO|US|BOY
0000000000|SRST2| 29.67 | -94.05 | 5|Sabine, TX/M |US|BOY
+0000000000|SRXA2| 58.383|-134.652| 2|Statter Harbor, AK Marine Exchange |US|BOY
0000000000|SSBN7| 33.84 | -78.48 | -0|Sunset Bch Nearshore Waves, NC |US|BOY
0000000000|STDM4| 47.18 | -87.22 | 211|Stannard Rock, MI/D |US|BOY
0000000000|STXA2| 57.116|-135.391| 11|Sitka AML, AK Marine Exchange |US|BOY
0000000000|SUPN6| 44.47 | -75.80 | 79|Superior Shoals, NY/V |US|BOY
0000000000|SVLS1| 31.95 | -80.68 | -0|Savannah Light, GA/D |US|BOY
0000000000|SVNM4| 42.401| -86.288| 176|South Haven, MI (GLERL) |US|BOY
+0000000000|SVXA2| 63.693|-170.492| 10|Savoonga, AK Marine Exchange |US|BOY
0000000000|SWLA2| 60.120|-149.427| 5|9455090 Seward, AK NOS |US|BOY
0000000000|SWPM4| 46.502| -84.373| 186|S.W. Pier, MI |US|BOY
0000000000|SWPV2| 36.95 | -76.33 | -0|8638610, Sewells Point, VA NOS |US|BOY
+0000000000|SWXA2| 60.116|-149.434| 8|Seward Harbor, AK Marine Exchange |US|BOY
0000000000|SXHW3| 46.56 | -90.44 | 186|Saxon Harbor, WI GLOS |US|BOY
+0000000000|SXXA2| 55.315|-131.596| 9|Saxman, AK Marine Exchange |US|BOY
0000000000|SYWW3| 45.20 | -87.12 | 0|Sister Bay, WI/D |US|BOY
0000000000|TAML1| 29.19 | -90.67 | 0|Tambour Bay, LA |US|BOY
0000000000|TAQT2| 27.812| -97.390| -0|Texas State Aquarium, TX |US|BOY
@@ -1029,6 +1059,7 @@
0000000000|TPBN4| 40.012| -75.042| -0|NWLON Tacony-Palmyra Bridge, NJ |US|BOY
0000000000|TPEF1| 25.408| -80.964| 0|Tarpon Bay East, FL NPS |US|BOY
0000000000|TPLM2| 38.90 | -76.44 | 12|Thomas Point, MD/M |US|BOY
+0000000000|TPXA2| 54.803|-130.934| 8|Tree Point, AK Marine Exchange |US|BOY
0000000000|TRBL1| 29.17 | -90.58 | 0|Terrebonne Bay, LA |US|BOY
0000000000|TRDF1| 28.415| -80.593| -0|Trident Pier, FL NOS |US|BOY
0000000000|TRRF1| 25.223| -80.653| 0|Taylor River, FL NPS |US|BOY
@@ -1040,11 +1071,13 @@
0000000000|ULRA2| 63.872|-160.784| 5|Unalakleet, UnalakltRvr, AK NOS WLON|US|BOY
0000000000|UNLA2| 53.879|-166.540| 2|9462620 Unalaska, AK NOS |US|BOY
0000000000|UPBC1| 38.038|-122.121| -0|Un Pac RR Bge, Martinez, CA NOS WLON|US|BOY
+0000000000|UQXA2| 71.315|-156.722| 3|Utqiagvik, AK Marine Exchange |US|BOY
0000000000|VAKF1| 25.73 | -80.16 | -0|Virginia Key, FL NOS |US|BOY
0000000000|VBBA3| 36.132|-114.412| 329|Lake Mead, Virgin Basin, NPS |US|BOY
0000000000|VCAF1| 24.712| -81.105| -0|Vaca Key, FL NOS |US|BOY
0000000000|VCAT2| 28.640| -96.595| -0|Port Lavaca, TX TCOON |US|BOY
0000000000|VCVA2| 57.13 |-170.29 | -0|Village Cove, St Paul, AK NOS WLOS |US|BOY
+0000000000|VDXA2| 61.127|-146.344| 5|Valdez, AK Marine Exchange |US|BOY
0000000000|VDZA2| 61.125|-146.362| 0|Valdez, AK 9454240 NOS |US|BOY
0000000000|VENF1| 27.07 | -82.45 | 5|Venice, FL/V |US|BOY
0000000000|VERV4| 19.202| -96.113| -0|Veracruz, MX |US|BOY
@@ -1057,6 +1090,7 @@
0000000000|WAVM6| 30.28 | -89.37 | -0|Waveland, MS NOS |US|BOY
0000000000|WAXM3| 41.582| -70.525| 10|Waquoit Bay NERR, MA |US|BOY
0000000000|WBYA1| 30.417| -87.825| -0|Weeks Bay, AL NOS WLON |US|BOY
+0000000000|WCXA2| 55.402|-131.729| 7|Ward Cove, AK Marine Exchange |US|BOY
0000000000|WDEL1| 28.662| -89.551| 0|Shell West Delta 143 |US|BOY
0000000000|WDSV2| 36.982| -76.322| 0|NOS 8638614 Willoughby Degaus, VA |US|BOY
0000000000|WELM1| 43.320| -70.563| -0|NWLON Wells, ME |US|BOY
@@ -1064,13 +1098,16 @@
0000000000|WFPM4| 46.762| -84.966| 186|NWSCR GLOS Whitefish Point, MI |US|BOY
0000000000|WHRI2| 42.361| -87.813| 180|Waukegan Harbor, IL GLOS |US|BOY
0000000000|WIWF1| 25.585| -81.044| 0|Willy Willy, FL NPS |US|BOY
+0000000000|WIXA2| 60.777|-148.682| 5|Whittier AMHS, AK Marine Exchange |US|BOY
0000000000|WKXA1| 30.415| -87.826| 0|Weeks Bay NERR, AL |US|BOY
0000000000|WLON7| 34.23 | -77.95 | -0|Wilmington, NC NOS WLOS |US|BOY
+0000000000|WLXA2| 65.605|-168.086| 4|Wales, AK Marine Exchange |US|BOY
0000000000|WNEM4| 46.283| -84.205| 177|West Neebish, MI NOS 9076027 |US|BOY
0000000000|WPLF1| 25.708| -81.248| 0|Watson Place, FL NPS |US|BOY
0000000000|WPOW1| 47.66 |-122.44 | 9|West Point, WA/V |US|BOY
0000000000|WPTW1| 46.927|-124.130| 0|Westport, WA NOS 9441102 |US|BOY
0000000000|WRBF1| 25.077| -80.728| 0|Whipray Basin, FL NPS |US|BOY
+0000000000|WRXA2| 70.636|-160.034| 10|Wainwright, AK Marine Exchange |US|BOY
0000000000|WSLM4| 45.842| -85.135| -0|White Shoal Light MI GLERL/UofCO |US|BOY
0000000000|WWEF1| 25.53 | -80.94 | -0|White Water - West, FL |US|BOY
0000000000|WYCM6| 30.326| -89.326| 0|Bay Waveland Y Club, MS NOS 8744737 |US|BOY
diff --git a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
index 0b163e71aa..f4c9d30c65 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
@@ -1046,6 +1046,7 @@
0000000000|K1V6 | 38.4284|-105.106| 1659|Fremont Cnty AP, Canon City, CO |US|MTR
0000074004|K1Y7 | 32.85 |-114.40 | 98|Yuma Proving Ground, AZ |US|MTR
0000000000|K1YT | 46.6667|-120.45| 438|Vagabond Army Airfield, Yakima, WA |US|MTR
+0000000000|K2G2 | 40.36061|-80.70169| 365|Jefferson Cnty AP, Steubenville, OH|US|MTR
0000000000|K2G9 | 40.03887|-79.01500| 693|Somerset Cnty AP, Somerset, PA |US|MTR
0000000000|K2J3 | 32.98594|-82.38481| 100|Louisville Muni AP, Louisville, GA|US|MTR
0000000000|K2J5 | 32.89303|-81.96522| 73|Millen AP, Millen, GA |US|MTR
@@ -1089,6 +1090,7 @@
0000000000|K33V | 40.74542|-106.27538|2486|Walden-Jackson Cnty AP, Walden, CO|US|MTR
0000000000|K35A | 34.68695| -81.64117| 186|Union Cnty AP, Union, SC |US|MTR
0000000000|K35B | 42.83 | -70.87 | 1|MERRIMACK RIVER, MA |US|MTR
+0000000000|K36K | 37.96950|-101.25500| 938|Lakin Airport, Lakin, KS |US|MTR
0000000000|K37C | 28.19 | -93.00 | 1|WEST CAMERON 556, LA |US|MTR
0000000000|K3A6 | 34.40 |-118.60 | 550|Newhall, CA |US|MTR
0000000000|K3AU | 37.67164|-97.07786| 405|Augusta Muni, Augusta, KS |US|MTR
@@ -1792,7 +1794,7 @@
0000000000|KDNA | 31.87495|-106.69385| 1254|Dona Ana County Jetport, NM |US|MTR
0000000000|KDNK | 31.10 | -93.00 | 114|Self Strip, Ft. Polk, LA |US|MTR
0000000000|KDNL | 33.47 | -82.03 | 130|Augusta, GA |US|MTR
-0000000000|KDNN | 34.72 | -84.87 | 216|Dalton Muni, GA |US|MTR
+0000000000|KDNN | 34.72294|-84.87024| 216|Dalton Muni AP, Dalton, GA |US|MTR
0000000000|KDNS | 41.98 | -95.38 | 388|DENISON, IA |US|MTR
0000000000|KDNV | 40.20317|-87.58973| 212|Danville, IL |US|MTR
0000000000|KDOE | 46.27 | -86.67 | 247|Doe Lake, MI |US|MTR
@@ -2094,6 +2096,7 @@
0000000000|KGFK | 47.96 | -97.18 | 257|GRAND FORKS INTL, ND |US|MTR
0000000000|KGFL | 43.36 | -73.62 | 100|GLENS FALLS, NY |US|MTR
0000000000|KGGE | 33.312| -79.320| 12|Georgetown, SC |US|MTR
+0000000000|KGGF | 40.87066|-101.73388| 1044|Grant Muni Airport, NE |US|MTR
0000072247|KGGG | 32.38 | -94.71 | 111|Longview/Gregg Co, TX |US|MTR
0000000000|KGGI | 41.709| -92.735| 307|Grinnell Rgnl AP, Grinnell, IA |US|MTR
0000000000|KGGP | 40.711| -86.373| 225|Logansport/Cass Cnty AP, IN |US|MTR
@@ -2444,6 +2447,7 @@
0000000000|KK61 | 39.471| -98.129| 432|Moritz Mem AP, Beloit, KS |US|MTR
0000000000|KK62 | 38.70408|-84.39183| 274|Gene Synder AP, Falmouth, KY |US|MTR
0000000000|KK68 | 38.27736|-95.21523| 301|Garnett Muni AP, Garnett, KS |US|MTR
+0000000000|KK70 | 25.32432|-80.27573| 2|Ocean Reef Club Airport, Key Largo, FL|US|MTR
0000000000|KK78 | 38.90406|-97.23586| 351|Abilene Muni AP, Abilene, KS |US|MTR
0000000000|KK82 | 39.761| -98.793| 548|Smith Center Muni, KS |US|MTR
0000000000|KK83 | 39.90417|-95.77943| 405|Sabetha Muni AP, Sabetha, KS |US|MTR
@@ -2584,6 +2588,7 @@
0000072340|KLZK | 34.84 | -92.25 | 165|North Little Rock, AR |US|MTR
0000000000|KLZU | 33.978| -83.962| 323|Lawrenceville/Gwinnett Co, GA |US|MTR
0000000000|KLZZ | 31.106| -98.196| 370|Lampasas, TX |US|MTR
+0000000000|KM01 | 35.20069|-90.05398| 69|Gen Dewitt Spain AP, Memphis, TN |US|MTR
0000000000|KM02 | 36.12794| -87.42983| 272|Dickson Muni AP, Dickson, TN |US|MTR
0000000000|KM04 | 35.58337| -89.58722| 85|Covington Muni AP, Covington, TN |US|MTR
0000000000|KM08 | 35.21514| -89.04325| 152|Bolivar/William L Whitehurst, TN |US|MTR
@@ -3549,7 +3554,7 @@
0000000000|KUTA | 34.681| -90.347| 59|Tunica Muni, MS |US|MTR
0000000000|KUTS | 30.74 | -95.59 | 105|Huntsville, TX |US|MTR
0000000000|KUUU | 41.54 | -71.28 | 52|NEWPORT, RI |US|MTR
-0000000000|KUUV | 38.233| -91.164| 284|Sullivan Rgnl, Sullivan, MO |US|MTR
+0000000000|KUUV | 38.23347|-91.16428| 284|Sullivan Rgnl, Sullivan, MO |US|MTR
0000000000|KUVA | 29.211| -99.744| 287|Garner Fld AP, Uvalde, TX |US|MTR
0000000000|KUXL | 30.13144| -93.37617| 3|Southland Fld AP, Sulphur, LA |US|MTR
0000000000|KUYF | 39.9327| -83.462| 330|Madison Cnty AP, London, OH |US|MTR
@@ -3610,6 +3615,7 @@
0000000000|KW22 | 39.00 | -80.274| 498|Upshur Cnty AP, Buckhannon, WV |US|MTR
0000000000|KW29 | 38.976| -76.33 | 5|Bay Brdg AP, Stevensville, MD |US|MTR
0000000000|KW31 | 36.9604| -78.1851| 160|Lunenburg Cnty AP, Kenbridge, VA |US|MTR
+0000000000|KW40 | 35.22083|-78.03768| 51|Mt Olive Muni AP, Mount Olive, NC |US|MTR
0000000000|KW43 | 44.663|-104.568| 1300|Hulett Muni, Hulett, WY |US|MTR
0000000000|KW63 | 36.5958| -78.5601| 128|Lake Country Rg AP, Clarksville, VA|US|MTR
0000000000|KW75 | 37.6024| -76.4467| 9|Hummel Fld AP, Saluda, VA |US|MTR
diff --git a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
index e0585ae625..3ef2fab357 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
+++ b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
@@ -956,6 +956,7 @@ K1Y7 PHX
K1Y8 PHX
K1Y9 PHX
K1YT SEA
+K2G2 PIT
K2G9 PHL
K2J3 ATL
K2J5 ATL
@@ -998,6 +999,7 @@ K33N PHL
K33V DEN
K35A CAE
K35D ARB
+K36K TOP
K37C NEW
K3A1 HUN
K3A6 LAX
@@ -1619,6 +1621,7 @@ KCSQ DSM
KCSV MEM
KCTB GTF
KCTJ ATL
+KCTP PHL
KCTY MIA
KCTZ RDU
KCUB CAE
@@ -2033,6 +2036,7 @@ KGFA GTF
KGFK BIS
KGFL ALB
KGGE RDU
+KGGF OMA
KGGG FTW
KGGI DSM
KGGP IND
@@ -2395,6 +2399,7 @@ KK59 TOP
KK61 TOP
KK62 CLE
KK68 TOP
+KK70 MIA
KK78 TOP
KK82 TOP
KK83 TOP
@@ -2485,6 +2490,7 @@ KLOR BHM
KLOT CHI
KLOU SDF
KLOV MIA
+KLOX LAX
KLOZ SDF
KLPC LAX
KLPR CLE
@@ -2540,6 +2546,7 @@ KLYV MSP
KLZK LIT
KLZU ATL
KLZZ FTW
+KM01 MEM
KM02 MEM
KM04 MEM
KM08 MEM
@@ -3093,6 +3100,7 @@ KPZQ ARB
KQDG ITU
KQV7 PHX
KRAC MKE
+KRAH RDU
KRAL LAX
KRAP FSD
KRAS SAT
@@ -3598,6 +3606,7 @@ KW13 WBC
KW22 CRW
KW29 WBC
KW31 WBC
+KW40 RDU
KW43 CYS
KW63 WBC
KW75 WBC
diff --git a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
index 022552fe94..d310b65af2 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
@@ -398,6 +398,7 @@
2C8 Cavalier Muni, Cavalier, ND
2D5 Oakes Muni, Oakes, ND
2DP Stumpy Point, NC
+2G2 Jefferson Cnty AP, Steubenville, OH
2G9 Somerset Cnty AP, Somerset, PA
2G4 Garrett Cnty AP, Oakland, MD
2G6 Meadville, PA
@@ -437,6 +438,7 @@
35A Union County Airport, Union, SC
35B Merrimack River, MA
35D Allegan, MI
+36K Lakin Airport, Lakin, KS
37C West Cameron 556, LA
3A1 Folsom Fld AP, Cullman, AL
3A6 Newhall, CA
@@ -1473,7 +1475,7 @@ DMX WFO Des Moines, Johnston, IA WSR-88D
DNA Dona Ana County Jetport, NM
DNK Self Strip, Ft. Polk, LA
DNL Augusta, GA
-DNN Dalton Muni, GA
+DNN Dalton Muni AP, Dalton, GA
DNS Denison, IA
DNV Danville, IL
DOE Doe Lake, MI
@@ -1867,6 +1869,7 @@ GFK Grand Forks, ND
GFL Glens Falls, NY
GFU N-Funafuti, TV
GGE Georgetown Cnty AP, SC
+GGF Grant Muni Airport, NE
GGG Longview, TX
GGH A-Honiara/Henderson, Solomon Is
GGI Grinnell Rgnl AP, Grinnell, IA
@@ -2567,6 +2570,7 @@ K59 Amelia Earhart AP, Atchison, KS
K61 Moritz Mem AP, Beloit, KS
K62 Gene Synder Airport, Falmouth, KY
K68 Garnett Muni AP, Garnett, KS
+K70 Ocean Reef Club Airport, Key Largo, FL
K78 Abilene Muni AP, Abilene, KS
K82 Smith Ctr Muni, KS
K83 Sabetha Muni AP, Sabetha, KS
@@ -2774,6 +2778,7 @@ LYV Quentin Aanenson AP, Luverne, MN
LZK WFO Little Rock, North Little Rock, AR WSR-88D
LZU Lawrenceville/Gwinnett Co, GA
LZZ Lampasas, TX
+M01 General Dewitt Spain Airport, Memphis, TN
M02 Dickson Muni AP, Dickson, TN
M04 Covington Muni AP, Covington, TN
M08 Bolivar/William Whitehurst, TN
@@ -4209,6 +4214,7 @@ W16 Winchester, VA
W22 Upshur Cnty AP, Buckhannon, WV
W29 Bay Bridge AP, Stevensville, MD
W31 Lunenburg Cnty AP, Kenbridge, VA
+W40 Mt Olive Muni Airport, Mount Olive, NC
W43 Hulett Muni, Hulett, WY
W63 Lake Country Rgnl AP, Clarksville, VA
W75 Hummel Fld AP, Saluda, VA