From ccb852f48e0587fdd40138047b135ba04caab544 Mon Sep 17 00:00:00 2001 From: edautz Date: Mon, 18 Jun 2018 11:49:39 +0000 Subject: [PATCH] Update map_leaflet.js Added speed parameter on the openstreet map points map, but only when speed > 0. --- docroot/map/map_leaflet.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docroot/map/map_leaflet.js b/docroot/map/map_leaflet.js index 25c6ae5..aec7190 100644 --- a/docroot/map/map_leaflet.js +++ b/docroot/map/map_leaflet.js @@ -45,11 +45,19 @@ function initialize_leaflet() { var dt = moment.utc(tst * 1000).local(); data.tst = tst; data.fulldate = dt.format("DD MMM YYYY HH:mm:ss") - var t = "{{ addr }}
({{ lat }},{{lon}}) {{ fulldate }}"; - if (typeof(tst) === 'undefined') { - t = "Position: {{lat}}, {{lon}}"; + var t = "{{ addr }}
({{ lat }},{{lon}}) {{ fulldate }}
Speed: {{ speed }}"; + // if speed is 0 then don't display speed + if (speed === 0) { + t = "{{ addr }}
({{ lat }},{{lon}}) {{ fulldate }}" } - + if (typeof(tst) === 'undefined') { + t = "Position: ({{lat}},{{lon}})
Speed: {{speed}}"; + } + // if speed is 0 then don't display speed + if (typeof(tst) === 'undefined' && speed === 0) { + t = "Position: ({{lat}},{{lon}})"; + } + layer.bindPopup(Mustache.render(t, data)); } },