feat: update new air api

RTAkland · Sep 10, 2024 · eb6ce24 · eb6ce24
1 parent aaf0d13
commit eb6ce24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/main/kotlin/cn/rtast/qwsdk/api/Air.kt b/src/main/kotlin/cn/rtast/qwsdk/api/Air.kt
@@ -74,5 +74,5 @@ object Air {
         return this.daily(location(), lang)
     }
 
-    fun beta(): AirBeta = AirBeta
+    fun new(): AirNew = AirNew
 }
diff --git a/...main/kotlin/cn/rtast/qwsdk/api/AirBeta.kt → src/main/kotlin/cn/rtast/qwsdk/api/AirNew.kt b/...main/kotlin/cn/rtast/qwsdk/api/AirBeta.kt → src/main/kotlin/cn/rtast/qwsdk/api/AirNew.kt
@@ -21,25 +21,20 @@ import cn.rtast.qwsdk.QWeatherSDK
 import cn.rtast.qwsdk.entity.air.BetaAirNowEntity
 import cn.rtast.qwsdk.entity.air.BetaAirStationEntity
 import cn.rtast.qwsdk.enums.Lang
+import cn.rtast.qwsdk.utils.Coordinate
 import cn.rtast.qwsdk.utils.Http
 import cn.rtast.qwsdk.utils.buildRequestURL
 
-object AirBeta {
+object AirNew {
 
     @JvmOverloads
     fun now(
-        location: String,
+        location: Coordinate,
         lang: Lang = Lang.ZH,
-        pollutant: Boolean = false,
-        station: Boolean = false,
     ): BetaAirNowEntity {
         val url = buildRequestURL(
-            "airquality/v1/now/$location",
-            mapOf(
-                "lang" to lang,
-                "pollutant" to pollutant,
-                "station" to station
-            )
+            "airquality/v1/current/${location.latitude}/${location.longitude}",
+            mapOf("lang" to lang)
         )
 
         val result = Http.get(url)

diff --git a/src/main/kotlin/cn/rtast/qwsdk/utils/Coordinate.kt b/src/main/kotlin/cn/rtast/qwsdk/utils/Coordinate.kt
@@ -17,8 +17,8 @@
 package cn.rtast.qwsdk.utils
 
 data class Coordinate(
-    private val longitude: Double,
-    private val latitude: Double,
+    val longitude: Double,
+    val latitude: Double,
 ) {
     // overload operator to impl Class name as method
     operator fun invoke(): String {