modified: app.py
modified: templates/index.html
This commit is contained in:
22
app.py
22
app.py
@@ -22,23 +22,23 @@ def download_and_extract(url):
|
||||
def extract_relevant_data(weather_data):
|
||||
relevant_data = []
|
||||
|
||||
# Durchlaufe die 'messages'-Liste, um die gewünschten Informationen zu extrahieren
|
||||
for message in weather_data.get('messages', []):
|
||||
for subset in message:
|
||||
# 'messages' sind die Blöcke, die wir durchlaufen
|
||||
messages = weather_data.get('messages', [])
|
||||
|
||||
# Durchlaufe alle 'messages' und extrahiere relevante Daten
|
||||
for message in messages[0]: # Annahme: die Daten befinden sich im ersten Element
|
||||
if isinstance(message, list):
|
||||
subset_data = {}
|
||||
for item in subset:
|
||||
for item in message:
|
||||
if isinstance(item, dict):
|
||||
# Extrahiere relevante Informationen basierend auf Schlüsseln
|
||||
if item.get('key') == 'stationOrSiteName':
|
||||
subset_data['station'] = item.get('value')
|
||||
elif item.get('key') == 'airTemperature':
|
||||
subset_data['temperature'] = item.get('value', 0) - 273.15 # Umrechnung in Celsius
|
||||
subset_data['temperature'] = item.get('value', 0) - 273.15 # In Celsius umrechnen
|
||||
elif item.get('key') == 'pressureReducedToMeanSeaLevel':
|
||||
subset_data['pressure'] = item.get('value')
|
||||
elif item.get('key') == 'relativeHumidity':
|
||||
subset_data['humidity'] = item.get('value')
|
||||
elif item.get('key') == 'totalPrecipitationOrTotalWaterEquivalent':
|
||||
subset_data['precipitation'] = item.get('value')
|
||||
elif item.get('key') == 'windSpeed':
|
||||
subset_data['wind_speed'] = item.get('value')
|
||||
if subset_data:
|
||||
relevant_data.append(subset_data)
|
||||
|
||||
@@ -51,7 +51,7 @@ def weather():
|
||||
if data:
|
||||
weather_data = json.loads(data)
|
||||
filtered_data = extract_relevant_data(weather_data)
|
||||
return jsonify(filtered_data)
|
||||
return jsonify(filtered_data) # Nur die relevanten Daten zurückgeben
|
||||
else:
|
||||
return jsonify({"error": "Fehler beim Abrufen der Wetterdaten"}), 500
|
||||
|
||||
|
||||
@@ -3,72 +3,66 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Wettervorhersage</title>
|
||||
<title>Wetterdaten</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #f4f4f4;
|
||||
margin: 20px;
|
||||
}
|
||||
h1 {
|
||||
color: #333;
|
||||
text-align: center;
|
||||
}
|
||||
input[type="text"] {
|
||||
padding: 10px;
|
||||
margin-bottom: 20px;
|
||||
width: 300px;
|
||||
.weather-container {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
button {
|
||||
padding: 10px;
|
||||
background-color: #007BFF;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
.weather-card {
|
||||
border: 1px solid #ccc;
|
||||
padding: 15px;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 8px;
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
button:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
.weather-data {
|
||||
margin-top: 20px;
|
||||
font-size: 18px;
|
||||
.weather-card h2 {
|
||||
margin-top: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Suche nach Wetterdaten</h1>
|
||||
<input type="text" id="city-input" placeholder="Geben Sie den Ortsnamen ein" />
|
||||
<button onclick="fetchWeatherData()">Wetter anzeigen</button>
|
||||
|
||||
<div id="weather-container" class="weather-data">
|
||||
<p>Wetterdaten werden hier angezeigt...</p>
|
||||
<h1>Aktuelle Wetterdaten</h1>
|
||||
<div id="weather-container" class="weather-container">
|
||||
<p>Lade Wetterdaten...</p>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// Funktion zum Abrufen der Wetterdaten
|
||||
async function fetchWeatherData() {
|
||||
const city = document.getElementById('city-input').value;
|
||||
const response = await fetch(`/get_weather?city=${city}`);
|
||||
const response = await fetch('/weather');
|
||||
const data = await response.json();
|
||||
displayWeatherData(data);
|
||||
}
|
||||
|
||||
function displayWeatherData(data) {
|
||||
|
||||
const container = document.getElementById('weather-container');
|
||||
container.innerHTML = '';
|
||||
container.innerHTML = ''; // Vorherige Inhalte löschen
|
||||
|
||||
if (data.error) {
|
||||
container.innerHTML = `<p>${data.error}</p>`;
|
||||
// Überprüfen, ob Daten vorhanden sind
|
||||
if (data.length > 0) {
|
||||
data.forEach(station => {
|
||||
const weatherCard = document.createElement('div');
|
||||
weatherCard.className = 'weather-card';
|
||||
weatherCard.innerHTML = `
|
||||
<h2>Station: ${station.station}</h2>
|
||||
<p>Temperatur: ${station.temperature.toFixed(2)} °C</p>
|
||||
<p>Luftdruck: ${station.pressure} Pa</p>
|
||||
<p>Windgeschwindigkeit: ${station.wind_speed} m/s</p>
|
||||
`;
|
||||
container.appendChild(weatherCard);
|
||||
});
|
||||
} else {
|
||||
const weatherHTML = `
|
||||
<p><strong>Ort:</strong> ${data.station}</p>
|
||||
<p><strong>Temperatur:</strong> ${data.temperature} K</p>
|
||||
<p><strong>Windgeschwindigkeit:</strong> ${data.wind_speed} m/s</p>
|
||||
<p><strong>Luftfeuchtigkeit:</strong> ${data.humidity} %</p>
|
||||
`;
|
||||
container.innerHTML = weatherHTML;
|
||||
container.innerHTML = '<p>Keine Wetterdaten verfügbar</p>';
|
||||
}
|
||||
}
|
||||
|
||||
// Rufe die Wetterdaten beim Laden der Seite ab
|
||||
window.onload = fetchWeatherData;
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user