From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/model/underwaygrid/GridCellAndData.kt | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/underwaygrid/GridCellAndData.kt b/src/main/kotlin/com/flightfeather/uav/model/underwaygrid/GridCellAndData.kt
index 75f6439..e62065c 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/underwaygrid/GridCellAndData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/underwaygrid/GridCellAndData.kt
@@ -15,25 +15,20 @@
override fun getFactorData(type: FactorType): Double? {
return when (type) {
-// NO2 -> NO2
-// CO -> CO
-// H2S -> H2S
-// SO2 -> SO2
-// O3 -> O3
+ NO2 -> gridDataDetail.no2.toDouble()
+ CO -> gridDataDetail.co.toDouble()
+ H2S -> gridDataDetail.h2s.toDouble()
+ SO2 -> gridDataDetail.so2.toDouble()
+ O3 -> gridDataDetail.o3.toDouble()
PM25 -> gridDataDetail.pm25.toDouble()
-// PM10 -> PM10
-// TEMPERATURE -> TEMPERATURE
-// HUMIDITY -> HUMIDITY
-// VOC -> VOC
-// NOI -> NOI
-// LNG -> LNG
-// LAT -> LAT
-// VELOCITY -> VELOCITY
-// TIME -> TIME
-// WIND_SPEED -> WIND_SPEED
-// WIND_DIRECTION -> WIND_DIRECTION
-// HEIGHT -> HEIGHT
-// NO -> NO
+ PM10 -> gridDataDetail.pm10.toDouble()
+ TEMPERATURE -> gridDataDetail.temperature.toDouble()
+ HUMIDITY -> gridDataDetail.humidity.toDouble()
+ VOC -> gridDataDetail.voc.toDouble()
+ NOI -> gridDataDetail.noi.toDouble()
+ WIND_SPEED -> gridDataDetail.windSpeed.toDouble()
+ WIND_DIRECTION -> gridDataDetail.windDirection.toDouble()
+ NO -> gridDataDetail.no.toDouble()
else -> null
}
}
--
Gitblit v1.9.3