From 4f97d21ae16d158faee43440292ca763d0559112 Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Tue, 16 Feb 2016 10:05:34 +0100 Subject: [PATCH] fix height; add CARD --- docroot/views/vmap.html | 52 +++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/docroot/views/vmap.html b/docroot/views/vmap.html index 9d0fefd..9944c8c 100644 --- a/docroot/views/vmap.html +++ b/docroot/views/vmap.html @@ -8,13 +8,15 @@ @@ -31,7 +33,7 @@ function clog(upd, id, s) { var ident = id || 'unknown'; - console.log(upd + ": " + ident + " " + s); + console.log(upd + " " + Math.round(new Date().getTime()/1000.0) + ": " + ident + " " + s); } function setmarkers() { @@ -65,7 +67,11 @@ devices.push(json[n]); } return (json.length); - } + }, + 'error': function (xhr, text, error) { + console.log(error); + return (-1); + } }); })(); @@ -125,9 +131,16 @@ return; } - lat = devices[0].lat; - lon = devices[0].lon; - tst = devices[0].tst; + try { + lat = devices[0].lat; + lon = devices[0].lon; + tst = devices[0].tst; + } catch (err) { + document.write("NO data"); + return; + } + + // FIXME: we can use "center" from VIEW to nail the map var center = new google.maps.LatLng(lat,lon); @@ -194,7 +207,8 @@ var userdev = loc.label ? loc.label : loc.tid; - + var facedata; + var data = { userdev: userdev, ghash: loc.ghash ? loc.ghash : '', @@ -202,15 +216,25 @@ lat: loc.lat, lon: loc.lon, fulldate: dt.format("DD MMM YYYY HH:mm:ss"), + facedata: loc.face, }; if (loc.addr) { - htmldesc = "{{userdev}}
{{addr}}
{{ghash}} ({{lat}},{{lon}}) {{fulldate}}"; + htmldesc = "
{{userdev}}
{{addr}}
{{ghash}} ({{lat}},{{lon}}) {{fulldate}}"; + + shortdesc = "{{userdev}} {{addr}}"; } else { - htmldesc = "{{userdev}}
{{lat}}, {{lon}}
{{ghash}} ({{lat}},{{lon}}) {{fulldate}}"; + htmldesc = "
{{userdev}}
{{lat}}, {{lon}}
{{ghash}} ({{lat}},{{lon}}) {{fulldate}}"; shortdesc = "{{userdev}} {{lat}},{{lon}}"; } + + + if (loc.face) { + htmldesc = htmldesc + "
"; + } else { + htmldesc = htmldesc + "
"; + } loc.description = Mustache.render(shortdesc, data); loc.htmldesc = Mustache.render(htmldesc, data); @@ -270,8 +294,6 @@ -
-
-
+