From 37e1c49637500fee2acb36489c6559aa8eb822ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian.kuerten@fu-berlin.de>
Date: Sat, 20 Dec 2014 18:48:54 +0100
Subject: [PATCH] Encoding query data using UTF-8

Therefore moved the hardcoded US-ASCII string to a constant field in the
OpenWeatherMap class so that it can be changed more conveniently.
---
 src/net/aksingh/java/api/owm/OpenWeatherMap.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/net/aksingh/java/api/owm/OpenWeatherMap.java b/src/net/aksingh/java/api/owm/OpenWeatherMap.java
index 3f1bc9f..32f8810 100644
--- a/src/net/aksingh/java/api/owm/OpenWeatherMap.java
+++ b/src/net/aksingh/java/api/owm/OpenWeatherMap.java
@@ -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) + "&"