From 52278d2721a19482544026eb5dda6f7cf906a9e8 Mon Sep 17 00:00:00 2001 From: siddharth ravikumar Date: Sun, 5 Jun 2022 14:57:52 -0400 Subject: nws: update GetForecastHourly Use `nws.get` for hitting the NWS forecast hourly endpoint. --- nws/nws.go | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'nws') diff --git a/nws/nws.go b/nws/nws.go index 3a7081e..6f75979 100644 --- a/nws/nws.go +++ b/nws/nws.go @@ -150,31 +150,15 @@ func GetForecastHourly(point *Point) (*Forecast, error) { return nil, fmt.Errorf("forecast hourly: link empty") } - // Get the forecast - resp, err := client.Get(point.Properties.ForecastHourly) - if err != nil { - return nil, fmt.Errorf("forecast hourly: get: %v", err) - } - - // Parse response body. - body, err := io.ReadAll(resp.Body) - if err != nil { - return nil, fmt.Errorf("forecast hourly: body: %v", err) - } - - // Check if the request failed. - if resp.StatusCode != 200 { - perr := new(Error) - err := json.Unmarshal(body, perr) - if err != nil { - return nil, fmt.Errorf("forecast hourly: json: %v", err) - } - return nil, fmt.Errorf("forecast: %v", perr) + // Get the hourly forecast. + body, nwsErr := get(point.Properties.ForecastHourly) + if nwsErr != nil { + return nil, fmt.Errorf("forecast hourly: %v", nwsErr) } // Unmarshal. forecast := new(Forecast) - err = json.Unmarshal(body, forecast) + err := json.Unmarshal(body, forecast) if err != nil { return nil, fmt.Errorf("forecast hourly: decode: %v", err) } -- cgit v1.2.3