address lint

akrherz · Feb 7, 2023 · 095cc7d · 095cc7d
1 parent fbe45bc
commit 095cc7d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 40 deletions.
diff --git a/htdocs/nws/debug_latlon/index.js b/htdocs/nws/debug_latlon/index.js
@@ -1,4 +1,4 @@
-$("#thebutton").click(function(){
+$("#thebutton").click(() => {
     const text = $("#thetext").val();
     const title = $("#thetitle").val();
     $.post(

diff --git a/htdocs/other/asi.php b/htdocs/other/asi.php
@@ -3,6 +3,7 @@
 require_once "../../include/forms.php";
 require_once "../../include/database.inc.php";
 require_once "../../include/imagemaps.php";
+require_once "../../include/myview.php";
 
 function download_data($sts, $ets)
 {
@@ -24,24 +25,24 @@ function download_data($sts, $ets)
         for ($j = 1; $j < 13; $j++) {
             echo sprintf(
                 "%s,%s,%s,%s,",
-                $row["ch${j}avg"],
-                $row["ch${j}sd"],
-                $row["ch${j}max"],
-                $row["ch${j}min"]
+                $row["ch{$j}avg"],
+                $row["ch{$j}sd"],
+                $row["ch{$j}max"],
+                $row["ch{$j}min"]
             );
         }
         echo "\n";
     }
 } // End of download_data
 
-$syear = isset($_GET["syear"]) ? intval($_GET["syear"]) : date("Y", time() - 86400);
-$eyear = isset($_GET["eyear"]) ? intval($_GET["eyear"]) : date("Y", time() - 86400);
-$emonth = isset($_GET["emonth"]) ? intval($_GET["emonth"]) : date("m", time());
-$eday = isset($_GET["eday"]) ? intval($_GET["eday"]) : date("d", time());
-$smonth = isset($_GET["smonth"]) ? intval($_GET["smonth"]) : date("m", time() - 86400);
-$sday = isset($_GET["sday"]) ? intval($_GET["sday"]) : date("d", time() - 86400);
-$ehour = isset($_GET["ehour"]) ? intval($_GET["ehour"]) : 0;
-$shour = isset($_GET["shour"]) ? intval($_GET["shour"]) : 0;
+$syear = get_int404("syear", date("Y", time() - 86400));
+$eyear = get_int404("eyear", date("Y", time() - 86400));
+$emonth = get_int404("emonth", date("m", time()));
+$eday = get_int404("eday", date("d", time()));
+$smonth = get_int404("smonth", date("m", time() - 86400));
+$sday = get_int404("sday", date("d", time() - 86400));
+$ehour = get_int404("ehour", 0);
+$shour = get_int404("shour", 0);
 $station = isset($_REQUEST['station']) ? xssafe($_REQUEST['station']) : 'ISU4003';
 
 $imguri = sprintf(
@@ -68,7 +69,6 @@ function download_data($sts, $ets)
         die();
     }
 }
-include("../../include/myview.php");
 $t = new MyView();
 
 $t->title = "Atmospheric Structure Instrumentation";

diff --git a/htdocs/plotting/auto/scripts100/p199.py b/htdocs/plotting/auto/scripts100/p199.py
@@ -1,4 +1,5 @@
-"""ISU Soil Moisture Network Daily Plots."""
+"""This application generates maps of daily ISU
+    Soil Moisture Network Data."""
 import datetime
 
 import pandas as pd
@@ -25,12 +26,7 @@
 
 def get_description():
     """Return a dict describing how to call this plotter"""
-    desc = {}
-    desc["data"] = True
-    desc[
-        "description"
-    ] = """This application generates maps of daily ISU
-    Soil Moisture Network Data."""
+    desc = {"description": __doc__, "data": True}
     ets = datetime.datetime.now().replace(minute=0)
     sts = ets - datetime.timedelta(days=1)
     desc["arguments"] = [
@@ -394,7 +390,7 @@ def plotter(fdict):
         title = "ISU Soil Moisture Average Wind Speed [MPH]"
         subtitle = "based on available daily summary data"
         data, df = plot8(ctx)
-    elif ctx["opt"] == "9":
+    else:  # 9
         title = (
             "ISU Soil Moisture Plant Available Soil Water (6-30 inch) [inch]"
         )

diff --git a/htdocs/plotting/auto/scripts200/p204.py b/htdocs/plotting/auto/scripts200/p204.py
@@ -1,4 +1,7 @@
-"""Heatmap of daily data."""
+"""This app generates a heatmap-like presentation of daily climate data
+    of your choice.  In the case of 'Trailing XX Days', you will want to set
+    a trailing number of days to evaluate the metric for.
+"""
 import calendar
 import datetime
 
@@ -18,16 +21,7 @@
 
 def get_description():
     """Return a dict describing how to call this plotter"""
-    desc = {}
-    desc["data"] = True
-    desc["cache"] = 86400
-    desc[
-        "description"
-    ] = """
-    This app generates a heatmap-like presentation of daily climate data
-    of your choice.  In the case of 'Trailing XX Days', you will want to set
-    a trailing number of days to evaluate the metric for.
-    """
+    desc = {"description": __doc__, "data": True, "cache": 86400}
     today = datetime.date.today()
     desc["arguments"] = [
         dict(
@@ -94,7 +88,7 @@ def plotter(fdict):
         )
         levels = [0, 25, 50, 75, 100, 150, 200, 250, 300]
         label = "Percent"
-    elif ctx["var"] == "daily_high_depart":
+    else:  # daily_high_depart
         climo = df[["high", "sday"]].groupby("sday").mean()
         df["high_avg"] = df.merge(
             climo, left_on="sday", right_index=True, suffixes=("", "_avg")

diff --git a/include/network.php b/include/network.php
@@ -8,7 +8,7 @@ class NetworkTable
     public array $table;
     public $dbconn;
 
-    function __construct($a, $force3char = FALSE, $only_online = FALSE)
+    public function __construct($a, $force3char = FALSE, $only_online = FALSE)
     {
         $this->table = array();
         $ol = ($only_online) ? " and online = 't' " : "";
@@ -70,7 +70,7 @@ public function loadStation($id)
         return true;
     }
 
-    function do_conversions($id)
+    public function do_conversions($id)
     {
         if (!is_null($this->table[$id]["archive_begin"])) {
             // can't deal with ancient dates
@@ -90,7 +90,7 @@ function do_conversions($id)
         }
     }
 
-    function get($id)
+    public function get($id)
     {
         return $this->table[$id];
     }

diff --git a/include/station.php b/include/station.php
@@ -9,7 +9,7 @@ class StationData
     public $table;
     public $dbconn;
 
-    function __construct($a, $n = "")
+    public function __construct($a, $n = "")
     {
         $this->table = array();
         $this->dbconn = iemdb("mesosite");
@@ -62,7 +62,7 @@ public function loadStation($id, $n = "")
         return true;
     }
 
-    function do_conversions($id)
+    public function do_conversions($id)
     {
         if (!is_null($this->table[$id]["archive_begin"])) {
             $this->table[$id]["archive_begin"] = new DateTime($this->table[$id]["archive_begin"]);
@@ -76,7 +76,7 @@ function do_conversions($id)
         }
     }
 
-    function get($id)
+    public function get($id)
     {
         return $this->table[$id];
     }