Release v2.17.3: roll weather forecasts forward at hour and day boundaries
This commit is contained in:
lzstealth committed
1 parent
5e23d16483
commit
bc8075379a
13 files changed
+263
-10
No files matched your search
@@ -36,6 +36,7 @@ function normalizeWeatherExpression(expression) {
|
||||
}
|
||||
|
||||
function withWeatherUnits(snapshot, location) {
|
||||
if (window.pulseWeatherData) snapshot = window.pulseWeatherData.filterForecastSnapshot(snapshot, location.timezone);
|
||||
var data = Object.assign({}, snapshot, { location_label: location.location_label || '', name: location.name || '', timezone: location.timezone || '', temp_unit: location.temperature_unit === 'fahrenheit' ? '°F' : '°C', wind_unit: location.wind_unit === 'mph' ? 'mph' : location.wind_unit === 'ms' ? 'm/s' : 'km/h', precip_unit: location.precipitation_unit === 'inch' ? 'in' : 'mm' });
|
||||
var temperatureUnit = location.temperature_unit === 'fahrenheit' ? '°F' : '°C';
|
||||
var windUnit = location.wind_unit === 'mph' ? 'mph' : location.wind_unit === 'ms' ? 'm/s' : 'km/h';
|
||||
@@ -62,6 +63,7 @@ function substituteWeatherVariables(html, value, iconSetId) {
|
||||
var alignment = iconMatch[3] || 'middle';
|
||||
var style = width ? ' style="display:block;font-size:' + width + 'px;line-height:1;width:' + width + 'px;height:' + height + 'px;"' : '';
|
||||
var weatherCode = weatherPlaceholderUtils.resolvePlaceholderExpression(value, codeExpression, { timeZone: value.timezone });
|
||||
if (weatherCode === null || weatherCode === undefined || weatherCode === '') return '';
|
||||
var source = window.pulseWeatherIcons && window.pulseWeatherIcons.imageForCode(initialData && initialData.weatherIconSets, iconSetId, weatherCode, window.pulseWeatherIcons.isNightForWeather(value));
|
||||
if (source) return window.pulseWeatherIcons.renderImage(source, width, height, alignment);
|
||||
var icon = '<i class="bi ' + weatherIconForCode(weatherCode) + '"' + style + ' aria-hidden="true"></i>';
|
||||
@@ -86,7 +88,8 @@ function renderWeatherRegion(region, regionContent) {
|
||||
if (value) {
|
||||
var weatherData = withWeatherUnits(snapshot, location);
|
||||
var fontSize = Math.max(8, Number(regionContent && regionContent.font_size || region && (region.font_size || region.fontSize) || 32) || 32);
|
||||
return '<div class="template-region weather" style="' + region.baseStyle + '"><div style="' + style + 'font-family:Arial,sans-serif;font-size:' + fontSize + 'px;line-height:1.5;">' + renderEditorJsContent(substituteWeatherVariables(value, weatherData, regionContent.weather_icon_set_id)) + '</div></div>';
|
||||
var liveContent = /\{\{\s*(?:hourly|daily)\./.test(value) ? ' data-weather-content="' + escapeHtml(JSON.stringify(regionContent)) + '"' : '';
|
||||
return '<div class="template-region weather"' + liveContent + ' style="' + region.baseStyle + '"><div data-weather-output style="' + style + 'font-family:Arial,sans-serif;font-size:' + fontSize + 'px;line-height:1.5;">' + renderEditorJsContent(substituteWeatherVariables(value, weatherData, regionContent.weather_icon_set_id)) + '</div></div>';
|
||||
}
|
||||
var daily = snapshot.daily || {};
|
||||
var days = (daily.time || []).slice(0, 7).map(function (day, index) {
|
||||
@@ -95,4 +98,36 @@ function renderWeatherRegion(region, regionContent) {
|
||||
return '<div class="template-region weather" style="' + region.baseStyle + '"><div style="' + style + 'padding:3%;font-family:Arial,sans-serif;"><div style="display:flex;align-items:center;justify-content:space-between;"><div><div style="font-size:.8em;opacity:.72;">' + escapeHtml(location.location_label || location.name) + '</div><strong style="font-size:2em;">' + escapeHtml(current.temperature_2m === undefined ? '-' : current.temperature_2m) + '°</strong></div><i class="bi ' + weatherIconForCode(current.weather_code) + '" style="font-size:3em;"></i></div><div style="display:grid;grid-template-columns:repeat(7,minmax(0,1fr));gap:.35em;margin-top:1em;">' + days + '</div></div></div>';
|
||||
}
|
||||
|
||||
weatherRegistry.register('weather', { renderRegion: renderWeatherRegion });
|
||||
function initializeWeatherRegions(root) {
|
||||
Array.prototype.forEach.call(root.querySelectorAll('.template-region.weather[data-weather-content]'), function (element) {
|
||||
if (element.__weatherTimer) window.clearTimeout(element.__weatherTimer);
|
||||
var content;
|
||||
try { content = JSON.parse(element.getAttribute('data-weather-content')); } catch (_error) { return; }
|
||||
var previousTimes = null;
|
||||
function tick() {
|
||||
element.__weatherTimer = null;
|
||||
if (!element.isConnected) return;
|
||||
var location = getWeatherLocation(content.weather_location_id);
|
||||
var output = element.querySelector('[data-weather-output]');
|
||||
if (location && location.responseJson && output) {
|
||||
var data = withWeatherUnits(location.responseJson, location);
|
||||
var times = JSON.stringify([data.hourly && data.hourly.time || [], data.daily && data.daily.time || []]);
|
||||
if (times !== previousTimes) {
|
||||
output.innerHTML = renderEditorJsContent(substituteWeatherVariables(content.value, data, content.weather_icon_set_id));
|
||||
previousTimes = times;
|
||||
}
|
||||
}
|
||||
element.__weatherTimer = window.setTimeout(tick, Math.max(1, 60000 - Date.now() % 60000));
|
||||
}
|
||||
tick();
|
||||
});
|
||||
}
|
||||
|
||||
function destroyWeatherRegions(root) {
|
||||
Array.prototype.forEach.call(root.querySelectorAll('.template-region.weather[data-weather-content]'), function (element) {
|
||||
if (element.__weatherTimer) window.clearTimeout(element.__weatherTimer);
|
||||
element.__weatherTimer = null;
|
||||
});
|
||||
}
|
||||
|
||||
weatherRegistry.register('weather', { renderRegion: renderWeatherRegion, initRegion: initializeWeatherRegions, destroyRegion: destroyWeatherRegions });
|
||||
@@ -103,7 +103,9 @@ function renderOnboardingFormBody(deviceId) {
|
||||
|
||||
|
||||
function renderPlayerPage(slug, initialData) {
|
||||
const serviceWorkerScript = '<script>' + fs.readFileSync(path.join(__dirname, '../web/public/js/shared/weather-icons.js'), 'utf8') + '</script>' + getPlayerServiceWorkerRegistrationScript();
|
||||
const serviceWorkerScript = ['weather-icons.js', 'weather-data.js'].map(function (filename) {
|
||||
return '<script>' + fs.readFileSync(path.join(__dirname, '../web/public/js/shared', filename), 'utf8') + '</script>';
|
||||
}).join('') + getPlayerServiceWorkerRegistrationScript();
|
||||
const template = getPlayerPageTemplate();
|
||||
const hlsScriptTag = '<script src="/assets/vendor/hls.min.js"></script>';
|
||||
const chartScriptTag = '<script src="/assets/vendor/chart.js/chart.umd.js"></script>';
|
||||
|
||||
@@ -17,6 +17,7 @@ const { createRequestAuthHeaders, createPageAuthToken } = require('#src/request-
|
||||
const { convertWeatherSnapshot } = require('#src/data/weather-units');
|
||||
|
||||
const placeholderUtils = require('#src/web/public/js/shared/placeholder-utils');
|
||||
const weatherData = require('#src/web/public/js/shared/weather-data');
|
||||
|
||||
const timetableScript = new vm.Script(fs.readFileSync(require.resolve('#src/player/regions/timetable'), 'utf8'));
|
||||
|
||||
@@ -195,8 +196,9 @@ function weatherIconForCode(code) {
|
||||
function substitutePlaceholders(html, regionContent, options) {
|
||||
const source = String(html || '');
|
||||
const type = String(regionContent && regionContent.type || '').trim().toLowerCase();
|
||||
const item = options && typeof options.getItem === 'function' ? options.getItem(type, regionContent) : null;
|
||||
let item = options && typeof options.getItem === 'function' ? options.getItem(type, regionContent) : null;
|
||||
if (!item) return source;
|
||||
if (type === 'weather') item = weatherData.filterForecastSnapshot(item, item.timezone);
|
||||
return source.replace(/\{\{\s*([^{}]+?)\s*\}\}/gi, function (_match, expression) {
|
||||
const weatherExpression = type === 'weather' ? normalizeWeatherExpression(expression) : expression;
|
||||
const resolved = typeof placeholderUtils.resolvePlaceholderExpression === 'function'
|
||||
@@ -207,6 +209,8 @@ function substitutePlaceholders(html, regionContent, options) {
|
||||
}
|
||||
if (type === 'weather' && /(?:^|\.)weather_code\.\d+\.icon(?:\(|$)|^current\.weather_code\.icon/.test(weatherExpression)) {
|
||||
const codeExpression = weatherExpression.replace(/\.icon(?:\(.*\))?$/, '');
|
||||
const weatherCode = placeholderUtils.resolvePlaceholderExpression(item, codeExpression);
|
||||
if (weatherCode === null || weatherCode === undefined || weatherCode === '') return '';
|
||||
const iconSize = String(expression).match(/\.icon\(\s*(\d+)(?:\s*,\s*(\d+))?(?:\s*,\s*(top|middle|bottom))?\s*\)$/);
|
||||
const width = iconSize ? Number(iconSize[1]) : 0;
|
||||
const height = iconSize && iconSize[2] ? Number(iconSize[2]) : width;
|
||||
|
||||
@@ -6,7 +6,7 @@ const path = require('path');
|
||||
const PUBLIC_JS_ROOT = path.join(__dirname, '..', 'public', 'js');
|
||||
const REGION_ROOT_DIR = path.join(PUBLIC_JS_ROOT, 'regions');
|
||||
const REGION_TYPE_DIR = path.join(REGION_ROOT_DIR, 'type');
|
||||
const REGION_CORE_SCRIPTS = ['js/shared/placeholder-utils.js', 'js/shared/placeholder-chips.js', 'js/shared/placeholder-info.js', 'js/shared/time-date-placeholders.js', 'js/regions/region-utils.js', 'js/regions/region-types.js', 'js/regions/chart-data.js', 'vendor/chart.js/chart.umd.js'];
|
||||
const REGION_CORE_SCRIPTS = ['js/shared/placeholder-utils.js', 'js/shared/weather-data.js', 'js/shared/placeholder-chips.js', 'js/shared/placeholder-info.js', 'js/shared/time-date-placeholders.js', 'js/regions/region-utils.js', 'js/regions/region-types.js', 'js/regions/chart-data.js', 'vendor/chart.js/chart.umd.js'];
|
||||
|
||||
function withAssetVersion(scriptPath, assetVersion) {
|
||||
if (!assetVersion) {
|
||||
|
||||
@@ -99,6 +99,7 @@
|
||||
}
|
||||
|
||||
function withWeatherUnits(snapshot, location) {
|
||||
if (window.pulseWeatherData) snapshot = window.pulseWeatherData.filterForecastSnapshot(snapshot, location.timezone);
|
||||
var data = Object.assign({}, snapshot, { location_label: location.location_label || '', name: location.name || '', timezone: location.timezone || '', temp_unit: location.temperature_unit === 'fahrenheit' ? '°F' : '°C', wind_unit: location.wind_unit === 'mph' ? 'mph' : location.wind_unit === 'ms' ? 'm/s' : 'km/h', precip_unit: location.precipitation_unit === 'inch' ? 'in' : 'mm' });
|
||||
var temperatureUnit = location.temperature_unit === 'fahrenheit' ? '°F' : '°C';
|
||||
var windUnit = location.wind_unit === 'mph' ? 'mph' : location.wind_unit === 'ms' ? 'm/s' : 'km/h';
|
||||
@@ -122,6 +123,7 @@
|
||||
var codeExpression = normalizedExpression.replace(/\.icon(?:\(.*\))?$/, '');
|
||||
var sizeExpression = rawExpression.match(/\.icon\((\d+)(?:\s*,\s*(\d+))?(?:\s*,\s*(top|middle|bottom))?\)$/);
|
||||
var weatherCode = placeholderUtils.resolvePlaceholderExpression(value, codeExpression, { timeZone: value.timezone });
|
||||
if (weatherCode === null || weatherCode === undefined || weatherCode === '') return '';
|
||||
var width = sizeExpression ? Math.max(1, Math.min(1000, Number(sizeExpression[1]))) : 0;
|
||||
var height = sizeExpression && sizeExpression[2] ? Math.max(1, Math.min(1000, Number(sizeExpression[2]))) : width;
|
||||
var alignment = sizeExpression && sizeExpression[3] || 'middle';
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
(function (root, factory) {
|
||||
if (typeof module === 'object' && module.exports) module.exports = factory();
|
||||
else root.pulseWeatherData = factory();
|
||||
}(typeof window !== 'undefined' ? window : globalThis, function () {
|
||||
function currentHour(timeZone, now) {
|
||||
var parts = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: timeZone || 'UTC', year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', hourCycle: 'h23'
|
||||
}).formatToParts(new Date(now));
|
||||
var values = {};
|
||||
parts.forEach(function (part) { values[part.type] = part.value; });
|
||||
return values.year + '-' + values.month + '-' + values.day + 'T' + values.hour;
|
||||
}
|
||||
|
||||
function filterHourlySnapshot(snapshot, timeZone, now) {
|
||||
var source = snapshot || {};
|
||||
var hourly = source.hourly;
|
||||
if (!hourly || !Array.isArray(hourly.time)) return source;
|
||||
var timestamp = now === undefined ? Date.now() : Number(now);
|
||||
var hour = currentHour(timeZone || source.timezone, timestamp);
|
||||
var indices = [];
|
||||
hourly.time.forEach(function (value, index) {
|
||||
var time = String(value || '');
|
||||
var keep;
|
||||
if (/(?:Z|[+-]\d{2}:?\d{2})$/i.test(time)) {
|
||||
var start = Date.parse(time);
|
||||
keep = Number.isFinite(start) && start + 3600000 > timestamp;
|
||||
} else {
|
||||
keep = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/.test(time) && time.slice(0, 13) >= hour;
|
||||
}
|
||||
if (keep) indices.push(index);
|
||||
});
|
||||
var filtered = {};
|
||||
Object.keys(hourly).forEach(function (field) {
|
||||
filtered[field] = Array.isArray(hourly[field]) ? indices.map(function (index) {
|
||||
return hourly[field][index] === undefined ? null : hourly[field][index];
|
||||
}) : hourly[field];
|
||||
});
|
||||
return Object.assign({}, source, { hourly: filtered });
|
||||
}
|
||||
|
||||
function filterDailySnapshot(snapshot, timeZone, now) {
|
||||
var source = snapshot || {};
|
||||
var daily = source.daily;
|
||||
if (!daily || !Array.isArray(daily.time)) return source;
|
||||
var timestamp = now === undefined ? Date.now() : Number(now);
|
||||
var zone = timeZone || source.timezone;
|
||||
var today = currentHour(zone, timestamp).slice(0, 10);
|
||||
var indices = [];
|
||||
daily.time.forEach(function (value, index) {
|
||||
var time = String(value || '');
|
||||
var day = '';
|
||||
if (/(?:Z|[+-]\d{2}:?\d{2})$/i.test(time)) {
|
||||
var start = Date.parse(time);
|
||||
if (Number.isFinite(start)) day = currentHour(zone, start).slice(0, 10);
|
||||
} else if (/^\d{4}-\d{2}-\d{2}(?:$|T\d{2}:\d{2})/.test(time)) {
|
||||
day = time.slice(0, 10);
|
||||
}
|
||||
if (day && day >= today) indices.push(index);
|
||||
});
|
||||
var filtered = {};
|
||||
Object.keys(daily).forEach(function (field) {
|
||||
filtered[field] = Array.isArray(daily[field]) ? indices.map(function (index) {
|
||||
return daily[field][index] === undefined ? null : daily[field][index];
|
||||
}) : daily[field];
|
||||
});
|
||||
return Object.assign({}, source, { daily: filtered });
|
||||
}
|
||||
|
||||
function filterForecastSnapshot(snapshot, timeZone, now) {
|
||||
var timestamp = now === undefined ? Date.now() : Number(now);
|
||||
return filterDailySnapshot(filterHourlySnapshot(snapshot, timeZone, timestamp), timeZone, timestamp);
|
||||
}
|
||||
|
||||
return { currentHour: currentHour, filterHourlySnapshot: filterHourlySnapshot, filterDailySnapshot: filterDailySnapshot, filterForecastSnapshot: filterForecastSnapshot };
|
||||
}));
|
||||
@@ -1030,10 +1030,20 @@ import { createSlideAnimationEditor } from '/assets/js/slides/slide-animation-ed
|
||||
previewResizeObserver.observe(slidePreviewStage);
|
||||
}
|
||||
requestSidebarSync();
|
||||
var weatherPreviewTimer;
|
||||
function scheduleWeatherPreviewUpdate() {
|
||||
weatherPreviewTimer = window.setTimeout(function () {
|
||||
var template = getTemplateById(templateSelect.value);
|
||||
if (template && template.regions.some(function (region) { return region.region_type === 'weather'; })) requestPreviewRender();
|
||||
scheduleWeatherPreviewUpdate();
|
||||
}, Math.max(1, 60000 - Date.now() % 60000));
|
||||
}
|
||||
scheduleWeatherPreviewUpdate();
|
||||
window.addEventListener('scroll', requestSidebarSync, { passive: true });
|
||||
window.addEventListener('resize', requestPreviewRender);
|
||||
window.addEventListener('resize', requestSidebarSync);
|
||||
window.addEventListener('beforeunload', function () {
|
||||
window.clearTimeout(weatherPreviewTimer);
|
||||
if (regionMediaController) {
|
||||
regionMediaController.queueUploadCleanup(regionMediaController.getPendingUploadCleanupPaths());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user