martin/jubilee
martin/jubilee
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set it so traffic only works during the week

Browse Source
This commit is contained in:
Martin Donnelly 2018-03-20 22:33:49 +00:00
parent 7b34834179
commit 1744d82898
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/service-worker.js
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
const CACHE_VERSION = { 'version': '0.0.397' }; const CACHE_VERSION = { 'version': '0.0.399' };
const dataCacheName = 'jubileeData-v1'; const dataCacheName = 'jubileeData-v1';
const cacheName = 'jubilee-final-1'; const cacheName = 'jubilee-final-1';
const filesToCache = [ const filesToCache = [

11
src/v1/js/Traffic.js
View File

@ -32,10 +32,16 @@ const TrafficModel = Backbone.Model.extend({
this.getTraffic(); this.getTraffic();
} }
const day = new Date().getDay();
console.log('tick', this.attributes); console.log('tick', this.attributes);
console.log('((hour >= 7) && (hour <= 9))', ((hour >= 7) && (hour <= 9))); console.log('((hour >= 7) && (hour <= 9))', ((hour >= 7) && (hour <= 9)));
console.log('((hour >= 17) && (hour <= 19))', ((hour >= 17) && (hour <= 19))); console.log('((hour >= 17) && (hour <= 19))', ((hour >= 17) && (hour <= 19)));
const delay = ( ((hour >= 7) && (hour <= 9)) || ((hour >= 17) && (hour <= 19)) ) ? 600000 : toHour(); let delay;
if (day === 0 || day === 6)
delay = toHour();
else
delay = ( ((hour >= 7) && (hour <= 9)) || ((hour >= 17) && (hour <= 19)) ) ? 600000 : toHour();
console.log('Delay', delay); console.log('Delay', delay);
this.timerID = setTimeout( this.timerID = setTimeout(
() => this.tick(), () => this.tick(),
@ -57,8 +63,7 @@ const TrafficModel = Backbone.Model.extend({
if (!this.has('latlong')) if (!this.has('latlong'))
return; return;
// 55.872407, -3.549003 // 55.872407, -3.549003
// const latlong = { 'lat':latitude, 'lon':longitude }; // const latlong = { 'lat':latitude, 'lon':longitude };
if ((hour >= 7) && (hour <= 9)) { if ((hour >= 7) && (hour <= 9)) {