Merge branch 'master' into patch-2

Author: hikarimn

README.md

@@ -31,6 +31,21 @@ var err error
 currentWeather, err = owm.CurrentWeatherFromCoordinates(lat, long)
 ```
 
+If fetching the weather from a city ID, pass the city ID as an argument to the CurrentWeatherFromCityID function
+```go
+var currentWeather *openweathermap.CurrentWeatherResponse
+var err error
+
+currentWeather, err = owm.CurrentWeatherFromCityID(id)
+```
+
+If fetching the weather from a zip code, pass the zip code as an argument to the CurrentWeatherFromZip function
+```go
+var currentWeather *openweathermap.CurrentWeatherResponse
+var err error
+
+currentWeather, err = owm.CurrentWeatherFromZip(zip)
+```
 
 This function returns a struct, (CurrentWeatherResonse) that matches the fields of the json response from the API
 ```json

openweathermap.go

@@ -155,6 +155,7 @@ func (owm *OpenWeatherMap) CurrentWeatherFromCoordinates(lat, long float64) (*Cu
 	return &cwr, nil
 }
 
+
 func (owm *OpenWeatherMap) CurrentWeatherFromZip(zip int) (*CurrentWeatherResponse, error) {
 	if owm.API_KEY == "" {
 		// No API keys present, return error
@@ -167,6 +168,29 @@ func (owm *OpenWeatherMap) CurrentWeatherFromZip(zip int) (*CurrentWeatherRespon
 		return nil, err
 	}
 	var cwr CurrentWeatherResponse
+  
+	// unmarshal the byte stream into a Go data type
+	jsonErr := json.Unmarshal(body, &cwr)
+	if jsonErr != nil {
+		return nil, jsonErr
+	}
+
+	return &cwr, nil
+}
+
+
+func (owm *OpenWeatherMap) CurrentWeatherFromCityId(id int) (*CurrentWeatherResponse, error) {
+	if (owm.API_KEY == "") {
+		// No API keys present, return error
+		return nil, errors.New("No API keys present")
+	}
+	url := fmt.Sprintf("http://%s/data/2.5/weather?id=%d&units=imperial&APPID=%s", API_URL, id, owm.API_KEY)
+
+	body, err := makeApiRequest(url)
+	if (err != nil) {
+		return nil, err
+	}
+	var cwr CurrentWeatherResponse
 
 	// unmarshal the byte stream into a Go data type
 	jsonErr := json.Unmarshal(body, &cwr)
@@ -177,3 +201,4 @@ func (owm *OpenWeatherMap) CurrentWeatherFromZip(zip int) (*CurrentWeatherRespon
 	return &cwr, nil
 }
 
+