Fix Weather Underground possible rain/snow confusion. Automatically set Celsius vs. Fahrenheit. Make sure Chromium is closed before relaunching it.

Author: kshetline

build.ts

@@ -902,6 +902,8 @@ async function doServiceDeployment(uid: number): Promise<void> {
       write(' ');
       await sleep(3000, true);
       stepDone();
+      await monitorProcess(spawn('pkill', ['-x', chromium], { uid }), true, ErrorMode.NO_ERRORS);
+      await sleep(500);
       exec(launchChromium + ' --user-data-dir=' + userHome, { uid });
       await sleep(1000, false);
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,

server/package-lock.json

@@ -137,9 +137,16 @@ function convertForecast(wuForecast: any, isMetric: boolean): ForecastData {
     if (!precipType || precipTypeNight === 'snow')
       precipType = precipTypeNight;
 
+    let precipAccumulation = wd.qpf[i];
+
+    if (precipType === 'snow' || (wd.qpfSnow[i] > 0 && precipType === 'precip')) {
+      precipType = 'snow';
+      precipAccumulation = wd.qpfSnow[i];
+    }
+
     daily.push({
       icon: getIcon(wd.daypart[0]?.iconCode[i * 2] ?? wd.daypart[0]?.iconCode[i * 2 + 1] ?? -1),
-      precipAccumulation: precipType === 'snow' ? wd.qpfSnow[i] : wd.qpf[i],
+      precipAccumulation,
       precipIntensityMax: 0,
       precipProbability: Math.max(wd.daypart[0]?.precipChance[i * 2] ?? 0, wd.daypart[0]?.precipChance[i * 2 + 1] ?? 0) / 100,
       precipType,

server/package.json

@@ -260,7 +260,7 @@
           </div>
         </div>
         <div class="dialog-buttons">
-          <span class="version-number">2.2.1</span>
+          <span class="version-number">2.2.2</span>
           <button id="settings-reload">Reload</button>
           <span>&bull;</span>
           <button id="settings-cancel">Cancel</button>

server/src/wunderground-forecast.ts

@@ -218,7 +218,7 @@ class AwClockApp implements AppService {
         const site = (runningDev ? DEV_URL : '');
         const promises = [
           getJson(`${site}/defaults`),
-          getJson('https://skyviewcafe.com/ip/json/?callback=?')
+          getJson('http://ip-api.com/json/?callback=?')
         ];
 
         Promise.all(promises)
@@ -231,9 +231,9 @@ class AwClockApp implements AppService {
             if (data[1]?.status === 'success') {
               this.settings.latitude = data[1].lat;
               this.settings.longitude = data[1].lon;
-              const city = [data[1].city, data[1].region, data[1].countryCode].join(', ')
+              this.settings.city = [data[1].city, data[1].region, data[1].countryCode].join(', ')
                 .replace(/(, [A-Z]{2}), US$/, '$1');
-              this.settings.city = city;
+              this.settings.celsius = !/AS|BS|BZ|FM|GU|MH|PW|US|VI/i.test(data[1].countryCode);
             }
 
             this.settingsChecked = true;