Merge pull request #592 from akrherz/231121

Omnibus
akrherz · Nov 21, 2023 · 3e702ac · 3e702ac
2 parents 2e4d46a + 4e36ce3
commit 3e702ac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/htdocs/plotting/auto/index.py b/htdocs/plotting/auto/index.py
@@ -462,6 +462,7 @@ def generate_form(apid, fdict, headers, cookies):
         "headextra": "",
         "dataextra": "",
         "issues": "",
+        "frontend": None,
     }
     if apid == 0:
         return res

diff --git a/htdocs/projects/iembot/mastodon/index.py b/htdocs/projects/iembot/mastodon/index.py
@@ -196,7 +196,7 @@ def build_subui(mapp, fdict):
 
 def sanitize_server(val):
     """Ensure we have something that is like a server."""
-    if val is None:
+    if val is None or val == "":
         return None
     if val.startswith("https://"):
         return val[8:]

diff --git a/scripts/00z/generate_rtp.py b/scripts/00z/generate_rtp.py
@@ -54,7 +54,8 @@ def main(job):
         data = pd.read_sql(
             text(
                 f"""
-        SELECT id, round(max(tmpf)::numeric,0) as max_tmpf,
+        SELECT id, round(max(
+            greatest(max_tmpf_6hr, tmpf))::numeric,0) as max_tmpf,
         count(tmpf) as obs FROM current_log c, stations t
         WHERE t.iemid = c.iemid and t.network = ANY(:networks) and
         valid >= :sts6z and valid < :ets and {job['limiter']}
@@ -69,7 +70,8 @@ def main(job):
         lows = pd.read_sql(
             text(
                 f"""
-        SELECT id, round(min(tmpf)::numeric,0) as min_tmpf,
+        SELECT id, round(min(
+            least(min_tmpf_6hr, tmpf))::numeric,0) as min_tmpf,
         count(tmpf) as obs FROM
         current_log c JOIN stations t on (t.iemid = c.iemid)
         WHERE t.network = ANY(:networks) and valid >= :sts6z
@@ -127,7 +129,7 @@ def main(job):
                 ":   06Z TO 00Z LOW TEMPERATURE FOR "
                 f"{job['sts12z']:%d %b %Y}\n"
                 ":   00Z YESTERDAY TO 00Z TODAY RAINFALL\n"
-                ":   ...BASED ON REPORTED OBS...\n"
+                ":   ...BASED ON REPORTED OBS AND ANY 6 HR MAX MIN...\n"
             )
             for sid in ids:
                 if (

diff --git a/scripts/12z/generate_rtp.py b/scripts/12z/generate_rtp.py
@@ -54,11 +54,13 @@ def main(job):
         data = pd.read_sql(
             text(
                 f"""
-        SELECT id, round(max(tmpf)::numeric,0) as max_tmpf,
+        SELECT id, round(
+            max(greatest(max_tmpf_6hr, tmpf))::numeric,0) as max_tmpf,
         count(tmpf) as obs FROM current_log c, stations t
         WHERE t.iemid = c.iemid and t.network = ANY(:networks) and
         valid >= :yesterday6z and valid < :today6z and {job['limiter']}
-        and tmpf > -99 and not id = ANY(:badtemps) GROUP by id
+        and tmpf > -99 and not id = ANY(:badtemps)
+        GROUP by id
                  """
             ),
             conn,
@@ -69,7 +71,8 @@ def main(job):
         lows = pd.read_sql(
             text(
                 f"""
-        SELECT id, round(min(tmpf)::numeric,0) as min_tmpf,
+        SELECT id, round(
+            min(least(min_tmpf_6hr, tmpf))::numeric,0) as min_tmpf,
         count(tmpf) as obs FROM
         current_log c JOIN stations t on (t.iemid = c.iemid)
         WHERE t.network = ANY(:networks) and valid >= :today0z
@@ -129,7 +132,7 @@ def main(job):
                 f":   06Z to 06Z HIGH TEMPERATURE FOR {tt}\n"
                 ":   00Z TO 12Z TODAY LOW TEMPERATURE\n"
                 ":   12Z YESTERDAY TO 12Z TODAY RAINFALL\n"
-                ":   ...BASED ON REPORTED OBS...\n"
+                ":   ...BASED ON REPORTED OBS AND ANY 6HR MAX MIN...\n"
             )
             for sid in ids:
                 if (