author | Alexandre Bertails <bertails@w3.org> |

Thu, 25 Aug 2011 16:23:38 -0400 | |

changeset 95 | 98f200362113 |

parent 94 | ca3131933846 (current diff) |

parent 89 | 3fde3593d89c (diff) |

child 98 | 862a94cf3a21 |

child 100 | 0b3b2d6779b8 |

~ merge

src/main/resources/templates/index.html | file | annotate | diff | comparison | revisions | |

src/main/scala/Main.scala |

--- a/src/main/resources/scripts/Utils.js Thu Aug 25 16:23:03 2011 -0400 +++ b/src/main/resources/scripts/Utils.js Thu Aug 25 16:23:38 2011 -0400 @@ -55,8 +55,8 @@ log : function (msg) { try { - console.log(msg); - // Util.htmlLog(msg); + // console.log(msg); + Util.htmlLog(msg); } catch (e) { Util.htmlLog(msg); }

--- a/src/main/resources/scripts/graph.js Thu Aug 25 16:23:03 2011 -0400 +++ b/src/main/resources/scripts/graph.js Thu Aug 25 16:23:38 2011 -0400 @@ -8,7 +8,8 @@ 'bottom':20, 'left':20 }; - this.AxisTextMergin = 10; + this.axisTextMergin = 10; + this.normarizeSec = 30; this.init = function(){ this.SN = "http://www.w3.org/2000/svg"; @@ -38,7 +39,7 @@ //Axis Text var xAxisText = document.createElementNS(this.SN,'text'); xAxisText.setAttribute('x',this.mergin.left); - xAxisText.setAttribute('y',this.mergin.top - this.AxisTextMergin); + xAxisText.setAttribute('y',this.mergin.top - this.axisTextMergin); xAxisText.setAttribute("text-anchor","middle"); var xAxisTextNode = document.createTextNode("km/h"); xAxisText.appendChild(xAxisTextNode); @@ -46,7 +47,7 @@ var yAxisText = document.createElementNS(this.SN,'text'); - yAxisText.setAttribute('x',this.graphWidth - this.mergin.right + this.AxisTextMergin); + yAxisText.setAttribute('x',this.graphWidth - this.mergin.right + this.axisTextMergin); yAxisText.setAttribute('y',this.graphHeight-this.mergin.bottom); yAxisText.setAttribute("alignment-baseline","central"); var yAxisTextNode = document.createTextNode("Time"); @@ -62,11 +63,14 @@ //Calculate speed var speedData = []; var topSpeed = 0; + var counter = 0; var duration = (jsonData.events[jsonData.events.length-1].t - jsonData.events[0].t)/1000; - for ( var int = 1; int < jsonData.events.length; int++) { - var distance = Util.geo.calculateDistance(jsonData.events[int-1].c[0], jsonData.events[int-1].c[1], jsonData.events[int].c[0], jsonData.events[int].c[1]); - var timeSec = (jsonData.events[int].t - jsonData.events[int-1].t)/1000; - var elapsedTime = (jsonData.events[int].t - jsonData.events[0].t)/1000; + for ( var i = 0; i < jsonData.events.length; i++) { + if ((jsonData.events[i].t - jsonData.events[counter].t) < 1000 * this.normarizeSec) continue; + var distance = Util.geo.calculateDistance(jsonData.events[counter].c[0], jsonData.events[counter].c[1], jsonData.events[i].c[0], jsonData.events[i].c[1]); + var timeSec = (jsonData.events[i].t - jsonData.events[counter].t)/1000; + var elapsedTime = (jsonData.events[i].t - jsonData.events[0].t)/1000; + console.log(distance); var speed = distance / timeSec * 3600; if (topSpeed < speed) { topSpeed = speed; @@ -75,12 +79,13 @@ 'speed':speed, 'elapsedTime':elapsedTime, }); + counter = i; }; console.log(speedData); //Plot data - for ( var i = 0; i < speedData.length; i++) { - var x = speedData[i].elapsedTime / duration * (this.graphWidth-this.mergin.left - this.mergin.right); - var y = speedData[i].speed / topSpeed * (this.graphHeight - this.mergin.top - this.mergin.bottom); + for ( var j = 0; j < speedData.length; j++) { + var x = speedData[j].elapsedTime / duration * (this.graphWidth-this.mergin.left - this.mergin.right); + var y = speedData[j].speed / topSpeed * (this.graphHeight - this.mergin.top - this.mergin.bottom); this.drawPoint(this.svg, x, y, 1); } };

--- a/src/main/resources/scripts/tracker.js Thu Aug 25 16:23:03 2011 -0400 +++ b/src/main/resources/scripts/tracker.js Thu Aug 25 16:23:38 2011 -0400 @@ -226,7 +226,7 @@ navigator.geolocation.clearWatch(app.watchId); clearInterval(app.intervalId); app.currentActivity.duration += (Date.now() - app.currentActivity.time); - app.currentActivity.distance = Util.geo.calculateDistanceCoordinates(app.currentActivity.events); + app.currentActivity.distance = (Util.geo.calculateDistanceCoordinates(app.currentActivity.events) * 1000).toFixed(0); app.got_error = 0; app.locations = 0; app.discarded = 0; @@ -352,4 +352,4 @@ user.weight = parseInt(document.getElementById("weight_input").value); user.height = parseInt(document.getElementById("height_input").value); user.save(); -} \ No newline at end of file +}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/resources/scripts/tracker_test.js Thu Aug 25 16:23:38 2011 -0400 @@ -0,0 +1,12 @@ +app.test = function () { + var a = new Activity("http://dbpedia.org/resource/Running"); + + a.date = 1312971214000; + a.distance = 6652; + a.duration = 2176; + a.userAgent = navigator.userAgent; + a.events = [{"t":1312971214000,"c":[42.412414,-71.140267,-31]},{"t":1312971217000,"c":[42.412457,-71.140305,-34]},{"t":1312971219000,"c":[42.412505,-71.140262,-32]},{"t":1312971223000,"c":[42.41258,-71.140198,-30]},{"t":1312971225000,"c":[42.412553,-71.140133,-29]},{"t":1312971227000,"c":[42.412521,-71.140053,-29]},{"t":1312971229000,"c":[42.4125,-71.139983,-28]},{"t":1312971231000,"c":[42.412473,-71.139929,-28]},{"t":1312971233000,"c":[42.412452,-71.13986,-28]},{"t":1312971236000,"c":[42.412392,-71.139763,-27]},{"t":1312971238000,"c":[42.412355,-71.139683,-27]},{"t":1312971240000,"c":[42.412328,-71.139607,-27]},{"t":1312971242000,"c":[42.412301,-71.139543,-27]},{"t":1312971244000,"c":[42.412274,-71.139489,-25]},{"t":1312971246000,"c":[42.412232,-71.139446,-25]},{"t":1312971249000,"c":[42.412189,-71.139345,-24]},{"t":1312971251000,"c":[42.412156,-71.13928,-23]},{"t":1312971253000,"c":[42.412124,-71.13921,-22]},{"t":1312971255000,"c":[42.412087,-71.139151,-22]},{"t":1312971257000,"c":[42.412038,-71.139157,-21]},{"t":1312971259000,"c":[42.41199,-71.139173,-20]},{"t":1312971262000,"c":[42.411926,-71.13921,-20]},{"t":1312971265000,"c":[42.411867,-71.139189,-20]},{"t":1312971267000,"c":[42.411829,-71.139146,-21]},{"t":1312971270000,"c":[42.411781,-71.139071,-21]},{"t":1312971272000,"c":[42.411733,-71.139076,-22]},{"t":1312971275000,"c":[42.411674,-71.139055,-24]},{"t":1312971277000,"c":[42.411647,-71.139001,-23]},{"t":1312971279000,"c":[42.411604,-71.138958,-22]},{"t":1312971281000,"c":[42.411566,-71.138915,-23]},{"t":1312971283000,"c":[42.41154,-71.138862,-23]},{"t":1312971285000,"c":[42.411518,-71.138792,-24]},{"t":1312971288000,"c":[42.41147,-71.138717,-23]},{"t":1312971290000,"c":[42.411443,-71.138658,-24]},{"t":1312971292000,"c":[42.411411,-71.138599,-23]},{"t":1312971294000,"c":[42.411379,-71.138545,-23]},{"t":1312971296000,"c":[42.411357,-71.138481,-23]},{"t":1312971298000,"c":[42.41132,-71.138443,-23]},{"t":1312971301000,"c":[42.411293,-71.138374,-25]},{"t":1312971303000,"c":[42.411266,-71.13832,-24]},{"t":1312971306000,"c":[42.411207,-71.138299,-24]},{"t":1312971308000,"c":[42.411143,-71.138304,-24]},{"t":1312971310000,"c":[42.411089,-71.138331,-25]},{"t":1312971314000,"c":[42.411019,-71.138443,-25]},{"t":1312971316000,"c":[42.410987,-71.138497,-25]},{"t":1312971318000,"c":[42.410944,-71.138545,-25]},{"t":1312971320000,"c":[42.410896,-71.138594,-24]},{"t":1312971322000,"c":[42.410858,-71.138642,-23]},{"t":1312971324000,"c":[42.410815,-71.13869,-25]},{"t":1312971327000,"c":[42.410735,-71.138733,-24]},{"t":1312971330000,"c":[42.410687,-71.138792,-24]},{"t":1312971332000,"c":[42.410644,-71.138851,-24]},{"t":1312971334000,"c":[42.410595,-71.138883,-24]},{"t":1312971336000,"c":[42.410558,-71.138921,-23]},{"t":1312971340000,"c":[42.410472,-71.139001,-25]},{"t":1312971342000,"c":[42.410424,-71.139033,-24]},{"t":1312971344000,"c":[42.410375,-71.139066,-23]},{"t":1312971347000,"c":[42.410316,-71.139098,-24]},{"t":1312971349000,"c":[42.410279,-71.139146,-24]},{"t":1312971353000,"c":[42.410231,-71.139221,-24]},{"t":1312971355000,"c":[42.410247,-71.139296,-24]},{"t":1312971357000,"c":[42.410241,-71.139361,-24]},{"t":1312971359000,"c":[42.410252,-71.139425,-25]},{"t":1312971361000,"c":[42.410263,-71.139506,-25]},{"t":1312971363000,"c":[42.410284,-71.139581,-25]},{"t":1312971366000,"c":[42.410327,-71.139672,-26]},{"t":1312971368000,"c":[42.410359,-71.13972,-25]},{"t":1312971370000,"c":[42.410375,-71.139784,-25]},{"t":1312971372000,"c":[42.410402,-71.139843,-25]},{"t":1312971374000,"c":[42.410429,-71.139908,-24]},{"t":1312971376000,"c":[42.410445,-71.139967,-24]},{"t":1312971379000,"c":[42.410472,-71.140058,-24]},{"t":1312971382000,"c":[42.410504,-71.140128,-23]},{"t":1312971385000,"c":[42.410553,-71.140187,-21]},{"t":1312971388000,"c":[42.410595,-71.140257,-18]},{"t":1312971392000,"c":[42.410687,-71.140278,-16]},{"t":1312971394000,"c":[42.410772,-71.140251,-19]},{"t":1312971396000,"c":[42.410831,-71.14023,-20]},{"t":1312971398000,"c":[42.41089,-71.140203,-20]},{"t":1312971400000,"c":[42.410944,-71.140176,-20]},{"t":1312971402000,"c":[42.410982,-71.140139,-20]},{"t":1312971405000,"c":[42.411051,-71.140101,-20]},{"t":1312971407000,"c":[42.411094,-71.140063,-22]},{"t":1312971409000,"c":[42.411143,-71.140026,-23]},{"t":1312971411000,"c":[42.411186,-71.139988,-22]},{"t":1312971413000,"c":[42.411223,-71.139951,-23]},{"t":1312971415000,"c":[42.411261,-71.139908,-22]},{"t":1312971418000,"c":[42.411314,-71.139876,-24]},{"t":1312971420000,"c":[42.411363,-71.139833,-25]},{"t":1312971422000,"c":[42.411411,-71.139806,-26]},{"t":1312971424000,"c":[42.411448,-71.139763,-26]},{"t":1312971426000,"c":[42.411486,-71.13972,-27]},{"t":1312971428000,"c":[42.411523,-71.139683,-27]},{"t":1312971431000,"c":[42.411572,-71.139602,-26]},{"t":1312971433000,"c":[42.411615,-71.139538,-27]},{"t":1312971435000,"c":[42.411668,-71.139506,-27]},{"t":1312971437000,"c":[42.411706,-71.139468,-28]},{"t":1312971439000,"c":[42.411749,-71.139414,-27]},{"t":1312971441000,"c":[42.411797,-71.139366,-27]},{"t":1312971444000,"c":[42.411781,-71.139264,-27]},{"t":1312971446000,"c":[42.411754,-71.139189,-27]},{"t":1312971448000,"c":[42.411711,-71.139135,-28]},{"t":1312971450000,"c":[42.411679,-71.139071,-26]},{"t":1312971452000,"c":[42.411641,-71.139001,-26]},{"t":1312971457000,"c":[42.411566,-71.138889,-25]},{"t":1312971459000,"c":[42.411534,-71.138835,-25]},{"t":1312971461000,"c":[42.411497,-71.13876,-25]},{"t":1312971463000,"c":[42.41147,-71.138701,-25]},{"t":1312971465000,"c":[42.411438,-71.138636,-25]},{"t":1312971467000,"c":[42.411422,-71.138577,-25]},{"t":1312971470000,"c":[42.411379,-71.138497,-24]},{"t":1312971472000,"c":[42.411346,-71.138443,-25]},{"t":1312971474000,"c":[42.411314,-71.13839,-25]},{"t":1312971477000,"c":[42.411271,-71.138315,-25]},{"t":1312971479000,"c":[42.411223,-71.138288,-25]},{"t":1312971483000,"c":[42.411121,-71.13832,-25]},{"t":1312971485000,"c":[42.411073,-71.138358,-25]},{"t":1312971487000,"c":[42.41103,-71.1384,-25]},{"t":1312971489000,"c":[42.410987,-71.138438,-25]},{"t":1312971491000,"c":[42.410944,-71.138486,-24]},{"t":1312971493000,"c":[42.410896,-71.138513,-24]},{"t":1312971496000,"c":[42.410842,-71.138588,-23]},{"t":1312971498000,"c":[42.410799,-71.138626,-23]},{"t":1312971500000,"c":[42.410772,-71.138679,-24]},{"t":1312971502000,"c":[42.41073,-71.138733,-25]},{"t":1312971504000,"c":[42.410692,-71.138792,-25]},{"t":1312971509000,"c":[42.41059,-71.138889,-25]},{"t":1312971511000,"c":[42.410542,-71.138915,-24]},{"t":1312971513000,"c":[42.410493,-71.138964,-24]},{"t":1312971515000,"c":[42.410456,-71.139001,-24]},{"t":1312971518000,"c":[42.410402,-71.13906,-24]},{"t":1312971522000,"c":[42.410322,-71.139141,-23]},{"t":1312971524000,"c":[42.410274,-71.139173,-23]},{"t":1312971527000,"c":[42.410236,-71.139237,-23]},{"t":1312971529000,"c":[42.410247,-71.139318,-22]},{"t":1312971532000,"c":[42.410263,-71.139404,-23]},{"t":1312971535000,"c":[42.410284,-71.1395,-23]},{"t":1312971537000,"c":[42.410311,-71.13957,-23]},{"t":1312971539000,"c":[42.410343,-71.139634,-23]},{"t":1312971541000,"c":[42.410365,-71.139693,-22]},{"t":1312971543000,"c":[42.410392,-71.139768,-22]},{"t":1312971545000,"c":[42.410418,-71.139827,-23]},{"t":1312971548000,"c":[42.41044,-71.139935,-23]},{"t":1312971550000,"c":[42.410472,-71.140004,-24]},{"t":1312971552000,"c":[42.410488,-71.140074,-24]},{"t":1312971554000,"c":[42.410499,-71.140133,-24]},{"t":1312971557000,"c":[42.410542,-71.140155,-21]},{"t":1312971561000,"c":[42.410606,-71.140246,-19]},{"t":1312971563000,"c":[42.410654,-71.140267,-17]},{"t":1312971564000,"c":[42.410703,-71.140257,-18]},{"t":1312971566000,"c":[42.410772,-71.140219,-21]},{"t":1312971568000,"c":[42.410837,-71.140198,-21]},{"t":1312971570000,"c":[42.410907,-71.140155,-22]},{"t":1312971574000,"c":[42.411025,-71.140079,-23]},{"t":1312971576000,"c":[42.411062,-71.140031,-23]},{"t":1312971578000,"c":[42.411121,-71.139994,-23]},{"t":1312971580000,"c":[42.411159,-71.139956,-23]},{"t":1312971582000,"c":[42.411218,-71.139919,-23]},{"t":1312971584000,"c":[42.411261,-71.139881,-23]},{"t":1312971587000,"c":[42.411352,-71.139849,-24]},{"t":1312971589000,"c":[42.411405,-71.139817,-25]},{"t":1312971591000,"c":[42.411459,-71.139774,-25]},{"t":1312971593000,"c":[42.411497,-71.139725,-24]},{"t":1312971595000,"c":[42.411534,-71.139677,-24]},{"t":1312971597000,"c":[42.411582,-71.139624,-25]},{"t":1312971600000,"c":[42.411647,-71.139554,-25]},{"t":1312971602000,"c":[42.411684,-71.139506,-25]},{"t":1312971605000,"c":[42.411727,-71.139425,-25]},{"t":1312971607000,"c":[42.41177,-71.139371,-25]},{"t":1312971609000,"c":[42.411781,-71.13928,-25]},{"t":1312971613000,"c":[42.411711,-71.139114,-24]},{"t":1312971615000,"c":[42.411674,-71.139055,-23]},{"t":1312971617000,"c":[42.411641,-71.138985,-23]},{"t":1312971619000,"c":[42.411593,-71.138932,-21]},{"t":1312971622000,"c":[42.41155,-71.138862,-22]},{"t":1312971626000,"c":[42.411491,-71.138749,-22]},{"t":1312971628000,"c":[42.411464,-71.138679,-22]},{"t":1312971630000,"c":[42.411432,-71.138604,-21]},{"t":1312971632000,"c":[42.411405,-71.138535,-22]},{"t":1312971634000,"c":[42.411379,-71.138481,-22]},{"t":1312971636000,"c":[42.411346,-71.138438,-22]},{"t":1312971639000,"c":[42.411304,-71.138347,-22]},{"t":1312971641000,"c":[42.411271,-71.138304,-22]},{"t":1312971644000,"c":[42.411212,-71.138282,-22]},{"t":1312971646000,"c":[42.411153,-71.138315,-21]},{"t":1312971648000,"c":[42.4111,-71.138347,-20]},{"t":1312971652000,"c":[42.410998,-71.138433,-21]},{"t":1312971654000,"c":[42.410949,-71.138481,-22]},{"t":1312971656000,"c":[42.410912,-71.138524,-21]},{"t":1312971658000,"c":[42.410864,-71.138572,-22]},{"t":1312971660000,"c":[42.410821,-71.138615,-23]},{"t":1312971662000,"c":[42.410783,-71.138658,-23]},{"t":1312971665000,"c":[42.41073,-71.138738,-24]},{"t":1312971667000,"c":[42.410681,-71.138776,-24]},{"t":1312971669000,"c":[42.410644,-71.138824,-23]},{"t":1312971671000,"c":[42.410595,-71.138867,-23]},{"t":1312971673000,"c":[42.410547,-71.138915,-23]},{"t":1312971675000,"c":[42.410515,-71.138974,-23]},{"t":1312971678000,"c":[42.410434,-71.139023,-23]},{"t":1312971680000,"c":[42.410392,-71.13906,-24]},{"t":1312971682000,"c":[42.410338,-71.139092,-22]},{"t":1312971684000,"c":[42.410295,-71.13913,-22]},{"t":1312971686000,"c":[42.410257,-71.139173,-22]},{"t":1312971688000,"c":[42.410236,-71.139237,-22]},{"t":1312971691000,"c":[42.410236,-71.139355,-22]},{"t":1312971693000,"c":[42.410241,-71.139425,-22]},{"t":1312971695000,"c":[42.410274,-71.1395,-22]},{"t":1312971697000,"c":[42.41029,-71.139575,-23]},{"t":1312971699000,"c":[42.410316,-71.139645,-23]},{"t":1312971704000,"c":[42.410381,-71.139779,-24]},{"t":1312971707000,"c":[42.410424,-71.13986,-23]},{"t":1312971709000,"c":[42.410461,-71.139929,-23]},{"t":1312971711000,"c":[42.410483,-71.140004,-23]},{"t":1312971713000,"c":[42.410493,-71.140096,-23]},{"t":1312971717000,"c":[42.410547,-71.140165,-21]},{"t":1312971720000,"c":[42.410585,-71.140224,-20]},{"t":1312971722000,"c":[42.410628,-71.140257,-18]},{"t":1312971725000,"c":[42.410703,-71.140273,-16]},{"t":1312971726000,"c":[42.410756,-71.140246,-16]},{"t":1312971730000,"c":[42.410874,-71.140203,-20]},{"t":1312971732000,"c":[42.410928,-71.140155,-20]},{"t":1312971734000,"c":[42.410982,-71.140139,-20]},{"t":1312971736000,"c":[42.411035,-71.140096,-21]},{"t":1312971738000,"c":[42.411067,-71.140053,-22]},{"t":1312971740000,"c":[42.411121,-71.140026,-24]},{"t":1312971743000,"c":[42.411175,-71.139983,-24]},{"t":1312971745000,"c":[42.411218,-71.139945,-25]},{"t":1312971747000,"c":[42.411261,-71.139902,-24]},{"t":1312971749000,"c":[42.411309,-71.13986,-24]},{"t":1312971751000,"c":[42.411352,-71.139833,-25]},{"t":1312971753000,"c":[42.4114,-71.139795,-26]},{"t":1312971756000,"c":[42.411464,-71.139731,-27]},{"t":1312971758000,"c":[42.411502,-71.139672,-26]},{"t":1312971761000,"c":[42.41155,-71.139624,-26]},{"t":1312971763000,"c":[42.411593,-71.139586,-26]},{"t":1312971765000,"c":[42.411625,-71.139538,-27]},{"t":1312971769000,"c":[42.411717,-71.139441,-27]},{"t":1312971771000,"c":[42.411759,-71.139393,-27]},{"t":1312971774000,"c":[42.411781,-71.139296,-26]},{"t":1312971776000,"c":[42.411754,-71.139221,-26]},{"t":1312971778000,"c":[42.411738,-71.139151,-25]},{"t":1312971779000,"c":[42.411711,-71.139098,-25]},{"t":1312971782000,"c":[42.411636,-71.139007,-25]},{"t":1312971784000,"c":[42.411593,-71.138937,-23]},{"t":1312971786000,"c":[42.411561,-71.138878,-24]},{"t":1312971788000,"c":[42.411534,-71.138813,-24]},{"t":1312971790000,"c":[42.411513,-71.13876,-23]},{"t":1312971792000,"c":[42.411486,-71.138701,-23]},{"t":1312971795000,"c":[42.411443,-71.13862,-22]},{"t":1312971797000,"c":[42.411427,-71.138535,-22]},{"t":1312971799000,"c":[42.411389,-71.138497,-23]},{"t":1312971801000,"c":[42.411352,-71.138449,-22]},{"t":1312971803000,"c":[42.411325,-71.13839,-22]},{"t":1312971805000,"c":[42.411298,-71.138336,-22]},{"t":1312971808000,"c":[42.411228,-71.138299,-23]},{"t":1312971811000,"c":[42.411164,-71.138315,-23]},{"t":1312971813000,"c":[42.4111,-71.138352,-23]},{"t":1312971815000,"c":[42.411051,-71.138395,-22]},{"t":1312971817000,"c":[42.410998,-71.138438,-23]},{"t":1312971821000,"c":[42.410907,-71.138529,-22]},{"t":1312971823000,"c":[42.410864,-71.138577,-22]},{"t":1312971825000,"c":[42.410821,-71.13862,-22]},{"t":1312971827000,"c":[42.410789,-71.138663,-22]},{"t":1312971829000,"c":[42.410751,-71.138717,-22]},{"t":1312971831000,"c":[42.410708,-71.138744,-22]},{"t":1312971834000,"c":[42.410638,-71.138808,-21]},{"t":1312971836000,"c":[42.410601,-71.138851,-21]},{"t":1312971838000,"c":[42.410558,-71.138889,-22]},{"t":1312971840000,"c":[42.41052,-71.138926,-24]},{"t":1312971842000,"c":[42.410477,-71.13898,-24]},{"t":1312971847000,"c":[42.410381,-71.139076,-23]},{"t":1312971849000,"c":[42.410327,-71.139087,-22]},{"t":1312971851000,"c":[42.410274,-71.139109,-21]},{"t":1312971853000,"c":[42.410252,-71.139168,-21]},{"t":1312971855000,"c":[42.410236,-71.139232,-21]},{"t":1312971857000,"c":[42.410231,-71.139328,-21]},{"t":1312971860000,"c":[42.410252,-71.139446,-22]},{"t":1312971862000,"c":[42.410274,-71.139516,-21]},{"t":1312971864000,"c":[42.410295,-71.139591,-20]},{"t":1312971866000,"c":[42.410333,-71.13965,-21]},{"t":1312971868000,"c":[42.410381,-71.139704,-21]},{"t":1312971870000,"c":[42.410418,-71.139758,-21]},{"t":1312971873000,"c":[42.410467,-71.139865,-20]},{"t":1312971875000,"c":[42.410488,-71.139935,-21]},{"t":1312971877000,"c":[42.410504,-71.140004,-22]},{"t":1312971879000,"c":[42.41051,-71.14009,-21]},{"t":1312971881000,"c":[42.410531,-71.14016,-21]},{"t":1312971886000,"c":[42.410606,-71.140235,-17]},{"t":1312971888000,"c":[42.410649,-71.140278,-17]},{"t":1312971890000,"c":[42.410719,-71.140251,-17]},{"t":1312971892000,"c":[42.410799,-71.14023,-19]},{"t":1312971894000,"c":[42.410858,-71.140208,-19]},{"t":1312971896000,"c":[42.410917,-71.140176,-19]},{"t":1312971899000,"c":[42.411014,-71.140112,-20]},{"t":1312971901000,"c":[42.411062,-71.140058,-21]},{"t":1312971903000,"c":[42.411116,-71.140026,-22]},{"t":1312971905000,"c":[42.411148,-71.139978,-23]},{"t":1312971907000,"c":[42.411191,-71.139945,-23]},{"t":1312971909000,"c":[42.411239,-71.139892,-23]},{"t":1312971912000,"c":[42.411298,-71.139833,-24]},{"t":1312971914000,"c":[42.411346,-71.139784,-24]},{"t":1312971916000,"c":[42.411416,-71.139742,-26]},{"t":1312971918000,"c":[42.411464,-71.139699,-25]},{"t":1312971920000,"c":[42.411513,-71.139666,-24]},{"t":1312971925000,"c":[42.411631,-71.139548,-24]},{"t":1312971927000,"c":[42.411674,-71.1395,-23]},{"t":1312971929000,"c":[42.411711,-71.139457,-22]},{"t":1312971931000,"c":[42.411749,-71.139404,-22]},{"t":1312971933000,"c":[42.411786,-71.139328,-22]},{"t":1312971935000,"c":[42.411786,-71.139253,-21]},{"t":1312971938000,"c":[42.411738,-71.139157,-23]},{"t":1312971940000,"c":[42.411711,-71.139076,-22]},{"t":1312971942000,"c":[42.411663,-71.139023,-22]},{"t":1312971944000,"c":[42.41162,-71.138942,-20]},{"t":1312971946000,"c":[42.411588,-71.138878,-21]},{"t":1312971948000,"c":[42.411561,-71.138824,-21]},{"t":1312971951000,"c":[42.411497,-71.138738,-22]},{"t":1312971953000,"c":[42.411464,-71.138674,-23]},{"t":1312971955000,"c":[42.411443,-71.138604,-23]},{"t":1312971957000,"c":[42.411411,-71.138551,-22]},{"t":1312971959000,"c":[42.411384,-71.138497,-23]},{"t":1312971961000,"c":[42.411357,-71.138438,-23]},{"t":1312971964000,"c":[42.411309,-71.138347,-23]},{"t":1312971966000,"c":[42.411261,-71.138309,-23]},{"t":1312971968000,"c":[42.411207,-71.138288,-23]},{"t":1312971970000,"c":[42.411159,-71.138304,-23]},{"t":1312971972000,"c":[42.411105,-71.138347,-22]},{"t":1312971974000,"c":[42.411051,-71.13839,-22]},{"t":1312971977000,"c":[42.410976,-71.138454,-22]},{"t":1312971979000,"c":[42.410939,-71.138513,-21]},{"t":1312971981000,"c":[42.41089,-71.138556,-20]},{"t":1312971983000,"c":[42.410848,-71.13861,-19]},{"t":1312971985000,"c":[42.410805,-71.138658,-19]},{"t":1312971987000,"c":[42.410767,-71.138706,-19]},{"t":1312971990000,"c":[42.410697,-71.13876,-20]},{"t":1312971992000,"c":[42.410649,-71.138797,-20]},{"t":1312971994000,"c":[42.410612,-71.138856,-20]},{"t":1312971996000,"c":[42.410569,-71.138889,-20]},{"t":1312971998000,"c":[42.41051,-71.138921,-20]},{"t":1312972000000,"c":[42.410467,-71.138969,-20]},{"t":1312972003000,"c":[42.410418,-71.139023,-22]},{"t":1312972005000,"c":[42.41037,-71.13906,-22]},{"t":1312972007000,"c":[42.410333,-71.139114,-21]},{"t":1312972009000,"c":[42.410295,-71.139151,-21]},{"t":1312972011000,"c":[42.410257,-71.139194,-21]},{"t":1312972016000,"c":[42.410247,-71.139371,-22]},{"t":1312972018000,"c":[42.410263,-71.13943,-21]},{"t":1312972020000,"c":[42.410279,-71.139495,-21]},{"t":1312972022000,"c":[42.410311,-71.139559,-22]},{"t":1312972024000,"c":[42.410338,-71.139618,-22]},{"t":1312972026000,"c":[42.410349,-71.139688,-23]},{"t":1312972029000,"c":[42.410386,-71.13979,-22]},{"t":1312972031000,"c":[42.410418,-71.139854,-21]},{"t":1312972033000,"c":[42.410451,-71.139919,-22]},{"t":1312972035000,"c":[42.410477,-71.139994,-22]},{"t":1312972037000,"c":[42.410488,-71.140074,-22]},{"t":1312972039000,"c":[42.410499,-71.140133,-21]},{"t":1312972042000,"c":[42.410536,-71.140208,-21]},{"t":1312972044000,"c":[42.410579,-71.140235,-20]},{"t":1312972046000,"c":[42.410612,-71.140278,-19]},{"t":1312972049000,"c":[42.410681,-71.140294,-19]},{"t":1312972050000,"c":[42.410735,-71.140257,-18]},{"t":1312972052000,"c":[42.41081,-71.14023,-19]},{"t":1312972055000,"c":[42.410896,-71.140187,-20]},{"t":1312972057000,"c":[42.410949,-71.140149,-20]},{"t":1312972059000,"c":[42.411003,-71.140117,-20]},{"t":1312972061000,"c":[42.411035,-71.140074,-21]},{"t":1312972063000,"c":[42.411089,-71.140042,-22]},{"t":1312972068000,"c":[42.411196,-71.139956,-23]},{"t":1312972070000,"c":[42.411239,-71.139924,-23]},{"t":1312972073000,"c":[42.411293,-71.13987,-23]},{"t":1312972075000,"c":[42.411346,-71.139833,-23]},{"t":1312972077000,"c":[42.4114,-71.139801,-24]},{"t":1312972081000,"c":[42.411486,-71.139736,-24]},{"t":1312972083000,"c":[42.411513,-71.139677,-25]},{"t":1312972085000,"c":[42.411556,-71.13964,-25]},{"t":1312972087000,"c":[42.411609,-71.139591,-25]},{"t":1312972089000,"c":[42.411647,-71.139538,-24]},{"t":1312972094000,"c":[42.411733,-71.139414,-22]},{"t":1312972096000,"c":[42.411754,-71.13935,-21]},{"t":1312972098000,"c":[42.411759,-71.139259,-20]},{"t":1312972100000,"c":[42.411717,-71.139189,-20]},{"t":1312972102000,"c":[42.411711,-71.139119,-19]},{"t":1312972104000,"c":[42.411679,-71.139055,-19]},{"t":1312972107000,"c":[42.411615,-71.138953,-18]},{"t":1312972109000,"c":[42.411582,-71.138894,-18]},{"t":1312972111000,"c":[42.411545,-71.138824,-18]},{"t":1312972113000,"c":[42.411513,-71.138776,-18]},{"t":1312972115000,"c":[42.411486,-71.138722,-19]},{"t":1312972117000,"c":[42.411448,-71.138658,-20]},{"t":1312972120000,"c":[42.411405,-71.138567,-21]},{"t":1312972122000,"c":[42.411379,-71.138513,-21]},{"t":1312972124000,"c":[42.411341,-71.138438,-21]},{"t":1312972126000,"c":[42.411309,-71.138374,-21]},{"t":1312972128000,"c":[42.411271,-71.138331,-21]},{"t":1312972130000,"c":[42.411223,-71.138315,-22]},{"t":1312972133000,"c":[42.411148,-71.138336,-21]},{"t":1312972135000,"c":[42.411084,-71.138374,-22]},{"t":1312972137000,"c":[42.411041,-71.138406,-22]},{"t":1312972139000,"c":[42.410987,-71.138454,-21]},{"t":1312972141000,"c":[42.410949,-71.138508,-22]},{"t":1312972143000,"c":[42.410896,-71.138556,-22]},{"t":1312972146000,"c":[42.410831,-71.138626,-22]},{"t":1312972148000,"c":[42.410794,-71.138663,-21]},{"t":1312972150000,"c":[42.410746,-71.138717,-21]},{"t":1312972152000,"c":[42.410703,-71.138754,-22]},{"t":1312972154000,"c":[42.41066,-71.138787,-22]},{"t":1312972156000,"c":[42.410617,-71.13883,-21]},{"t":1312972159000,"c":[42.410542,-71.138889,-21]},{"t":1312972162000,"c":[42.410477,-71.138942,-21]},{"t":1312972164000,"c":[42.410445,-71.138991,-21]},{"t":1312972166000,"c":[42.410402,-71.139028,-22]},{"t":1312972168000,"c":[42.410365,-71.139076,-22]},{"t":1312972172000,"c":[42.410284,-71.139135,-22]},{"t":1312972174000,"c":[42.410252,-71.139194,-22]},{"t":1312972176000,"c":[42.410236,-71.139275,-22]},{"t":1312972178000,"c":[42.410225,-71.139355,-24]},{"t":1312972180000,"c":[42.410257,-71.139409,-23]},{"t":1312972182000,"c":[42.41029,-71.139484,-23]},{"t":1312972185000,"c":[42.410333,-71.139581,-23]},{"t":1312972187000,"c":[42.410359,-71.139656,-22]},{"t":1312972189000,"c":[42.410397,-71.139715,-22]},{"t":1312972191000,"c":[42.410418,-71.13979,-22]},{"t":1312972193000,"c":[42.41044,-71.13986,-22]},{"t":1312972195000,"c":[42.410493,-71.139919,-22]},{"t":1312972198000,"c":[42.410504,-71.140037,-20]},{"t":1312972200000,"c":[42.41052,-71.140101,-19]},{"t":1312972202000,"c":[42.410542,-71.140155,-19]},{"t":1312972205000,"c":[42.410585,-71.140224,-17]},{"t":1312972207000,"c":[42.410617,-71.140273,-15]},{"t":1312972211000,"c":[42.410756,-71.140246,-14]},{"t":1312972213000,"c":[42.410815,-71.140224,-15]},{"t":1312972215000,"c":[42.410874,-71.140181,-15]},{"t":1312972217000,"c":[42.410928,-71.140128,-16]},{"t":1312972219000,"c":[42.410987,-71.140085,-17]},{"t":1312972221000,"c":[42.411035,-71.140047,-19]},{"t":1312972224000,"c":[42.411105,-71.14001,-20]},{"t":1312972227000,"c":[42.411169,-71.139945,-19]},{"t":1312972229000,"c":[42.411212,-71.139913,-20]},{"t":1312972231000,"c":[42.411266,-71.139876,-19]},{"t":1312972233000,"c":[42.41132,-71.139838,-20]},{"t":1312972237000,"c":[42.411432,-71.139758,-21]},{"t":1312972239000,"c":[42.411481,-71.139725,-21]},{"t":1312972241000,"c":[42.411518,-71.139683,-21]},{"t":1312972243000,"c":[42.411561,-71.139634,-21]},{"t":1312972245000,"c":[42.411615,-71.139602,-20]},{"t":1312972247000,"c":[42.411658,-71.139538,-20]},{"t":1312972250000,"c":[42.411722,-71.139463,-21]},{"t":1312972252000,"c":[42.411749,-71.139409,-21]},{"t":1312972254000,"c":[42.41177,-71.139334,-20]},{"t":1312972256000,"c":[42.411786,-71.139248,-20]},{"t":1312972258000,"c":[42.411754,-71.139168,-20]},{"t":1312972260000,"c":[42.411722,-71.139092,-21]},{"t":1312972263000,"c":[42.411658,-71.139017,-21]},{"t":1312972265000,"c":[42.411609,-71.138953,-21]},{"t":1312972267000,"c":[42.411572,-71.138905,-22]},{"t":1312972270000,"c":[42.41155,-71.138819,-23]},{"t":1312972272000,"c":[42.411518,-71.13876,-24]},{"t":1312972276000,"c":[42.411443,-71.138626,-24]},{"t":1312972278000,"c":[42.411422,-71.138551,-23]},{"t":1312972280000,"c":[42.411389,-71.138492,-22]},{"t":1312972282000,"c":[42.411368,-71.138433,-24]},{"t":1312972284000,"c":[42.411325,-71.138374,-25]},{"t":1312972286000,"c":[42.411277,-71.138325,-25]},{"t":1312972289000,"c":[42.411191,-71.138282,-24]},{"t":1312972291000,"c":[42.411148,-71.138309,-24]},{"t":1312972293000,"c":[42.411094,-71.138352,-24]},{"t":1312972295000,"c":[42.411046,-71.138395,-23]},{"t":1312972297000,"c":[42.410998,-71.138465,-23]},{"t":1312972299000,"c":[42.410944,-71.138497,-22]},{"t":1312972302000,"c":[42.410885,-71.138572,-22]},{"t":1312972304000,"c":[42.410848,-71.13862,-23]},{"t":1312972306000,"c":[42.41081,-71.138663,-22]},{"t":1312972308000,"c":[42.410751,-71.138722,-24]},{"t":1312972310000,"c":[42.410697,-71.138776,-23]},{"t":1312972315000,"c":[42.41059,-71.138862,-21]},{"t":1312972317000,"c":[42.410542,-71.138889,-22]},{"t":1312972319000,"c":[42.410515,-71.138948,-22]},{"t":1312972321000,"c":[42.410467,-71.138985,-23]},{"t":1312972323000,"c":[42.410408,-71.139028,-24]},{"t":1312972325000,"c":[42.410354,-71.139071,-24]},{"t":1312972328000,"c":[42.410284,-71.13913,-24]},{"t":1312972330000,"c":[42.410247,-71.139168,-22]},{"t":1312972332000,"c":[42.410231,-71.139237,-23]},{"t":1312972334000,"c":[42.410225,-71.139328,-23]},{"t":1312972336000,"c":[42.410241,-71.139393,-24]},{"t":1312972338000,"c":[42.410274,-71.139463,-24]},{"t":1312972341000,"c":[42.410311,-71.139554,-25]},{"t":1312972343000,"c":[42.410338,-71.13964,-24]},{"t":1312972345000,"c":[42.410375,-71.139704,-23]},{"t":1312972347000,"c":[42.410397,-71.139774,-22]},{"t":1312972349000,"c":[42.410424,-71.139827,-21]},{"t":1312972351000,"c":[42.41044,-71.139892,-21]},{"t":1312972354000,"c":[42.410477,-71.140015,-20]},{"t":1312972356000,"c":[42.410483,-71.140085,-19]},{"t":1312972358000,"c":[42.410504,-71.140144,-19]},{"t":1312972361000,"c":[42.410569,-71.140192,-17]},{"t":1312972363000,"c":[42.410606,-71.14023,-17]},{"t":1312972367000,"c":[42.410703,-71.140283,-15]},{"t":1312972369000,"c":[42.410778,-71.140235,-15]},{"t":1312972371000,"c":[42.410848,-71.140198,-16]},{"t":1312972373000,"c":[42.410901,-71.140171,-16]},{"t":1312972375000,"c":[42.410955,-71.140128,-18]},{"t":1312972377000,"c":[42.411014,-71.140096,-18]},{"t":1312972380000,"c":[42.411089,-71.140026,-19]},{"t":1312972382000,"c":[42.411137,-71.139983,-20]},{"t":1312972384000,"c":[42.411196,-71.139951,-20]},{"t":1312972387000,"c":[42.41125,-71.139897,-20]},{"t":1312972389000,"c":[42.411293,-71.139876,-20]},{"t":1312972393000,"c":[42.411422,-71.139822,-21]},{"t":1312972395000,"c":[42.41147,-71.139768,-21]},{"t":1312972397000,"c":[42.411507,-71.139715,-22]},{"t":1312972399000,"c":[42.411545,-71.139666,-21]},{"t":1312972401000,"c":[42.411588,-71.139613,-20]},{"t":1312972403000,"c":[42.411631,-71.139559,-21]},{"t":1312972406000,"c":[42.411706,-71.139479,-21]},{"t":1312972408000,"c":[42.411738,-71.13942,-21]},{"t":1312972410000,"c":[42.411786,-71.139355,-21]},{"t":1312972412000,"c":[42.411776,-71.139264,-22]},{"t":1312972414000,"c":[42.411754,-71.139194,-23]},{"t":1312972416000,"c":[42.411738,-71.139114,-22]},{"t":1312972419000,"c":[42.411684,-71.139007,-21]},{"t":1312972421000,"c":[42.411636,-71.138953,-21]},{"t":1312972423000,"c":[42.411582,-71.138883,-21]},{"t":1312972426000,"c":[42.41154,-71.138813,-23]},{"t":1312972428000,"c":[42.411513,-71.13876,-22]},{"t":1312972432000,"c":[42.411443,-71.138636,-23]},{"t":1312972434000,"c":[42.411422,-71.138551,-22]},{"t":1312972436000,"c":[42.411384,-71.138486,-21]},{"t":1312972439000,"c":[42.411341,-71.138411,-20]},{"t":1312972441000,"c":[42.411309,-71.138347,-22]},{"t":1312972445000,"c":[42.411202,-71.13832,-21]},{"t":1312972447000,"c":[42.411148,-71.138325,-21]},{"t":1312972449000,"c":[42.411094,-71.138363,-22]},{"t":1312972451000,"c":[42.411051,-71.138395,-22]},{"t":1312972453000,"c":[42.410992,-71.138433,-21]},{"t":1312972455000,"c":[42.410955,-71.138486,-22]},{"t":1312972458000,"c":[42.41089,-71.138567,-22]},{"t":1312972460000,"c":[42.410842,-71.138604,-22]},{"t":1312972462000,"c":[42.41081,-71.138658,-22]},{"t":1312972464000,"c":[42.410767,-71.138706,-22]},{"t":1312972466000,"c":[42.410719,-71.13876,-22]},{"t":1312972471000,"c":[42.410617,-71.138856,-22]},{"t":1312972473000,"c":[42.410574,-71.138889,-22]},{"t":1312972475000,"c":[42.410526,-71.138921,-23]},{"t":1312972477000,"c":[42.410477,-71.138964,-23]},{"t":1312972479000,"c":[42.410429,-71.138991,-24]},{"t":1312972481000,"c":[42.410386,-71.139028,-23]},{"t":1312972484000,"c":[42.410316,-71.139092,-23]},{"t":1312972486000,"c":[42.410274,-71.13913,-23]},{"t":1312972489000,"c":[42.41022,-71.139194,-23]},{"t":1312972491000,"c":[42.410209,-71.139264,-24]},{"t":1312972494000,"c":[42.410225,-71.13935,-25]},{"t":1312972497000,"c":[42.410263,-71.139446,-24]},{"t":1312972499000,"c":[42.410284,-71.139511,-24]},{"t":1312972501000,"c":[42.410311,-71.139597,-23]},{"t":1312972503000,"c":[42.410343,-71.139661,-22]},{"t":1312972505000,"c":[42.410359,-71.13972,-22]},{"t":1312972507000,"c":[42.410397,-71.139795,-22]},{"t":1312972510000,"c":[42.410445,-71.13986,-21]},{"t":1312972512000,"c":[42.410472,-71.139924,-23]},{"t":1312972514000,"c":[42.410493,-71.139988,-23]},{"t":1312972516000,"c":[42.410504,-71.140058,-23]},{"t":1312972518000,"c":[42.410542,-71.140112,-22]},{"t":1312972520000,"c":[42.410579,-71.140171,-21]},{"t":1312972523000,"c":[42.410622,-71.140262,-20]},{"t":1312972525000,"c":[42.41066,-71.140299,-20]},{"t":1312972527000,"c":[42.41073,-71.140283,-19]},{"t":1312972528000,"c":[42.410772,-71.140251,-19]},{"t":1312972530000,"c":[42.410853,-71.140219,-20]},{"t":1312972532000,"c":[42.410896,-71.140192,-21]},{"t":1312972536000,"c":[42.410998,-71.140139,-21]},{"t":1312972538000,"c":[42.41103,-71.140096,-21]},{"t":1312972540000,"c":[42.411078,-71.140053,-21]},{"t":1312972542000,"c":[42.411126,-71.140015,-22]},{"t":1312972544000,"c":[42.411169,-71.139972,-22]},{"t":1312972546000,"c":[42.411218,-71.139935,-21]},{"t":1312972549000,"c":[42.411271,-71.139876,-22]},{"t":1312972551000,"c":[42.411314,-71.139843,-22]},{"t":1312972553000,"c":[42.411373,-71.139817,-22]},{"t":1312972556000,"c":[42.411432,-71.139763,-23]},{"t":1312972558000,"c":[42.411481,-71.139725,-23]},{"t":1312972562000,"c":[42.411572,-71.139645,-24]},{"t":1312972564000,"c":[42.411609,-71.139597,-24]},{"t":1312972566000,"c":[42.411652,-71.139548,-25]},{"t":1312972568000,"c":[42.411695,-71.1395,-25]},{"t":1312972570000,"c":[42.411749,-71.139446,-25]},{"t":1312972572000,"c":[42.411802,-71.139382,-24]},{"t":1312972575000,"c":[42.411797,-71.139275,-24]},{"t":1312972577000,"c":[42.411776,-71.1392,-24]},{"t":1312972579000,"c":[42.411749,-71.139109,-24]},{"t":1312972581000,"c":[42.411695,-71.139039,-24]},{"t":1312972583000,"c":[42.411658,-71.138958,-23]},{"t":1312972585000,"c":[42.411615,-71.138894,-23]},{"t":1312972588000,"c":[42.411572,-71.138808,-25]},{"t":1312972590000,"c":[42.411507,-71.138776,-25]},{"t":1312972592000,"c":[42.411486,-71.138706,-25]},{"t":1312972594000,"c":[42.411464,-71.138642,-24]},{"t":1312972596000,"c":[42.411427,-71.138588,-23]},{"t":1312972598000,"c":[42.411395,-71.138535,-23]},{"t":1312972601000,"c":[42.411346,-71.138454,-22]},{"t":1312972603000,"c":[42.41133,-71.13839,-23]},{"t":1312972605000,"c":[42.411304,-71.138331,-22]},{"t":1312972607000,"c":[42.411261,-71.138309,-23]},{"t":1312972609000,"c":[42.411207,-71.138304,-23]},{"t":1312972611000,"c":[42.411153,-71.138331,-23]},{"t":1312972614000,"c":[42.411062,-71.138395,-22]},{"t":1312972616000,"c":[42.411008,-71.138443,-22]},{"t":1312972618000,"c":[42.41096,-71.138492,-22]},{"t":1312972620000,"c":[42.410917,-71.138529,-22]},{"t":1312972622000,"c":[42.410874,-71.138567,-21]},{"t":1312972624000,"c":[42.410837,-71.138615,-21]},{"t":1312972627000,"c":[42.410756,-71.138669,-22]},{"t":1312972629000,"c":[42.410719,-71.138712,-22]},{"t":1312972631000,"c":[42.410687,-71.138754,-21]},{"t":1312972633000,"c":[42.410649,-71.138813,-21]},{"t":1312972635000,"c":[42.410612,-71.138856,-22]},{"t":1312972640000,"c":[42.41052,-71.138953,-21]},{"t":1312972642000,"c":[42.410472,-71.138985,-22]},{"t":1312972645000,"c":[42.410418,-71.139039,-20]},{"t":1312972647000,"c":[42.410381,-71.139082,-21]},{"t":1312972649000,"c":[42.410343,-71.139125,-20]},{"t":1312972653000,"c":[42.410268,-71.139205,-22]},{"t":1312972656000,"c":[42.410236,-71.139291,-22]},{"t":1312972658000,"c":[42.410241,-71.139355,-22]},{"t":1312972660000,"c":[42.410241,-71.139425,-22]},{"t":1312972662000,"c":[42.410274,-71.139495,-23]},{"t":1312972666000,"c":[42.410338,-71.139634,-23]},{"t":1312972668000,"c":[42.410354,-71.139709,-23]},{"t":1312972670000,"c":[42.410381,-71.139763,-21]},{"t":1312972672000,"c":[42.410402,-71.139817,-21]},{"t":1312972675000,"c":[42.41044,-71.139897,-21]},{"t":1312972679000,"c":[42.410504,-71.140004,-21]},{"t":1312972681000,"c":[42.410526,-71.140063,-20]},{"t":1312972684000,"c":[42.410563,-71.140139,-21]},{"t":1312972686000,"c":[42.41059,-71.140208,-20]},{"t":1312972688000,"c":[42.410633,-71.140267,-21]},{"t":1312972692000,"c":[42.41073,-71.140278,-20]},{"t":1312972694000,"c":[42.410805,-71.140235,-21]},{"t":1312972696000,"c":[42.410869,-71.140219,-22]},{"t":1312972698000,"c":[42.410928,-71.140181,-22]},{"t":1312972700000,"c":[42.410976,-71.140144,-22]},{"t":1312972702000,"c":[42.41103,-71.14009,-22]},{"t":1312972705000,"c":[42.4111,-71.140037,-23]},{"t":1312972707000,"c":[42.411153,-71.140004,-22]},{"t":1312972709000,"c":[42.411196,-71.139967,-23]},{"t":1312972711000,"c":[42.411239,-71.13994,-22]},{"t":1312972713000,"c":[42.411282,-71.139913,-22]},{"t":1312972718000,"c":[42.4114,-71.13986,-24]},{"t":1312972720000,"c":[42.411454,-71.139827,-25]},{"t":1312972723000,"c":[42.411497,-71.139752,-25]},{"t":1312972725000,"c":[42.41154,-71.139704,-25]},{"t":1312972727000,"c":[42.411566,-71.13965,-25]},{"t":1312972731000,"c":[42.411641,-71.139581,-25]},{"t":1312972734000,"c":[42.411684,-71.139511,-26]},{"t":1312972736000,"c":[42.411722,-71.139441,-26]},{"t":1312972738000,"c":[42.411765,-71.139371,-25]},{"t":1312972740000,"c":[42.411786,-71.139302,-24]},{"t":1312972744000,"c":[42.411759,-71.139173,-23]},{"t":1312972746000,"c":[42.411722,-71.139109,-22]},{"t":1312972748000,"c":[42.411684,-71.139028,-22]},{"t":1312972750000,"c":[42.411647,-71.138958,-21]},{"t":1312972752000,"c":[42.411609,-71.138894,-21]},{"t":1312972757000,"c":[42.41155,-71.138792,-24]},{"t":1312972759000,"c":[42.411529,-71.138738,-24]},{"t":1312972761000,"c":[42.411486,-71.13869,-24]},{"t":1312972763000,"c":[42.411464,-71.138626,-24]},{"t":1312972766000,"c":[42.411438,-71.13854,-24]},{"t":1312972770000,"c":[42.411373,-71.138443,-23]},{"t":1312972772000,"c":[42.411346,-71.13839,-23]},{"t":1312972774000,"c":[42.411314,-71.138347,-22]},{"t":1312972776000,"c":[42.411261,-71.13832,-23]},{"t":1312972778000,"c":[42.411196,-71.138325,-23]},{"t":1312972780000,"c":[42.411153,-71.138347,-23]},{"t":1312972783000,"c":[42.411094,-71.138374,-22]},{"t":1312972785000,"c":[42.411051,-71.138417,-23]},{"t":1312972787000,"c":[42.411003,-71.138459,-23]},{"t":1312972789000,"c":[42.41096,-71.138508,-23]},{"t":1312972791000,"c":[42.410923,-71.138551,-24]},{"t":1312972793000,"c":[42.410885,-71.138594,-23]},{"t":1312972796000,"c":[42.41081,-71.138653,-23]},{"t":1312972798000,"c":[42.410756,-71.138695,-23]},{"t":1312972800000,"c":[42.410713,-71.138754,-24]},{"t":1312972802000,"c":[42.410665,-71.138797,-24]},{"t":1312972804000,"c":[42.410622,-71.138846,-24]},{"t":1312972806000,"c":[42.410574,-71.138873,-23]},{"t":1312972809000,"c":[42.41051,-71.138942,-25]},{"t":1312972811000,"c":[42.410472,-71.138991,-25]},{"t":1312972813000,"c":[42.410408,-71.139028,-24]},{"t":1312972815000,"c":[42.410359,-71.139066,-23]},{"t":1312972817000,"c":[42.410322,-71.139103,-22]},{"t":1312972822000,"c":[42.410252,-71.139216,-22]},{"t":1312972824000,"c":[42.410231,-71.139269,-22]},{"t":1312972826000,"c":[42.410241,-71.139339,-23]},{"t":1312972828000,"c":[42.410241,-71.13942,-23]},{"t":1312972830000,"c":[42.410263,-71.139489,-23]},{"t":1312972832000,"c":[42.41029,-71.139554,-23]},{"t":1312972835000,"c":[42.410349,-71.13965,-24]},{"t":1312972837000,"c":[42.410375,-71.13972,-23]},{"t":1312972839000,"c":[42.410392,-71.139779,-21]},{"t":1312972841000,"c":[42.410429,-71.139843,-22]},{"t":1312972843000,"c":[42.410467,-71.139913,-21]},{"t":1312972845000,"c":[42.410493,-71.139978,-21]},{"t":1312972848000,"c":[42.410526,-71.140074,-20]},{"t":1312972850000,"c":[42.410558,-71.140122,-20]},{"t":1312972852000,"c":[42.41059,-71.140181,-19]},{"t":1312972854000,"c":[42.410617,-71.14024,-19]},{"t":1312972857000,"c":[42.410665,-71.140289,-16]},{"t":1312972861000,"c":[42.41081,-71.140208,-17]},{"t":1312972863000,"c":[42.410874,-71.140176,-17]},{"t":1312972865000,"c":[42.410917,-71.140149,-17]},{"t":1312972867000,"c":[42.410955,-71.140101,-18]},{"t":1312972869000,"c":[42.411008,-71.140069,-18]},{"t":1312972871000,"c":[42.411046,-71.140031,-19]},{"t":1312972874000,"c":[42.411116,-71.139988,-19]},{"t":1312972876000,"c":[42.411159,-71.139956,-19]},{"t":1312972879000,"c":[42.411218,-71.139913,-20]},{"t":1312972881000,"c":[42.411261,-71.139886,-21]},{"t":1312972883000,"c":[42.41133,-71.139838,-22]},{"t":1312972887000,"c":[42.411422,-71.139768,-24]},{"t":1312972889000,"c":[42.411464,-71.139709,-24]},{"t":1312972891000,"c":[42.411502,-71.139656,-24]},{"t":1312972893000,"c":[42.411545,-71.139597,-23]},{"t":1312972895000,"c":[42.411588,-71.139559,-23]},{"t":1312972897000,"c":[42.411641,-71.139516,-23]},{"t":1312972900000,"c":[42.411717,-71.139436,-24]},{"t":1312972902000,"c":[42.411759,-71.139371,-23]},{"t":1312972904000,"c":[42.411776,-71.139312,-22]},{"t":1312972906000,"c":[42.41177,-71.139248,-23]},{"t":1312972908000,"c":[42.411738,-71.139194,-22]},{"t":1312972910000,"c":[42.411717,-71.139125,-22]},{"t":1312972913000,"c":[42.411663,-71.139017,-22]},{"t":1312972915000,"c":[42.411641,-71.138942,-22]},{"t":1312972917000,"c":[42.411604,-71.138905,-22]},{"t":1312972919000,"c":[42.411566,-71.138862,-22]},{"t":1312972921000,"c":[42.411534,-71.138813,-21]},{"t":1312972926000,"c":[42.411459,-71.138685,-22]},{"t":1312972928000,"c":[42.411438,-71.138604,-23]},{"t":1312972930000,"c":[42.411411,-71.138524,-22]},{"t":1312972932000,"c":[42.411379,-71.13847,-22]},{"t":1312972934000,"c":[42.411341,-71.138422,-22]},{"t":1312972939000,"c":[42.411266,-71.13832,-23]},{"t":1312972942000,"c":[42.411207,-71.138288,-23]},{"t":1312972944000,"c":[42.411164,-71.138315,-23]},{"t":1312972946000,"c":[42.41111,-71.138363,-22]},{"t":1312972948000,"c":[42.411057,-71.138406,-23]},{"t":1312972952000,"c":[42.410976,-71.138497,-22]},{"t":1312972954000,"c":[42.410928,-71.138535,-22]},{"t":1312972956000,"c":[42.410874,-71.138577,-22]},{"t":1312972958000,"c":[42.410826,-71.13862,-23]},{"t":1312972960000,"c":[42.410767,-71.138658,-24]},{"t":1312972962000,"c":[42.410724,-71.138712,-24]},{"t":1312972965000,"c":[42.410671,-71.138765,-23]},{"t":1312972968000,"c":[42.410628,-71.138824,-23]},{"t":1312972970000,"c":[42.41059,-71.138862,-22]},{"t":1312972972000,"c":[42.410542,-71.138899,-22]},{"t":1312972974000,"c":[42.410504,-71.138937,-21]},{"t":1312972978000,"c":[42.410413,-71.139012,-22]},{"t":1312972980000,"c":[42.410381,-71.13906,-22]},{"t":1312972982000,"c":[42.410333,-71.139092,-22]},{"t":1312972984000,"c":[42.410295,-71.139135,-22]},{"t":1312972986000,"c":[42.410252,-71.139162,-21]},{"t":1312972988000,"c":[42.410231,-71.139243,-21]},{"t":1312972991000,"c":[42.410241,-71.139339,-22]},{"t":1312972994000,"c":[42.410236,-71.139425,-23]},{"t":1312972996000,"c":[42.410252,-71.139489,-23]},{"t":1312972998000,"c":[42.410279,-71.139559,-24]},{"t":1312973000000,"c":[42.410306,-71.139618,-23]},{"t":1312973004000,"c":[42.410375,-71.139736,-22]},{"t":1312973006000,"c":[42.410402,-71.139801,-22]},{"t":1312973008000,"c":[42.410424,-71.139854,-22]},{"t":1312973010000,"c":[42.410445,-71.139919,-20]},{"t":1312973012000,"c":[42.410477,-71.139978,-21]},{"t":1312973014000,"c":[42.410493,-71.140047,-20]},{"t":1312973017000,"c":[42.410536,-71.140128,-19]},{"t":1312973019000,"c":[42.410574,-71.140171,-18]},{"t":1312973022000,"c":[42.410628,-71.14024,-17]},{"t":1312973025000,"c":[42.410687,-71.140278,-17]},{"t":1312973027000,"c":[42.410746,-71.140262,-17]},{"t":1312973030000,"c":[42.410837,-71.140208,-19]},{"t":1312973032000,"c":[42.410885,-71.140171,-19]},{"t":1312973034000,"c":[42.410933,-71.140133,-19]},{"t":1312973036000,"c":[42.410998,-71.140096,-19]},{"t":1312973038000,"c":[42.411051,-71.140063,-19]},{"t":1312973040000,"c":[42.411089,-71.14002,-20]},{"t":1312973043000,"c":[42.411143,-71.139988,-21]},{"t":1312973045000,"c":[42.411202,-71.139951,-21]},{"t":1312973047000,"c":[42.41125,-71.139902,-20]},{"t":1312973050000,"c":[42.411314,-71.139865,-21]},{"t":1312973053000,"c":[42.411368,-71.139827,-22]},{"t":1312973056000,"c":[42.411438,-71.139774,-23]},{"t":1312973058000,"c":[42.411475,-71.13972,-24]},{"t":1312973060000,"c":[42.411518,-71.139683,-24]},{"t":1312973062000,"c":[42.411561,-71.139629,-24]},{"t":1312973064000,"c":[42.411593,-71.139581,-24]},{"t":1312973066000,"c":[42.411636,-71.139543,-25]},{"t":1312973069000,"c":[42.4117,-71.139468,-26]},{"t":1312973071000,"c":[42.411743,-71.139398,-26]},{"t":1312973073000,"c":[42.41177,-71.139334,-24]},{"t":1312973075000,"c":[42.411776,-71.139248,-24]},{"t":1312973077000,"c":[42.411765,-71.139173,-24]},{"t":1312973079000,"c":[42.411738,-71.139082,-24]},{"t":1312973082000,"c":[42.411663,-71.138985,-25]},{"t":1312973084000,"c":[42.411625,-71.138915,-24]},{"t":1312973086000,"c":[42.411588,-71.138867,-24]},{"t":1312973088000,"c":[42.41154,-71.138792,-24]},{"t":1312973090000,"c":[42.411491,-71.138738,-23]},{"t":1312973092000,"c":[42.411459,-71.138679,-24]},{"t":1312973095000,"c":[42.411432,-71.138561,-23]},{"t":1312973097000,"c":[42.411411,-71.138481,-22]},{"t":1312973100000,"c":[42.411373,-71.138411,-23]},{"t":1312973102000,"c":[42.411336,-71.138368,-23]},{"t":1312973104000,"c":[42.411314,-71.138309,-23]},{"t":1312973108000,"c":[42.411212,-71.138261,-23]},{"t":1312973109000,"c":[42.411164,-71.138304,-21]},{"t":1312973111000,"c":[42.411116,-71.138336,-20]},{"t":1312973113000,"c":[42.411073,-71.138374,-20]},{"t":1312973115000,"c":[42.411035,-71.138411,-20]},{"t":1312973117000,"c":[42.410998,-71.138465,-20]},{"t":1312973121000,"c":[42.410907,-71.138551,-20]},{"t":1312973123000,"c":[42.410864,-71.138599,-20]},{"t":1312973126000,"c":[42.41081,-71.138669,-21]},{"t":1312973128000,"c":[42.410772,-71.138706,-21]},{"t":1312973130000,"c":[42.410719,-71.138738,-20]},{"t":1312973134000,"c":[42.410654,-71.13883,-21]},{"t":1312973136000,"c":[42.410606,-71.138862,-21]},{"t":1312973138000,"c":[42.410553,-71.138894,-20]},{"t":1312973140000,"c":[42.410515,-71.138932,-21]},{"t":1312973142000,"c":[42.410461,-71.138969,-22]},{"t":1312973144000,"c":[42.410402,-71.139012,-22]},{"t":1312973147000,"c":[42.410338,-71.139066,-22]},{"t":1312973149000,"c":[42.410295,-71.139114,-21]},{"t":1312973151000,"c":[42.410257,-71.139157,-22]},{"t":1312973153000,"c":[42.410241,-71.139232,-21]},{"t":1312973155000,"c":[42.410225,-71.139302,-20]},{"t":1312973157000,"c":[42.410236,-71.139361,-21]},{"t":1312973160000,"c":[42.410252,-71.139468,-21]},{"t":1312973162000,"c":[42.410279,-71.139532,-21]},{"t":1312973164000,"c":[42.410322,-71.139607,-21]},{"t":1312973166000,"c":[42.410359,-71.139661,-20]},{"t":1312973168000,"c":[42.410402,-71.139725,-20]},{"t":1312973170000,"c":[42.410418,-71.139801,-21]},{"t":1312973173000,"c":[42.410434,-71.139892,-22]},{"t":1312973175000,"c":[42.410472,-71.139967,-19]},{"t":1312973177000,"c":[42.410493,-71.14002,-19]},{"t":1312973179000,"c":[42.41052,-71.140079,-19]},{"t":1312973181000,"c":[42.410547,-71.140139,-18]},{"t":1312973183000,"c":[42.410579,-71.140198,-19]},{"t":1312973186000,"c":[42.410617,-71.140257,-19]},{"t":1312973188000,"c":[42.41066,-71.140278,-19]},{"t":1312973190000,"c":[42.410724,-71.140273,-18]},{"t":1312973191000,"c":[42.410767,-71.14024,-19]},{"t":1312973193000,"c":[42.410821,-71.140214,-19]},{"t":1312973195000,"c":[42.410885,-71.140181,-20]},{"t":1312973199000,"c":[42.410992,-71.140117,-20]},{"t":1312973201000,"c":[42.411035,-71.14009,-20]},{"t":1312973203000,"c":[42.411089,-71.140042,-20]},{"t":1312973205000,"c":[42.411137,-71.140004,-20]},{"t":1312973207000,"c":[42.411186,-71.139961,-20]},{"t":1312973209000,"c":[42.411228,-71.139919,-20]},{"t":1312973212000,"c":[42.411287,-71.13986,-21]},{"t":1312973214000,"c":[42.411341,-71.139838,-20]},{"t":1312973216000,"c":[42.411405,-71.139822,-21]},{"t":1312973218000,"c":[42.411454,-71.139801,-22]},{"t":1312973220000,"c":[42.411475,-71.139736,-21]},{"t":1312973222000,"c":[42.411513,-71.139688,-22]},{"t":1312973225000,"c":[42.411577,-71.139613,-21]},{"t":1312973228000,"c":[42.411625,-71.139548,-22]},{"t":1312973230000,"c":[42.411663,-71.139511,-23]},{"t":1312973232000,"c":[42.411706,-71.139468,-24]},{"t":1312973234000,"c":[42.411749,-71.139409,-23]},{"t":1312973238000,"c":[42.41177,-71.139269,-22]},{"t":1312973240000,"c":[42.411754,-71.139189,-22]},{"t":1312973242000,"c":[42.411727,-71.139109,-21]},{"t":1312973244000,"c":[42.411674,-71.139012,-20]},{"t":1312973246000,"c":[42.411625,-71.138948,-20]},{"t":1312973248000,"c":[42.411593,-71.138878,-20]},{"t":1312973251000,"c":[42.411545,-71.138771,-22]},{"t":1312973253000,"c":[42.411513,-71.138717,-22]},{"t":1312973255000,"c":[42.411475,-71.138626,-23]},{"t":1312973257000,"c":[42.411438,-71.138561,-22]},{"t":1312973259000,"c":[42.4114,-71.138502,-23]},{"t":1312973261000,"c":[42.411368,-71.138454,-22]},{"t":1312973264000,"c":[42.411309,-71.138374,-22]},{"t":1312973266000,"c":[42.411261,-71.138325,-23]},{"t":1312973268000,"c":[42.411196,-71.138299,-23]},{"t":1312973270000,"c":[42.411137,-71.13832,-23]},{"t":1312973272000,"c":[42.411094,-71.138358,-23]},{"t":1312973274000,"c":[42.411035,-71.13839,-23]},{"t":1312973277000,"c":[42.410966,-71.138481,-21]},{"t":1312973279000,"c":[42.410912,-71.138524,-21]},{"t":1312973281000,"c":[42.410864,-71.138572,-22]},{"t":1312973283000,"c":[42.41081,-71.138642,-23]},{"t":1312973285000,"c":[42.410767,-71.138695,-24]},{"t":1312973287000,"c":[42.410719,-71.138744,-24]},{"t":1312973290000,"c":[42.410665,-71.138808,-23]},{"t":1312973292000,"c":[42.410606,-71.138846,-22]},{"t":1312973294000,"c":[42.410558,-71.138899,-22]},{"t":1312973296000,"c":[42.410499,-71.138937,-23]},{"t":1312973298000,"c":[42.410445,-71.138985,-24]},{"t":1312973300000,"c":[42.410386,-71.139023,-23]},{"t":1312973303000,"c":[42.410333,-71.139092,-24]},{"t":1312973305000,"c":[42.410279,-71.13913,-23]},{"t":1312973307000,"c":[42.410231,-71.139173,-24]},{"t":1312973310000,"c":[42.410198,-71.139264,-22]},{"t":1312973311000,"c":[42.410241,-71.139328,-22]},{"t":1312973313000,"c":[42.410263,-71.139387,-22]},{"t":1312973316000,"c":[42.410279,-71.1395,-21]},{"t":1312973318000,"c":[42.410311,-71.139575,-21]},{"t":1312973320000,"c":[42.410349,-71.13965,-20]},{"t":1312973322000,"c":[42.410381,-71.139715,-20]},{"t":1312973324000,"c":[42.410418,-71.139763,-19]},{"t":1312973326000,"c":[42.41044,-71.139827,-20]},{"t":1312973329000,"c":[42.410456,-71.139935,-19]},{"t":1312973331000,"c":[42.410488,-71.139988,-18]},{"t":1312973334000,"c":[42.410504,-71.140069,-17]},{"t":1312973336000,"c":[42.410547,-71.140144,-18]},{"t":1312973338000,"c":[42.410585,-71.140219,-18]},{"t":1312973342000,"c":[42.410671,-71.140283,-17]},{"t":1312973344000,"c":[42.410751,-71.140246,-17]},{"t":1312973346000,"c":[42.410826,-71.140214,-17]},{"t":1312973348000,"c":[42.410896,-71.140171,-17]},{"t":1312973350000,"c":[42.410955,-71.140139,-16]},{"t":1312973352000,"c":[42.411008,-71.140101,-16]},{"t":1312973355000,"c":[42.4111,-71.140058,-16]},{"t":1312973357000,"c":[42.411164,-71.14002,-16]},{"t":1312973359000,"c":[42.411212,-71.139978,-16]},{"t":1312973361000,"c":[42.411261,-71.139935,-16]},{"t":1312973363000,"c":[42.411314,-71.139908,-17]},{"t":1312973365000,"c":[42.411368,-71.13987,-18]},{"t":1312973368000,"c":[42.411448,-71.139806,-20]},{"t":1312973370000,"c":[42.411481,-71.139758,-21]},{"t":1312973372000,"c":[42.411523,-71.139699,-21]},{"t":1312973375000,"c":[42.411577,-71.139645,-20]},{"t":1312973377000,"c":[42.41162,-71.139597,-20]},{"t":1312973381000,"c":[42.411706,-71.139489,-22]},{"t":1312973383000,"c":[42.411743,-71.139436,-22]},{"t":1312973385000,"c":[42.411781,-71.139398,-22]},{"t":1312973388000,"c":[42.411776,-71.139302,-22]},{"t":1312973390000,"c":[42.411749,-71.139221,-23]}]; + if (!Util.postNewResourceAsJSON(user.getPostRunURI(),a)) { + Util.log("[ERROR] Can't store the workout"); + } +}

--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/resources/templates/app.ssp Thu Aug 25 16:23:38 2011 -0400 @@ -0,0 +1,80 @@ +<!DOCTYPE html> +<html lang='en' xmlns='http://www.w3.org/1999/xhtml'> +<head> + <meta charset="utf-8" /> + <title>Virtual Trainer</title> + + <style> + #stats li h2 { display: inline } + </style> + + <script src="../scripts/Utils.js"></script> + <script src="../scripts/json2.js"></script> + <script src="http://www.openlayers.org/api/OpenLayers.js"></script> + <script src="../scripts/graph.js"></script> + <script src="../scripts/map.js"></script> + + <script> + function init() { + // get list of workouts + var workouts = getWorkouts(); + if (workouts.length == 0) + return; + // update History section + updateHistory(workouts); + // create map + OLMap.createMap(); + // show results for last workout + showResult(workouts[0]); + } + </script> + +</head> +<body onload="init();" > + + <div id="history"> + <h1>History</h1> + <ul> + <li><a href="#">Workout1</a></li> + <li><a href="#">Workout2</a></li> + </ul> + </div> + <div id="stats"> + <h1>Stats</h1> + <ul> + <li class="date"> + <h2>Date</h2> + <span>Aug 10 11</span> + </li> + <li class="start"> + <h2>Start Time</h2> + <span>00:00:00</span> + </li> + <li class="duration"> + <h2>Elapsed Time</h2> + <span>0</span> + </li> + <li class="distance"> + <h2>Distance</h2> + <span>0 mile</span> + </li> + <li class="pace"> + <h2>Avg Pace</h2> + <span>0 min/mile</span> + </li> + <li class="speed"> + <h2>Avg Speed</h2> + <span>0 mph</span> + </li> + <li class="climb"> + <h2>Ascent/Climb</h2> + <span>0 ft</span> + </li> + </ul> + </div> + <div id="map" style="width:500px; height:300px"></div> + <br /> + <div id="speed_graph" style="width:500px; height: 200px;"></div> + +</body> +</html>

--- a/src/main/resources/templates/geolocation.ssp Thu Aug 25 16:23:03 2011 -0400 +++ b/src/main/resources/templates/geolocation.ssp Thu Aug 25 16:23:38 2011 -0400 @@ -14,6 +14,8 @@ </script> <script src='/scripts/tracker.js'> </script> + <script src='/scripts/tracker_test.js'> + </script> <link rel="stylesheet" href="/styles/tracker.css" type="text/css" /> </head> <body> @@ -82,6 +84,12 @@ </p> +<p> +<button type='button' id='test_button' + onclick='app.test()'>Test</button> +</p> + + </section> </section>

--- a/src/main/resources/templates/index.html Thu Aug 25 16:23:03 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>Virtual Trainer</title> - - <style> - #stats li h2 { display: inline } - </style> - - <script src="../scripts/Utils.js"></script> - <script src="../scripts/json2.js"></script> - <script src="http://www.openlayers.org/api/OpenLayers.js"></script> - <script src="../scripts/graph.js"></script> - <script src="../scripts/map.js"></script> - - <script type="text/javascript"> - function init() { - // get list of workouts - var workouts = getWorkouts(); - // update History section - updateHistory(workouts); - // create map - OLMap.createMap(); - // show results for last workout - showResult(workouts[0]); - } - - </script> - -</head> -<body onload="init();" > - - <div id="history"> - <h1>History</h1> - <ul> - <li><a href="#">Workout1</a></li> - <li><a href="#">Workout2</a></li> - </ul> - </div> - <div id="stats"> - <h1>Stats</h1> - <ul> - <li class="date"> - <h2>Date</h2> - <span>Aug 10 11</span> - </li> - <li class="start"> - <h2>Start Time</h2> - <span>06:13:35</span> - </li> - <li class="duration"> - <h2>Elapsed Time</h2> - <span>36'16"</span> - </li> - <li class="distance"> - <h2>Distance</h2> - <span>4.13 mile</span> - </li> - <li class="pace"> - <h2>Avg Pace</h2> - <span>8'46" min/mile</span> - </li> - <li class="speed"> - <h2>Avg Speed</h2> - <span>6.84 mph</span> - </li> - <li class="climb"> - <h2>Ascent/Climb</h2> - <span>698 ft</span> - </li> - </ul> - </div> - <div id="map" style="width:500px; height:300px"></div> - <br /> - <div id="speed_graph" style="width:500px; height: 200px;"></div> - -</body> -</html>

--- a/src/main/scala/Main.scala Thu Aug 25 16:23:03 2011 -0400 +++ b/src/main/scala/Main.scala Thu Aug 25 16:23:38 2011 -0400 @@ -36,6 +36,11 @@ Ok ~> ContentType("application/xhtml+xml") ~> Scalate(req, "geolocation.ssp")(engine) } + val app = unfiltered.filter.Planify { + case req @ Path(Seg("app" :: Nil)) => + Ok ~> ContentType("application/xhtml+xml") ~> Scalate(req, "app.ssp")(engine) + } + val workoutAPI = unfiltered.filter.Planify { case req @ POST(Path(Seg("user" :: user :: "workout" :: Nil))) & Host(host) => { val json:MongoDBObject = com.mongodb.util.JSON.parse(Body.string(req)).asInstanceOf[com.mongodb.DBObject] @@ -102,7 +107,7 @@ ctx.resources(fromClasspath("scripts/").toURI.toURL) }.context("/styles"){ ctx:ContextBuilder => ctx.resources(fromClasspath("styles/").toURI.toURL) - }.filter(tracker).filter(workoutAPI).filter(echo).run() + }.filter(tracker).filter(app).filter(workoutAPI).filter(echo).run() }