@things-factory/weather 9.0.0-beta.50 → 9.0.0-beta.55

package/server/controllers/weather-controller.ts

@@ -78,17 +78,16 @@ export async function getGlobalWeatherImage(type: WeatherType, forceRefresh: boo
           // 객체인 경우 처리 (JSON.stringify된 버퍼일 수 있음)
           try {
             // JSON 문자열로 변환했다가 다시 파싱하면 배열로 변환될 수 있음
-            cachedData = Object.keys(cachedDataJson)
-              .filter(key => !isNaN(Number(key)))
-              .sort((a, b) => Number(a) - Number(b))
-              .map(key => cachedDataJson[key])
+            if ((cachedDataJson.type = 'Buffer')) {
+              cachedData = cachedDataJson.data
+            }
           } catch (conversionError) {
             console.error('캐시 데이터 변환 실패:', conversionError)
           }
         }
       }
 
-      if (cachedData) {
+      if (cachedData && cachedData.length > 0) {
         console.log(`전체 날씨 이미지 캐시 사용 (타입: ${type})`)
         return cachedData
       }
@@ -98,7 +97,7 @@ export async function getGlobalWeatherImage(type: WeatherType, forceRefresh: boo
 
     var { value: weatherPoints } = (await cacheService.getFromCache(`weather-points`, {})) || {}
 
-    if (!weatherPoints) {
+    if (!weatherPoints || weatherPoints.length === 0) {
       const weatherData = await getGlobalWeatherData(10)
 
       const flattenedWeatherPoints = weatherData.reduce((acc, area) => {
@@ -106,10 +105,27 @@ export async function getGlobalWeatherImage(type: WeatherType, forceRefresh: boo
       }, [])
 
       weatherPoints = flattenedWeatherPoints.map(point => {
+        let value
+        switch (type) {
+          case 'temperature':
+            value = point.temperature?.current
+            break
+          case 'humidity':
+            value = point.humidity
+            break
+          case 'wind':
+            value = point.wind?.speed
+            break
+          case 'precipitation':
+            value = 0
+            break // 현재 데이터 없음
+        }
+
         return {
           lat: point.location.latitude,
           lng: point.location.longitude,
-          value: point.temperature?.current,
+          value,
+          // value: point.temperature?.current,
           description: point.weatherDescription,
           temperature: point.temperature?.current,
           humidity: point.humidity,

package/server/services/chrome-renderer.ts

@@ -100,39 +100,70 @@ export async function renderWeatherMap(
             }
           }
 
-          const imageData = ctx.createImageData(width, height)
-
-          data.forEach(point => {
-            const pixel = latLngToPixel(point.lat, point.lng)
-            if (!pixel) return
-
-            const color = valueToRGB(type, point)
-            const index = (pixel.y * width + pixel.x) * 4
-
-            if (index >= 0 && index < imageData.data.length) {
-              imageData.data[index] = color.r
-              imageData.data[index + 1] = color.g
-              imageData.data[index + 2] = color.b
-              imageData.data[index + 3] = color.a
-            } else {
-              console.warn('잘못된 인덱스:', index)
+          function calculateColor(type, value) {
+            switch (type) {
+              case 'temperature':
+                return { r: Math.min(255, Math.max(0, (value + 50) * 2.55)), g: 0, b: 0, a: 255 }
+              case 'humidity':
+                return { r: 0, g: Math.min(255, Math.max(0, value * 2.55)), b: 0, a: 255 }
+              case 'wind':
+                return { r: Math.min(255, Math.max(0, value * 5)), g: 0, b: 255, a: 255 }
+              case 'precipitation':
+                return { r: 0, g: 0, b: Math.min(255, Math.max(0, value * 2.55)), a: 255 }
+              default:
+                return { r: 255, g: 255, b: 255, a: 255 }
             }
+          }
 
-            /* only for test */
-            for (let dy = -18; dy <= 18; dy++) {
-              for (let dx = -18; dx <= 18; dx++) {
-                const fillIndex = ((pixel.y + dy) * width + (pixel.x + dx)) * 4
-                if (fillIndex >= 0 && fillIndex < imageData.data.length) {
-                  imageData.data[fillIndex] = color.r
-                  imageData.data[fillIndex + 1] = color.g
-                  imageData.data[fillIndex + 2] = color.b
-                  imageData.data[fillIndex + 3] = color.a
+          function renderInterpolated(ctx, data, type, width, height) {
+            const imageData = ctx.createImageData(width, height)
+            const maxDistance = width * 0.05 // 최대 영향 거리 (이미지 너비의 5%)
+
+            // 모든 픽셀에 대해 계산
+            for (let y = 0; y < height; y++) {
+              for (let x = 0; x < width; x++) {
+                // 픽셀의 위/경도 계산
+                const lng = (x / width) * 360 - 180
+                const lat = 90 - (y / height) * 180
+
+                // 역거리 가중치 보간법
+                let weightedSum = 0
+                let totalWeight = 0
+
+                data.forEach(point => {
+                  const pixelX = ((point.lng + 180) / 360) * width
+                  const pixelY = ((90 - point.lat) / 180) * height
+                  const distance = Math.sqrt(Math.pow(x - pixelX, 2) + Math.pow(y - pixelY, 2))
+
+                  if (distance <= maxDistance && typeof point.value === 'number') {
+                    const weight = 1 / (Math.pow(distance, 2) + 0.1)
+                    weightedSum += point.value * weight
+                    totalWeight += weight
+                  }
+                })
+
+                const index = (y * width + x) * 4
+                if (totalWeight > 0) {
+                  const value = weightedSum / totalWeight
+                  const color = calculateColor(type, value)
+
+                  imageData.data[index] = color.r
+                  imageData.data[index + 1] = color.g
+                  imageData.data[index + 2] = color.b
+                  imageData.data[index + 3] = color.a
+                } else {
+                  // 영향 범위 내 데이터 없음
+                  imageData.data[index + 3] = 0 // 투명하게
                 }
               }
             }
-          })
 
-          ctx.putImageData(imageData, 0, 0)
+            ctx.putImageData(imageData, 0, 0)
+          }
+
+          // 보간 렌더링 호출
+          renderInterpolated(ctx, data, type, width, height)
+
           console.log('Canvas 렌더링 완료')
           ;(window as any).renderComplete = true
         } catch (err) {