Add new fields and remove deprecated

shawntoffel · Mar 4, 2018 · 353d4e2 · 353d4e2
1 parent 3b84db8
commit 353d4e2
Show file tree

Hide file tree

Showing 4 changed files with 1,295 additions and 1,152 deletions.
diff --git a/darksky.go b/darksky.go
@@ -27,6 +27,7 @@ func New(apiKey string) DarkSky {
 	return &darkSky{apiKey, &http.Client{}}
 }
 
+// NewWithClient creates a new DarkSky client with custom http.Client
 func NewWithClient(apiKey string, client *http.Client) DarkSky {
 	return &darkSky{apiKey, client}
 }

diff --git a/darksky_test.go b/darksky_test.go
@@ -2,11 +2,12 @@ package darksky
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseForecastFullResponse(t *testing.T) {

diff --git a/structs.go b/structs.go
@@ -37,42 +37,42 @@ type ForecastResponse struct {
 
 // DataPoint contains various properties, each representing the average (unless otherwise specified) of a particular weather phenomenon occurring during a period of time.
 type DataPoint struct {
-	ApparentTemperature        Measurement `json:"apparentTemperature,omitempty"`
-	ApparentTemperatureMax     Measurement `json:"apparentTemperatureMax,omitempty"`
-	ApparentTemperatureMaxTime Timestamp   `json:"apparentTemperatureMaxTime,omitempty"`
-	ApparentTemperatureMin     Measurement `json:"apparentTemperatureMin,omitempty"`
-	ApparentTemperatureMinTime Timestamp   `json:"apparentTemperatureMinTime,omitempty"`
-	CloudCover                 Measurement `json:"cloudCover,omitempty"`
-	DewPoint                   Measurement `json:"dewPoint,omitempty"`
-	Humidity                   Measurement `json:"humidity,omitempty"`
-	Icon                       string      `json:"icon,omitempty"`
-	MoonPhase                  Measurement `json:"moonPhase,omitempty"`
-	NearestStormBearing        Measurement `json:"nearestStormBearing,omitempty"`
-	NearestStormDistance       Measurement `json:"nearestStormDistance,omitempty"`
-	Ozone                      Measurement `json:"ozone,omitempty"`
-	PrecipAccumulation         Measurement `json:"precipAccumulation,omitempty"`
-	PrecipIntensity            Measurement `json:"precipIntensity,omitempty"`
-	PrecipIntensityMax         Measurement `json:"precipIntensityMax,omitempty"`
-	PrecipIntensityMaxTime     Timestamp   `json:"precipIntensityMaxTime,omitempty"`
-	PrecipProbability          Measurement `json:"precipProbability,omitempty"`
-	PrecipType                 string      `json:"precipType,omitempty"`
-	Pressure                   Measurement `json:"pressure,omitempty"`
-	Summary                    string      `json:"summary,omitempty"`
-	SunriseTime                Timestamp   `json:"sunriseTime,omitempty"`
-	SunsetTime                 Timestamp   `json:"sunsetTime,omitempty"`
-	Temperature                Measurement `json:"temperature,omitempty"`
-	TemperatureMax             Measurement `json:"temperatureMax,omitempty"`
-	TemperatureMaxTime         Timestamp   `json:"temperatureMaxTime,omitempty"`
-	TemperatureMin             Measurement `json:"temperatureMin,omitempty"`
-	TemperatureMinTime         Timestamp   `json:"temperatureMinTime,omitempty"`
-	Time                       Timestamp   `json:"time,omitempty"`
-	UvIndex                    int64       `json:"uvIndex,omitempty"`
-	UvIndexTime                Timestamp   `json:"uvIndexTime,omitempty"`
-	Visibility                 Measurement `json:"visibility,omitempty"`
-	WindBearing                Measurement `json:"windBearing,omitempty"`
-	WindGust                   Measurement `json:"windGust,omitempty"`
-	WindGustTime               Timestamp   `json:"windGustTime,omitempty"`
-	WindSpeed                  Measurement `json:"windSpeed,omitempty"`
+	ApparentTemperature         Measurement `json:"apparentTemperature,omitempty"`
+	ApparentTemperatureHigh     Measurement `json:"apparentTemperatureHigh,omitempty"`
+	ApparentTemperatureHighTime Timestamp   `json:"apparentTemperatureHighTime,omitempty"`
+	ApparentTemperatureLow      Measurement `json:"apparentTemperatureLow,omitempty"`
+	ApparentTemperatureLowTime  Timestamp   `json:"apparentTemperatureLowTime,omitempty"`
+	CloudCover                  Measurement `json:"cloudCover,omitempty"`
+	DewPoint                    Measurement `json:"dewPoint,omitempty"`
+	Humidity                    Measurement `json:"humidity,omitempty"`
+	Icon                        string      `json:"icon,omitempty"`
+	MoonPhase                   Measurement `json:"moonPhase,omitempty"`
+	NearestStormBearing         Measurement `json:"nearestStormBearing,omitempty"`
+	NearestStormDistance        Measurement `json:"nearestStormDistance,omitempty"`
+	Ozone                       Measurement `json:"ozone,omitempty"`
+	PrecipAccumulation          Measurement `json:"precipAccumulation,omitempty"`
+	PrecipIntensity             Measurement `json:"precipIntensity,omitempty"`
+	PrecipIntensityMax          Measurement `json:"precipIntensityMax,omitempty"`
+	PrecipIntensityMaxTime      Timestamp   `json:"precipIntensityMaxTime,omitempty"`
+	PrecipProbability           Measurement `json:"precipProbability,omitempty"`
+	PrecipType                  string      `json:"precipType,omitempty"`
+	Pressure                    Measurement `json:"pressure,omitempty"`
+	Summary                     string      `json:"summary,omitempty"`
+	SunriseTime                 Timestamp   `json:"sunriseTime,omitempty"`
+	SunsetTime                  Timestamp   `json:"sunsetTime,omitempty"`
+	Temperature                 Measurement `json:"temperature,omitempty"`
+	TemperatureHigh             Measurement `json:"temperatureHigh,omitempty"`
+	TemperatureHighTime         Timestamp   `json:"temperatureHighTime,omitempty"`
+	TemperatureLow              Measurement `json:"temperatureLow,omitempty"`
+	TemperatureLowTime          Timestamp   `json:"temperatureLowTime,omitempty"`
+	Time                        Timestamp   `json:"time,omitempty"`
+	UvIndex                     int64       `json:"uvIndex,omitempty"`
+	UvIndexTime                 Timestamp   `json:"uvIndexTime,omitempty"`
+	Visibility                  Measurement `json:"visibility,omitempty"`
+	WindBearing                 Measurement `json:"windBearing,omitempty"`
+	WindGust                    Measurement `json:"windGust,omitempty"`
+	WindGustTime                Timestamp   `json:"windGustTime,omitempty"`
+	WindSpeed                   Measurement `json:"windSpeed,omitempty"`
 }
 
 // DataBlock represents the various weather phenomena occurring over a period of time