From a5e6c8bc41f6db2eb81df65346118df359e11851 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 08:46:21 +0100 Subject: [PATCH] working now --- rowers/templates/embedded_video.html | 80 +++++++++++++++------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html index 49f4cc6c..39ee9be0 100644 --- a/rowers/templates/embedded_video.html +++ b/rowers/templates/embedded_video.html @@ -141,47 +141,51 @@ // 4. The API will call this function when the video player is ready. function onPlayerReady(event) { // event.target.playVideo(); - function updateTime() { - var oldTime = videotime; - var slider = document.getElementById("myRange"); - var lock = document.getElementById("lock"); - if(player && player.getCurrentTime) { - videotime = player.getCurrentTime(); - var delay = document.getElementById("id_delay").value; - sliderpos = Math.round(videotime) + Math.round(delay); - slider.value = sliderpos; - var datatime = parseFloat(videotime)+parseFloat(delay); - // velo = boatspeed[Math.round(datatime)]; - lat = latitude[Math.round(datatime)]; - lon = longitude[Math.round(datatime)]; - // strokerate = spm[Math.round(datatime)]; - // catchangle = ctch[Math.round(datatime)]; - {% for id, metric in metrics.items %} - {{ id }}_now = {{ id }}_values[Math.round(datatime)]; - // console.log(datatime,{{ id }}_now, "{{ metric.name }}") - {% endfor %} - document.getElementById("time").innerHTML = Math.round(videotime); - document.getElementById("datatime").innerHTML = Math.round(datatime); - // document.getElementById("speed").innerHTML = velo; - // document.getElementById("spm").innerHTML = strokerate; - // document.getElementById("catch").innerHTML = catchangle; - {% for id, metric in metrics.items %} - document.getElementById("{{ id }}").innerHTML = {{ id }}_now; - {% endfor %} - // gauge.set(catch_now); - var newLatLng = new L.LatLng(lat, lon); - // console.log(newLatLng); - marker.setLatLng(newLatLng); - } - if(videotime !== oldTime) { - onProgress(videotime); - } - } - timeupdater = setInterval(updateTime, 1000); } + function updateTime() { + var oldTime = videotime; + var slider = document.getElementById("myRange"); + var lock = document.getElementById("lock"); + if(player && player.getCurrentTime) { + videotime = player.getCurrentTime(); + var delay = document.getElementById("id_delay").value; + sliderpos = Math.round(videotime) + Math.round(delay); + slider.value = sliderpos; + + var datatime = parseFloat(videotime)+parseFloat(delay); + // velo = boatspeed[Math.round(datatime)]; + lat = latitude[Math.round(datatime)]; + lon = longitude[Math.round(datatime)]; + // strokerate = spm[Math.round(datatime)]; + // catchangle = ctch[Math.round(datatime)]; + {% for id, metric in metrics.items %} + {{ id }}_now = {{ id }}_values[Math.round(datatime)]; + // console.log(datatime,{{ id }}_now, "{{ metric.name }}") + {% endfor %} + + document.getElementById("time").innerHTML = Math.round(videotime); + document.getElementById("datatime").innerHTML = Math.round(datatime); + // document.getElementById("speed").innerHTML = velo; + // document.getElementById("spm").innerHTML = strokerate; + // document.getElementById("catch").innerHTML = catchangle; + {% for id, metric in metrics.items %} + document.getElementById("{{ id }}").innerHTML = {{ id }}_now; + {% endfor %} + // gauge.set(catch_now); + var newLatLng = new L.LatLng(lat, lon); + // console.log(newLatLng); + marker.setLatLng(newLatLng); + } + if(videotime !== oldTime) { + onProgress(videotime); + } + } + + timeupdater = setInterval(updateTime, 1000); + // when the time changes, this will be called. function onProgress(currentTime) { var slider = document.getElementById("myRange"); @@ -326,7 +330,7 @@ } else { if (playing) { player.seekTo(0); - player.startVideo(); + player.playVideo(); } else { player.seekTo(0);