sp9unb
/
sondechaser
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania 1 Wiki Aktywność

Add radiosondy archive parser

master
Piotro 2023-06-12 18:33:17 +02:00
rodzic 4d8d0431e9
commit 6375f6f8de
3 zmienionych plików z 60 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
app/src/main/java/eu/piotro/sondechaser/data/DataCollector.java
Wyświetl plik

@ -67,7 +67,6 @@ public class DataCollector implements Runnable {
}
private GeoPoint toGeoPoint(Location l) {
System.out.println(l);
if (l == null)
return null;
return new GeoPoint(l.getLatitude(), l.getLongitude());

59
app/src/main/java/eu/piotro/sondechaser/data/RadiosondyCollector.java
Wyświetl plik

@ -54,8 +54,11 @@ public class RadiosondyCollector implements Runnable {
while (!Thread.interrupted()) {
if (!archive)
downloadFlyingMapData();
if ((i++)%3 == 0)
if ((i++)%3 == 0) {
downloadPrediction();
if (archive)
downloadArchive();
}
Thread.sleep(15000);
}
} catch (InterruptedException ignored) {}
@ -188,6 +191,53 @@ public class RadiosondyCollector implements Runnable {
}
}
private class ParseArchive implements SondeParser {
public void parse(String data) {
try {
JSONObject json = new JSONObject(data);
JSONArray feat = json.getJSONArray("features");
if (feat.length() == 0) {
archive = true;
return;
}
JSONObject curr = feat.getJSONObject(3);
Sonde sonde = new Sonde();
sonde.lon = (float)curr.getJSONObject("geometry").getJSONArray("coordinates").getDouble(0);
sonde.lat = (float)curr.getJSONObject("geometry").getJSONArray("coordinates").getDouble(1);
sonde.alt = curr.getJSONObject("geometry").getJSONArray("coordinates").getInt(2);
//sonde.vspeed = 0;
String time_str = curr.getJSONObject("properties").getString("description");
System.err.println(time_str.substring(11, 11+19));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
sonde.time = sdf.parse(time_str.substring(11, 11+19)).getTime();
synchronized (dataLock) {
lastSonde = sonde;
}
JSONArray path = feat.getJSONObject(0).getJSONObject("geometry").getJSONArray("coordinates");
ArrayList<GeoPoint> gps = new ArrayList<>();
for (int i=path.length()-1; i>=0; i-=10) {
JSONArray entry = path.getJSONArray(i);
gps.add(new GeoPoint(entry.getDouble(1), entry.getDouble(0)));
System.out.println(entry.getDouble(0));
}
synchronized (dataLock) {
track = gps;
}
last_decoded = new Date().getTime();
} catch (Exception e) {
e.printStackTrace();
}
}
}
private void downloadFlyingMapData() {
try {
URL url = new URL(BASE_URL + "export/export_map.php?sonde_map=1&sondenumber=" + sondeName);
@ -202,6 +252,13 @@ public class RadiosondyCollector implements Runnable {
} catch (Exception ignored) {}
}
private void downloadArchive() {
try {
URL url = new URL(BASE_URL + "sonde-data/GeoJSON/M/"+sondeName+".json");
downloadData(url, new ParseArchive());
} catch (Exception ignored) {}
}
public Sonde getLastSonde() {
synchronized (dataLock) {
return lastSonde;

4
app/src/main/java/eu/piotro/sondechaser/ui/home/MapUpdater.java
Wyświetl plik

@ -311,9 +311,9 @@ public class MapUpdater {
public void updateStatus(int rs_color, int sh_color, int lc_color) {
try {
homeFragment.requireActivity().runOnUiThread(() -> {
((TextView) homeFragment.requireView().findViewById(R.id.textstatl)).setTextColor(rs_color);
((TextView) homeFragment.requireView().findViewById(R.id.textstatl)).setTextColor(lc_color);
((TextView) homeFragment.requireView().findViewById(R.id.textstats)).setTextColor(sh_color);
((TextView) homeFragment.requireView().findViewById(R.id.textstatr)).setTextColor(lc_color);
((TextView) homeFragment.requireView().findViewById(R.id.textstatr)).setTextColor(rs_color);
});
}catch (Exception ignored){}
}