From d3e56c97a19d3235cd1831222090c2dbab3631c8 Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@atcsim.de>
Date: Thu, 5 Oct 2023 09:05:44 +0200
Subject: [PATCH] Update list-city-weather.ps1

---
 Scripts/list-city-weather.ps1 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Scripts/list-city-weather.ps1 b/Scripts/list-city-weather.ps1
index e1761d96..f38fd330 100755
--- a/Scripts/list-city-weather.ps1
+++ b/Scripts/list-city-weather.ps1
@@ -1,8 +1,8 @@
 <#
 .SYNOPSIS
-	Lists current weather of cities world-wide 
+	Lists the weather of cities world-wide 
 .DESCRIPTION
-	This PowerShell script lists the current weather of cities world-wide (west to east).
+	This PowerShell script lists the current weather conditions of cities world-wide (west to east).
 .EXAMPLE
 	PS> ./list-city-weather.ps1
 .LINK
@@ -11,20 +11,21 @@
 	Author: Markus Fleschutz | License: CC0
 #>
 
-$Cities="Hawaii","Los Angeles","Mexico City","Dallas","Miami","New York","Rio de Janeiro","Paris","London","Berlin","Cape Town","Dubai","Mumbai","Singapore","Hong Kong","Perth","Peking","Tokyo","Sydney"
-
 function ListCityWeather {
+	$Cities="Hawaii","Los Angeles","Mexico City","Dallas","Miami","New York","Rio de Janeiro","Paris","London","Berlin","Cape Town","Dubai","Mumbai","Singapore","Hong Kong","Perth","Peking","Tokyo","Sydney"
 	foreach($City in $Cities) {
-		$Conditions = (Invoke-WebRequest http://wttr.in/${City}?format="%c  +%t`t+%p`t+%h`t+%P  +%w" -UserAgent "curl" -useBasicParsing).Content
-		$Sun = (Invoke-WebRequest http://wttr.in/${City}?format="+%S →+%s" -UserAgent "curl" -useBasicParsing).Content
-		New-Object PSObject -Property @{ City="$City"; Conditions="$Conditions"; Sun="$Sun" }
+		$Temp = (Invoke-WebRequest http://wttr.in/${City}?format="%t %c " -UserAgent "curl" -useBasicParsing).Content
+		$Clouds = (Invoke-WebRequest http://wttr.in/${City}?format="%h %p" -UserAgent "curl" -useBasicParsing).Content
+		$Wind = (Invoke-WebRequest http://wttr.in/${City}?format="%w" -UserAgent "curl" -useBasicParsing).Content
+		$Sun = (Invoke-WebRequest http://wttr.in/${City}?format="%S → %s" -UserAgent "curl" -useBasicParsing).Content
+		New-Object PSObject -Property @{ City="$City"; Temperature="$Temp"; Clouds="$Clouds"; Wind="$Wind"; Sun="$Sun" }
 	}
 }
 
 try {
-	ListCityWeather | Format-Table -property City,Conditions,Sun
+	ListCityWeather | Format-Table -property @{e='City';width=17},@{e='Temperature';width=15},@{e='Clouds';width=15},@{e='Wind';width=12},@{e='Sun';width=20}
 	exit 0 # success
 } catch {
 	"⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"
 	exit 1
-}
+}
\ No newline at end of file