License changed to default MIT and replaced net.aksingh.java.api.owm.Tools.HTML.strictAddress() with java.net.URLEncoder()

.gitignore

@@ -0,0 +1,5 @@
+lib/nblibraries.properties
+nbproject/
+lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+/build/
+build.xml

src/net/aksingh/java/api/owm/AbstractWeatherData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 

src/net/aksingh/java/api/owm/CurrentWeatherData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 

src/net/aksingh/java/api/owm/DailyForecastData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 

src/net/aksingh/java/api/owm/ForecastWeatherData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 

src/net/aksingh/java/api/owm/OpenWeatherMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
@@ -25,11 +23,12 @@ package net.aksingh.java.api.owm;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URLEncoder;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
- * Provides methods to get weather, forecast, and other data from 
+ * Provides methods to get weather, forecast, and other data from
  * OpenWeatherMap.org
  *
  * @author Ashutosh Kumar Singh
@@ -37,54 +36,49 @@ import org.json.JSONObject;
  * @since 2.5.0.1
  */
 public class OpenWeatherMap {
-    
+
     public static enum OWM_URL {
         // Base URL for OpenWeatherMap.org API 2.5
-        
+
-        BASE_URL ("http://api.openweathermap.org/data/2.5/"),
+        BASE_URL("http://api.openweathermap.org/data/2.5/"),
-        
         // Parameters
-        
-        PARAMETER_CURRENT_WEATHER ("weather?"),
-        PARAMETER_FORECAST_WEATHER ("forecast?"),
-        PARAMETER_DAILY_FORECAST ("forecast/daily?"),
-        PARAMETER_SEARCH_CITY ("find?"),
-        
-        PARAMETER_COUNT ("cnt="),
-
-        PARAMETER_CITY_NAME ("q="),
-        PARAMETER_CITY_ID ("id="),
-        PARAMETER_LATITUDE ("lat="),
-        PARAMETER_LONGITUDE ("lon="),
-
-        PARAMETER_MODE ("mode="),
-        PARAMETER_UNITS ("units="),
-        PARAMETER_APPID ("APPID="),
 
+        PARAMETER_CURRENT_WEATHER("weather?"),
+        PARAMETER_FORECAST_WEATHER("forecast?"),
+        PARAMETER_DAILY_FORECAST("forecast/daily?"),
+        PARAMETER_SEARCH_CITY("find?"),
+        PARAMETER_COUNT("cnt="),
+        PARAMETER_CITY_NAME("q="),
+        PARAMETER_CITY_ID("id="),
+        PARAMETER_LATITUDE("lat="),
+        PARAMETER_LONGITUDE("lon="),
+        PARAMETER_MODE("mode="),
+        PARAMETER_UNITS("units="),
+        PARAMETER_APPID("APPID="),
         // Possible values of parameters
 
-        PARAMETER_MODE_VALUE_JSON ("json"),
+        PARAMETER_MODE_VALUE_JSON("json"),
-        PARAMETER_UNITS_VALUE_IMPERIAL ("imperial"),
+        PARAMETER_UNITS_VALUE_IMPERIAL("imperial"),
-        PARAMETER_UNITS_VALUE_METRIC ("metric");
+        PARAMETER_UNITS_VALUE_METRIC("metric");
-        
+
-        
         private final String value;
-        
+
         private OWM_URL(String val) {
             this.value = val;
         }
-        
+
         /**
          * Returns the parameter.
+         *
          * @return Parameter
          */
         public String getParameter() {
-           return this.value;
+            return this.value;
         }
     }
-    
+
-    
     public static class OWM_Response {
+
         private final String OWM_MODE_VALUE;
         private final String OWM_UNITS_VALUE;
         private final String OWM_APPID_VALUE;
@@ -98,454 +92,453 @@ public class OpenWeatherMap {
             this.OWM_UNITS_VALUE = unit.getParameter();
             this.OWM_APPID_VALUE = apiKey;
         }
-        
+
-        public String currentWeatherByCityName(String cityName) 
+        public String currentWeatherByCityName(String cityName)
                 throws MalformedURLException, IOException {
-            String url;
             String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
-            
-            response = Tools.Downloader.downloadPage(url);
 
-            return response;
+            String address = OWM_URL.BASE_URL.getParameter()
-        }
+                    + OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
-        
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
-        public String currentWeatherByCityName(String cityName, String countryCode) 
+                    + URLEncoder.encode(cityName, "US-ASCII") + "&"
-                throws MalformedURLException, IOException {
+                    + OWM_URL.PARAMETER_MODE.getParameter()
-            String url;
+                    + this.OWM_MODE_VALUE + "&"
-            String response;
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
-            
+                    + this.OWM_UNITS_VALUE + "&"
-            url = OWM_URL.BASE_URL.getParameter() +
+                    + OWM_URL.PARAMETER_APPID.getParameter()
-                    OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter() +
+                    + this.OWM_APPID_VALUE;
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) +
-                    "," + countryCode + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+            response = Tools.Downloader.downloadPage(address);
-
-            return response;
-        }
-        
-        public String currentWeatherByCityCode(long cityCode) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_CITY_ID.getParameter() +
-                    Long.toString(cityCode) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
-
-            response = Tools.Downloader.downloadPage(url);
-
-            return response;
-        }
-        
-        public String currentWeatherByCoordinates(float latitude, float longitude) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_LATITUDE.getParameter() +
-                    Float.toString(latitude) + "&" +
-                    OWM_URL.PARAMETER_LONGITUDE.getParameter() +
-                    Float.toString(longitude) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
-
-            response = Tools.Downloader.downloadPage(url);
 
             return response;
         }
 
-        public String forecastWeatherByCityName(String cityName) 
+        public String currentWeatherByCityName(String cityName, String countryCode)
                 throws MalformedURLException, IOException {
-            String url;
+            String address;
             String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
+                    + URLEncoder.encode(cityName, "US-ASCII")
+                    + "," + countryCode + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String forecastWeatherByCityName(String cityName, String countryCode) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) +
-                    "," + countryCode + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String currentWeatherByCityCode(long cityCode)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_CITY_ID.getParameter()
+                    + Long.toString(cityCode) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String forecastWeatherByCityCode(long cityCode) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_CITY_ID.getParameter() +
-                    Long.toString(cityCode) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String currentWeatherByCoordinates(float latitude, float longitude)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_CURRENT_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_LATITUDE.getParameter()
+                    + Float.toString(latitude) + "&"
+                    + OWM_URL.PARAMETER_LONGITUDE.getParameter()
+                    + Float.toString(longitude) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String forecastWeatherByCoordinates(float latitude, float longitude) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter() +
-                    OWM_URL.PARAMETER_LATITUDE.getParameter() +
-                    Float.toString(latitude) + "&" +
-                    OWM_URL.PARAMETER_LONGITUDE.getParameter() +
-                    Float.toString(longitude) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String forecastWeatherByCityName(String cityName)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
+                    + URLEncoder.encode(cityName, "US-ASCII") + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String dailyForecastByCityName(String cityName, byte count) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_DAILY_FORECAST.getParameter() +
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) + "&" +
-                    OWM_URL.PARAMETER_COUNT.getParameter() +
-                    Byte.toString(count) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String forecastWeatherByCityName(String cityName, String countryCode)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
+                    + URLEncoder.encode(cityName, "US-ASCII")
+                    + "," + countryCode + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String dailyForecastByCityName(String cityName, String countryCode, byte count) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_DAILY_FORECAST.getParameter() +
-                    OWM_URL.PARAMETER_CITY_NAME.getParameter() +
-                    Tools.HTML.strictAddress(cityName) +
-                    "," + countryCode + "&" +
-                    OWM_URL.PARAMETER_COUNT.getParameter() +
-                    Byte.toString(count) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String forecastWeatherByCityCode(long cityCode)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_CITY_ID.getParameter()
+                    + Long.toString(cityCode) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String dailyForecastByCityCode(long cityCode, byte count) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_DAILY_FORECAST.getParameter() +
-                    OWM_URL.PARAMETER_CITY_ID.getParameter() +
-                    Long.toString(cityCode) + "&" +
-                    OWM_URL.PARAMETER_COUNT.getParameter() +
-                    Byte.toString(count) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String forecastWeatherByCoordinates(float latitude, float longitude)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_FORECAST_WEATHER.getParameter()
+                    + OWM_URL.PARAMETER_LATITUDE.getParameter()
+                    + Float.toString(latitude) + "&"
+                    + OWM_URL.PARAMETER_LONGITUDE.getParameter()
+                    + Float.toString(longitude) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
-        
-        public String dailyForecastByCoordinates(float latitude, float longitude, byte count) 
-                throws MalformedURLException, IOException {
-            String url;
-            String response;
-            
-            url = OWM_URL.BASE_URL.getParameter() +
-                    OWM_URL.PARAMETER_DAILY_FORECAST.getParameter() +
-                    OWM_URL.PARAMETER_LATITUDE.getParameter() +
-                    Float.toString(latitude) + "&" +
-                    OWM_URL.PARAMETER_COUNT.getParameter() +
-                    Byte.toString(count) + "&" +
-                    OWM_URL.PARAMETER_LONGITUDE.getParameter() +
-                    Float.toString(longitude) + "&" +
-                    OWM_URL.PARAMETER_MODE.getParameter() +
-                    this.OWM_MODE_VALUE + "&" +
-                    OWM_URL.PARAMETER_UNITS.getParameter() +
-                    this.OWM_UNITS_VALUE + "&" +
-                    OWM_URL.PARAMETER_APPID.getParameter() +
-                    this.OWM_APPID_VALUE;
 
-            response = Tools.Downloader.downloadPage(url);
+        public String dailyForecastByCityName(String cityName, byte count)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
+                    + URLEncoder.encode(cityName, "US-ASCII") + "&"
+                    + OWM_URL.PARAMETER_COUNT.getParameter()
+                    + Byte.toString(count) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
+
+            return response;
+        }
+
+        public String dailyForecastByCityName(String cityName, String countryCode, byte count)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+                    + OWM_URL.PARAMETER_CITY_NAME.getParameter()
+                    + URLEncoder.encode(cityName, "US-ASCII")
+                    + "," + countryCode + "&"
+                    + OWM_URL.PARAMETER_COUNT.getParameter()
+                    + Byte.toString(count) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
+
+            return response;
+        }
+
+        public String dailyForecastByCityCode(long cityCode, byte count)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+                    + OWM_URL.PARAMETER_CITY_ID.getParameter()
+                    + Long.toString(cityCode) + "&"
+                    + OWM_URL.PARAMETER_COUNT.getParameter()
+                    + Byte.toString(count) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
+
+            return response;
+        }
+
+        public String dailyForecastByCoordinates(float latitude, float longitude, byte count)
+                throws MalformedURLException, IOException {
+            String address;
+            String response;
+
+            address = OWM_URL.BASE_URL.getParameter()
+                    + OWM_URL.PARAMETER_DAILY_FORECAST.getParameter()
+                    + OWM_URL.PARAMETER_LATITUDE.getParameter()
+                    + Float.toString(latitude) + "&"
+                    + OWM_URL.PARAMETER_COUNT.getParameter()
+                    + Byte.toString(count) + "&"
+                    + OWM_URL.PARAMETER_LONGITUDE.getParameter()
+                    + Float.toString(longitude) + "&"
+                    + OWM_URL.PARAMETER_MODE.getParameter()
+                    + this.OWM_MODE_VALUE + "&"
+                    + OWM_URL.PARAMETER_UNITS.getParameter()
+                    + this.OWM_UNITS_VALUE + "&"
+                    + OWM_URL.PARAMETER_APPID.getParameter()
+                    + this.OWM_APPID_VALUE;
+
+            response = Tools.Downloader.downloadPage(address);
 
             return response;
         }
     }
-    
+
-    
+    /**
-    /***********************
+     * *********************
      * Declaring this class
-     ***********************/
+     **********************
-    
+     */
     private final OWM_Response owmResponse;
-    
+
     public OpenWeatherMap(String apiKey) {
         this(OWM_URL.PARAMETER_UNITS_VALUE_IMPERIAL, apiKey);
     }
-    
+
     public OpenWeatherMap(OWM_URL unit, String apiKey) {
         this.owmResponse = new OWM_Response(unit, apiKey);
     }
-    
+
-    public CurrentWeatherData currentWeatherByCityName(String cityName) 
+    public CurrentWeatherData currentWeatherByCityName(String cityName)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         CurrentWeatherData cwd;
-        
+
         jsonResponse = owmResponse.currentWeatherByCityName(cityName);
         cwd = this.currentWeatherFromResponse(jsonResponse);
-        
+
         return cwd;
     }
-    
+
-    public CurrentWeatherData currentWeatherByCityName(String cityName, String countryCode) 
+    public CurrentWeatherData currentWeatherByCityName(String cityName, String countryCode)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         CurrentWeatherData cwd;
-        
+
         jsonResponse = owmResponse.currentWeatherByCityName(cityName, countryCode);
         cwd = this.currentWeatherFromResponse(jsonResponse);
-        
+
         return cwd;
     }
-    
+
-    public CurrentWeatherData currentWeatherByCityCode(long cityCode) 
+    public CurrentWeatherData currentWeatherByCityCode(long cityCode)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         CurrentWeatherData cwd;
-        
+
         jsonResponse = owmResponse.currentWeatherByCityCode(cityCode);
         cwd = this.currentWeatherFromResponse(jsonResponse);
-        
+
         return cwd;
     }
-    
+
-    public CurrentWeatherData currentWeatherByCoordinates(float latitude, float longitude) 
+    public CurrentWeatherData currentWeatherByCoordinates(float latitude, float longitude)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         CurrentWeatherData cwd;
-        
+
         jsonResponse = owmResponse.currentWeatherByCoordinates(latitude, longitude);
         cwd = this.currentWeatherFromResponse(jsonResponse);
-        
+
         return cwd;
     }
-    
+
-    public CurrentWeatherData currentWeatherFromResponse(String jsonResponse) 
+    public CurrentWeatherData currentWeatherFromResponse(String jsonResponse)
             throws MalformedURLException, IOException, JSONException {
         JSONObject jsonObj;
         CurrentWeatherData cwd;
-        
+
         jsonObj = (jsonResponse != null) ? new JSONObject(jsonResponse) : null;
         cwd = new CurrentWeatherData(jsonObj);
-        
+
         return cwd;
     }
-    
+
-    public ForecastWeatherData forecastWeatherByCityName(String cityName) 
+    public ForecastWeatherData forecastWeatherByCityName(String cityName)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         ForecastWeatherData fwd;
-        
+
         jsonResponse = owmResponse.forecastWeatherByCityName(cityName);
         fwd = this.forecastWeatherFromResponse(jsonResponse);
-        
+
         return fwd;
     }
-    
+
-    public ForecastWeatherData forecastWeatherByCityName(String cityName, String countryCode) 
+    public ForecastWeatherData forecastWeatherByCityName(String cityName, String countryCode)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         ForecastWeatherData fwd;
-        
+
         jsonResponse = owmResponse.forecastWeatherByCityName(cityName, countryCode);
         fwd = this.forecastWeatherFromResponse(jsonResponse);
-        
+
         return fwd;
     }
-    
+
-    public ForecastWeatherData forecastWeatherByCityCode(long cityCode) 
+    public ForecastWeatherData forecastWeatherByCityCode(long cityCode)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         ForecastWeatherData fwd;
-        
+
         jsonResponse = owmResponse.forecastWeatherByCityCode(cityCode);
         fwd = this.forecastWeatherFromResponse(jsonResponse);
-        
+
         return fwd;
     }
-    
+
-    public ForecastWeatherData forecastWeatherByCoordinates(float latitude, float longitude) 
+    public ForecastWeatherData forecastWeatherByCoordinates(float latitude, float longitude)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         ForecastWeatherData fwd;
-        
+
         jsonResponse = owmResponse.forecastWeatherByCoordinates(latitude, longitude);
         fwd = this.forecastWeatherFromResponse(jsonResponse);
-        
+
         return fwd;
     }
-    
+
-    public ForecastWeatherData forecastWeatherFromResponse(String jsonResponse) 
+    public ForecastWeatherData forecastWeatherFromResponse(String jsonResponse)
             throws MalformedURLException, IOException, JSONException {
         JSONObject jsonObj;
         ForecastWeatherData fwd;
-        
+
         jsonObj = (jsonResponse != null) ? new JSONObject(jsonResponse) : null;
         fwd = new ForecastWeatherData(jsonObj);
-        
+
         return fwd;
     }
-    
+
-    public DailyForecastData dailyForecastByCityName(String cityName, byte count) 
+    public DailyForecastData dailyForecastByCityName(String cityName, byte count)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         DailyForecastData dfd;
-        
+
         jsonResponse = owmResponse.dailyForecastByCityName(cityName, count);
         dfd = this.dailyForecastFromResponse(jsonResponse);
-        
+
         return dfd;
     }
-    
+
-    public DailyForecastData dailyForecastByCityName(String cityName, String countryCode, byte count) 
+    public DailyForecastData dailyForecastByCityName(String cityName, String countryCode, byte count)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         DailyForecastData dfd;
-        
+
         jsonResponse = owmResponse.dailyForecastByCityName(cityName, countryCode, count);
         dfd = this.dailyForecastFromResponse(jsonResponse);
-        
+
         return dfd;
     }
-    
+
-    public DailyForecastData dailyForecastByCityCode(long cityCode, byte count) 
+    public DailyForecastData dailyForecastByCityCode(long cityCode, byte count)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         DailyForecastData dfd;
-        
+
         jsonResponse = owmResponse.dailyForecastByCityCode(cityCode, count);
         dfd = this.dailyForecastFromResponse(jsonResponse);
-        
+
         return dfd;
     }
-    
+
-    public DailyForecastData dailyForecastByCoordinates(float latitude, float longitude, byte count) 
+    public DailyForecastData dailyForecastByCoordinates(float latitude, float longitude, byte count)
             throws MalformedURLException, IOException, JSONException {
         String jsonResponse;
         DailyForecastData dfd;
-        
+
         jsonResponse = owmResponse.dailyForecastByCoordinates(latitude, longitude, count);
         dfd = this.dailyForecastFromResponse(jsonResponse);
-        
+
         return dfd;
     }
-    
+
-    public DailyForecastData dailyForecastFromResponse(String jsonResponse) 
+    public DailyForecastData dailyForecastFromResponse(String jsonResponse)
             throws MalformedURLException, IOException, JSONException {
         JSONObject jsonObj;
         DailyForecastData dfd;
-        
+
         jsonObj = (jsonResponse != null) ? new JSONObject(jsonResponse) : null;
         dfd = new DailyForecastData(jsonObj);
-        
+
         return dfd;
     }
 }

src/net/aksingh/java/api/owm/Tools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C)2013 Ashutosh Kumar Singh [me@AKSingh.net]
+ * Copyright (C)2013-2014 Ashutosh Kumar Singh [me@AKSingh.net]
  * 
  * Permission is hereby granted, free of charge, to any person obtaining 
  * a copy of this software and associated documentation files (the "Software"), 
@@ -11,8 +11,6 @@
  * The above copyright notice and this permission notice shall be included 
  * in all copies or substantial portions of the Software.
  * 
- * The Software shall be used for Good, not Evil.
- * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
@@ -32,7 +30,7 @@ import java.util.Scanner;
 /**
  * Provides various tools, which help doing tasks in this application. 
  * For example, tool for downloading content from the Internet, tool for 
- * correcting and stricting web addresses, etc.
+ * correcting, etc.
  * 
  * <p>Note: This class directly do not provide any functions, but has 
  * <code>static</code> sub-classes which provide various 
@@ -40,7 +38,7 @@ import java.util.Scanner;
  * classes.
  * 
  * @author Ashutosh Kumar Singh
- * @version 2013-08-05
+ * @version 2014-07-01
  * @since 2.5.0.1
  */
 public class Tools {
@@ -92,39 +90,6 @@ public class Tools {
     }
     
     
-    /**
-     * Provides functions to handle HTML, e.g., correcting 
-     * non-compliant or non-strict web addresses, etc.
-     * 
-     * @author Ashutosh Kumar Singh
-     * @version 2013/08/05
-     * @since 2.5.0.1
-     */
-    public static class HTML {
-
-        /**
-         * Stricts a non-strict or non-compliant web address 
-         * to a proper URL.
-         *
-         * <p>Note: This function checks and stricts only some parts of the 
-         * URL, which are necessary to be corrected for accessing data from 
-         * the OpenWeatherMap.org
-         * 
-         * @param inputString String to be converted to strict HTML address
-         * @return HTML standards-followed and stricted URL
-         */
-        public static String strictAddress(String inputString) {
-            String outputString = "";
-
-            if (inputString != null) {
-                outputString = inputString.replace(" ", "%20").replace(".", "%2E");
-            }
-            
-            return outputString;
-        }
-    }
-    
-    
     /**
      * Provides methods to do conversions.
      * For example, converting degree to direction, etc.
@@ -137,6 +102,7 @@ public class Tools {
         
         /**
          * Converts degree to direction.
+         * @param degree
          * @return Direction
          * 
          * @throws IllegalArgumentException