RandomHuman
/
Weatherscan
mirror of https://github.com/buffbears/Weatherscan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: RandomHuman:4e6a39dca34fff50feb8536930d243b3aa2b31b4
Branches Tags
RandomHuman:master
RandomHuman:websitetest
RandomHuman:new
...
compare: RandomHuman:548d30740146c05c9cd0014be539dccb9599f430
Branches Tags
RandomHuman:master
RandomHuman:websitetest
RandomHuman:new

2 Commits
4e6a39dca3 ... 548d307401

Author SHA1 Message Date
BuildTools 548d307401 fixedloopcomplete 2022-09-23 19:18:35 -04:00
BuildTools d9f8295396 Fixedhealthtiprotationandcleanedupsomestuff 2022-09-23 16:57:44 -04:00
2 changed files with 7 additions and 16 deletions
Show Stats Expand all files Collapse all files

4
webroot/js/config.js
View File

@ -62,7 +62,6 @@ For this to work properly, there must be two packages in the loop that are not s
*/ */
var slideLoopSettings = { var slideLoopSettings = {
order:[ order:[
{type:"radar",repeat:0,locidx:0,slideDelay:4000,slideOrder:[{name:"localDoppler",slideDelay:""}]},
{type:"cities",repeat:0,locidx:0,slideDelay:10000,slideOrder:[{name:"cityIntro",slideDelay:""},{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"city8Slides",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:"return (Math.random() > 0.5) ? true : false",alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"extendedForecast",slideDelay:""},{name:"almanac",slideDelay:""}]}, {type:"cities",repeat:0,locidx:0,slideDelay:10000,slideOrder:[{name:"cityIntro",slideDelay:""},{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"city8Slides",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:"return (Math.random() > 0.5) ? true : false",alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"extendedForecast",slideDelay:""},{name:"almanac",slideDelay:""}]},
{type:"health",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"healthIntro",slideDelay:""},{name:"healthForecast",slideDelay:""},{name:"pollen",slideDelay:"",testDisplay:"if (!weatherInfo.healthPollen.totalcat || weatherInfo.healthforecast.noReport != false) {return true}"},{name:"achesBreath",slideDelay:""},{name:"airQuality",slideDelay:""},{name:"uvIndex",slideDelay:""},{name:"healthTip",slideDelay:""},{name:"moreInfoImage",slideDelay:""}]}, {type:"health",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"healthIntro",slideDelay:""},{name:"healthForecast",slideDelay:""},{name:"pollen",slideDelay:"",testDisplay:"if (!weatherInfo.healthPollen.totalcat || weatherInfo.healthforecast.noReport != false) {return true}"},{name:"achesBreath",slideDelay:""},{name:"airQuality",slideDelay:""},{name:"uvIndex",slideDelay:""},{name:"healthTip",slideDelay:""},{name:"moreInfoImage",slideDelay:""}]},
{type:"travel",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"travelIntro",slideDelay:""},{name:"destinationForecast",slideDelay:""}]}, {type:"travel",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"travelIntro",slideDelay:""},{name:"destinationForecast",slideDelay:""}]},
@ -71,7 +70,8 @@ var slideLoopSettings = {
{type:"airport",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"airportIntro",slideDelay:""},{name:"airportConditions",slideDelay:""},{name:"otherAirportConds",slideDelay:""}]}, {type:"airport",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"airportIntro",slideDelay:""},{name:"airportConditions",slideDelay:""},{name:"otherAirportConds",slideDelay:""}]},
{type:"international",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"internationalIntro",slideDelay:""},{name:"internationalForecast",slideDelay:""}]}, {type:"international",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"internationalIntro",slideDelay:""},{name:"internationalForecast",slideDelay:""}]},
{type:"cities",repeat:true,locidx:'extra reverse',slideDelay:10000,slideOrders:[[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayPart",slideDelay:""},{name:"extendedForecast",slideDelay:""}],[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""}]]}, {type:"cities",repeat:true,locidx:'extra reverse',slideDelay:10000,slideOrders:[[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayPart",slideDelay:""},{name:"extendedForecast",slideDelay:""}],[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""}]]},
{type:"cities",repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"cityIntro",slideDelay:""},{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"city8Slides",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"extendedForecast",slideDelay:""},{name:"almanac",slideDelay:""}]}, {type:"radar",repeat:0,locidx:0,slideDelay:60000,slideOrder:[{name:"localDoppler",slideDelay:""}]},
{type:"cities",loopComplete:true,repeat:true,locidx:0,slideDelay:10000,slideOrder:[{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"cityIntro",slideDelay:""},{name:"bulletin",slideDelay:"",testDisplay:'if (weatherInfo.bulletin.weatherLocs[replaceLocIdx].enabled != true) {return true}'},{name:"currentConditions",slideDelay:""},{name:"city8Slides",slideDelay:""},{name:"localDoppler",slideDelay:"",testDisplay:'return (Math.random() > 0.5) ? true : false',alternate:{name:"regionalSatellite",slideDelay:""}},{name:"dayDesc",slideDelay:""},{name:"extendedForecast",slideDelay:""},{name:"almanac",slideDelay:""}]},
] ]
} }
var severeLoopSettings = {radarTransition:true,order:[ var severeLoopSettings = {radarTransition:true,order:[

19
webroot/js/slides-loop.js
View File

@ -4,9 +4,6 @@ headings:
RADAR < MAIN CITY < CITY 1 < CITY 2 RADAR < MAIN CITY < CITY 1 < CITY 2
*/ */
var buildHeaderGlobal; var buildHeaderGlobal;
var slideLoopOrder = [];
var header = '#slides-header', severepreload = false
var maindiv = { var maindiv = {
"localDoppler":".radar-slide", "localDoppler":".radar-slide",
@ -166,7 +163,7 @@ var mainMap
var radarSlideDuration = 60000, var radarSlideDuration = 60000,
slideDelay = 10000; slideDelay = 10000;
// for later // for later
var selectval = 0; var header = '#slides-header', severepreload = false, tipidx = 0;
buildHeader(); buildHeader();
setTimeout(function() { setTimeout(function() {
@ -492,8 +489,7 @@ var mainMap
weatherAudio.playLocalforecastii(); weatherAudio.playLocalforecastii();
//fade in //fade in
$('.info-slide-content.daypart').fadeIn(500); $('.info-slide-content.daypart').fadeIn(500);
//for calculating when to show daypart
selectval = selectval + 1
//fadeout //fadeout
setTimeout(function() { setTimeout(function() {
$('.info-slide-content.daypart').fadeOut(500).promise().done(function(){ $('.info-slide-content.daypart').fadeOut(500).promise().done(function(){
@ -543,8 +539,6 @@ var mainMap
}); });
} else { } else {
$('.info-slide-content.forecast').fadeOut(500).promise().done(function(){ $('.info-slide-content.forecast').fadeOut(500).promise().done(function(){
selectval = selectval + 1
if (selectval === 4) {selectval = 0}
wait(0); wait(0);
}); });
} }
@ -888,7 +882,6 @@ var mainMap
let month = d.getMonth(); let month = d.getMonth();
const summertips = ["summertip","preparednessplantip","severeweathertip","severeweathertip2","severeweathertip3","drivingtip","drivingtip2","allergytip","allergytip2"] const summertips = ["summertip","preparednessplantip","severeweathertip","severeweathertip2","severeweathertip3","drivingtip","drivingtip2","allergytip","allergytip2"]
const wintertips = ["wintertip","wintertip2","preparednessplantip","winterdrivingtip","winterdrivingtip2","pettip","pettip2","pettip3","pipetip","pipetip2","pipetip3","flutip","flutip2","firetip","firetip2","sunscreenwintertip","sunscreenwintertip2","shovelingtip","allergytip","allergytip2"] const wintertips = ["wintertip","wintertip2","preparednessplantip","winterdrivingtip","winterdrivingtip2","pettip","pettip2","pettip3","pipetip","pipetip2","pipetip3","flutip","flutip2","firetip","firetip2","sunscreenwintertip","sunscreenwintertip2","shovelingtip","allergytip","allergytip2"]
var tipidx = 0;
if (month > 2 && month < 9) { if (month > 2 && month < 9) {
$('.' + summertips[tipidx]).show(); $('.' + summertips[tipidx]).show();
@ -1398,8 +1391,7 @@ var mainMap
weatherAudio.playLocalforecastii(); weatherAudio.playLocalforecastii();
//fade in //fade in
$('.info-slide-content.severe-daypart').fadeIn(500); $('.info-slide-content.severe-daypart').fadeIn(500);
//for calculating when to show daypart
selectval = selectval + 1
//fadeout //fadeout
setTimeout(function() { setTimeout(function() {
$('.info-slide-content.severe-daypart').fadeOut(500).promise().done(function(){ $('.info-slide-content.severe-daypart').fadeOut(500).promise().done(function(){
@ -1447,8 +1439,7 @@ var mainMap
}); });
} else { } else {
$('.info-slide-content.severe-forecast').fadeOut(500).promise().done(function(){ $('.info-slide-content.severe-forecast').fadeOut(500).promise().done(function(){
selectval = selectval + 1
if (selectval === 4) {selectval = 0}
wait(0); wait(0);
}); });
} }
@ -1774,7 +1765,7 @@ var mainMap
$scroller = $(header + ' .hscroller'), $scroller = $(header + ' .hscroller'),
left = 0; left = 0;
//reload cityslide data from newweathermanager on loop complete //reload cityslide data from newweathermanager on loop complete
if ($cities[1].classList.contains('loopcomplete')) { if ($cities[moveHeaderVal].dataset.loopComplete) {
grabCitySlidesData() grabCitySlidesData()
grabHealthData() grabHealthData()
grabCity8SlidesData() grabCity8SlidesData()