Andreas/solxpect
1
0
Fork 0
mirror of https://github.com/woheller69/solxpect.git synced 2025-12-17 09:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add some null checks

Browse source
This commit is contained in:
woheller69 2023-04-04 12:47:30 +02:00
parent 7951aa6811
commit 443a9144e3
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/woheller69/weather/weather_api/open_meteo/OMDataExtractor.java
View file

@ -1,9 +1,6 @@
package org.woheller69.weather.weather_api.open_meteo; package org.woheller69.weather.weather_api.open_meteo;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import androidx.preference.PreferenceManager;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
@ -45,10 +42,10 @@ public class OMDataExtractor implements IDataExtractor {
for (int i = 0; i < timeArray.length(); i++) { for (int i = 0; i < timeArray.length(); i++) {
WeekForecast weekForecast = new WeekForecast(); WeekForecast weekForecast = new WeekForecast();
weekForecast.setTimestamp(System.currentTimeMillis() / 1000); weekForecast.setTimestamp(System.currentTimeMillis() / 1000);
if (!timeArray.isNull(i)) weekForecast.setForecastTime((timeArray.getLong(i)+12*3600)*1000L); //shift to midday if (timeArray!=null && !timeArray.isNull(i)) weekForecast.setForecastTime((timeArray.getLong(i)+12*3600)*1000L); //shift to midday
if (!weathercodeArray.isNull(i)) weekForecast.setWeatherID(conversion.convertWeatherCategory(weathercodeArray.getString(i))); if (weathercodeArray!=null && !weathercodeArray.isNull(i)) weekForecast.setWeatherID(conversion.convertWeatherCategory(weathercodeArray.getString(i)));
if (!sunriseArray.isNull(i)) weekForecast.setTimeSunrise(sunriseArray.getLong(i)); if (sunriseArray!=null && !sunriseArray.isNull(i)) weekForecast.setTimeSunrise(sunriseArray.getLong(i));
if (!sunsetArray.isNull(i)) weekForecast.setTimeSunset(sunsetArray.getLong(i)); if (sunsetArray!=null && !sunsetArray.isNull(i)) weekForecast.setTimeSunset(sunsetArray.getLong(i));
weekforecasts.add(weekForecast); weekforecasts.add(weekForecast);
} }
return weekforecasts; return weekforecasts;
@ -64,7 +61,6 @@ public class OMDataExtractor implements IDataExtractor {
@Override @Override
public List<HourlyForecast> extractHourlyForecast(String data, int cityID) { public List<HourlyForecast> extractHourlyForecast(String data, int cityID) {
try { try {
SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
List<HourlyForecast> hourlyForecasts = new ArrayList<>(); List<HourlyForecast> hourlyForecasts = new ArrayList<>();
JSONObject jsonData = new JSONObject(data); JSONObject jsonData = new JSONObject(data);
@ -84,10 +80,10 @@ public class OMDataExtractor implements IDataExtractor {
for (int i = 0; i < timeArray.length(); i++) { for (int i = 0; i < timeArray.length(); i++) {
HourlyForecast hourlyForecast = new HourlyForecast(); HourlyForecast hourlyForecast = new HourlyForecast();
hourlyForecast.setTimestamp(System.currentTimeMillis() / 1000); hourlyForecast.setTimestamp(System.currentTimeMillis() / 1000);
if (timeArray!=null) hourlyForecast.setForecastTime(timeArray.getLong(i)*1000L); if (timeArray!=null && !timeArray.isNull(i)) hourlyForecast.setForecastTime(timeArray.getLong(i)*1000L);
if (weathercodeArray!=null) hourlyForecast.setWeatherID(conversion.convertWeatherCategory(weathercodeArray.getString(i))); if (weathercodeArray!=null && !weathercodeArray.isNull(i)) hourlyForecast.setWeatherID(conversion.convertWeatherCategory(weathercodeArray.getString(i)));
if (directRadiationArray!=null) hourlyForecast.setDirectRadiationNormal((float) directRadiationArray.getDouble(i)); if (directRadiationArray!=null && !directRadiationArray.isNull(i)) hourlyForecast.setDirectRadiationNormal((float) directRadiationArray.getDouble(i));
if (diffuseRadiationArray!=null) hourlyForecast.setDiffuseRadiation((float) diffuseRadiationArray.getDouble(i)); if (diffuseRadiationArray!=null && !diffuseRadiationArray.isNull(i)) hourlyForecast.setDiffuseRadiation((float) diffuseRadiationArray.getDouble(i));
hourlyForecast.setPower(spp.getPower(hourlyForecast.getDirectRadiationNormal(),hourlyForecast.getDiffuseRadiation(), timeArray.getLong(i)-1800)); //use solar position 1/2h earlier for calculation of average power in preceding hour hourlyForecast.setPower(spp.getPower(hourlyForecast.getDirectRadiationNormal(),hourlyForecast.getDiffuseRadiation(), timeArray.getLong(i)-1800)); //use solar position 1/2h earlier for calculation of average power in preceding hour
hourlyForecasts.add(hourlyForecast); hourlyForecasts.add(hourlyForecast);
} }