diff --git a/htdocs/DCP/site.phtml b/htdocs/DCP/site.phtml index ca929fc769..ada1f70446 100644 --- a/htdocs/DCP/site.phtml +++ b/htdocs/DCP/site.phtml @@ -1,5 +1,5 @@ - #map { - width: 100%; - height: 400px; - border: 2px solid black; - } +#map { + width: 100%; + height: 400px; + border: 2px solid black; +} Click on the dot to select your site:
@@ -121,24 +138,30 @@ EOF; } $extra .= "

"; - $theader = ""; + $theader = ""; foreach ($mycols as $k => $v) { - $theader .= ""; + $theader .= sprintf( + '', + $station, + $network, + date("Y", $ts), + date("m", $ts), + date("d", $ts), + $v, + $v, + ); } $theader .= ""; + $extra .= $theader; $times = array_keys($data); if (sizeof($times) == 0) { - $extra .= $theader; $extra .= ""; } $colorme = True; $cnt = 0; foreach ($times as $k => $ts) { - if ($cnt % 30 == 0) { - $extra .= $theader; - } - $extra .= sprintf( "", ($colorme) ? " style='background: #eee;'" : "", @@ -171,9 +194,9 @@ $t->content = <<
  • Timestamps are presented in central standard or daylight time
  • The column headings are the - SHEF encoded + SHEF encoded variable names.
  • -
  • Archive begins on 1 Jan 2002 for Iowa, 9 Dec 2010 for other states. +
  • Archive begins on 1 Jan 2002 for Iowa, 9 Dec 2010 for other states. The archive is not complete for all the sites listed.
  • The IEM classifies SHEF provided data into two classes on a state by state basis. The COOP network sites are mostly official once-daily cooperative @@ -196,7 +219,7 @@ $t->content = <<
  • +
    Select from map diff --git a/scripts/ingestors/other/parse0010.py b/scripts/ingestors/other/parse0010.py index 05a78c617f..e8512b6345 100644 --- a/scripts/ingestors/other/parse0010.py +++ b/scripts/ingestors/other/parse0010.py @@ -38,11 +38,9 @@ def main(): iem = Observation("OT0010", "OT", valid) iem.data["tmpf"] = float(tokens[4]) - iem.data["max_tmpf"] = float(tokens[5]) - iem.data["min_tmpf"] = float(tokens[6]) relh = int(tokens[7]) if 0 < relh <= 100: - iem.data["relh"] = int(tokens[7]) + iem.data["relh"] = int(tokens[6]) iem.data["dwpf"] = ( dewpoint_from_relative_humidity( units("degF") * iem.data["tmpf"], @@ -59,7 +57,7 @@ def main(): float(tokens[9]), "mile / hour", "knot" ) iem.data["alti"] = float(tokens[11]) - iem.data["pday"] = float(tokens[13]) / 100.0 + iem.data["pday"] = float(tokens[12]) / 100.0 iem.data["srad"] = float(tokens[17]) iem.save(cursor) diff --git a/scripts/other/ot2archive.py b/scripts/other/ot2archive.py index 6e18b760a8..c9931e9563 100644 --- a/scripts/other/ot2archive.py +++ b/scripts/other/ot2archive.py @@ -49,11 +49,12 @@ def dowork(ts, ts2): row["gust"], row["c1tmpf"], row["srad"], + row["relh"], ) ocursor.execute( "INSERT into alldata(station, valid, tmpf, dwpf, drct, sknt, " - "alti, pday, gust, c1tmpf, srad) values " - "(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)", + "alti, pday, gust, c1tmpf, srad, relh) values " + "(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)", args, )
    Site:Valid:
    Site:Valid:$v%s
    No Data Found
    %s%s
    {$n2select} -
    Select from map
    {$ys} {$ms} {$ds}