current_weather and weather_forecast method fix for zips under length of 5
parent
0060368e0a
commit
e0cd0c376f
|
@ -347,12 +347,23 @@ public class System {
|
|||
|
||||
try {
|
||||
HttpClient http_client = HttpClient.newHttpClient();
|
||||
HttpRequest get_request;
|
||||
|
||||
HttpRequest get_request = HttpRequest.newBuilder()
|
||||
if(current_user.getZip().length()<5){
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/weather?q=" + current_user.getHometown()
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
else{
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/weather?zip=" + current_user.getZip()
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
|
||||
|
||||
|
@ -413,12 +424,22 @@ public class System {
|
|||
|
||||
try {
|
||||
HttpClient http_client = HttpClient.newHttpClient();
|
||||
HttpRequest get_request;
|
||||
|
||||
HttpRequest get_request = HttpRequest.newBuilder()
|
||||
if(destination_zip.length()<5){
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/forecast?q=" + search(destination_zip).get(0).split(";")[1]
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
else{
|
||||
get_request = HttpRequest.newBuilder()
|
||||
.uri(new URI("https://api.openweathermap.org/data/2.5/forecast?zip=" + destination_zip
|
||||
+ ",de&appid=" + api_key + "&units=metric&lang=de"))
|
||||
.GET()
|
||||
.build();
|
||||
}
|
||||
|
||||
HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
|
||||
|
||||
|
|
Loading…
Reference in New Issue