adam/yr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Use query params instead of sprintf

Browse source 
Signed-off-by: Tim Hårek Andreassen <tim@harek.no>
This commit is contained in:
Tim Hårek Andreassen 2024-09-24 22:18:08 +02:00
parent 5b8ba0122d
commit 012bd95cbb
No known key found for this signature in database
GPG key ID: E59C7734F0E10EB5
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/met/met.go
View file

@ -22,13 +22,21 @@ func New(siteName string) (*Met, error) {
} }
func (m *Met) Forecast(lat, lon float64, alt *int) (*LocationForecastResult, error) { func (m *Met) Forecast(lat, lon float64, alt *int) (*LocationForecastResult, error) {
url := fmt.Sprintf("https://api.met.no/weatherapi/locationforecast/2.0/complete?lat=%.4f&lon=%.4f&altitude=%d", lat, lon, alt) url := "https://api.met.no/weatherapi/locationforecast/2.0/complete"
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
q := req.URL.Query()
q.Add("lat", fmt.Sprintf("%.4f", lat))
q.Add("lon", fmt.Sprintf("%.4f", lon))
if alt != nil {
q.Add("altitude", fmt.Sprintf("%d", alt))
}
req.URL.RawQuery = q.Encode()
req.Header.Set("User-Agent", m.siteName) req.Header.Set("User-Agent", m.siteName)
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {

2
internal/met/met_test.go
View file

@ -25,7 +25,7 @@ func TestForecast(t *testing.T) {
f, err := c.Forecast(60.389444, 5.33, nil) f, err := c.Forecast(60.389444, 5.33, nil)
assert.NoError(err) assert.NoError(err)
coords := f.Geometry.Coordinates coords := f.Geometry.Coordinates
assert.Equal([]float64{5.33, 60.3894, 0}, coords) assert.Equal([]float64{5.33, 60.3894, 2}, coords)
_, err = c.Forecast(10000.0, 10000.33, nil) _, err = c.Forecast(10000.0, 10000.33, nil)
assert.Error(err) assert.Error(err)