From 8fb9f67a25da644efbddd3f5384c8e2df1b0b3cf Mon Sep 17 00:00:00 2001 From: XANTRONIX Industrial Date: Fri, 21 Feb 2025 16:30:19 -0500 Subject: [PATCH] Update nexrad-archive-init to populate nexrad_wfo table --- Dockerfile | 5 +++-- bin/nexrad-archive-init | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index abf8bb5..0c24bb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /var/opt/nexrad-archive/lib/nexrad RUN mkdir -p /var/opt/nexrad-archive/bin RUN mkdir -p /var/lib/nexrad-archive -COPY db/nexrad.sql doc/radars.tsv /tmp +COPY db/nexrad.sql doc/radars.tsv doc/wfo.tsv /tmp COPY lib/nexrad/*.py /var/opt/nexrad-archive/lib/nexrad COPY bin/nexrad-archive bin/nexrad-archive-init /var/opt/nexrad-archive/bin @@ -19,6 +19,7 @@ RUN sqlite3 -init /tmp/nexrad.sql /var/lib/nexrad-archive/nexrad.db .quit RUN /var/opt/nexrad-archive/bin/nexrad-archive-init \ /var/lib/nexrad-archive/nexrad.db \ - /tmp/radars.tsv + /tmp/radars.tsv \ + /tmp/wfo.tsv ENTRYPOINT ["/var/opt/nexrad-archive/bin/nexrad-archive", "/var/lib/nexrad-archive/nexrad.db"] diff --git a/bin/nexrad-archive-init b/bin/nexrad-archive-init index 6ab3532..b576437 100755 --- a/bin/nexrad-archive-init +++ b/bin/nexrad-archive-init @@ -4,6 +4,7 @@ import argparse from nexrad.db import Database from nexrad.radar import Radar +from nexrad.wfo import WFO parser = argparse.ArgumentParser( description = 'Initialize NEXRAD radar site database' @@ -11,6 +12,7 @@ parser = argparse.ArgumentParser( parser.add_argument('db', help='Path to SQLite3 database') parser.add_argument('radars-tsv', help='Path to NEXRAD radar station TSV file') +parser.add_argument('wfo-tsv', help='Path to forecast office TSV file') args = parser.parse_args() @@ -21,4 +23,7 @@ db.execute('begin transaction') for radar in Radar.each_from_tsv(getattr(args, 'radars-tsv')): db.add(radar) +for wfo in WFO.each_from_tsv(getattr(args, 'wfo-tsv')): + db.add(wfo) + db.commit()