refactor(forecast): overnight/% chances

src/__tests__/abbreviateForecast.test.ts

@@ -100,11 +100,23 @@ describe("Forecast Truncation", () => {
     expect(abbreviateForecast("cloudy with 60 percent chance of showers. low 13.", forecastLengthWanted)).toStrictEqual(
       "cloudy w/ 60% chnc of shwrs. low 13."
     );
+    expect(
+      abbreviateForecast(
+        "30 percent chance of rain showers or flurries changing to 30 percent chance of flurries near midnight",
+        forecastLengthWanted
+      )
+    ).toStrictEqual("30% chnc of rain shwrs/flrys until 12am");
+    expect(
+      abbreviateForecast(
+        "70 percent chance of rain showers or flurries changing to 30 percent chance of flurries near midnight",
+        forecastLengthWanted
+      )
+    ).toStrictEqual("30-70% chnc of rain shwrs/flrys until 12am");
   });
 
   test("Condition developing", () => {
-    expect(abbreviateForecast("fog patches developing overnight", forecastLengthWanted)).toStrictEqual(
-      "fog patches overnight"
+    expect(abbreviateForecast("fog patches developing ovrngt", forecastLengthWanted)).toStrictEqual(
+      "fog patches ovrngt"
     );
     expect(abbreviateForecast("fog patches developing after 12am", forecastLengthWanted)).toStrictEqual(
       "fog patches after 12am"
@@ -118,9 +130,7 @@ describe("Forecast Truncation", () => {
     expect(abbreviateForecast("30% chance of showers or tstorms", forecastLengthWanted)).toStrictEqual(
       "30% chnc of shwrs/tstorms"
     );
-    expect(abbreviateForecast("rain or flurries overnight", forecastLengthWanted)).toStrictEqual(
-      "rain/flrys overnight"
-    );
+    expect(abbreviateForecast("rain or flurries ovrngt", forecastLengthWanted)).toStrictEqual("rain/flrys ovrngt");
   });
 
   test("Wintery weather", () => {

src/lib/conditions/forecast.ts

@@ -81,6 +81,7 @@ const abbreviateTimeOfDay = (forecast: string) =>
     .replace(/morning/gi, "mrng")
     .replace(/afternoon/gi, "aftn")
     .replace(/evening/gi, "eve")
+    .replace(/overnight/gi, "ovrngt")
     .replace(/midnight/gi, "12am")
     .replace(/beginning/gi, "bgng")
     .replace(/occasional/gi, "ocnl")
@@ -111,14 +112,29 @@ const abbreviatePrecipitationPredictions = (forecast: string) =>
   forecast.replace(/amount (\d+) (-|to) (\d+) (cm|mm)/gi, "amount $1-$3$4");
 
 const abbreviateChanceOfPrecipitation = (forecast: string) => {
-  const initialAbbreviation = forecast.replace(/chance/gi, "chnc");
+  if (!forecast.includes("chance")) return forecast;
+
+  // precip is interesting. lets do abbreviations first
+  let abbreviation = forecast.replace(/chance/gi, "chnc");
   if (forecast.includes("near"))
-    return initialAbbreviation.replace(
+    abbreviation = abbreviation.replace(
       /(\d+)% chnc (.+?) changing to (\d+)% chnc .+(noon|midnigh)/gi,
       "$1-$3% chnc $2 until $4"
     );
+  else abbreviation = abbreviation.replace(/(\d+)% chnc (.+?) changing to (\d+)% chnc (.+)/gi, "$1-$3% chnc $4");
+
+  // if there's no range for the chance, return now
+  if (!abbreviation.includes("-")) return abbreviation;
+
+  // then make sure the percentages are min-max%, or that its just one % if both numbers are the same
+  const [min, max, ...rest] = abbreviation.split(/-|%/g);
+  if (!max) return abbreviation;
 
-  return initialAbbreviation.replace(/(\d+)% chnc (.+?) changing to (\d+)% chnc (.+)/gi, "$1-$3% chnc $4");
+  // now return after some edits
+  const minNumber = Number(min);
+  const maxNumber = Number(max);
+  if (minNumber === maxNumber) return `${minNumber}% ${rest.join(" ").trim()}`;
+  else return `${Math.min(minNumber, maxNumber)}-${Math.max(minNumber, maxNumber)}% ${rest.join(" ").trim()}`;
 };
 
 const abbreviateShortCompassDirections = (forecast: string) =>