From b0b7b6ea01e677bf34dfc812badcb0fa2c7bab71 Mon Sep 17 00:00:00 2001 From: K2IE Date: Mon, 23 Jun 2025 10:17:45 -0400 Subject: [PATCH] Fixes issues #7 and #8. --- noaacap/DEBIAN/control | 2 +- noaacap/usr/local/bin/noaacap.py | 6 ++++-- noaacap/usr/local/share/noaacap/README | 8 ++++---- noaacap/usr/local/share/noaacap/ppmap.db | Bin 12288 -> 12288 bytes 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/noaacap/DEBIAN/control b/noaacap/DEBIAN/control index fad6076..735f734 100644 --- a/noaacap/DEBIAN/control +++ b/noaacap/DEBIAN/control @@ -1,5 +1,5 @@ Package: noaacap -Version: 1.4.0 +Version: 1.4.2 Section: hamradio Priority: extra Maintainer: Dan Srebnick diff --git a/noaacap/usr/local/bin/noaacap.py b/noaacap/usr/local/bin/noaacap.py index 95658c1..e298b86 100755 --- a/noaacap/usr/local/bin/noaacap.py +++ b/noaacap/usr/local/bin/noaacap.py @@ -6,7 +6,7 @@ ## ## See /usr/local/share/noaacap/CHANGELOG for change history ## -version = "1.4.0" +version = "1.4.2" import sys import pytz @@ -281,7 +281,9 @@ for i in range(0, count): sorted_zcs = (sorted(zcs_discrete)) # Move myZone to first position in case of truncation - move_entry(sorted_zcs,myZone,0) + if myZone in sorted_zcs: + move_entry(sorted_zcs,myZone,0) + log.debug("myZone found in sorted zcs and moved to index 0") # Move adjacent zones, if present, after myZone adjZone2Index = 1 diff --git a/noaacap/usr/local/share/noaacap/README b/noaacap/usr/local/share/noaacap/README index d1e5d2e..2618384 100644 --- a/noaacap/usr/local/share/noaacap/README +++ b/noaacap/usr/local/share/noaacap/README @@ -1,4 +1,4 @@ -The current release of noaacap is 1.4.0. If you are running older than this +The current release of noaacap is 1.4.2. If you are running older than this version, please update before asking for support. This software is written in python3 and has been tested with aprx 2.9.x. @@ -63,8 +63,8 @@ the following command: timedatectl list-timezones | grep America. myZone should be set to your zone code. A list of zone codes may be found at https://www.weather.gov/pimar/PubZone. Only list one zone. The program will send the alert for all affected zones that will fit in the allocated 67 -characters. You could instead use a county code if you wish. However the -associated zone may also be sent, wasting characters. +characters. You could instead use a county code, if you wish. However, +NOAA now seems to return zones rather than counties in some cases. As an example, if you're located in Lancaster, PA, the map shows that you are in zone 066. Enter PAZ066 for myZone. @@ -89,4 +89,4 @@ weather alerts via this program. Dan Srebnick, K2IE 02/06/2020 -Updated 04/03/2024 +Updated 07/23/2025 diff --git a/noaacap/usr/local/share/noaacap/ppmap.db b/noaacap/usr/local/share/noaacap/ppmap.db index 2fee906399dc89b7177cff8a97765c976b203d03..68dd9b36d4fa36965dfdab3f6887b98d4a9ba036 100644 GIT binary patch delta 80 zcmV-W0I&amV1QtdG!HfbxB~$E001ef%<&6Z1C##`6#+c4S-TGdL;%r~7Z8O8;tk&o m(G9V2FAbAyE((+D9T*Qqcyw}QZDk-xWnpvySV*%19{v$z+8e9@ delta 62 zcmV-E0Kxx&V1QtdG!7pC0008B000tw43ap0ll~7D0Xwl-yAK0G0O6At5QPEZv!M_$ U4UvEplWZ;uliM8_vjZOe5lVIw*#H0l