erik/owm-japis
erik/owm-japis
1
0
Fork 0
mirror of https://bitbucket.org/akapribot/owm-japis.git synced 2025-04-24 23:07:12 -07:00
Code Activity

Encoding query data using UTF-8

Browse source 
Therefore moved the hardcoded US-ASCII string to a constant field in the
OpenWeatherMap class so that it can be changed more conveniently.
This commit is contained in:
Sebastian Kürten 2014-12-20 18:48:54 +01:00
parent 0ab7938fbf
commit 37e1c49637
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/net/aksingh/java/api/owm/OpenWeatherMap.java
View file

@ -40,6 +40,8 @@ import org.json.JSONObject;
*/
public class OpenWeatherMap {
private static final String ENCODING = "UTF-8";
public static enum OWM_URL {
// Base URL for OpenWeatherMap.org API 2.5
@ -103,7 +105,7 @@ public class OpenWeatherMap {
String address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII") + "&"
+ URLEncoder.encode(cityName, ENCODING) + "&"
+ OWM_URL.PARAMETER_MODE.getParameter()
+ this.OWM_MODE_VALUE + "&"
+ OWM_URL.PARAMETER_UNITS.getParameter()
@ -124,7 +126,7 @@ public class OpenWeatherMap {
address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII")
+ URLEncoder.encode(cityName, ENCODING)
+ "," + countryCode + "&"
+ OWM_URL.PARAMETER_MODE.getParameter()
+ this.OWM_MODE_VALUE + "&"
@ -190,7 +192,7 @@ public class OpenWeatherMap {
address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII") + "&"
+ URLEncoder.encode(cityName, ENCODING) + "&"
+ OWM_URL.PARAMETER_MODE.getParameter()
+ this.OWM_MODE_VALUE + "&"
+ OWM_URL.PARAMETER_UNITS.getParameter()
@ -211,7 +213,7 @@ public class OpenWeatherMap {
address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII")
+ URLEncoder.encode(cityName, ENCODING)
+ "," + countryCode + "&"
+ OWM_URL.PARAMETER_MODE.getParameter()
+ this.OWM_MODE_VALUE + "&"
@ -277,7 +279,7 @@ public class OpenWeatherMap {
address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII") + "&"
+ URLEncoder.encode(cityName, ENCODING) + "&"
+ OWM_URL.PARAMETER_COUNT.getParameter()
+ Byte.toString(count) + "&"
+ OWM_URL.PARAMETER_MODE.getParameter()
@ -300,7 +302,7 @@ public class OpenWeatherMap {
address = OWM_URL.BASE_URL.getParameter()
+ OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+ OWM_URL.PARAMETER_CITY_NAME.getParameter()
+ URLEncoder.encode(cityName, "US-ASCII")
+ URLEncoder.encode(cityName, ENCODING)
+ "," + countryCode + "&"
+ OWM_URL.PARAMETER_COUNT.getParameter()
+ Byte.toString(count) + "&"