zwischenstand mit bugs...
This commit is contained in:
parent
47cdc61119
commit
842e48423b
|
|
@ -48,7 +48,7 @@ hr.top {
|
||||||
* * The CSS shown here will not be introduced in the Quickstart guide, but
|
* * The CSS shown here will not be introduced in the Quickstart guide, but
|
||||||
* * shows how you can use CSS to style your Element's container.
|
* * shows how you can use CSS to style your Element's container.
|
||||||
* */
|
* */
|
||||||
input,
|
input
|
||||||
.StripeElement {
|
.StripeElement {
|
||||||
height: 40px;
|
height: 40px;
|
||||||
padding: 10px 12px;
|
padding: 10px 12px;
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
|
|
@ -1,25 +1,32 @@
|
||||||
var urlParams = new URLSearchParams(window.location.search);
|
var urlParams = new URLSearchParams(window.location.search);
|
||||||
var deveui = urlParams.get('deveui');
|
var deveui = urlParams.get('deveui');
|
||||||
var alias = urlParams.get('alias');
|
var alias = urlParams.get('alias');
|
||||||
var start = urlParams.get('start');
|
|
||||||
var stop = urlParams.get('stop');
|
|
||||||
var lon = urlParams.get('lon');
|
var lon = urlParams.get('lon');
|
||||||
var lat = urlParams.get('lat');
|
var lat = urlParams.get('lat');
|
||||||
var map;
|
var map;
|
||||||
|
var lcontrol;
|
||||||
var last_slider_position;
|
var last_slider_position;
|
||||||
|
var markers = [];
|
||||||
|
var marker;
|
||||||
var allmarkers = L.layerGroup();
|
var allmarkers = L.layerGroup();
|
||||||
|
var woBischIcon = L.icon({
|
||||||
if (start == null) {
|
iconUrl: '/static/images/marker.png',
|
||||||
var dstart = moment({hour: 0});
|
iconSize: [64, 64],
|
||||||
var start = dstart.utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
|
iconAnchor: [32, 64],
|
||||||
}
|
popupAnchor: [0, -64]
|
||||||
|
});
|
||||||
if (stop == null) {
|
|
||||||
var dstop = moment();
|
|
||||||
var stop = dstop.utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
|
|
||||||
}
|
|
||||||
|
|
||||||
var datapoints;
|
var datapoints;
|
||||||
|
var woBischIcon2 = L.icon({
|
||||||
|
iconUrl: '/static/images/marker-all.png',
|
||||||
|
iconSize: [64, 64],
|
||||||
|
iconAnchor: [32, 32],
|
||||||
|
popupAnchor: [0, 0]
|
||||||
|
});
|
||||||
|
|
||||||
|
var dstart = moment({hour: 0});
|
||||||
|
var start = dstart.utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
|
||||||
|
var dstop = moment();
|
||||||
|
var stop = dstop.utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
|
||||||
|
|
||||||
function vbat2icon(level) {
|
function vbat2icon(level) {
|
||||||
switch (level) {
|
switch (level) {
|
||||||
|
|
@ -51,7 +58,6 @@ function vbat2icon(level) {
|
||||||
return '<span class="icon ' + icon_color + '"><i class="fas ' + fa_battery_string + '"></i></span>';
|
return '<span class="icon ' + icon_color + '"><i class="fas ' + fa_battery_string + '"></i></span>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function refreshDatapoints(deveui, start, stop) {
|
function refreshDatapoints(deveui, start, stop) {
|
||||||
range = ""
|
range = ""
|
||||||
range = range + "&start=" + start;
|
range = range + "&start=" + start;
|
||||||
|
|
@ -88,33 +94,27 @@ function refreshDatapoints(deveui, start, stop) {
|
||||||
var myhtml = '<p class="has-text-centered"><b>' + alias + '</b><br />' + moment(date).format('DD.MM.YYYY HH:mm') + '<br />' + vbat2icon(datapoints[datapoints.length - 1][4]) + '</p>';
|
var myhtml = '<p class="has-text-centered"><b>' + alias + '</b><br />' + moment(date).format('DD.MM.YYYY HH:mm') + '<br />' + vbat2icon(datapoints[datapoints.length - 1][4]) + '</p>';
|
||||||
marker.bindPopup(myhtml).openPopup();
|
marker.bindPopup(myhtml).openPopup();
|
||||||
|
|
||||||
|
markers = [];
|
||||||
|
|
||||||
// we create the layer group with all positions
|
// we create the layer group with all positions
|
||||||
var markers = [];
|
var myIcon = L.divIcon({className: 'my-div-icon'});
|
||||||
for (let i of datapoints) {
|
for (let i of datapoints) {
|
||||||
unix_timestamp = i[0];
|
unix_timestamp = i[0];
|
||||||
date = new Date(unix_timestamp * 1000);
|
date = new Date(unix_timestamp * 1000);
|
||||||
markers.push(L.marker([i[1], i[2]]).bindPopup(moment(date).format('DD.MM.YYYY HH:mm')));
|
markers.push(L.marker([i[1], i[2]], {icon: woBischIcon2}).bindPopup(moment(date).format('DD.MM.YYYY HH:mm')));
|
||||||
}
|
}
|
||||||
allmarkers = L.layerGroup(markers);
|
allmarkers = L.layerGroup(markers);
|
||||||
var baseMaps = {
|
if (lcontrol != undefined) {
|
||||||
};
|
//lcontrol.clearLayers();
|
||||||
var overlayMaps = {
|
lcontrol.remove();
|
||||||
"alle Positionen": allmarkers
|
}
|
||||||
};
|
lcontrol = L.control.layers({}).addTo(map);
|
||||||
L.control.layers(baseMaps, overlayMaps).addTo(map);
|
lcontrol.addOverlay(allmarkers,'alle Positionen anzeigen');
|
||||||
console.log(map);
|
var bounds = new L.LatLngBounds([[mydata['max_lat'], mydata['max_lon']], [mydata['min_lat'], mydata['min_lon']]]);
|
||||||
|
map.fitBounds(bounds, { padding: [20, 20] });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
var myfeature;
|
|
||||||
var marker;
|
|
||||||
var woBischIcon = L.icon({
|
|
||||||
iconUrl: '/static/images/marker.png',
|
|
||||||
iconSize: [64, 64],
|
|
||||||
iconAnchor: [32, 64],
|
|
||||||
popupAnchor: [0, -64]
|
|
||||||
});
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
map = new L.Map('map', {
|
map = new L.Map('map', {
|
||||||
crs: L.CRS.EPSG3857,
|
crs: L.CRS.EPSG3857,
|
||||||
|
|
@ -124,21 +124,13 @@ $(document).ready(function() {
|
||||||
var tilelayer = new L.tileLayer(url);
|
var tilelayer = new L.tileLayer(url);
|
||||||
map.addLayer(tilelayer);
|
map.addLayer(tilelayer);
|
||||||
map.setView(L.latLng(lat, lon), 10);
|
map.setView(L.latLng(lat, lon), 10);
|
||||||
|
marker = L.marker([lat, lon],{icon: woBischIcon, zIndexOffset: 1000}).addTo(map);
|
||||||
var overlayMaps = {
|
|
||||||
"All": allmarkers
|
|
||||||
};
|
|
||||||
marker = L.marker([lat, lon],{icon: woBischIcon}).addTo(map);
|
|
||||||
|
|
||||||
$('#reportrange span').html(moment(start).locale('de').format('D. MMM YYYY') + ' - ' + moment(stop).locale('de').format('D. MMM YYYY'));
|
$('#reportrange span').html(moment(start).locale('de').format('D. MMM YYYY') + ' - ' + moment(stop).locale('de').format('D. MMM YYYY'));
|
||||||
|
|
||||||
refreshDatapoints(deveui,start,stop);
|
refreshDatapoints(deveui,start,stop);
|
||||||
|
|
||||||
|
|
||||||
console.log("End of document ready...");
|
console.log("End of document ready...");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
var start = moment({hour: 0});
|
var start = moment({hour: 0});
|
||||||
var end = moment();
|
var end = moment();
|
||||||
|
|
@ -202,11 +194,8 @@ $(function() {
|
||||||
}
|
}
|
||||||
}, cb);
|
}, cb);
|
||||||
|
|
||||||
//cb(start, end);
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function updateSliderTooltip(c)
|
function updateSliderTooltip(c)
|
||||||
{
|
{
|
||||||
if (datapoints == undefined || datapoints.length == 0) {
|
if (datapoints == undefined || datapoints.length == 0) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue