bot/WeatherTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplications of data, sort query list, visual improvements

Browse Source
This commit is contained in:
Guntis Smaukstelis
2023-05-21 13:26:17 +03:00
parent 040672d6e0
commit 8b3f97bb96
8 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/parse/Aggregate.scala
+1 -1
View File
@@ -112,7 +112,7 @@ object Aggregate {
case AggregateKey.Max => flatValues.maximumOption.map(DoubleValue)
case AggregateKey.Avg => flatValues.reduceOption(_ + _).map(sum => DoubleValue(sum / flatValues.length))
case AggregateKey.Sum => flatValues.sum.some.map(DoubleValue)
case AggregateKey.List => TimeDoubleList(timestamps.zip(values)).some
case AggregateKey.List => TimeDoubleList(timestamps.zip(values).sorted).some
case AggregateKey.Distinct => None
}
}
src/main/scala/parse/Main.scala
+4 -3
View File
@@ -15,9 +15,10 @@ object Main {
println("================ start parser")
val formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmm")
val from = LocalDateTime.parse("20230512_2200", formatter)
val to = LocalDateTime.parse("20230514_1230", formatter)
val userQuery = UserQuery(List("Rīga"), "tempAvg", AggregateKey.List)
val from = LocalDateTime.parse("20230515_0905", formatter)
val to = LocalDateTime.parse("20230516_0942", formatter)
val userQuery = UserQuery(List("Bauska", "Dagda", "Daugavgrīva", "Rīga"), "precipitation", AggregateKey.Sum)
// val userQuery = UserQuery(List("Daugavgrīva"), "precipitation", AggregateKey.List)
for {
dbService <- DBService.of
src/main/scala/parse/WeatherData.scala
+1 -1
View File
@@ -77,7 +77,7 @@ object WeatherData {
}
}
//val cityList: List[String] = List("Ainaži", "Alūksne", "Bauska", "Dagda", "Daugavgrīva", "Daugavpils", "Dobele", "Gulbene", "Jelgava", "Kalnciems", "Kolka", "Kuldīga", "Lielpēči", "Liepāja", "Madona", "Mērsrags", "Pāvilosta", "Piedruja", "Priekuļi", "Rēzekne", "Rīga", "Rucava", "Rūjiena", "Saldus", "Sigulda", "Sīļi", "Skrīveri", "Skulte", "Stende", "Ventspils", "Vičaki", "Zīlāni", "Zosēni", "Ainaži", "Alūksne", "Bauska", "Dagda", "Daugavgrīva", "Daugavpils", "Dobele", "Gulbene", "Jelgava", "Kalnciems", "Kolka", "Kuldīga", "Lielpēči", "Liepāja", "Madona", "Mērsrags", "Pāvilosta", "Piedruja", "Priekuļi", "Rēzekne", "Rīga", "Rucava", "Rūjiena", "Saldus", "Sigulda", "Sīļi", "Skrīveri", "Skulte", "Stende", "Ventspils", "Vičaki", "Zīlāni", "Zosēni")
//val cityList: List[String] = List("Ainaži", "Alūksne", "Bauska", "Dagda", "Daugavgrīva", "Daugavpils", "Dobele", "Gulbene", "Jelgava", "Kalnciems", "Kolka", "Kuldīga", "Lielpēči", "Liepāja", "Madona", "Mērsrags", "Pāvilosta", "Piedruja", "Priekuļi", "Rēzekne", "Rīga", "Rucava", "Rūjiena", "Saldus", "Sigulda", "Sīļi", "Skrīveri", "Skulte", "Stende", "Ventspils", "Vičaki", "Zīlāni", "Zosēni")
//Map(