diff --git a/web/src/harmonie/GribFile.tsx b/web/src/harmonie/GribFile.tsx
index f3215bc..5a8dc10 100644
--- a/web/src/harmonie/GribFile.tsx
+++ b/web/src/harmonie/GribFile.tsx
@@ -82,7 +82,7 @@ export const GribFile: Component<{
{ getGribList()
.sort((a, b) => a.title > b.title ? 1 : -1)
.map((grib, i) =>
-
onParamClick(i)}>{ grib.title }
+ onParamClick(i)}>{ grib.title.replace('meteorology, ', '') }
)}
diff --git a/web/src/harmonie/draw/categoricalRain.ts b/web/src/harmonie/draw/categoricalRain.ts
index 3770ab5..4312c4c 100644
--- a/web/src/harmonie/draw/categoricalRain.ts
+++ b/web/src/harmonie/draw/categoricalRain.ts
@@ -1,43 +1,37 @@
type RGBAu8 = [number, number, number, number]
-const FOG: RGBAu8 = [254, 248, 0, 255] // 'fef800'
-const FOG_FREEZING: RGBAu8 = [194, 188, 0, 255] // 'c2bc00'
-const RAIN_LIGHT: RGBAu8 = [0, 255, 0, 255] // '00ff00'
-const RAIN_MODERATE: RGBAu8 = [0, 197, 0, 255] // '00c500'
-const RAIN_HEAVY: RGBAu8 = [0, 132, 0, 255] // '008400'
-const ICE_LIGHT: RGBAu8 = [255, 32, 55, 255] // 'ff2037'
-const ICE_HEAVY: RGBAu8 = [220, 0, 0, 255] // 'dc0000'
+const DRIZZLE: RGBAu8 = [5, 200, 0, 255]
+const RAIN: RGBAu8 = [50, 150, 0, 255]
+const SLEET: RGBAu8 = [255, 175, 0, 255]
+const SNOW: RGBAu8 = [0, 160, 255, 255]
+const FREEZING_DRIZZLE: RGBAu8 = [255, 100, 120, 255]
+const FREEZING_RAIN: RGBAu8 = [255, 0, 0, 255]
+const GRAUPEL: RGBAu8 = [230, 40, 250, 255]
+const HAIL: RGBAu8 = [180, 0, 250, 255]
+
export function categoricalRainColors(value: number): RGBAu8 {
switch (value) {
case 0:
- return FOG
+ return DRIZZLE
case 1*32:
- return FOG_FREEZING
+ return RAIN
case 2*32:
- return RAIN_LIGHT
+ return SLEET
case 3*32:
- return RAIN_MODERATE
+ return SNOW
case 4*32:
- return RAIN_HEAVY
+ return FREEZING_DRIZZLE
case 5*32:
- return ICE_LIGHT
+ return FREEZING_RAIN
case 6*32:
- return ICE_HEAVY
+ return GRAUPEL
+ case 7*32:
+ return HAIL
default:
return [255, 255, 255, 0]
}
}
-/* FROM CHATGPT
-0 = No rain
-1 * 32 = 32 (Drizzle)
-2 * 32 = 64 (Light rain)
-3 * 32 = 96 (Moderate rain)
-4 * 32 = 128 (Heavy rain)
-5 * 32 = 160 (Very heavy rain, if applicable)
-6 * 32 = 192 (Extreme rain, if applicable)
-*/
-
export function hexToU8(hex: string): [number, number, number] {
return [parseInt('0x'+hex.slice(0, 2)), parseInt('0x'+hex.slice(2, 4)), parseInt('0x'+hex.slice(4, 6))]
}