,radar:blend(darken)/650x360/{},{},{}/current.png)
'.format( self.generator.skin_dict['Extras']['forecast_api_id'], self.generator.skin_dict['Extras']['forecast_api_secret'], lat, lon, zoom )
else:
- marker = ""
- radar_html = ''.format( lat, lon, zoom, marker, lat, lon )
+ radar_html = ''.format( lat, lon, zoom, marker, lat, lon )
else:
radar_html = self.generator.skin_dict['Extras']['radar_html']
+
+ if self.generator.skin_dict['Extras'].get('radar_html_dark') == None:
+ if self.generator.skin_dict['Extras'].get('aeris_map') == "1":
+ radar_html_dark = ',radar:blend(lighten)/650x360/{},{},{}/current.png)
'.format( self.generator.skin_dict['Extras']['forecast_api_id'], self.generator.skin_dict['Extras']['forecast_api_secret'], lat, lon, zoom )
+ else:
+ radar_html_dark = "None"
+ else:
+ radar_html_dark = self.generator.skin_dict['Extras']['radar_html_dark']
"""
Build the all time stats.
@@ -390,11 +414,14 @@ def get_extension_list(self, timespan, db_lookup):
at_outTemp_max_range_query = wx_manager.getSql( 'SELECT dateTime, ROUND( (max - min), 1 ) as total, ROUND( min, 1 ) as min, ROUND( max, 1 ) as max FROM archive_day_outTemp WHERE min IS NOT NULL AND max IS NOT NULL ORDER BY total DESC LIMIT 1;' )
at_outTemp_min_range_query = wx_manager.getSql( 'SELECT dateTime, ROUND( (max - min), 1 ) as total, ROUND( min, 1 ) as min, ROUND( max, 1 ) as max FROM archive_day_outTemp WHERE min IS NOT NULL AND max IS NOT NULL ORDER BY total ASC LIMIT 1;' )
- # Find the group_name for outTemp
+ # Find the group_name for outTemp in database
outTemp_unit = converter.group_unit_dict["group_temperature"]
-
- # Find the number of decimals to round to
- outTemp_round = self.generator.skin_dict['Units']['StringFormats'].get(outTemp_unit, "%.1f")
+
+ # Find the group_name for outTemp from the skin.conf
+ skin_outTemp_unit = self.generator.converter.group_unit_dict["group_temperature"]
+
+ # Find the number of decimals to round to based on the skin.conf
+ outTemp_round = self.generator.skin_dict['Units']['StringFormats'].get(skin_outTemp_unit, "%.1f")
# Largest Daily Temperature Range Conversions
# Max temperature for this day
@@ -452,18 +479,21 @@ def get_extension_list(self, timespan, db_lookup):
# Rain lookups
- # Find the group_name for rain
+ # Find the group_name for rain in database
rain_unit = converter.group_unit_dict["group_rain"]
- # Find the number of decimals to round to
- rain_round = self.generator.skin_dict['Units']['StringFormats'].get(rain_unit, "%.2f")
-
+ # Find the group_name for rain in the skin.conf
+ skin_rain_unit = self.generator.converter.group_unit_dict["group_rain"]
+
+ # Find the number of decimals to round the result based on the skin.conf
+ rain_round = self.generator.skin_dict['Units']['StringFormats'].get(skin_rain_unit, "%.2f")
+
# Rainiest Day
rainiest_day_query = wx_manager.getSql( 'SELECT dateTime, sum FROM archive_day_rain WHERE dateTime >= %s ORDER BY sum DESC LIMIT 1;' % year_start_epoch )
if rainiest_day_query is not None:
rainiest_day_tuple = (rainiest_day_query[1], rain_unit, 'group_rain')
rainiest_day_converted = rain_round % self.generator.converter.convert(rainiest_day_tuple)[0]
- rainiest_day = [ rainiest_day_query[0], rainiest_day_converted ]
+ rainiest_day = [ rainiest_day_query[0], locale.format("%g", float(rainiest_day_converted)) ]
else:
rainiest_day = [ calendar.timegm( time.gmtime() ), locale.format("%.2f", 0) ]
@@ -472,7 +502,7 @@ def get_extension_list(self, timespan, db_lookup):
at_rainiest_day_query = wx_manager.getSql( 'SELECT dateTime, sum FROM archive_day_rain ORDER BY sum DESC LIMIT 1' )
at_rainiest_day_tuple = (at_rainiest_day_query[1], rain_unit, 'group_rain')
at_rainiest_day_converted = rain_round % self.generator.converter.convert(at_rainiest_day_tuple)[0]
- at_rainiest_day = [ at_rainiest_day_query[0], at_rainiest_day_converted ]
+ at_rainiest_day = [ at_rainiest_day_query[0], locale.format("%g", float(at_rainiest_day_converted)) ]
# Find what kind of database we're working with and specify the correctly tailored SQL Query for each type of database
@@ -666,7 +696,6 @@ def get_extension_list(self, timespan, db_lookup):
"""
if self.generator.skin_dict['Extras']['forecast_enabled'] == "1" and self.generator.skin_dict['Extras']['forecast_api_id'] != "" or 'forecast_dev_file' in self.generator.skin_dict['Extras']:
- forecast_provider = self.generator.skin_dict['Extras']['forecast_provider']
forecast_file = html_root + "/json/forecast.json"
forecast_api_id = self.generator.skin_dict['Extras']['forecast_api_id']
forecast_api_secret = self.generator.skin_dict['Extras']['forecast_api_secret']
@@ -821,7 +850,6 @@ def aeris_icon( data ):
"mcloudyw": "mostly-cloudy-day",
"mcloudywn": "mostly-cloudy-night",
"na": "unknown",
- "null": "null",
"pcloudy": "partly-cloudy-day",
"pcloudyn": "partly-cloudy-night",
"pcloudyr": "rain",
@@ -852,6 +880,7 @@ def aeris_icon( data ):
"showers": "rain",
"showersn": "rain",
"showersw": "rain",
+ "showerswn": "rain",
"sleet": "sleet",
"sleetn": "sleet",
"sleetsnow": "sleet",
@@ -886,20 +915,20 @@ def aeris_icon( data ):
forecast_lang = self.generator.skin_dict['Extras']['forecast_lang'].lower()
- if forecast_provider == "aeris":
- if self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "1":
- forecast_current_url = "https://api.aerisapi.com/observations/%s,%s?&format=json&filter=metar&limit=1&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
- else:
- forecast_current_url = "https://api.aerisapi.com/observations/%s,%s?&format=json&filter=allstations&limit=1&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
- forecast_24hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=day&limit=7&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
- forecast_3hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=3hr&limit=8&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
- forecast_1hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=1hr&limit=16&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
- if self.generator.skin_dict['Extras']['forecast_alert_limit']:
- forecast_alert_limit = self.generator.skin_dict['Extras']['forecast_alert_limit']
- forecast_alerts_url = "https://api.aerisapi.com/alerts/%s,%s?&format=json&limit=%s&lang=%s&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_alert_limit, forecast_lang, forecast_api_id, forecast_api_secret )
- else:
- # Default to 1 alerts to show if the option is missing. Can go up to 10
- forecast_alerts_url = "https://api.aerisapi.com/alerts/%s,%s?&format=json&limit=1&lang=%s&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_lang, forecast_api_id, forecast_api_secret )
+ if self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "1":
+ forecast_current_url = "https://api.aerisapi.com/observations/%s,%s?&format=json&filter=allstations&filter=metar&limit=1&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ else:
+ forecast_current_url = "https://api.aerisapi.com/observations/%s,%s?&format=json&filter=allstations&limit=1&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ forecast_24hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=day&limit=7&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ forecast_3hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=3hr&limit=8&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ forecast_1hr_url = "https://api.aerisapi.com/forecasts/%s,%s?&format=json&filter=1hr&limit=16&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ aqi_url = "https://api.aerisapi.com/airquality/closest?p=%s,%s&format=json&radius=50mi&limit=1&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_api_id, forecast_api_secret )
+ if self.generator.skin_dict['Extras']['forecast_alert_limit']:
+ forecast_alert_limit = self.generator.skin_dict['Extras']['forecast_alert_limit']
+ forecast_alerts_url = "https://api.aerisapi.com/alerts/%s,%s?&format=json&limit=%s&lang=%s&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_alert_limit, forecast_lang, forecast_api_id, forecast_api_secret )
+ else:
+ # Default to 1 alerts to show if the option is missing. Can go up to 10
+ forecast_alerts_url = "https://api.aerisapi.com/alerts/%s,%s?&format=json&limit=1&lang=%s&client_id=%s&client_secret=%s" % ( latitude, longitude, forecast_lang, forecast_api_id, forecast_api_secret )
# Determine if the file exists and get it's modified time, enhanced for 1 hr forecast to load close to the hour
if os.path.isfile( forecast_file ):
@@ -931,46 +960,97 @@ def aeris_icon( data ):
forecast_file_result = response.read()
response.close()
else:
- if forecast_provider == "aeris":
- # Current conditions
- req = Request( forecast_current_url, None, headers )
- response = urlopen( req )
- current_page = response.read()
- response.close()
- # 24hr forecast (was Forecast)
- req = Request( forecast_24hr_url, None, headers )
- response = urlopen( req )
- forecast_24hr_page = response.read()
- response.close()
- # 3hr forecast
- req = Request( forecast_3hr_url, None, headers )
- response = urlopen( req )
- forecast_3hr_page = response.read()
- response.close()
- # 1hr forecast
- req = Request( forecast_1hr_url, None, headers )
+ # Current conditions
+ req = Request( forecast_current_url, None, headers )
+ response = urlopen( req )
+ current_page = response.read()
+ response.close()
+ # 24hr forecast (was Forecast)
+ req = Request( forecast_24hr_url, None, headers )
+ response = urlopen( req )
+ forecast_24hr_page = response.read()
+ response.close()
+ # 3hr forecast
+ req = Request( forecast_3hr_url, None, headers )
+ response = urlopen( req )
+ forecast_3hr_page = response.read()
+ response.close()
+ # 1hr forecast
+ req = Request( forecast_1hr_url, None, headers )
+ response = urlopen( req )
+ forecast_1hr_page = response.read()
+ response.close()
+ # AQI
+ req = Request( aqi_url, None, headers )
+ response = urlopen( req )
+ aqi_page = response.read()
+ response.close()
+ if self.generator.skin_dict['Extras']['forecast_alert_enabled'] == "1":
+ # Alerts
+ req = Request( forecast_alerts_url, None, headers )
response = urlopen( req )
- forecast_1hr_page = response.read()
+ alerts_page = response.read()
response.close()
- if self.generator.skin_dict['Extras']['forecast_alert_enabled'] == "1":
- # Alerts
- req = Request( forecast_alerts_url, None, headers )
- response = urlopen( req )
- alerts_page = response.read()
- response.close()
-
- # Combine all into 1 file
- if self.generator.skin_dict['Extras']['forecast_alert_enabled'] == "1":
- try:
- forecast_file_result = json.dumps( {"timestamp": int(time.time()), "current": [json.loads(current_page)], "forecast_24hr": [json.loads(forecast_24hr_page)], "forecast_3hr": [json.loads(forecast_3hr_page)], "forecast_1hr": [json.loads(forecast_1hr_page)], "alerts": [json.loads(alerts_page)]} )
- except:
- forecast_file_result = json.dumps( {"timestamp": int(time.time()), "current": [json.loads(current_page.decode('utf-8'))], "forecast_24hr": [json.loads(forecast_24hr_page.decode('utf-8'))], "forecast_3hr": [json.loads(forecast_3hr_page.decode('utf-8'))], "forecast_1hr": [json.loads(forecast_1hr_page.decode('utf-8'))], "alerts": [json.loads(alerts_page.decode('utf-8'))]} )
- else:
- try:
- forecast_file_result = json.dumps( {"timestamp": int(time.time()), "current": [json.loads(current_page)], "forecast_24hr": [json.loads(forecast_24hr_page)], "forecast_3hr": [json.loads(forecast_3hr_page)], "forecast_1hr": [json.loads(forecast_1hr_page)]} )
- except:
- forecast_file_result = json.dumps( {"timestamp": int(time.time()), "current": [json.loads(current_page.decode('utf-8'))], "forecast_24hr": [json.loads(forecast_24hr_page.decode('utf-8'))], "forecast_3hr": [json.loads(forecast_3hr_page.decode('utf-8'))], "forecast_1hr": [json.loads(forecast_1hr_page.decode('utf-8'))]} )
-
+
+ # Combine all into 1 file
+ if self.generator.skin_dict['Extras']['forecast_alert_enabled'] == "1":
+ try:
+ forecast_file_result = json.dumps( {"timestamp":
+ int(time.time()),
+ "current":
+ [json.loads(current_page)],
+ "forecast_24hr":
+ [json.loads(forecast_24hr_page)],
+ "forecast_3hr":
+ [json.loads(forecast_3hr_page)],
+ "forecast_1hr":
+ [json.loads(forecast_1hr_page)],
+ "alerts":
+ [json.loads(alerts_page)],
+ "aqi":
+ [json.loads(aqi_page)]} )
+ except:
+ forecast_file_result = json.dumps( {"timestamp":
+ int(time.time()),
+ "current":
+ [json.loads(current_page.decode('utf-8'))],
+ "forecast_24hr":
+ [json.loads(forecast_24hr_page.decode('utf-8'))],
+ "forecast_3hr":
+ [json.loads(forecast_3hr_page.decode('utf-8'))],
+ "forecast_1hr":
+ [json.loads(forecast_1hr_page.decode('utf-8'))],
+ "alerts":
+ [json.loads(alerts_page.decode('utf-8'))],
+ "aqi":
+ [json.loads(aqi_page.decode('utf-8'))]} )
+ else:
+ try:
+ forecast_file_result = json.dumps( {"timestamp":
+ int(time.time()),
+ "current":
+ [json.loads(current_page)],
+ "forecast_24hr":
+ [json.loads(forecast_24hr_page)],
+ "forecast_3hr":
+ [json.loads(forecast_3hr_page)],
+ "forecast_1hr":
+ [json.loads(forecast_1hr_page)],
+ "aqi":
+ [json.loads(aqi_page)]} )
+ except:
+ forecast_file_result = json.dumps( {"timestamp":
+ int(time.time()),
+ "current":
+ [json.loads(current_page.decode('utf-8'))],
+ "forecast_24hr":
+ [json.loads(forecast_24hr_page.decode('utf-8'))],
+ "forecast_3hr":
+ [json.loads(forecast_3hr_page.decode('utf-8'))],
+ "forecast_1hr":
+ [json.loads(forecast_1hr_page.decode('utf-8'))],
+ "aqi":
+ [json.loads(aqi_page.decode('utf-8'))]} )
except Exception as error:
raise Warning( "Error downloading forecast data. Check the URL in your configuration and try again. You are trying to use URL: %s, and the error is: %s" % ( forecast_24hr_url, error ) )
@@ -990,46 +1070,154 @@ def aeris_icon( data ):
with open( forecast_file, "r" ) as read_file:
data = json.load( read_file )
- if forecast_provider == "aeris":
- if len(data["current"][0]["response"]) > 0 and self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "0":
- # Non-metar responses do not contain these values. Set them to empty.
- current_obs_summary = ""
- current_obs_icon = "null.png"
- visibility = "N/A"
- visibility_unit = ""
- elif len(data["current"][0]["response"]) > 0 and self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "1":
- current_obs_summary = aeris_coded_weather( data["current"][0]["response"]["ob"]["weatherPrimaryCoded"] )
- current_obs_icon = aeris_icon( data["current"][0]["response"]["ob"]["icon"] ) + ".png"
-
- if forecast_units == "si" or forecast_units == "ca":
- if data["current"][0]["response"]["ob"]["visibilityKM"] is not None:
- visibility = locale.format("%g", data["current"][0]["response"]["ob"]["visibilityKM"] )
- visibility_unit = "km"
- else:
- visibility = "N/A"
- visibility_unit = ""
+ try:
+ aqi = data['aqi'][0]['response'][0]['periods'][0]['aqi']
+ aqi_category = data['aqi'][0]['response'][0]['periods'][0]['category']
+ aqi_time = data['aqi'][0]['response'][0]['periods'][0]['timestamp']
+ aqi_location = data['aqi'][0]['response'][0]['place']['name'].title()
+ except Exception as error:
+ logerr( "Error getting AQI from Aeris weather. The error was:\n%s\nThe response from the Aeris AQI server was:\n%s\nThe URL being used is:\n%s" % (error, data['aqi'], aqi_url))
+
+ # Substitute label names if defined in config files, to allow users to supply their own translations
+ # see https://www.aerisweather.com/support/docs/api/reference/endpoints/airquality/
+ if aqi_category == "good":
+ if label_dict["aqi_good"] not in ("aqi_good", ""):
+ aqi_category = label_dict["aqi_good"]
+ else:
+ aqi_category = "good"
+ elif aqi_category == "moderate":
+ if label_dict["aqi_moderate"] not in ("aqi_moderate", ""):
+ aqi_category = label_dict["aqi_moderate"]
+ else:
+ aqi_category = "moderate"
+ elif aqi_category == "usg":
+ if label_dict["aqi_usg"] not in ("aqi_usg", ""):
+ aqi_category = label_dict["aqi_usg"]
+ else:
+ aqi_category = "unhealthy for some"
+ elif aqi_category == "unhealthy":
+ if label_dict["aqi_unhealthy"] not in ("aqi_unhealthy", ""):
+ aqi_category = label_dict["aqi_unhealthy"]
+ else:
+ aqi_category = "unhealthy"
+ elif aqi_category == "very unhealthy":
+ if label_dict["aqi_very_unhealthy"] not in ("aqi_very_unhealthy", ""):
+ aqi_category = label_dict["aqi_very_unhealthy"]
+ else:
+ aqi_category = "very unhealthy"
+ elif aqi_category == "hazardous":
+ if label_dict["aqi_hazardous"] not in ("aqi_hazardous", ""):
+ aqi_category = label_dict["aqi_hazardous"]
+ else:
+ aqi_category = "hazardous"
+ else:
+ aqi_category = "unknown"
+
+ if label_dict["beaufort0"] != "beaufort0":
+ beaufort0 = label_dict["beaufort0"]
+ else:
+ beaufort0 = "calm"
+ if label_dict["beaufort1"] != "beaufort1":
+ beaufort1 = label_dict["beaufort1"]
+ else:
+ beaufort1 = "light air"
+ if label_dict["beaufort2"] != "beaufort2":
+ beaufort2 = label_dict["beaufort2"]
+ else:
+ beaufort2 = "light breeze"
+ if label_dict["beaufort3"] != "beaufort3":
+ beaufort3 = label_dict["beaufort3"]
+ else:
+ beaufort3 = "gentle breeze"
+ if label_dict["beaufort4"] != "beaufort4":
+ beaufort4 = label_dict["beaufort4"]
+ else:
+ beaufort4 = "moderate breeze"
+ if label_dict["beaufort5"] != "beaufort5":
+ beaufort5 = label_dict["beaufort5"]
+ else:
+ beaufort5 = "fresh breeze"
+ if label_dict["beaufort6"] != "beaufort6":
+ beaufort6 = label_dict["beaufort6"]
+ else:
+ beaufort6 = "strong breeze"
+ if label_dict["beaufort7"] != "beaufort7":
+ beaufort7 = label_dict["beaufort7"]
+ else:
+ beaufort7 = "near gale"
+ if label_dict["beaufort8"] != "beaufort8":
+ beaufort8 = label_dict["beaufort8"]
+ else:
+ beaufort8 = "gale"
+ if label_dict["beaufort9"] != "beaufort9":
+ beaufort9 = label_dict["beaufort9"]
+ else:
+ beaufort9 = "strong gale"
+ if label_dict["beaufort10"] != "beaufort10":
+ beaufort10 = label_dict["beaufort10"]
+ else:
+ beaufort10 = "storm"
+ if label_dict["beaufort11"] != "beaufort11":
+ beaufort11 = label_dict["beaufort11"]
+ else:
+ beaufort11 = "violent storm"
+ if label_dict["beaufort12"] != "beaufort12":
+ beaufort12 = label_dict["beaufort12"]
+ else:
+ beaufort12 = "hurricane force"
+
+ if len(data["current"][0]["response"]) > 0 and self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "0":
+ # Non-metar responses do not contain these values. Set them to empty.
+ current_obs_summary = ""
+ current_obs_icon = ""
+ visibility = "N/A"
+ visibility_unit = ""
+ elif len(data["current"][0]["response"]) > 0 and self.generator.skin_dict['Extras']['forecast_aeris_use_metar'] == "1":
+ current_obs_summary = aeris_coded_weather( data["current"][0]["response"]["ob"]["weatherPrimaryCoded"] )
+ current_obs_icon = aeris_icon( data["current"][0]["response"]["ob"]["icon"] ) + ".png"
+
+ if forecast_units == "si" or forecast_units == "ca":
+ if data["current"][0]["response"]["ob"]["visibilityKM"] is not None:
+ visibility = locale.format("%g", data["current"][0]["response"]["ob"]["visibilityKM"] )
+ visibility_unit = "km"
else:
- # us, uk2 and default to miles per hour
- if data["current"][0]["response"]["ob"]["visibilityMI"] is not None:
- visibility = locale.format("%g", float( data["current"][0]["response"]["ob"]["visibilityMI"] ) )
- visibility_unit = "miles"
- else:
- visibility = "N/A"
- visibility_unit = ""
+ visibility = "N/A"
+ visibility_unit = ""
else:
- # If the user selected to not use METAR, then these observations are null.
- # If there's no data in the ob array then it's probably because of an error. Example:
- # "code": "warn_no_data",
- # "description": "Valid request. No results available based on your query parameters."
- current_obs_summary = ""
- current_obs_icon = "null.png"
- visibility = "N/A"
- visibility_unit = ""
+ # us, uk2 and default to miles per hour
+ if data["current"][0]["response"]["ob"]["visibilityMI"] is not None:
+ visibility = locale.format("%g", float( data["current"][0]["response"]["ob"]["visibilityMI"] ) )
+ visibility_unit = "miles"
+ else:
+ visibility = "N/A"
+ visibility_unit = ""
+ else:
+ # If the user selected to not use METAR, then these observations are null.
+ # If there's no data in the ob array then it's probably because of an error. Example:
+ # "code": "warn_no_data",
+ # "description": "Valid request. No results available based on your query parameters."
+ current_obs_summary = ""
+ current_obs_icon = ""
+ visibility = "N/A"
+ visibility_unit = ""
else:
- current_obs_icon = "null.png"
+ current_obs_icon = ""
current_obs_summary = ""
visibility = "N/A"
visibility_unit = ""
+ beaufort0 = ""
+ beaufort1 = ""
+ beaufort2 = ""
+ beaufort3 = ""
+ beaufort4 = ""
+ beaufort5 = ""
+ beaufort6 = ""
+ beaufort7 = ""
+ beaufort8 = ""
+ beaufort9 = ""
+ beaufort10 = ""
+ beaufort11 = ""
+ beaufort12 = ""
"""
@@ -1049,7 +1237,8 @@ def aeris_icon( data ):
if self.generator.skin_dict['Extras']['earthquake_server'] == "USGS":
earthquake_url = "http://earthquake.usgs.gov/fdsnws/event/1/query?limit=1&lat=%s&lon=%s&maxradiuskm=%s&format=geojson&nodata=204&minmag=2" % ( latitude, longitude, earthquake_maxradiuskm )
elif self.generator.skin_dict['Extras']['earthquake_server'] == "GeoNet":
- earthquake_url = "https://api.geonet.org.nz/quake?MMI=4"
+ earthquake_url = ("https://api.geonet.org.nz/quake?MMI=%s"
+ % self.generator.skin_dict['Extras']['geonet_mmi'])
earthquake_is_stale = False
# Determine if the file exists and get it's modified time
@@ -1121,19 +1310,12 @@ def aeris_icon( data ):
elif self.generator.skin_dict['Extras']['earthquake_server'] == "GeoNet":
eqtime = eqdata["features"][0]["properties"]["time"]
#convert time to UNIX format
- eqtime = eqtime.replace("Z","")
- try:
- # Python 3.7+
- eqtime = datetime.datetime.fromisoformat(eqtime)
- except:
- # Python 2/3.6:
- from dateutil import parser
- eqtime = parser.isoparse(eqtime)
- eqtime = int(eqtime.replace(tzinfo=datetime.timezone.utc).timestamp())
+ eqtime = datetime.datetime.strptime(eqtime, "%Y-%m-%dT%H:%M:%S.%fZ")
+ eqtime = int((eqtime-datetime.datetime(1970,1,1)).total_seconds())
equrl = ("https://www.geonet.org.nz/earthquake/" +
eqdata["features"][0]["properties"]["publicID"])
eqplace = eqdata["features"][0]["properties"]["locality"]
- eqmag = locale.format("%g", float(round(eqdata["features"][0]["properties"]["magnitude"],1)) )
+ eqmag = locale.format("%g", float(round(eqdata["features"][0]["properties"]["magnitude"],1)) )
eqlat = str( round( eqdata["features"][0]["geometry"]["coordinates"][1], 4 ) )
eqlon = str( round( eqdata["features"][0]["geometry"]["coordinates"][0], 4 ) )
eqdistance_bearing = self.get_gps_distance((float(latitude), float(longitude)),
@@ -1335,60 +1517,79 @@ def aeris_icon( data ):
custom_css_exists = False
# Build the search list with the new values
- search_list_extension = { 'belchertown_version': VERSION,
- 'belchertown_debug': belchertown_debug,
- 'moment_js_utc_offset': moment_js_utc_offset,
- 'highcharts_timezoneoffset': highcharts_timezoneoffset,
- 'system_locale': system_locale,
- 'system_locale_js': system_locale_js,
- 'locale_encoding': locale_encoding,
- 'highcharts_decimal': highcharts_decimal,
- 'highcharts_thousands': highcharts_thousands,
- 'radar_html': radar_html,
- 'archive_interval_ms': archive_interval_ms,
- 'ordinate_names': ordinate_names,
- 'charts': json.dumps(charts),
- 'graphpage_titles': json.dumps(graphpage_titles),
- 'graphpage_titles_dict': graphpage_titles,
- 'graphpage_content': json.dumps(graphpage_content),
- 'graph_page_buttons': graph_page_buttons,
- 'alltime' : all_stats,
- 'year_outTemp_range_max': year_outTemp_range_max,
- 'year_outTemp_range_min': year_outTemp_range_min,
- 'at_outTemp_range_max' : at_outTemp_range_max,
- 'at_outTemp_range_min': at_outTemp_range_min,
- 'rainiest_day': rainiest_day,
- 'at_rainiest_day': at_rainiest_day,
- 'year_rainiest_month': year_rainiest_month,
- 'at_rainiest_month': at_rainiest_month,
- 'at_rain_highest_year': at_rain_highest_year,
- 'year_days_with_rain': year_days_with_rain,
- 'year_days_without_rain': year_days_without_rain,
- 'at_days_with_rain': at_days_with_rain,
- 'at_days_without_rain': at_days_without_rain,
- 'windSpeedUnitLabel': windSpeed_unit_label,
- 'noaa_header_html': noaa_header_html,
- 'default_noaa_file': default_noaa_file,
- 'current_obs_icon': current_obs_icon,
- 'current_obs_summary': current_obs_summary,
- 'visibility': visibility,
- 'visibility_unit': visibility_unit,
- 'station_obs_json': json.dumps(station_obs_json),
- 'station_obs_html': station_obs_html,
- 'all_obs_rounding_json': json.dumps(all_obs_rounding_json),
- 'all_obs_unit_labels_json': json.dumps(all_obs_unit_labels_json),
- 'earthquake_time': eqtime,
- 'earthquake_url': equrl,
- 'earthquake_place': eqplace,
- 'earthquake_magnitude': eqmag,
- 'earthquake_lat': eqlat,
- 'earthquake_lon': eqlon,
- 'earthquake_distance_away': eqdistance,
- 'earthquake_distance_label': eq_distance_label,
- 'earthquake_bearing': eqbearing,
- 'earthquake_bearing_raw': eqbearing_raw,
- 'social_html': social_html,
- 'custom_css_exists': custom_css_exists }
+ search_list_extension = {
+ 'belchertown_version': VERSION,
+ 'belchertown_debug': belchertown_debug,
+ 'moment_js_utc_offset': moment_js_utc_offset,
+ 'highcharts_timezoneoffset': highcharts_timezoneoffset,
+ 'system_locale': system_locale,
+ 'system_locale_js': system_locale_js,
+ 'locale_encoding': locale_encoding,
+ 'highcharts_decimal': highcharts_decimal,
+ 'highcharts_thousands': highcharts_thousands,
+ 'radar_html': radar_html,
+ 'radar_html_dark': radar_html_dark,
+ 'archive_interval_ms': archive_interval_ms,
+ 'ordinate_names': ordinate_names,
+ 'charts': json.dumps(charts),
+ 'graphpage_titles': json.dumps(graphpage_titles),
+ 'graphpage_titles_dict': graphpage_titles,
+ 'graphpage_content': json.dumps(graphpage_content),
+ 'graph_page_buttons': graph_page_buttons,
+ 'alltime' : all_stats,
+ 'year_outTemp_range_max': year_outTemp_range_max,
+ 'year_outTemp_range_min': year_outTemp_range_min,
+ 'at_outTemp_range_max' : at_outTemp_range_max,
+ 'at_outTemp_range_min': at_outTemp_range_min,
+ 'rainiest_day': rainiest_day,
+ 'at_rainiest_day': at_rainiest_day,
+ 'year_rainiest_month': year_rainiest_month,
+ 'at_rainiest_month': at_rainiest_month,
+ 'at_rain_highest_year': at_rain_highest_year,
+ 'year_days_with_rain': year_days_with_rain,
+ 'year_days_without_rain': year_days_without_rain,
+ 'at_days_with_rain': at_days_with_rain,
+ 'at_days_without_rain': at_days_without_rain,
+ 'windSpeedUnitLabel': windSpeed_unit_label,
+ 'noaa_header_html': noaa_header_html,
+ 'default_noaa_file': default_noaa_file,
+ 'current_obs_icon': current_obs_icon,
+ 'current_obs_summary': current_obs_summary,
+ 'visibility': visibility,
+ 'visibility_unit': visibility_unit,
+ 'station_obs_json': json.dumps(station_obs_json),
+ 'station_obs_html': station_obs_html,
+ 'all_obs_rounding_json': json.dumps(all_obs_rounding_json),
+ 'all_obs_unit_labels_json': json.dumps(all_obs_unit_labels_json),
+ 'earthquake_time': eqtime,
+ 'earthquake_url': equrl,
+ 'earthquake_place': eqplace,
+ 'earthquake_magnitude': eqmag,
+ 'earthquake_lat': eqlat,
+ 'earthquake_lon': eqlon,
+ 'earthquake_distance_away': eqdistance,
+ 'earthquake_distance_label': eq_distance_label,
+ 'earthquake_bearing': eqbearing,
+ 'earthquake_bearing_raw': eqbearing_raw,
+ 'social_html': social_html,
+ 'custom_css_exists': custom_css_exists,
+ 'aqi': aqi,
+ 'aqi_category': aqi_category,
+ 'aqi_location': aqi_location,
+ 'beaufort0': beaufort0,
+ 'beaufort1': beaufort1,
+ 'beaufort2': beaufort2,
+ 'beaufort3': beaufort3,
+ 'beaufort4': beaufort4,
+ 'beaufort5': beaufort5,
+ 'beaufort6': beaufort6,
+ 'beaufort7': beaufort7,
+ 'beaufort8': beaufort8,
+ 'beaufort9': beaufort9,
+ 'beaufort10': beaufort10,
+ 'beaufort11': beaufort11,
+ 'beaufort12': beaufort12
+ }
# Finally, return our extension as a list:
return [search_list_extension]
@@ -1990,6 +2191,29 @@ def get_observation_data(self, binding, archive, observation, start_ts, end_ts,
elif windData[1] >= 22:
group_6_windDir.append( windData[0] )
group_6_windSpeed.append( windData[1] )
+ elif windSpeed_unit == "beaufort":
+ if windData[1] <= 1:
+ group_0_windDir.append( windData[0] )
+ group_0_windSpeed.append( windData[1] )
+ elif windData[1] == 2:
+ group_1_windDir.append( windData[0] )
+ group_1_windSpeed.append( windData[1] )
+ elif windData[1] == 3:
+ group_2_windDir.append( windData[0] )
+ group_2_windSpeed.append( windData[1] )
+ elif windData[1] == 4:
+ group_3_windDir.append( windData[0] )
+ group_3_windSpeed.append( windData[1] )
+ elif windData[1] == 5:
+ group_4_windDir.append( windData[0] )
+ group_4_windSpeed.append( windData[1] )
+ elif windData[1] == 6:
+ group_5_windDir.append( windData[0] )
+ group_5_windSpeed.append( windData[1] )
+ elif windData[1] >= 7:
+ group_6_windDir.append( windData[0] )
+ group_6_windSpeed.append( windData[1] )
+
# Get the windRose data
group_0_series_data = self.create_windrose_data( group_0_windDir, group_0_windSpeed )
@@ -2065,7 +2289,15 @@ def get_observation_data(self, binding, archive, observation, start_ts, end_ts,
group_4_speedRange = "11-16"
group_5_speedRange = "17-21"
group_6_speedRange = "22+"
-
+ elif windSpeed_unit == "beaufort":
+ group_0_speedRange = "0"
+ group_1_speedRange = "1"
+ group_2_speedRange = "2"
+ group_3_speedRange = "3"
+ group_4_speedRange = "4"
+ group_5_speedRange = "5"
+ group_6_speedRange = "6+"
+
group_0_name = "%s %s" % (group_0_speedRange, windSpeed_unit_label)
group_1_name = "%s %s" % (group_1_speedRange, windSpeed_unit_label)
group_2_name = "%s %s" % (group_2_speedRange, windSpeed_unit_label)
@@ -2187,6 +2419,10 @@ def get_observation_data(self, binding, archive, observation, start_ts, end_ts,
return data
+ if observation == "aqiChart":
+ data = { "aqiChart": True, "obsdata": [{'y': aqi, 'category': aqi_category}] }
+ return data
+
# Hays chart
if observation == "haysChart":
@@ -2349,7 +2585,7 @@ def get_observation_data(self, binding, archive, observation, start_ts, end_ts,
usage_round = int(self.skin_dict['Units']['StringFormats'].get(obs_vt[1], "1f")[-2])
obs_round_vt = [round(x,usage_round) if x is not None else None for x in obs_vt[0]]
else:
- usage_round = int(self.skin_dict['Units']['StringFormats'].get(obs_vt[2], "2f")[-2])
+ usage_round = int(self.skin_dict['Units']['StringFormats'].get(obs_vt[1], "2f")[-2])
obs_round_vt = [self.round_none(x, usage_round) for x in obs_vt[0]]
# "Today" charts, "timespan_specific" charts and floating timespan charts have the point timestamp on the stop time so we don't see the
diff --git a/bin/user/belchertown.py.mju b/bin/user/belchertown.py.mju
new file mode 100644
index 00000000..2f60087d
--- /dev/null
+++ b/bin/user/belchertown.py.mju
@@ -0,0 +1,2710 @@
+# Extension for the Belchertown skin.
+# This extension builds search list extensions as well
+# as a crude "cron" to download necessary files.
+#
+# Pat O'Brien, August 19, 2018
+
+from __future__ import with_statement
+from __future__ import print_function # Python 2/3 compatibility
+import datetime
+import time
+import calendar
+import json
+import os
+import os.path
+import syslog
+import sys
+import locale
+
+import weewx
+import weecfg
+import configobj
+import weedb
+import weeutil.weeutil
+import weewx.reportengine
+import weewx.station
+import weewx.units
+import weewx.tags
+import weeplot.genplot
+import weeplot.utilities
+
+from collections import OrderedDict
+
+from math import atan2, degrees, radians, cos, sin, asin, sqrt
+
+from weewx.cheetahgenerator import SearchList
+from weewx.tags import TimespanBinder
+from weeutil.weeutil import to_bool, TimeSpan, to_float, to_int, archiveDaySpan, archiveWeekSpan, archiveMonthSpan, archiveYearSpan, archiveSpanSpan, startOfDay, timestamp_to_string, option_as_list
+try:
+ from weeutil.config import search_up
+except:
+ # Pass here because chances are we have an old version of weewx which will get caught below.
+ pass
+try:
+ # weewx 4
+ from weeutil.config import accumulateLeaves
+except:
+ # weewx 3
+ from weeutil.weeutil import accumulateLeaves
+
+# Check weewx version. Many things like search_up, weeutil.weeutil.KeyDict (label_dict) are from 3.9
+if weewx.__version__ < "3.9":
+ raise weewx.UnsupportedFeature("weewx 3.9 and newer is required, found %s" % weewx.__version__)
+
+try:
+ # Test for new-style weewx v4 logging by trying to import weeutil.logger
+ import weeutil.logger
+ import logging
+
+ log = logging.getLogger(__name__)
+
+ def logdbg(msg):
+ log.debug(msg)
+
+ def loginf(msg):
+ log.info(msg)
+
+ def logerr(msg):
+ log.error(msg)
+
+except ImportError:
+ # Old-style weewx logging
+ import syslog
+
+ def logmsg(level, msg):
+ syslog.syslog(level, 'Belchertown Extension: %s' % msg)
+
+ def logdbg(msg):
+ logmsg(syslog.LOG_DEBUG, msg)
+
+ def loginf(msg):
+ logmsg(syslog.LOG_INFO, msg)
+
+ def logerr(msg):
+ logmsg(syslog.LOG_ERR, msg)
+
+# Print version in syslog for easier troubleshooting
+VERSION = "1.2"
+loginf("version %s" % VERSION)
+
+aqi = 0
+aqi_category = ""
+aqi_time = 0
+aqi_location = ""
+
+class getData(SearchList):
+ def __init__(self, generator):
+ SearchList.__init__(self, generator)
+
+ def get_gps_distance(self, pointA, pointB, distance_unit):
+ # https://www.geeksforgeeks.org/program-distance-two-points-earth/ and https://stackoverflow.com/a/43960736
+ # The math module contains a function named radians which converts from degrees to radians.
+ if (type(pointA) != tuple) or (type(pointB) != tuple):
+ raise TypeError("Only tuples are supported as arguments")
+ lat1 = pointA[0]
+ lon1 = pointA[1]
+ lat2 = pointB[0]
+ lon2 = pointB[1]
+ # convert decimal degrees to radians
+ lat1r, lon1r, lat2r, lon2r = map(radians, [lat1, lon1, lat2, lon2])
+ # Haversine formula
+ dlat = lat2r - lat1r
+ dlon = lon2r - lon1r
+ a = sin(dlat / 2)**2 + cos(lat1r) * cos(lat2r) * sin(dlon / 2)**2
+ c = 2 * asin(sqrt(a))
+ # Radius of earth in kilometers is 6371. Use 3956 for miles
+ if distance_unit == "km":
+ r = 6371
+ else:
+ # Assume mile
+ r = 3956
+ bearing = self.get_gps_bearing(pointA, pointB)
+ # Returns distance as object 0 and bearing as object 1
+ return [(c * r), self.get_cardinal_direction(bearing), bearing]
+
+ def get_gps_bearing(self, pointA, pointB):
+ """
+ https://gist.github.com/jeromer/2005586
+ Calculates the bearing between two points.
+ :Parameters:
+ - pointA: The tuple representing the latitude/longitude for the
+ first point. Latitude and longitude must be in decimal degrees
+ - pointB: The tuple representing the latitude/longitude for the
+ second point. Latitude and longitude must be in decimal degrees
+ :Returns:
+ The bearing in degrees
+ :Returns Type:
+ float
+ """
+ if (type(pointA) != tuple) or (type(pointB) != tuple):
+ raise TypeError("Only tuples are supported as arguments")
+ lat1 = radians(pointA[0])
+ lat2 = radians(pointB[0])
+ diffLong = radians(pointB[1] - pointA[1])
+ x = sin(diffLong) * cos(lat2)
+ y = cos(lat1) * sin(lat2) - (sin(lat1)
+ * cos(lat2) * cos(diffLong))
+ initial_bearing = atan2(x, y)
+ # Now we have the initial bearing but math.atan2 return values
+ # from -180 to + 180 degrees which is not what we want for a compass bearing
+ # The solution is to normalize the initial bearing as shown below
+ initial_bearing = degrees(initial_bearing)
+ compass_bearing = (initial_bearing + 360) % 360
+ return compass_bearing
+
+ def get_cardinal_direction(self, degree, return_only_labels=False):
+ default_ordinate_names = ['N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE', 'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW', 'N/A']
+ try:
+ ordinate_names = weeutil.weeutil.option_as_list(self.generator.skin_dict['Units']['Ordinates']['directions'])
+ try:
+ ordinate_names = [unicode(x, "utf-8") for x in ordinate_names] # Python 2, convert to unicode
+ except:
+ pass
+ except KeyError:
+ ordinate_names = default_ordinate_names
+
+ if return_only_labels:
+ return ordinate_names
+
+ if 0 <= degree <= 11.25:
+ return ordinate_names[0]
+ elif 11.26 <= degree <= 33.75:
+ return ordinate_names[1]
+ elif 33.76 <= degree <= 56.25:
+ return ordinate_names[2]
+ elif 56.26 <= degree <= 78.75:
+ return ordinate_names[3]
+ elif 78.76 <= degree <= 101.25:
+ return ordinate_names[4]
+ elif 101.26 <= degree <= 123.75:
+ return ordinate_names[5]
+ elif 123.76 <= degree <= 146.25:
+ return ordinate_names[6]
+ elif 146.26 <= degree <= 168.75:
+ return ordinate_names[7]
+ elif 168.76 <= degree <= 191.25:
+ return ordinate_names[8]
+ elif 191.26 <= degree <= 213.75:
+ return ordinate_names[9]
+ elif 213.76 <= degree <= 236.25:
+ return ordinate_names[10]
+ elif 236.26 <= degree <= 258.75:
+ return ordinate_names[11]
+ elif 258.76 <= degree <= 281.25:
+ return ordinate_names[12]
+ elif 281.26 <= degree <= 303.75:
+ return ordinate_names[13]
+ elif 303.76 <= degree <= 326.25:
+ return ordinate_names[14]
+ elif 326.26 <= degree <= 348.75:
+ return ordinate_names[15]
+ elif 348.76 <= degree <= 360:
+ return ordinate_names[0]
+
+ def get_extension_list(self, timespan, db_lookup):
+ """
+ Build the data needed for the Belchertown skin
+ """
+
+ global aqi
+ global aqi_category
+ global aqi_time
+ global aqi_location
+
+
+ # Look for the debug flag which can be used to show more logging
+ weewx.debug = int(self.generator.config_dict.get('debug', 0))
+
+ # Setup label dict for text and titles
+ try:
+ d = self.generator.skin_dict['Labels']['Generic']
+ except KeyError:
+ d = {}
+ label_dict = weeutil.weeutil.KeyDict(d)
+
+ # Setup database manager
+ binding = self.generator.config_dict['StdReport'].get('data_binding', 'wx_binding')
+ manager = self.generator.db_binder.get_manager(binding)
+
+ belchertown_debug = self.generator.skin_dict['Extras'].get('belchertown_debug', 0)
+
+ # Find the right HTML ROOT
+ if 'HTML_ROOT' in self.generator.skin_dict:
+ html_root = os.path.join(self.generator.config_dict['WEEWX_ROOT'],
+ self.generator.skin_dict['HTML_ROOT'])
+ else:
+ html_root = os.path.join(self.generator.config_dict['WEEWX_ROOT'],
+ self.generator.config_dict['StdReport']['HTML_ROOT'])
+
+ # Setup UTC offset hours for moment.js in index.html
+ moment_js_stop_struct = time.localtime( time.time() )
+ moment_js_utc_offset = (calendar.timegm(moment_js_stop_struct) - calendar.timegm(time.gmtime(time.mktime(moment_js_stop_struct))))/60
+
+ # Highcharts UTC offset is the opposite of normal. Positive values are west, negative values are east of UTC. https://api.highcharts.com/highcharts/time.timezoneOffset
+ # Multiplying by -1 will reverse the number sign and keep 0 (not -0). https://stackoverflow.com/a/14053631/1177153
+ highcharts_timezoneoffset = moment_js_utc_offset * -1
+
+ # If theme locale is auto, get the system locale for use with moment.js, and the system decimal for use with highcharts
+ if self.generator.skin_dict['Extras']['belchertown_locale'] == "auto":
+ system_locale, locale_encoding = locale.getdefaultlocale()
+ else:
+ try:
+ # Try setting the locale. Locale needs to be in locale.encoding format. Example: "en_US.UTF-8", or "de_DE.UTF-8"
+ locale.setlocale(locale.LC_ALL, self.generator.skin_dict['Extras']['belchertown_locale'])
+ system_locale, locale_encoding = locale.getlocale()
+ except Exception as error:
+ # The system can't find the locale requested, so just set the variables anyways for JavaScript's use.
+ system_locale, locale_encoding = self.generator.skin_dict['Extras']['belchertown_locale'].split(".")
+ if belchertown_debug:
+ logerr( "Locale: Error using locale %s. This locale may not be installed on your system and you may see unexpected results. Belchertown skin JavaScript will try to use this locale. Full error: %s" % ( self.generator.skin_dict['Extras']['belchertown_locale'], error ) )
+
+ if system_locale is None:
+ # Unable to determine locale. Fallback to en_US
+ system_locale = "en_US"
+
+ if locale_encoding is None:
+ # Unable to determine locale_encoding. Fallback to UTF-8
+ locale_encoding = "UTF-8"
+
+ try:
+ system_locale_js = system_locale.replace("_", "-") # Python's locale is underscore. JS uses dashes.
+ except:
+ system_locale_js = "en-US" # Error finding locale, set to en-US
+
+ highcharts_decimal = self.generator.skin_dict['Extras'].get('highcharts_decimal', None)
+ # Change the Highcharts decimal to the locale if the option is missing or on auto mode, otherwise use whats defined in Extras
+ if highcharts_decimal is None or highcharts_decimal == "auto":
+ try:
+ highcharts_decimal = locale.localeconv()["decimal_point"]
+ except:
+ # Locale not found, default back to a period
+ highcharts_decimal = "."
+
+ highcharts_thousands = self.generator.skin_dict['Extras'].get('highcharts_thousands', None)
+ # Change the Highcharts thousands separator to the locale if the option is missing or on auto mode, otherwise use whats defined in Extras
+ if highcharts_thousands is None or highcharts_thousands == "auto":
+ try:
+ highcharts_thousands = locale.localeconv()["thousands_sep"]
+ except:
+ # Locale not found, default back to a comma
+ highcharts_thousands = ","
+
+ # Get the archive interval for the highcharts gapsize
+ try:
+ archive_interval_ms = int(self.generator.config_dict["StdArchive"]["archive_interval"]) * 1000
+ except KeyError:
+ archive_interval_ms = 300000 # 300*1000 for archive_interval emulated to millis
+
+ # Get the ordinal labels
+ ordinate_names = self.get_cardinal_direction("", True)
+
+ # Build the chart array for the HTML
+ # Outputs a dict of nested lists which allow you to have different charts for different timespans on the site in different order with different names.
+ # OrderedDict([('day', ['chart1', 'chart2', 'chart3', 'chart4']),
+ # ('week', ['chart1', 'chart5', 'chart6', 'chart2', 'chart3', 'chart4']),
+ # ('month', ['this_is_chart1', 'chart2_is_here', 'chart3', 'windSpeed_and_windDir', 'chart5', 'chart6', 'chart7']),
+ # ('year', ['chart1', 'chart2', 'chart3', 'chart4', 'chart5'])])
+ chart_config_path = os.path.join(
+ self.generator.config_dict['WEEWX_ROOT'],
+ self.generator.skin_dict['SKIN_ROOT'],
+ self.generator.skin_dict.get('skin', ''),
+ 'graphs.conf')
+ default_chart_config_path = os.path.join(
+ self.generator.config_dict['WEEWX_ROOT'],
+ self.generator.skin_dict['SKIN_ROOT'],
+ self.generator.skin_dict.get('skin', ''),
+ 'graphs.conf.example')
+ if os.path.exists( chart_config_path ):
+ chart_dict = configobj.ConfigObj(chart_config_path, file_error=True)
+ else:
+ chart_dict = configobj.ConfigObj(default_chart_config_path, file_error=True)
+ charts = OrderedDict()
+ for chart_timespan in chart_dict.sections:
+ timespan_chart_list = []
+ for plotname in chart_dict[chart_timespan].sections:
+ if plotname not in timespan_chart_list:
+ timespan_chart_list.append( plotname )
+ charts[chart_timespan] = timespan_chart_list
+
+ # Create a dict of chart group titles for use on the graphs page header. If no title defined, use the chart group name
+ graphpage_titles = OrderedDict()
+ for chartgroup in chart_dict.sections:
+ if "title" in chart_dict[chartgroup]:
+ graphpage_titles[chartgroup] = chart_dict[chartgroup]["title"]
+ else:
+ graphpage_titles[chartgroup] = chartgroup
+
+ # Create a dict of chart group page content for use on the graphs page below the header.
+ graphpage_content = OrderedDict()
+ for chartgroup in chart_dict.sections:
+ if "page_content" in chart_dict[chartgroup]:
+ graphpage_content[chartgroup] = chart_dict[chartgroup]["page_content"]
+
+ # Setup the Graphs page button row based on the skin extras option and the button_text from graphs.conf
+ graph_page_buttons = ""
+ graph_page_graphgroup_buttons = []
+ for chartgroup in chart_dict.sections:
+ if "show_button" in chart_dict[chartgroup] and chart_dict[chartgroup]["show_button"].lower() == "true":
+ graph_page_graphgroup_buttons.append(chartgroup)
+ for gg in graph_page_graphgroup_buttons:
+ if "button_text" in chart_dict[gg]:
+ button_text = chart_dict[gg]["button_text"]
+ else:
+ button_text = gg
+ graph_page_buttons += '
-
-
-
-
-
- $obs.label.home_page_header
-
- $obs.label.powered_by
-
-
-
-
-
- #if $social_html != ""
- $social_html
- #end if
-
-
- #if $Extras.has_key("forecast_alert_enabled") and $Extras.forecast_alert_enabled == '1'
-
-
-
-
-
-
-
- #end if
-
-
-
-
- #if os.path.exists("index_hook_after_station_info.inc")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #if $Extras.has_key("forecast_enabled") and $Extras.forecast_enabled == '1' and $current_obs_icon != ""
- 
- #end if
-
-
- #end if
-
-
- $current.outTemp.formatted$unit.label.outTemp
-
-
-
-
-
- $current_obs_summary
-
-
- #if $current.appTemp.has_data
-
- $obs.label.feels_like: $current.appTemp
- #end if
-
-
-
-
-
- | $obs.label.highest_temperature | -$obs.label.lowest_temperature | -
| $day.outTemp.max | -$day.outTemp.min | -
-
-
-
-
-
-
-
-
-
-
-
- #if $current.windDir.ordinal_compass == "N/A"
- --
- #else
- $current.windDir.ordinal_compass
- #end if
-
-
- #if $current.windDir.raw is None:
- -
- #else
- $current.windDir.format("%.0f")
- #end if
-
-
-
-
-
-
-
-
- | $obs.label.wind_speed | -$obs.label.wind_gust | -|
| - - $current.windSpeed.toString(addLabel=False, NONE_string="--") - - | -- - $current.windGust.toString(addLabel=False, NONE_string="--") - - | -|
| $unit.label.windSpeed | -||
-
-
-
-
-
-
- $station_obs_html
-
-
-
-
-
-
-
-
-
-
- |
-
- #if $obs.label.sun_and_moon and $obs.label.sun_and_moon != ''
-
-
- $obs.label.sun_and_moon
-
- #end if
-
-
- 
- - 
-
-
-
- #if $Extras.has_key("almanac_extras") and $Extras.almanac_extras == '1' and $almanac.hasExtras
-
-
-
-
- #end if
-
-
- #echo $almanac.moon_phase.title()#
-
- - $almanac.moon_fullness% $obs.label.moon_visible - |
-
- $radar_html
-
-
- #include "index_hook_after_station_info.inc"
-
-
- #end if
-
- #if $Extras.has_key("forecast_enabled") and $Extras.forecast_enabled == '1' and (($Extras.has_key("forecast_interval_hours") and $Extras.forecast_interval_hours != '0') or not ($Extras.has_key("forecast_interval_hours")))
-
-
-
-
-
-
- #end if
-
-
-
- #if os.path.exists("index_hook_after_forecast.inc")
-
-
- $obs.label.forecast_header
-
-
-
- #if $Extras.has_key("forecast_interval_hours") and $Extras.forecast_interval_hours != '0'
- #if $Extras.has_key("forecast_interval_hours") and $Extras.forecast_interval_hours == '1'
-
- #end if
-
- #end if
-
- #if $Extras.has_key("forecast_interval_hours") and $Extras.forecast_interval_hours == '3'
-
- #end if
-
-
- #if $Extras.has_key("forecast_interval_hours") and $Extras.forecast_interval_hours == '24'
-
- #end if
-
-
- #include "index_hook_after_forecast.inc"
-
-
- #end if
-
-
-
- #if $Extras.has_key('earthquake_enabled') and $Extras.earthquake_enabled == '1'
-
-
- #include "footer.html.tmpl"
diff --git a/skins/Belchertown/js/belchertown.js.tmpl b/skins/Belchertown/js/belchertown.js.tmpl
index de7dbcd5..2cce8301 100644
--- a/skins/Belchertown/js/belchertown.js.tmpl
+++ b/skins/Belchertown/js/belchertown.js.tmpl
@@ -1,4 +1,4 @@
-// mju version - Nov 2020
+// mju version Jan 2021
#encoding UTF-8
#import datetime
@@ -198,6 +198,190 @@ function get_outTemp_color( unit, outTemp, returnColor=false ) {
}
}
+// Change the color of the aqi variable according to US-EPA standards
+// (adjusted to match skin colors better)
+function get_aqi_color( aqi, returnColor=false ) {
+ if ( aqi >= 301 ) {
+ var aqi_color = "#cc241d";
+ } else if ( aqi >= 201 ) {
+ var aqi_color = "#b16286";
+ } else if ( aqi >= 151 ) {
+ var aqi_color = "rgba(255,69,69,1)";
+ } else if ( aqi >= 101 ) {
+ var aqi_color = "rgba(255,127,0,1)";
+ } else if ( aqi >= 51 ) {
+ var aqi_color = "rgba(255,174,0,0.9)";
+ } else if ( aqi < 51 ) {
+ var aqi_color = "#71bc3c";
+ }
+
+ // Return the color value if requested, otherwise just set the div color
+ if ( returnColor ) {
+ return aqi_color;
+ } else {
+ jQuery(".aqi_outer").css( "color", aqi_color );
+ }
+}
+
+function get_gauge_color( value, options ) {
+ if (options.color1) {
+ // Failsafe in case value drops below the lowest color position user has set.
+ // Otherwise color is undefined when the value is below color1_position
+ var color = options.color1
+ }
+ if (options.color2) {
+ if (value >= options.color2_position) {
+ var color = options.color2
+ }
+ }
+ if (options.color3) {
+ if (value >= options.color3_position) {
+ var color = options.color3
+ }
+ }
+ if (options.color4) {
+ if (value >= options.color4_position) {
+ var color = options.color4
+ }
+ }
+ if (options.color5) {
+ if (value >= options.color5_position) {
+ var color = options.color5
+ }
+ }
+ if (options.color6) {
+ if (value >= options.color6_position) {
+ var color = options.color6
+ }
+ }
+ if (options.color7) {
+ if (value >= options.color7_position){
+ var color = options.color7
+ }
+ }
+ return color
+}
+
+function get_gauge_label( value, options ) {
+ if (options.color1) {
+ if (options.color1_label) {
+ var label = options.color1_label
+ }
+ }
+ if (options.color2) {
+ if (value >= options.color2_position) {
+ var label = null
+ if (options.color2_label) {
+ var label = options.color2_label
+ }
+ }
+ }
+ if (options.color3) {
+ if (value >= options.color3_position) {
+ var label = null
+ if (options.color3_label) {
+ var label = options.color3_label
+ }
+ }
+ }
+ if (options.color4) {
+ if (value >= options.color4_position) {
+ var label = null
+ if (options.color4_label) {
+ var label = options.color4_label
+ }
+ }
+ }
+ if (options.color5) {
+ if (value >= options.color5_position) {
+ var label = null
+ if (options.color5_label) {
+ var label = options.color5_label
+ }
+ }
+ }
+ if (options.color6) {
+ if (value >= options.color6_position) {
+ var label = null
+ if (options.color6_label) {
+ var label = options.color6_label
+ }
+ }
+ }
+ if (options.color7) {
+ if (value >= options.color7_position){
+ var label = null
+ if (options.color7_label) {
+ var label = options.color7_label
+ }
+ }
+ }
+ return label
+}
+
+function kts_to_beaufort(windspeed) {
+ // Given windspeed in knots, converts to Beaufort scale
+ if (windspeed <= 1) {
+ return 0
+ } else if (windspeed <= 3) {
+ return 1
+ } else if (windspeed <=6) {
+ return 2
+ } else if (windspeed <=10) {
+ return 3
+ } else if (windspeed <=15) {
+ return 4
+ } else if (windspeed <=21) {
+ return 5
+ } else if (windspeed <=27) {
+ return 6
+ } else if (windspeed <=33) {
+ return 7
+ } else if (windspeed <=40) {
+ return 8
+ } else if (windspeed <=47) {
+ return 9
+ } else if (windspeed <=55) {
+ return 10
+ } else if (windspeed <=63) {
+ return 11
+ } else if (windspeed > 63) {
+ return 12
+ }
+}
+
+function beaufort_cat(beaufort) {
+ // Given Beaufort number, returns category description
+ switch (beaufort) {
+ case 0:
+ return "$beaufort0"
+ case 1:
+ return "$beaufort1"
+ case 2:
+ return "$beaufort2"
+ case 3:
+ return "$beaufort3"
+ case 4:
+ return "$beaufort4"
+ case 5:
+ return "$beaufort5"
+ case 6:
+ return "$beaufort6"
+ case 7:
+ return "$beaufort7"
+ case 8:
+ return "$beaufort8"
+ case 9:
+ return "$beaufort9"
+ case 10:
+ return "$beaufort10"
+ case 11:
+ return "$beaufort11"
+ case 12:
+ return "$beaufort12"
+ }
+}
+
function highcharts_tooltip_factory(obsvalue, point_obsType, highchartsReturn=false, rounding, mirrored=false, numberFormat) {
// Mirrored values have the negative sign removed
if ( mirrored ) {
@@ -333,31 +517,23 @@ function autoTheme(sunset_hour, sunset_min, sunrise_hour, sunrise_min) {
belchertown_debug("Auto theme: are we in daylight hours: " + dayTime);
belchertown_debug("Auto theme: sessionStorage.getItem('theme') = " + sessionStorage.getItem('theme'));
- if ( dayTime ) {
+ if ( dayTime == true ) {
// Day time, set light if needed
- if ( document.body.classList.contains("dark") ) {
- if ( sessionStorage.getItem('theme') == "auto" ) {
- belchertown_debug("Auto theme: setting light theme since dayTime variable is true (day)");
- } else {
- belchertown_debug("Auto theme: cannot set light theme since visitor used toggle to override theme. Refresh to reset the override.");
- }
- // Only change theme if user has not overridden the auto option with the toggle
- if ( sessionStorage.getItem('theme') == "auto" ) {
- changeTheme("light");
- }
+ // Only change theme if user has not overridden the auto option with the toggle
+ if ( sessionStorage.getItem('theme') == "auto" ) {
+ belchertown_debug("Auto theme: setting light theme since dayTime variable is true (day)");
+ changeTheme("light");
+ } else {
+ belchertown_debug("Auto theme: cannot set light theme since visitor used toggle to override theme. Refresh to reset the override.");
}
} else {
// Night time, set dark if needed
- if ( document.body.classList.contains("light") ) {
- if ( sessionStorage.getItem('theme') == "auto" ) {
- belchertown_debug("Auto theme: setting dark theme since dayTime variable is false (night)");
- } else {
- belchertown_debug("Auto theme: cannot set dark theme since visitor used toggle to override theme. Refresh to reset the override.");
- }
- // Only change theme if user has not overridden the auto option with the toggle
- if ( sessionStorage.getItem('theme') == "auto" ) {
- changeTheme("dark");
- }
+ // Only change theme if user has not overridden the auto option with the toggle
+ if ( sessionStorage.getItem('theme') == "auto" ) {
+ belchertown_debug("Auto theme: setting dark theme since dayTime variable is false (night)");
+ changeTheme("dark");
+ } else {
+ belchertown_debug("Auto theme: cannot set dark theme since visitor used toggle to override theme. Refresh to reset the override.");
}
}
}
@@ -375,6 +551,9 @@ function changeTheme(themeName, toggleOverride=false) {
}
if ( themeName == "dark" ) {
// Apply dark theme
+ #if $radar_html_dark != "None"
+ jQuery('.radar_image').html( '$radar_html_dark' );
+ #end if
jQuery('body').addClass("dark");
jQuery('body').removeClass("light");
#if $Extras.has_key('theme_toggle_enabled') and $Extras.theme_toggle_enabled == '1'
@@ -387,6 +566,9 @@ function changeTheme(themeName, toggleOverride=false) {
sessionStorage.setItem('currentTheme', 'dark');
} else if ( themeName == "light" ) {
// Apply light theme
+ #if $radar_html_dark != "None"
+ jQuery('.radar_image').html( '$radar_html' );
+ #end if
jQuery('body').addClass("light");
jQuery('body').removeClass("dark");
#if $Extras.has_key('theme_toggle_enabled') and $Extras.theme_toggle_enabled == '1'
@@ -625,6 +807,7 @@ function aeris_coded_alerts( data, full_observation = false ) {
"CF.A": "$obs.label.forecast_alert_code_CF_A",
"FG.Y": "$obs.label.forecast_alert_code_FG_Y",
"MF.Y": "$obs.label.forecast_alert_code_MF_Y",
+ "FO.Y": "$obs.label.forecast_alert_code_FO_Y",
"SM.Y": "$obs.label.forecast_alert_code_SM_Y",
"MS.Y": "$obs.label.forecast_alert_code_MS_Y",
"DS.W": "$obs.label.forecast_alert_code_DS_W",
@@ -894,7 +1077,7 @@ function aeris_icon( data ) {
"showers": "rain",
"showersn": "rain",
"showersw": "rain",
- "showersw": "rain",
+ "showerswn": "rain",
"sleet": "sleet",
"sleetn": "sleet",
"sleetsnow": "sleet",
@@ -1001,8 +1184,7 @@ function update_forecast_data( data ) {
forecast_provider = "$Extras.forecast_provider";
belchertown_debug("Forecast: Provider is " + forecast_provider);
belchertown_debug("Forecast: Updating data");
- belchertown_debug(data);
-
+ belchertown_debug(data);
if ( forecast_provider == "N/A" ) {
jQuery(".forecastrow").hide();
@@ -1032,7 +1214,7 @@ function update_forecast_data( data ) {
} catch(err) {
// Visibility not in the station observation table or any of the unit arrays, so silently exit
}
-
+
// start of new composite version of forecast code
var forecast_types = ["forecast_1hr","forecast_3hr","forecast_24hr"];
@@ -1077,7 +1259,13 @@ function update_forecast_data( data ) {
}
// Determine wind units
- if ( "$Extras.forecast_units" == "ca" ) {
+ if ( "$unit.unit_type.windSpeed" == "knot" ) {
+ windSpeed = data[(forecast_interval)][0]["response"][0]["periods"][i]["windSpeedKTS"];
+ windGust = data[(forecast_interval)][0]["response"][0]["periods"][i]["windGustKTS"];
+ } else if ( "$unit.unit_type.windSpeed" == "beaufort" ) {
+ windSpeed = kts_to_beaufort(data[(forecast_interval)][0]["response"][0]["periods"][i]["windSpeedKTS"]);
+ windGust = kts_to_beaufort(data[(forecast_interval)][0]["response"][0]["periods"][i]["windGustKTS"]);
+ } else if ( "$Extras.forecast_units" == "ca" ) {
// ca = kph
windSpeed = data[(forecast_interval)][0]["response"][0]["periods"][i]["windSpeedKPH"];
windGust = data[(forecast_interval)][0]["response"][0]["periods"][i]["windGustKPH"];
@@ -1102,7 +1290,7 @@ function update_forecast_data( data ) {
}
// ensure that precip is always defined
precip = 0;
- } else if ( data[(forecast_interval)][0]["response"][0]["periods"][i]["pop"] > 0 ) {
+ } else if ( data[(forecast_interval)][0]["response"][0]["periods"][i]["pop"] > 0 ) {
// Rain percent of precip
precip = data[(forecast_interval)][0]["response"][0]["periods"][i]["pop"];
} else {
@@ -1169,6 +1357,7 @@ function update_forecast_data( data ) {
output_html += '
- #else
-
-
-
- #if os.path.exists("index_hook_after_snapshot.inc")
-
-
- #end if
-
-
-
-
- #if $Extras.has_key('earthquake_enabled') and $Extras.earthquake_enabled == '1'
-
-
-
-
- $obs.label.weather_snapshots $obs.label.weather_snapshots_link
-
-
-
-
-
-
-
-
-
-
-
- | $obs.label.snapshot_high: | $day.outTemp.max | -$obs.label.snapshot_low: | $day.outTemp.min | -
| $obs.label.snapshot_today_avg_wind: | $day.wind.avg | -$obs.label.snapshot_today_high_wind: | $day.wind.max | -
| $obs.label.snapshot_today_rain: | $day.rain.sum | -$obs.label.snapshot_today_rainrate: | $day.rainRate.max | -
-
-
-
-
-
-
- | $obs.label.snapshot_high: | $month.outTemp.max | -$obs.label.snapshot_low: | $month.outTemp.min | -
| $obs.label.snapshot_month_avg_wind: | $month.wind.avg | -$obs.label.snapshot_month_high_wind: | $month.wind.max | -
| $obs.label.snapshot_month_rain: | $month.rain.sum | -$obs.label.snapshot_month_rainrate: | $month.rainRate.max | -
-
- #end if
- $obs.label.earthquake_title
-
-
- #if $earthquake_place != ''
-
- $earthquake_place -
- - $earthquake_place -
-
- #end if
-
- $obs.label.earthquake_magnitude $earthquake_magnitude
-
-
- $earthquake_distance_away $earthquake_distance_label $earthquake_bearing
-
-
- #include "index_hook_after_snapshot.inc"
-
-
- #end if
-
- #if $Extras.has_key('highcharts_enabled') and $Extras.highcharts_enabled == '1'
-
-
-
-
- #end if
-
-
-
- #if os.path.exists("index_hook_after_charts.inc")
-
-
- $graphpage_titles_dict[$Extras.highcharts_homepage_graphgroup] $obs.label.homepage_graphs_link
-
-
-
-
-
- #include "index_hook_after_charts.inc"
-
-
- #end if
-
-
-
-
- ';
if ( forecast_row[i]["snow_depth"] > 0 ) {
output_html += '
" + get_gauge_label( options.series[0].data[1]["y"], options.series[0] ) + '' + options.plotOptions.solidgauge.dataLabels.y = -25 + } else if ( unit_label_array[observation_type] == null ) { + options.plotOptions.solidgauge.dataLabels.format = "{y:.#f}" + } else { + options.plotOptions.solidgauge.dataLabels.format = "{y:.#f}
" + unit_label_array[observation_type] + '' + options.plotOptions.solidgauge.dataLabels.y = -25 + } + options.yAxis = { + min: 0, + max: 100, + lineColor: null, + tickPositions: [] + } + // Override default max and min if user has specified + if (options.series[0].yAxis_max) { + options.yAxis.max = options.series[0].yAxis_max; + } + if (options.series[0].yAxis_min) { + options.yAxis.min = options.series[0].yAxis_min; + } + options.tooltip.enabled = false + options.xAxis.crosshair = false + } + + // If AQI chart is present, configure a special chart + if (observation_type == "aqiChart") { + // Highcharts does not allow the guage background to have rounded ends. To get around + // this, define a "dummy" series that fills the gauge with the appropriate color. + // This way, the ends are rounded if the user specifies. + options.series[0].data = [{ + y: 500, + color: '#e6e6e6', + className: 'highcharts-pane', + zIndex: 0, + dataLabels: {enabled: false} + }, { + y: options.series[0].data[0]['y'], + color: get_aqi_color(options.series[0].data[0]['y'], true), + category: options.series[0].data[0]['category'] + }] + options.chart.type = "solidgauge" + options.pane = { + startAngle: -140, + endAngle: 140, + background: [{ + outerRadius: 0, + innerRadius: 0, + }] + } + options.plotOptions = { + solidgauge: { + dataLabels: { + useHTML: true, + enabled: true, + y: -30, + borderWidth: 0, + format: '{y}
' + options.series[0].data[1]['category'] + '', + style: { + fontWeight: 'bold', + lineHeight: '0.5em', + textAlign: 'center', + fontSize: '50px', + color: options.series[0].data[1].color, + textOutline: 'none' + } + }, + linecap: 'round', + rounded: true + } + } + options.yAxis = { + min: 0, + max: 500, + lineColor: null, + tickPositions: [] + } + options.tooltip.enabled = false + options.xAxis.crosshair = false + } + // If Hays chart is present, configure a special chart to show that data if (observation_type == "haysChart") { options.chart.type = "arearange" @@ -2165,20 +2503,16 @@ function showChart(json_file, prepend_renderTo=false) { } } }; - // Find min and max of the series data for the yAxis min and max var maximum_flattened = []; options.series[0].data.forEach( seriesData => { maximum_flattened.push(seriesData[2]); }); var range_max = Math.max(...maximum_flattened); - if (options.series[0].yAxis_softMax) { var range_max = options.series[0].yAxis_softMax; } - options.legend = { "enabled": false } - options.yAxis = { showFirstLabel: false, tickInterval: 2, @@ -2194,7 +2528,6 @@ function showChart(json_file, prepend_renderTo=false) { y: 0 }, } - options.tooltip = { split: false, shared: true, @@ -2209,7 +2542,6 @@ function showChart(json_file, prepend_renderTo=false) { }); } } - var currentSeries = options.series; var currentSeriesData = options.series[0].data; var range_unit = options.series[0].range_unit; @@ -2269,12 +2601,12 @@ function showChart(json_file, prepend_renderTo=false) { }, } - options.xAxis = {} options.xAxis = { - labels: { - format: "{value: %b}" + dateTimeLabelFormats: { + day: '%e %b', + week: '%e %b', + month: '%b %y', }, - tickInterval: 2592000000, // 30 days showLastLabel: true, crosshair: true, type: "datetime" diff --git a/skins/Belchertown/skin.README.txt b/skins/Belchertown/skin.README.txt deleted file mode 100644 index ab75f10f..00000000 --- a/skins/Belchertown/skin.README.txt +++ /dev/null @@ -1,91 +0,0 @@ -Testing Belchertown Reports -=========================== - -There are two reasons for using a testing arangement - -1 To test new versions of the Belchertown skin after updates have been made before release to Lordship Weather -2 Whilst developing a version of the Lordship Weather website. Can be used with care for any modifications. - - -Using and Switching Belchertown test skin On & Off -================================================== - -1 Check skin_blank exists in Belchertown/test folder -2 Check skin_test.conf exists in the Belchertown/test folder -3 Edits are made to skin.conf in BelchertownTest folder when it is set to skin_test.conf - -ON To turn the test report generation ON: - 1 copy skin_test.conf to skin.conf for editing and testing -OFF To turn the test report generation OFF: - 1 copy skin.conf to skin_test.conf, preserving the changes that have been made during testing - 2 copy skin_blank.conf to skin.conf, to ensure the blank is used - - -IMPORTANT NOTE -============== - -Watch for the generate tags. They have been commented out for testing but need to be replaced for live operation. -Probably the best way of moving test to live is to do a compare on the test and live .conf files -and then move the significant differences from test to live - -Also necessary to force the complete regeneration of all files because of the generate tags (daily, weekly, monthly etc) - - - - -Setup -===== - -Weewx - weewx.conf Changes -========================== - -A Belchertown test setup, containing .conf files etc is set up in /etc/weewx/skins/Belchertown/test -The weewx config file /etc/weex/weewx.conf is modified to contain a new stanza to produce reports in /var/weewx/reports/test - - [[BelchertownTest]] - skin = BelchertownTest - HTML_ROOT = /var/weewx/reports/test - belchertown_root_url = /var/weewx/reports/test - [[[Units]]] - [[[[Groups]]]] - group_altitude = meter - group_speed2 = mile_per_hour2 - group_pressure = mbar - group_rain = mm - group_rainrate = mm_per_hour - group_temperature = degree_C - group_degree_day = degree_C_day - group_speed = mile_per_hour - [[[[TimeFormats]]]] - current = %x %H:%M hrs - [[[Extras]]] - highcharts_homepage_graphgroup = homepage - site_title = Lordship Weather - footer_copyright_text = Lordship Weather - forecast_enabled = 1 - -BelchertownTest Changes -======================= - -The contents of /etc/weewx/skins/Belechertown are copied to etc/weewx/skins/BelchertownTest -A backup of skin.conf in /etc/weewx/BelchertownTest called skin_test.conf -A new skin.conf (skin_blank.conf) is produced in /etc/weewx/skins/BelchertownTest with no contents -This is then switched with skin_test.conf in the same folder to switch - -Using and Switching Belchertown test skin On & Off -================================================== - -1 Check skin_blank exists in Belchertown/test folder -2 Check skin_test.conf exists in the Belchertown/test folder -3 Edits are made to skin.conf in BelchertownTest folder when it is set to skin_test.conf - -ON To turn the test report generation ON: - 1 copy skin_test.conf to skin.conf for editing and testing -OFF To turn the test report generation OFF: - 1 copy skin.conf to skin_test.conf, preserving the changes that have been made during testing - 2 copy skin_blank.conf to skin.conf, to ensure the blank is used - - - - - diff --git a/skins/Belchertown/skin.conf b/skins/Belchertown/skin.conf index d297911f..24f7983c 100644 --- a/skins/Belchertown/skin.conf +++ b/skins/Belchertown/skin.conf @@ -2,7 +2,7 @@ # SKIN CONFIGURATION FILE # # Copyright (c) 2010 Tom Keffer #
# Updated for the Belchertown Skin by Pat O'Brien, 2019 #
-# Updated for Lordship Weather by Michael Underwood (# mju)- Aug/Nov 2020 #
+# Updated for Lordship Weather by Michael Underwood (# mju)- Jan 2021 #
###############################################################################
[Extras]
@@ -12,12 +12,12 @@
belchertown_locale = "auto"
theme = dark # mju - normally dark, but set to light for test site
theme_toggle_enabled = 1
- site_title = "Lordship Test Site" # mju - to distinguish test from live site
+ site_title = "Lordship Weather"
logo_image = ""
logo_image_dark = ""
#radar_html = ""
almanac_extras = 1
-
+ beaufort_category = 1
# mju - embedded windy.com inserted here to over-write the default, subsequently dropped in favour of meteo forecast
# mju - windy.com rain/thunder radar_windy = ''
@@ -76,24 +76,25 @@
# Forecast defaults
forecast_enabled = 1 # mju
forecast_provider = "aeris"
- forecast_api_id = ""
- forecast_api_secret = ""
+ forecast_api_id = "" # mju - transferred to weewx.conf
+ forecast_api_secret = "" # mju - transferred to weewx.conf
forecast_interval_hours = 1 # new values are 0,1,3 or 24
forecast_units = "uk2" # mju
forecast_lang = "en"
forecast_stale = 3540
forecast_aeris_use_metar = 1 # mju change to 0, after metar test mods carried out in belchertown.py (#393)
- forecast_alert_enabled = 1 # mju, now that aeris does european alerts
+ forecast_alert_enabled = 0 # mju, now that uk no longer appears to be part of eumetnet post brexit
forecast_alert_limit = 1
forecast_show_daily_forecast_link = 0
forecast_daily_forecast_link = ""
-
+ aqi_enabled = 1
+ aqi_location_enabled = 1
# Earthquake defaults
earthquake_enabled = 1
earthquake_maxradiuskm = 1000
earthquake_stale = 10740
earthquake_server = USGS
-
+ geonet_mmi = 4
# Social Share Button Defaults. Define the text below under Labels
facebook_enabled = 0
twitter_enabled = 0
@@ -233,6 +234,14 @@
forecast_last_updated = Last Updated on
forecast_interval_caption = Forecast Interval (hours):
+ # Air Quality Index label defaults
+ aqi_good = good
+ aqi_moderate = moderate
+ aqi_usg = unhealthy for some # Official wording: "unhealthy for sensitive groups"
+ aqi_unhealthy = unhealthy
+ aqi_very_unhealthy = very unhealthy
+ aqi_hazardous = hazardous
+
# Aeris Weather Forecast Codes. From https://www.aerisweather.com/support/docs/api/reference/weather-codes/
forecast_cloud_code_CL = "Clear"
forecast_cloud_code_FW = "Mostly Clear"
@@ -318,6 +327,7 @@
forecast_alert_code_CF_A = "Coastal Flood Watch"
forecast_alert_code_FG_Y = "Dense Fog Advisory"
forecast_alert_code_MF_Y = "Dense Fog Advisory"
+ forecast_alert_code_FO_Y = "Fog Advisory"
forecast_alert_code_SM_Y = "Dense Smoke Advisory"
forecast_alert_code_MS_Y = "Dense Smoke Advisory"
forecast_alert_code_DS_W = "Dust Storm Warning"
diff --git a/skins/Belchertown/skin.conf.mju b/skins/Belchertown/skin.conf.mju
index d297911f..24f7983c 100644
--- a/skins/Belchertown/skin.conf.mju
+++ b/skins/Belchertown/skin.conf.mju
@@ -2,7 +2,7 @@
# SKIN CONFIGURATION FILE #
# Copyright (c) 2010 Tom Keffer #
# Updated for the Belchertown Skin by Pat O'Brien, 2019 #
-# Updated for Lordship Weather by Michael Underwood (# mju)- Aug/Nov 2020 #
+# Updated for Lordship Weather by Michael Underwood (# mju)- Jan 2021 #
###############################################################################
[Extras]
@@ -12,12 +12,12 @@
belchertown_locale = "auto"
theme = dark # mju - normally dark, but set to light for test site
theme_toggle_enabled = 1
- site_title = "Lordship Test Site" # mju - to distinguish test from live site
+ site_title = "Lordship Weather"
logo_image = ""
logo_image_dark = ""
#radar_html = ""
almanac_extras = 1
-
+ beaufort_category = 1
# mju - embedded windy.com inserted here to over-write the default, subsequently dropped in favour of meteo forecast
# mju - windy.com rain/thunder radar_windy = ''
@@ -76,24 +76,25 @@
# Forecast defaults
forecast_enabled = 1 # mju
forecast_provider = "aeris"
- forecast_api_id = ""
- forecast_api_secret = ""
+ forecast_api_id = "" # mju - transferred to weewx.conf
+ forecast_api_secret = "" # mju - transferred to weewx.conf
forecast_interval_hours = 1 # new values are 0,1,3 or 24
forecast_units = "uk2" # mju
forecast_lang = "en"
forecast_stale = 3540
forecast_aeris_use_metar = 1 # mju change to 0, after metar test mods carried out in belchertown.py (#393)
- forecast_alert_enabled = 1 # mju, now that aeris does european alerts
+ forecast_alert_enabled = 0 # mju, now that uk no longer appears to be part of eumetnet post brexit
forecast_alert_limit = 1
forecast_show_daily_forecast_link = 0
forecast_daily_forecast_link = ""
-
+ aqi_enabled = 1
+ aqi_location_enabled = 1
# Earthquake defaults
earthquake_enabled = 1
earthquake_maxradiuskm = 1000
earthquake_stale = 10740
earthquake_server = USGS
-
+ geonet_mmi = 4
# Social Share Button Defaults. Define the text below under Labels
facebook_enabled = 0
twitter_enabled = 0
@@ -233,6 +234,14 @@
forecast_last_updated = Last Updated on
forecast_interval_caption = Forecast Interval (hours):
+ # Air Quality Index label defaults
+ aqi_good = good
+ aqi_moderate = moderate
+ aqi_usg = unhealthy for some # Official wording: "unhealthy for sensitive groups"
+ aqi_unhealthy = unhealthy
+ aqi_very_unhealthy = very unhealthy
+ aqi_hazardous = hazardous
+
# Aeris Weather Forecast Codes. From https://www.aerisweather.com/support/docs/api/reference/weather-codes/
forecast_cloud_code_CL = "Clear"
forecast_cloud_code_FW = "Mostly Clear"
@@ -318,6 +327,7 @@
forecast_alert_code_CF_A = "Coastal Flood Watch"
forecast_alert_code_FG_Y = "Dense Fog Advisory"
forecast_alert_code_MF_Y = "Dense Fog Advisory"
+ forecast_alert_code_FO_Y = "Fog Advisory"
forecast_alert_code_SM_Y = "Dense Smoke Advisory"
forecast_alert_code_MS_Y = "Dense Smoke Advisory"
forecast_alert_code_DS_W = "Dust Storm Warning"
diff --git a/skins/Belchertown/skin_blank.conf b/skins/Belchertown/skin_blank.conf
deleted file mode 100644
index a64aa7e7..00000000
--- a/skins/Belchertown/skin_blank.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-###############################################################################
-# SKIN CONFIGURATION FILE #
-# Copyright (c) 2010 Tom Keffer #
-# Updated for the Belchertown Skin by Pat O'Brien, 2019 #
-# Updated for Lordship Weather by Michael Underwood - June 2020 #
-# Converted into a blank skin to switch Belchertowntest on/off #
-# without having to change parameters in weewx.conf and restarting it #
-###############################################################################
-
diff --git a/skins/Belchertown/skin_test.conf b/skins/Belchertown/skin_test.conf
deleted file mode 100644
index a06a2da8..00000000
--- a/skins/Belchertown/skin_test.conf
+++ /dev/null
@@ -1,588 +0,0 @@
-###############################################################################
-# SKIN CONFIGURATION FILE #
-# Copyright (c) 2010 Tom Keffer #
-# Updated for the Belchertown Skin by Pat O'Brien, 2019 #
-# Updated for Lordship Weather by Michael Underwood (# mju)- August 2020 #
-###############################################################################
-
-[Extras]
-
- # General Site Defaults
- belchertown_debug = 0
- belchertown_locale = "auto"
- theme = light # mju - normally dark, but set to light for test site
- theme_toggle_enabled = 1
- site_title = "Lordship Test Site" # mju - to distinguish test from live site
- logo_image = ""
- logo_image_dark = ""
- #radar_html = ""
- almanac_extras = 1
-
- # mju - embedded windy.com inserted here to over-write the default, subsequently dropped in favour of meteo forecast
-
- # mju - windy.com rain/thunder radar_windy = ''
-
- # mju - meteoradar.co.uk - used so that rainfall radar forecast (verwacht) shows on Nexus tablet, actual = actueel
-
- radar_html = ''
-
- # Station Observations. Special observation rainWithRainRate combines Daily Rain with Rain Rate in 1 line
- station_observations = "barometer", "dewpoint", "outHumidity", "rainWithRainRate", "radiation", "UV", "inTemp"
-
- # Manifest Settings for Mobile Phones
- manifest_name = "Lordship Weather" # mju - was "My Weather Website"
- manifest_short_name = "LWX" # mju - was "MWW"
-
- # Highcharts settings
- highcharts_enabled = 1
- graph_page_show_all_button = 1
- graph_page_default_graphgroup = "day"
- highcharts_homepage_graphgroup = "homepage"
- highcharts_decimal = "auto"
- highcharts_thousands = "auto"
-
- # MQTT Websockets defaults
- mqtt_websockets_enabled = 0
- mqtt_websockets_host = ""
- mqtt_websockets_port = 1883
- mqtt_websockets_ssl = 0
- mqtt_websockets_topic = ""
- disconnect_live_website_visitor = 1800000
-
- # Show an alert if the page updated timestamp is older than expected with this setting. Does not apply to MQTT Websocket enabled websites
- # The late time threshold is defined in seconds. This should be greater than your archive_interval from weewx.conf.
- # Typically you would want this 2 or 3 times archive_interval
- show_last_updated_alert = 0
- last_updated_alert_threshold = 1800
-
- # If mqtt_websockets_enabled is set to 0, but want the page to full reload on an interval, specify this below in milliseconds. 300000 = 5 minutes
- webpage_autorefresh = 300000 # mju - was 0
-
- # Image Reload Section.
- # Set reload_hook_images to 1 to enable, then set the number of *seconds* for each section to reload.
- # A value of -1 will disable reloading images in that section.
- # radar = the radar image if you used radar_html setting
- # asi = index_hook_after_station_info.inc
- # af = index_hook_after_forecast.inc
- # as = index_hook_after_snapshot.inc
- # ac = index_hook_after_charts.inc
- reload_hook_images = 0
- reload_images_radar = 300
- reload_images_hook_asi = -1
- reload_images_hook_af = -1
- reload_images_hook_as = -1
- reload_images_hook_ac = -1
-
- # Forecast defaults
- forecast_enabled = 1 # mju
- forecast_3hr_enabled = 1 # new
- forecast_1hr_enabled = 1 # new
- forecast_provider = "aeris"
- forecast_api_id = "4GQJ42R3uZi9oTwsYT5rI" # mju
- forecast_api_secret = "PWoDWZg3VExO26Pfr39FwOtmsFtBy8E5kGRmUUXQ" # mju
- forecast_interval_hours = 3 # new values are 0,1,3 or 24; defaults to 24
- forecast_units = "uk2" # mju
- forecast_lang = "en"
- forecast_stale = 3540
- forecast_alert_enabled = 1 # mju, now that aeris does european alerts
- forecast_alert_limit = 1
- forecast_show_daily_forecast_link = 0
- forecast_daily_forecast_link = ""
-
- # Earthquake defaults
- earthquake_enabled = 1
- earthquake_maxradiuskm = 1000
- earthquake_stale = 10740
-
- # Social Share Button Defaults. Define the text below under Labels
- facebook_enabled = 0
- twitter_enabled = 0
- social_share_html = "http://yourwebsite"
-
- # Google Analytics
- #googleAnalyticsId = UA-12345678-1
-
- # This is the display of the Pi Kiosk which is in the /pi folder
- pi_kiosk_bold = "false"
- pi_theme = "auto"
-
-###############################################################################
-
-[Labels]
- # Labels used in this skin
-
- [[Generic]]
- # Generic labels, keyed by an observation type.
- # To change a label or translate it to your language
- # change the text after the equal sign.
-
- # Extra Observation labels
- appTemp = Apparent Temperature
- cloudbase = Cloud Base
- visibility = Visibility
- windrun = Wind Run
-
- # HTML Header Meta Tags and HTML Title. These labels have a default value
- # set inside of header.html.tmpl. Leave as "" to use the default value.
- html_title = ""
- html_description = ""
-
- # Footer Information
- footer_copyright_text = "Lordship Weather" # mju - was "My Weather Website"
- footer_disclaimer_text = "Use data from this website at your own risk"
-
- # Twitter Social Share
- twitter_text = "Check out my website: My Weather Website Weather Conditions"
- twitter_owner = "YourTwitterUsernameHere"
- twitter_hashtags = "weewx #weather"
-
- # Station Observation Table
- rainWithRainRate = Rain
-
- # Navigation Menu
- nav_home = Home
- nav_graphs = Graphs
- nav_records = Records
- nav_reports = Reports
- nav_about = About
-
- # Default page headers
- home_page_header = "Letchworth South-East Weather Conditions" # mju - was "My Station
- graphs_page_header = "Weather Observation Graphs"
- records_page_header = "Weather Observation Records"
- reports_page_header = "Weather Observation Reports"
- about_page_header = "About This Weather Station"
- powered_by = "Data from an Aercus WeatherSleuth" # mju
-
- # Earthquake translations
- earthquake_no_data = No recent earthquake data available!
-
- # Home Page Text and Titles
- second = "second", "seconds"
- minute = "minute", "minutes"
- hour = "hour", "hours"
- sun = Sun
- moon = Moon
- sun_and_moon = Sun & Moon
- moon_visible = visible
- wind_speed = Speed
- wind_gust = Gust
- wind_today_max = Today Max
- feels_like = Feels like
- highest_temperature = High
- lowest_temperature = Low
- average_temperature = Average
- header_last_updated_alert = Notice: This page hasn't been updated recently and may contain stale data!
- header_last_updated = Last Updated
- mqtt_websockets_connecting = Connecting to weather station real time data.
- mqtt_websockets_waiting = Connected. Waiting for data.
- mqtt_websockets_connected = Connected to weather station live. Data received
- mqtt_websockets_stopped = Live updates have stopped.
- mqtt_websockets_continue = Continue live updates
- mqtt_websockets_failed = Failed connecting to the weather station. Please try again later!
- mqtt_websockets_lost = Lost connection to the weather station. Please try again later!
- weather_snapshots = Weather Record Snapshots.
- weather_snapshots_link = View all weather records here.
- snapshot_high = High
- snapshot_low = Low
- snapshot_today_avg_wind = Average Wind
- snapshot_today_high_wind = Highest Wind
- snapshot_today_high_uv = Highest UV
- snapshot_today_rain = Today's Rain
- snapshot_today_rainrate = Highest Rate
- snapshot_month_avg_wind = Average Wind
- snapshot_month_high_wind = Highest Wind
- snapshot_month_high_uv = Highest UV
- snapshot_month_rain = Total Rain
- snapshot_month_rainrate = Highest Rate
- earthquake_title = Recent Local Earthquake
- earthquake_magnitude = Magnitude
- homepage_graphs_link = View more here.
- copyright = Copyright
-
- # Almanac Popup
- close = Close
- almanac_more_details = More Almanac Information
- almanac_modal_title = Almanac Information
- sun_always_down = Always down
- sun_always_up = Always up
- more_than_yesterday = more than yesterday
- less_than_yesterday = less than yesterday
- start_civil_twilight = Start civil twilight
- rise = Rise
- transit = Transit
- set = Set
- end_civil_twilight = End Civil Twilight
- azimuth = Azimuth
- altitude = Altitude
- right_ascension = Right ascension
- declination = Declination
- equinox = Equinox
- solstice = Solstice
- total_daylight = Total daylight
- full_moon = Full moon
- new_moon = New moon
- phase = Phase
- full = full
- install_pyephem = Install pyephem for detailed celestial timings.
-
- # General Forecast translations
- forecast_header = Daily Forecast #(Powered by AerisWeather) # mju to meet aeris t&c
- forecast_1hr_header = Hourly Forecast #(Openweather) # new for openweather
- forecast_3hr_header = 3-hourly Forecast #(Powered by AerisWeather) # mju to meet aeris t&c
- daily_forecast = Daily Forecast (Powered by AerisWeather) # mju to meet aeris t&c; not used
- alert_in_effect = in effect until
- forecast_last_updated = Last Updated on
-
- # Aeris Weather Forecast Codes. From https://www.aerisweather.com/support/docs/api/reference/weather-codes/
- forecast_cloud_code_CL = "Clear"
- forecast_cloud_code_FW = "Mostly Clear"
- forecast_cloud_code_SC = "Partly Cloudy"
- forecast_cloud_code_BK = "Mostly Cloudy"
- forecast_cloud_code_OV = "Cloudy"
-
- forecast_coverage_code_AR = "Areas of"
- forecast_coverage_code_BR = "Brief"
- forecast_coverage_code_C = "Chance of"
- forecast_coverage_code_D = "Definite"
- forecast_coverage_code_FQ = "Frequent"
- forecast_coverage_code_IN = "Intermittent"
- forecast_coverage_code_IS = "Isolated"
- forecast_coverage_code_L = "Likely"
- forecast_coverage_code_NM = "Numerous"
- forecast_coverage_code_O = "Occasional"
- forecast_coverage_code_PA = "Patchy"
- forecast_coverage_code_PD = "Periods of"
- forecast_coverage_code_S = "Slight Chance of"
- forecast_coverage_code_SC = "Scattered"
- forecast_coverage_code_VC = "In the Vicinity"
- forecast_coverage_code_WD = "Widespread"
-
- forecast_intensity_code_VL = "Very Light"
- forecast_intensity_code_L = "Light"
- forecast_intensity_code_H = "Heavy"
- forecast_intensity_code_VH = "Very Heavy"
-
- forecast_weather_code_A = "Hail"
- forecast_weather_code_BD = "Blowing Dust"
- forecast_weather_code_BN = "Blowing Sand"
- forecast_weather_code_BR = "Mist"
- forecast_weather_code_BS = "Blowing Snow"
- forecast_weather_code_BY = "Blowing Spray"
- forecast_weather_code_F = "Fog"
- forecast_weather_code_FR = "Frost"
- forecast_weather_code_H = "Haze"
- forecast_weather_code_IC = "Ice Crystals"
- forecast_weather_code_IF = "Ice Fog"
- forecast_weather_code_IP = "Sleet"
- forecast_weather_code_K = "Smoke"
- forecast_weather_code_L = "Drizzle"
- forecast_weather_code_R = "Rain"
- forecast_weather_code_RW = "Rain Showers"
- forecast_weather_code_RS = "Rain/Snow Mix"
- forecast_weather_code_SI = "Snow/Sleet Mix"
- forecast_weather_code_WM = "Wintry Mix"
- forecast_weather_code_S = "Snow"
- forecast_weather_code_SW = "Snow Showers"
- forecast_weather_code_T = "Thunderstorms"
- forecast_weather_code_UP = "Unknown Precipitation"
- forecast_weather_code_VA = "Volcanic Ash"
- forecast_weather_code_WP = "Waterspouts"
- forecast_weather_code_ZF = "Freezing Fog"
- forecast_weather_code_ZL = "Freezing Drizzle"
- forecast_weather_code_ZR = "Freezing Rain"
- forecast_weather_code_ZY = "Freezing Spray"
-
- # DarkSky Specific Codes
- forecast_weather_code_W = "Windy"
- forecast_weather_code_TO = "Tornado"
-
- # Graphs Page Text and Titles
- graphs_page_all_button = All
- graphs_windrose_frequency = Frequency
- graphs_windDir_ordinals = '{ 0: "N", 90: "E", 180: "S", 270: "W", 360: "N" }'
-
- # Records Page Text and Titles
- records_ending = ending
- records_days_text = days
- records_all_time = All Time
- records_temperature_records = Temperature Records
- records_high_temp = Highest Temperature
- records_low_temp = Lowest Temperature
- records_high_apptemp = Highest Apparent Temperature
- records_low_apptemp = Lowest Apparent Temperature
- records_high_heatindex = Highest Heat Index
- records_low_windchill = Lowest Wind Chill
- records_largest_temp_range = Largest Daily Temperature Range
- records_smallest_temp_range = Smallest Daily Temperature Range
- records_wind_records = Wind Records
- records_strongest_wind = Strongest Wind Gust
- records_daily_windrun = Highest Daily Wind Run
- records_rain_records = Rain Records
- records_highest_daily_rainfall = Highest Daily Rainfall
- records_highest_daily_rainrate = Highest Daily Rain Rate
- records_month_high_rainfall = Month with Highest Total Rainfall
- records_total_rainfall = Total Rainfall for
- records_consec_days_with_rain = Consecutive Days With Rain
- records_consec_days_without_rain = Consecutive Days Without Rain
- records_humidity_records = Humidity Records
- records_high_humidity = Highest Humidity
- records_lowest_humidity = Lowest Humidity
- records_highest_dewpoint = Highest Dewpoint
- records_lowest_dewpoint = Lowest Dewpoint
- records_barometer_records = Barometer Records
- records_high_barometer = Highest Barometer
- records_low_barometer = Lowest Barometer
- records_sun_records = Sun Records
- records_high_solar_rad = Highest Solar Radiation
- records_high_uv = Highest UV
- records_inTemp_records = Inside Temp Records
- records_high_inTemp = Highest inside Temp
- records_low_inTemp = Lowest inside Temp
-
- # NOAA Reports Page Text and Titles
- reports_title = NOAA Reports
- reports_click_here_link = Click here
- reports_view_more = to view this report directly or click on a month or year to change the NOAA report.
-
- # Pi Page Text and Titles
- mqtt_websockets_waiting_pi = Connecting.
- mqtt_websockets_connected_pi = Connected. Received
-
- # moment.js default labels formats
- time_earthquake = "LLL"
- time_last_updated = "LL, LTS"
- time_snapshot_records_today_header = "dddd, LL"
- time_snapshot_records_month_header = "MMMM YYYY"
- time_sunrise = "LT"
- time_sunset = "LT"
- time_forecast_alert_expires = "LLL"
- time_forecast_date = "ddd D MMM" # mju - has to be set explicitly as default is US format
- time_forecast_time = "ddd HH:mm" # mju - has to be set explicitly as default is US format
- time_forecast_last_updated = "LLL"
- time_records_page_full_date = "LLL"
- time_records_page_month_day_year = "LL"
- time_records_page_rainfall_range_begin = "MMMM DD"
- time_records_page_rainfall_range_end = "LL"
-
-
-
-###############################################################################
-
-[Almanac]
- # The labels to be used for the phases of the moon:
- moon_phases = New Moon, Waxing Crescent, First Quarter, Waxing Gibbous, Full Moon, Waning Gibbous, Last Quarter, Waning Crescent
-
-###############################################################################
-
-[Units]
- # This section is for managing the selection and formatting of units.
-
- [[Groups]]
- # For each group of measurements, this section sets what units to
- # use for it.
- # NB: The unit is always in the singular. I.e., 'mile_per_hour',
- # NOT 'miles_per_hour'
-
- group_altitude = foot # Options are 'foot' or 'meter'
- group_degree_day = degree_F_day # Options are 'degree_F_day' or 'degree_C_day'
- group_direction = degree_compass
- group_distance = mile # Options are 'mile' or 'km'
- group_moisture = centibar
- group_percent = percent
- group_pressure = inHg # Options are 'inHg', 'mmHg', 'mbar', or 'hPa'
- group_radiation = watt_per_meter_squared
- group_rain = inch # Options are 'inch', 'cm', or 'mm'
- group_rainrate = inch_per_hour # Options are 'inch_per_hour', 'cm_per_hour', or 'mm_per_hour'
- group_speed = mile_per_hour # Options are 'mile_per_hour', 'km_per_hour', 'knot', or 'meter_per_second'
- group_speed2 = mile_per_hour2 # Options are 'mile_per_hour2', 'km_per_hour2', 'knot2', or 'meter_per_second2'
- group_temperature = degree_F # Options are 'degree_F' or 'degree_C'
- group_uv = uv_index
- group_volt = volt
-
- # The following are used internally and should not be changed:
- group_count = count
- group_interval = minute
- group_time = unix_epoch
- group_elapsed = second
-
- [[StringFormats]]
- # This section sets the string formatting for each type of unit.
-
- centibar = %.0f
- cm = %.2f
- cm_per_hour = %.2f
- degree_C = %.1f
- degree_F = %.1f
- degree_compass = %.0f
- foot = %.0f
- hPa = %.1f
- hour = %.1f
- inHg = %.3f
- inch = %.2f
- inch_per_hour = %.2f
- km = %.2f
- km_per_hour = %.0f
- km_per_hour2 = %.1f
- knot = %.0f
- knot2 = %.1f
- mbar = %.1f
- meter = %.0f
- meter_per_second = %.1f
- meter_per_second2 = %.1f
- mile = %.2f
- mile_per_hour = %.0f
- mile_per_hour2 = %.1f
- mm = %.1f
- mmHg = %.1f
- mm_per_hour = %.1f
- percent = %.0f
- second = %.0f
- uv_index = %.1f
- volt = %.1f
- watt_per_meter_squared = %.0f
- NONE = "N/A"
-
- [[Labels]]
- # This section sets a label to be used for each type of unit.
-
- centibar = " cb"
- cm = " cm"
- cm_per_hour = " cm/hr"
- degree_C = " °C"
- degree_F = " °F"
- degree_compass = °
- foot = " feet"
- hPa = " hPa"
- inHg = " inHg"
- inch = " in"
- inch_per_hour = " in/hr"
- km = " km"
- km_per_hour = " km/h"
- km_per_hour2 = " km/h"
- knot = " knots"
- knot2 = " knots"
- mbar = " mbar"
- meter = " meters"
- meter_per_second = " m/s"
- meter_per_second2 = " m/s"
- mile = " miles"
- mile_per_hour = " mph"
- mile_per_hour2 = " mph"
- mm = " mm"
- mmHg = " mmHg"
- mm_per_hour = " mm/hr"
- percent = %
- volt = " V"
- watt_per_meter_squared = " W/m²"
- day = " day", " days"
- hour = " hour", " hours"
- minute = " minute", " minutes"
- second = " second", " seconds"
- NONE = ""
-
- [[TimeFormats]]
- # This section sets the string format to be used for each time scale.
- # The values below will work in every locale, but may not look
- # particularly attractive. See the Customization Guide for alternatives.
-
- day = %X
- week = %X (%A)
- month = %x %X
- year = %x %X
- rainyear = %x %X
- current = %x %X
- ephem_day = %X
- ephem_year = %x %X
-
- [[Ordinates]]
- # The ordinal directions. The last one should be for no wind direction
- directions = N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW, N/A
-
- [[DegreeDays]]
- # This section sets the base temperatures used for the calculation
- # of heating and cooling degree-days.
-
- # Base temperature for heating days, with unit:
- heating_base = 65, degree_F
- # Base temperature for cooling days, with unit:
- cooling_base = 65, degree_F
-
- [[Trend]]
- time_delta = 10800 # 3 hours
- time_grace = 300 # 5 minutes
-
-###############################################################################
-
-[CheetahGenerator]
- # This section is used by the generator CheetahGenerator, and specifies
- # which files are to be generated from which template.
-
- search_list_extensions = user.belchertown.getData
-
- # Possible encodings are 'html_entities', 'utf8', or 'strict_ascii'
- encoding = html_entities
-
- [[SummaryByMonth]]
- # Reports that summarize "by month"
- [[[NOAA_month]]]
- encoding = strict_ascii
- template = NOAA/NOAA-YYYY-MM.txt.tmpl
-
- [[SummaryByYear]]
- # Reports that summarize "by year"
- [[[NOAA_year]]]
- encoding = strict_ascii
- template = NOAA/NOAA-YYYY.txt.tmpl
-
- [[ToDate]]
- # Reports that show statistics "to date", such as day-to-date,
- # week-to-date, month-to-date, etc.
- [[[weewx_data]]]
- template = json/weewx_data.json.tmpl
-
- [[Belchertown]]
- template = js/belchertown.js.tmpl
-
- [[[home]]]
- template = index.html.tmpl
-
- [[[about]]]
- template = about/index.html.tmpl
-
- [[[graphs]]]
- template = graphs/index.html.tmpl
-
- [[[records]]]
- template = records/index.html.tmpl
-
- [[[reports]]]
- template = reports/index.html.tmpl
-
- [[[pi]]]
- template = pi/index.html.tmpl
-
- [[[manifest]]]
- encoding = utf8
- template = manifest.json.tmpl
-
-###############################################################################
-
-[CopyGenerator]
-
- # This section is used by the generator CopyGenerator
-
- # List of files to be copied only the first time the generator runs
- copy_once = favicon.ico, images/*, json/index.html, js/index.html, js/responsive-menu.js, robots.txt
-
- # List of files to be copied each time the generator runs
- copy_always = *.css
-
-
-###############################################################################
-
-#
-# The list of generators that are to be run:
-#
-[Generators]
- generator_list = weewx.cheetahgenerator.CheetahGenerator, weewx.reportengine.CopyGenerator, user.belchertown.HighchartsJsonGenerator
diff --git a/skins/Belchertown/style.css b/skins/Belchertown/style.css
index 9e463872..4901bc01 100644
--- a/skins/Belchertown/style.css
+++ b/skins/Belchertown/style.css
@@ -1,4 +1,4 @@
-/* mju version - Nov 2020 */
+/* mju version - Jan 2021 */
/*
CSS file for Belchertown weather website.
This website was originally created in WordPress on Genesis WP.
@@ -1464,6 +1464,16 @@ p.entry-meta {
font-size:20px;
}
+.aqi_outer {
+ text-align:center;
+ font-size:20px;
+}
+
+.aqi_location_outer {
+ text-align:center;
+ font-size:14px;
+}
+
#wxicon {
display: block;
margin: 0 auto;
@@ -1641,8 +1651,12 @@ p.entry-meta {
}
.mph {
- padding-top:10px !important;
- font-size:18px !important;
+ padding-top: 5px !important;
+ font-size: 15px !important;
+}
+
+.beaufort {
+ padding-top: 10px !important;
}
.wx-pressure-trend {
diff --git a/skins/Belchertown/style.css.mju b/skins/Belchertown/style.css.mju
index 9e463872..4901bc01 100644
--- a/skins/Belchertown/style.css.mju
+++ b/skins/Belchertown/style.css.mju
@@ -1,4 +1,4 @@
-/* mju version - Nov 2020 */
+/* mju version - Jan 2021 */
/*
CSS file for Belchertown weather website.
This website was originally created in WordPress on Genesis WP.
@@ -1464,6 +1464,16 @@ p.entry-meta {
font-size:20px;
}
+.aqi_outer {
+ text-align:center;
+ font-size:20px;
+}
+
+.aqi_location_outer {
+ text-align:center;
+ font-size:14px;
+}
+
#wxicon {
display: block;
margin: 0 auto;
@@ -1641,8 +1651,12 @@ p.entry-meta {
}
.mph {
- padding-top:10px !important;
- font-size:18px !important;
+ padding-top: 5px !important;
+ font-size: 15px !important;
+}
+
+.beaufort {
+ padding-top: 10px !important;
}
.wx-pressure-trend {
';
+ // output_html += '+'/images/snowflake-icon-15px.png)
';
output_html += ' '+ parseFloat( forecast_row[i]["snow_depth"] ).toFixed(0) +' ' + forecast_row[i]["snow_unit"];
output_html += '
';
} else if ( forecast_row[i]["precip"] > 0 ) {
@@ -1598,6 +1787,16 @@ function update_current_wx(data) {
if ( data.hasOwnProperty("windSpeed_mps") ) {
jQuery(".curwindspeed").html( parseFloat(parseFloat(data["windSpeed_mps"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windSpeed"], maximumFractionDigits: unit_rounding_array["windSpeed"]}) );
}
+ // Windspeed Beaufort
+ if ( data.hasOwnProperty("windSpeed_beaufort") ) {
+ jQuery(".curwindspeed").html( parseFloat(parseFloat(data["windSpeed_beaufort"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windSpeed"], maximumFractionDigits: unit_rounding_array["windSpeed"]}) );
+ }
+ // Windspeed knots
+ if ( data.hasOwnProperty("windSpeed_knot") ) {
+ jQuery(".curwindspeed").html( parseFloat(parseFloat(data["windSpeed_knot"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windSpeed"], maximumFractionDigits: unit_rounding_array["windSpeed"]}) );
+ }
+
+ jQuery(".beaufort").html( beaufort_cat( parseFloat(data["beaufort_count"])) );
// Wind Gust US
// May not be provided in mqtt, but just in case.
@@ -1612,6 +1811,14 @@ function update_current_wx(data) {
if ( data.hasOwnProperty("windGust_mps") ) {
jQuery(".curwindgust").html( parseFloat(parseFloat(data["windGust_mps"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windGust"], maximumFractionDigits: unit_rounding_array["windGust"]}) );
}
+ // Wind Gust Beaufort
+ if ( data.hasOwnProperty("windGust_beaufort") ) {
+ jQuery(".curwindspeed").html( parseFloat(parseFloat(data["windGust_beaufort"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windSpeed"], maximumFractionDigits: unit_rounding_array["windSpeed"]}) );
+ }
+ // Windspeed knots
+ if ( data.hasOwnProperty("windGust_knot") ) {
+ jQuery(".curwindspeed").html( parseFloat(parseFloat(data["windGust_knot"])).toLocaleString("$system_locale_js", {minimumFractionDigits: unit_rounding_array["windSpeed"], maximumFractionDigits: unit_rounding_array["windSpeed"]}) );
+ }
// Windchill US
if ( data.hasOwnProperty("windchill") ) {
@@ -1631,6 +1838,10 @@ Highcharts.setOptions({
timezoneOffset: $highcharts_timezoneoffset
},
lang: {
+ months: moment.months(),
+ shortMonths: moment.monthsShort(),
+ weekdays: moment.weekdays(),
+ shortWeekdays: moment.weekdaysShort(),
decimalPoint: "$highcharts_decimal",
thousandsSep: "$highcharts_thousands"
}
@@ -2048,10 +2259,6 @@ function showChart(json_file, prepend_renderTo=false) {
// Barometer chart plots get a higher precision yAxis tick
if (s.obsType == "barometer") {
- if ( typeof s.yAxis_tickInterval === "undefined" ) {
- // If no tick interval override, set 0.01 as default tick interval to satisfy an old request for this level of precision.
- options.yAxis[this_yAxis].tickInterval = 0.01;
- }
// Define yAxis label float format if rounding is defined. Default to 2 decimals if nothing defined
if ( typeof s.rounding !== "undefined" ) {
options.yAxis[this_yAxis].labels = { format: '{value:.'+s.rounding+'f}' }
@@ -2152,7 +2359,138 @@ function showChart(json_file, prepend_renderTo=false) {
options.series.push(ns);
});
}
-
+
+ // Configure gauge chart formatting
+ if (options.chart.type == "gauge") {
+ // Highcharts does not allow the guage background to have rounded ends. To get around
+ // this, define a "dummy" series that fills the gauge with the appropriate color.
+ // This way, the ends are rounded if the user specifies.
+ //
+ // Gauge chart works best with only one data point, so the most recent (last) data point
+ // is used
+ options.series[0].data = [{
+ y: 9999999,
+ color: '#e6e6e6',
+ className: 'highcharts-pane',
+ zIndex: 0,
+ dataLabels: {enabled: false}
+ }, {
+ y: options.series[0].data.pop()[1],
+ color: options.series[0].color,
+ }]
+ options.chart.type = "solidgauge"
+ options.pane = {
+ startAngle: -140,
+ endAngle: 140,
+ background: [{
+ outerRadius: 0,
+ innerRadius: 0,
+ }]
+ }
+ // If user has set colors_enabled, change the color according to the value
+ if (options.series[0].colors_enabled) {
+ options.series[0].data[1].color = get_gauge_color(options.series[0].data[1]["y"], options.series[0])
+ }
+ options.plotOptions = {
+ solidgauge: {
+ dataLabels: {
+ useHTML: true,
+ enabled: true,
+ borderWidth: 0,
+ style: {
+ fontWeight: 'bold',
+ lineHeight: '0.5em',
+ textAlign: 'center',
+ fontSize: '50px',
+ // Match color if set by user
+ color: options.series[0].data[1].color,
+ textOutline: 'none'
+ }
+ },
+ }
+ }
+ if ( get_gauge_label( options.series[0].data[1]["y"], options.series[0] ) ) {
+ options.plotOptions.solidgauge.dataLabels.format = "{y:.#f} ';
output_html += ' '+ parseFloat( forecast_row[i]["snow_depth"] ).toFixed(0) +' ' + forecast_row[i]["snow_unit"];
output_html += '" + get_gauge_label( options.series[0].data[1]["y"], options.series[0] ) + '' + options.plotOptions.solidgauge.dataLabels.y = -25 + } else if ( unit_label_array[observation_type] == null ) { + options.plotOptions.solidgauge.dataLabels.format = "{y:.#f}" + } else { + options.plotOptions.solidgauge.dataLabels.format = "{y:.#f}
" + unit_label_array[observation_type] + '' + options.plotOptions.solidgauge.dataLabels.y = -25 + } + options.yAxis = { + min: 0, + max: 100, + lineColor: null, + tickPositions: [] + } + // Override default max and min if user has specified + if (options.series[0].yAxis_max) { + options.yAxis.max = options.series[0].yAxis_max; + } + if (options.series[0].yAxis_min) { + options.yAxis.min = options.series[0].yAxis_min; + } + options.tooltip.enabled = false + options.xAxis.crosshair = false + } + + // If AQI chart is present, configure a special chart + if (observation_type == "aqiChart") { + // Highcharts does not allow the guage background to have rounded ends. To get around + // this, define a "dummy" series that fills the gauge with the appropriate color. + // This way, the ends are rounded if the user specifies. + options.series[0].data = [{ + y: 500, + color: '#e6e6e6', + className: 'highcharts-pane', + zIndex: 0, + dataLabels: {enabled: false} + }, { + y: options.series[0].data[0]['y'], + color: get_aqi_color(options.series[0].data[0]['y'], true), + category: options.series[0].data[0]['category'] + }] + options.chart.type = "solidgauge" + options.pane = { + startAngle: -140, + endAngle: 140, + background: [{ + outerRadius: 0, + innerRadius: 0, + }] + } + options.plotOptions = { + solidgauge: { + dataLabels: { + useHTML: true, + enabled: true, + y: -30, + borderWidth: 0, + format: '{y}
' + options.series[0].data[1]['category'] + '', + style: { + fontWeight: 'bold', + lineHeight: '0.5em', + textAlign: 'center', + fontSize: '50px', + color: options.series[0].data[1].color, + textOutline: 'none' + } + }, + linecap: 'round', + rounded: true + } + } + options.yAxis = { + min: 0, + max: 500, + lineColor: null, + tickPositions: [] + } + options.tooltip.enabled = false + options.xAxis.crosshair = false + } + // If Hays chart is present, configure a special chart to show that data if (observation_type == "haysChart") { options.chart.type = "arearange" @@ -2165,20 +2503,16 @@ function showChart(json_file, prepend_renderTo=false) { } } }; - // Find min and max of the series data for the yAxis min and max var maximum_flattened = []; options.series[0].data.forEach( seriesData => { maximum_flattened.push(seriesData[2]); }); var range_max = Math.max(...maximum_flattened); - if (options.series[0].yAxis_softMax) { var range_max = options.series[0].yAxis_softMax; } - options.legend = { "enabled": false } - options.yAxis = { showFirstLabel: false, tickInterval: 2, @@ -2194,7 +2528,6 @@ function showChart(json_file, prepend_renderTo=false) { y: 0 }, } - options.tooltip = { split: false, shared: true, @@ -2209,7 +2542,6 @@ function showChart(json_file, prepend_renderTo=false) { }); } } - var currentSeries = options.series; var currentSeriesData = options.series[0].data; var range_unit = options.series[0].range_unit; @@ -2269,12 +2601,12 @@ function showChart(json_file, prepend_renderTo=false) { }, } - options.xAxis = {} options.xAxis = { - labels: { - format: "{value: %b}" + dateTimeLabelFormats: { + day: '%e %b', + week: '%e %b', + month: '%b %y', }, - tickInterval: 2592000000, // 30 days showLastLabel: true, crosshair: true, type: "datetime" diff --git a/skins/Belchertown/skin.README.txt b/skins/Belchertown/skin.README.txt deleted file mode 100644 index ab75f10f..00000000 --- a/skins/Belchertown/skin.README.txt +++ /dev/null @@ -1,91 +0,0 @@ -Testing Belchertown Reports -=========================== - -There are two reasons for using a testing arangement - -1 To test new versions of the Belchertown skin after updates have been made before release to Lordship Weather -2 Whilst developing a version of the Lordship Weather website. Can be used with care for any modifications. - - -Using and Switching Belchertown test skin On & Off -================================================== - -1 Check skin_blank exists in Belchertown/test folder -2 Check skin_test.conf exists in the Belchertown/test folder -3 Edits are made to skin.conf in BelchertownTest folder when it is set to skin_test.conf - -ON To turn the test report generation ON: - 1 copy skin_test.conf to skin.conf for editing and testing -OFF To turn the test report generation OFF: - 1 copy skin.conf to skin_test.conf, preserving the changes that have been made during testing - 2 copy skin_blank.conf to skin.conf, to ensure the blank is used - - -IMPORTANT NOTE -============== - -Watch for the generate tags. They have been commented out for testing but need to be replaced for live operation. -Probably the best way of moving test to live is to do a compare on the test and live .conf files -and then move the significant differences from test to live - -Also necessary to force the complete regeneration of all files because of the generate tags (daily, weekly, monthly etc) - - - - -Setup -===== - -Weewx - weewx.conf Changes -========================== - -A Belchertown test setup, containing .conf files etc is set up in /etc/weewx/skins/Belchertown/test -The weewx config file /etc/weex/weewx.conf is modified to contain a new stanza to produce reports in /var/weewx/reports/test - - [[BelchertownTest]] - skin = BelchertownTest - HTML_ROOT = /var/weewx/reports/test - belchertown_root_url = /var/weewx/reports/test - [[[Units]]] - [[[[Groups]]]] - group_altitude = meter - group_speed2 = mile_per_hour2 - group_pressure = mbar - group_rain = mm - group_rainrate = mm_per_hour - group_temperature = degree_C - group_degree_day = degree_C_day - group_speed = mile_per_hour - [[[[TimeFormats]]]] - current = %x %H:%M hrs - [[[Extras]]] - highcharts_homepage_graphgroup = homepage - site_title = Lordship Weather - footer_copyright_text = Lordship Weather - forecast_enabled = 1 - -BelchertownTest Changes -======================= - -The contents of /etc/weewx/skins/Belechertown are copied to etc/weewx/skins/BelchertownTest -A backup of skin.conf in /etc/weewx/BelchertownTest called skin_test.conf -A new skin.conf (skin_blank.conf) is produced in /etc/weewx/skins/BelchertownTest with no contents -This is then switched with skin_test.conf in the same folder to switch - -Using and Switching Belchertown test skin On & Off -================================================== - -1 Check skin_blank exists in Belchertown/test folder -2 Check skin_test.conf exists in the Belchertown/test folder -3 Edits are made to skin.conf in BelchertownTest folder when it is set to skin_test.conf - -ON To turn the test report generation ON: - 1 copy skin_test.conf to skin.conf for editing and testing -OFF To turn the test report generation OFF: - 1 copy skin.conf to skin_test.conf, preserving the changes that have been made during testing - 2 copy skin_blank.conf to skin.conf, to ensure the blank is used - - - - - diff --git a/skins/Belchertown/skin.conf b/skins/Belchertown/skin.conf index d297911f..24f7983c 100644 --- a/skins/Belchertown/skin.conf +++ b/skins/Belchertown/skin.conf @@ -2,7 +2,7 @@ # SKIN CONFIGURATION FILE # # Copyright (c) 2010 Tom Keffer