From d116b1282740142a1c87fa88c1c8728f0c6dd768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 14 Dec 2022 22:52:04 +0000 Subject: [PATCH] show place name in the weather bar --- nixos/i3/openweathermap-fullfeatured.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/i3/openweathermap-fullfeatured.sh b/nixos/i3/openweathermap-fullfeatured.sh index 60da058c..9be08285 100755 --- a/nixos/i3/openweathermap-fullfeatured.sh +++ b/nixos/i3/openweathermap-fullfeatured.sh @@ -71,6 +71,9 @@ else current=$($CURL "$API/weather?appid=$KEY&lat=$location_lat&lon=$location_lon&units=$UNITS") forecast=$($CURL "$API/forecast?appid=$KEY&lat=$location_lat&lon=$location_lon&units=$UNITS&cnt=1") + place=$($CURL "https://nominatim.openstreetmap.org/reverse?lat=$location_lat&lon=$location_lon&format=jsonv2") + suburb=$(echo "$place" | $JQ -r ".address.suburb") + city=$(echo "$place" | $JQ -r ".address.city") fi fi @@ -84,15 +87,6 @@ if [ -n "$current" ] && [ -n "$forecast" ]; then forecast_feels=$(echo "$forecast" | $JQ ".list[].main.feels_like" | $CUT -d "." -f 1) forecast_icon=$(echo "$forecast" | $JQ -r ".list[].weather[0].icon") - if [ "$current_temp" -gt "$forecast_temp" ]; then - trend="getting colder" - echo "[$location_lat, $location_lon]: $current_text $(get_icon "$current_icon") $current_temp($current_feels)$SYMBOL => $(get_icon "$forecast_icon") $forecast_temp($forecast_feels)$SYMBOL" - elif [ "$forecast_temp" -gt "$current_temp" ]; then - trend="getting warmer" - echo "[$location_lat, $location_lon]: $current_text $(get_icon "$current_icon") $current_temp($current_feels)$SYMBOL => $(get_icon "$forecast_icon") $forecast_temp($forecast_feels)$SYMBOL" - else - trend="stable weather" - echo "[$location_lat, $location_lon]: $current_text $(get_icon "$current_icon") $current_temp($current_feels)$SYMBOL" - fi + echo "$suburb, $city: $current_text $(get_icon "$current_icon") $current_temp($current_feels)$SYMBOL => $(get_icon "$forecast_icon") $forecast_temp($forecast_feels)$SYMBOL" fi