dmxm/node-red-contrib-jwht-map
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix map lock once and for all...

Browse Source 
hopefully. Close Websocket onunload.
This commit is contained in:
Dave Conway-Jones 2019-03-15 18:50:37 +00:00
parent 93d7c8e027
commit ed9815f889
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
worldmap/index.html
View File

@ -69,7 +69,7 @@
<link rel="stylesheet" type="text/css" href="leaflet/dialog-polyfill.css"/> <link rel="stylesheet" type="text/css" href="leaflet/dialog-polyfill.css"/>
</head> </head>
<body onunload="ws.send(JSON.stringify({'action':'end'}));"> <body onunload="ws.send(JSON.stringify({'action':'end'})); ws.disconnect;">
<div id="topbar"> <div id="topbar">
<a href="https://nodered.org"><img src="images/node-red.png" width="60px" height="24px"/></a> <a href="https://nodered.org"><img src="images/node-red.png" width="60px" height="24px"/></a>
<span class="topbar"> Node-RED - map all the things</span> <span class="topbar"> Node-RED - map all the things</span>
@ -82,9 +82,9 @@
<tr><td><input type='text' name='search' id='search' size='20' style="width:150px;"/>&nbsp;<span onclick='doSearch();'><i class="fa fa-search fa-lg"></i></span></td></tr> <tr><td><input type='text' name='search' id='search' size='20' style="width:150px;"/>&nbsp;<span onclick='doSearch();'><i class="fa fa-search fa-lg"></i></span></td></tr>
<tr><td style="cursor:default"><i class="fa fa-spinner fa-lg fa-fw"></i> Set Max Age <input type='text' name='maxage' id='maxage' value="600" size="5" onchange='setMaxAge();'/>s</td></tr> <tr><td style="cursor:default"><i class="fa fa-spinner fa-lg fa-fw"></i> Set Max Age <input type='text' name='maxage' id='maxage' value="600" size="5" onchange='setMaxAge();'/>s</td></tr>
<tr><td style="cursor:default"><i class="fa fa-search-plus fa-lg fa-fw"></i> Cluster at zoom <<input type='text' name='setclus' id='setclus' size="2" onchange='setCluster();'/></td></tr> <tr><td style="cursor:default"><i class="fa fa-search-plus fa-lg fa-fw"></i> Cluster at zoom <<input type='text' name='setclus' id='setclus' size="2" onchange='setCluster();'/></td></tr>
<tr><td style="cursor:default"><input type='checkbox' id='panit' onclick='doPanit();'/> Auto Pan Map</td></tr> <tr><td style="cursor:default"><input type='checkbox' id='panit' onclick='doPanit(this.checked);'/> Auto Pan Map</td></tr>
<tr><td style="cursor:default"><input type='checkbox' id='lockit' onclick='doLock();'/> Lock Map</td></tr> <tr><td style="cursor:default"><input type='checkbox' id='lockit' onclick='doLock(this.checked);'/> Lock Map</td></tr>
<tr><td style="cursor:default"><input type='checkbox' id='heatall' onclick='doHeatAll();'/> Heatmap all layers</td></tr> <tr><td style="cursor:default"><input type='checkbox' id='heatall' onclick='doHeatAll(this.checked);'/> Heatmap all layers</td></tr>
<tr><td style="cursor:default"><span id="showHelp" ><i class="fa fa-info fa-lg fa-fw"></i>Help</span></td></tr> <tr><td style="cursor:default"><span id="showHelp" ><i class="fa fa-info fa-lg fa-fw"></i>Help</span></td></tr>
</table></div> </table></div>
<div id="map"></div> <div id="map"></div>
@ -310,26 +310,25 @@ document.getElementById('exitHelp').onclick = function() {
}; };
var panit = false; var panit = false;
function doPanit() { function doPanit(v) {
panit = !panit; if (v !== undefined) { panit = v; }
console.log("Panit set :",panit); console.log("Panit set :",panit);
} }
var heatAll = false; var heatAll = false;
function doHeatAll() { function doHeatAll(v) {
heatAll = !heatAll; if (v !== undefined) { heatall = v; }
console.log("Heatall set :",heatAll); console.log("Heatall set :",heatAll);
} }
var lockit = false; var lockit = false;
var mb = new L.LatLngBounds([[-120,-360],[120,360]]); var mb = new L.LatLngBounds([[-120,-360],[120,360]]);
function doLock() { function doLock(v) {
if (lockit === true) { if (v !== undefined) { lockit = v;
lockit = false; if (lockit === false) {
mb = new L.LatLngBounds([[-120,-360],[120,360]]); mb = new L.LatLngBounds([[-120,-360],[120,360]]);
} }
else { else {
lockit = true;
mb = map.getBounds(); mb = map.getBounds();
window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter())); window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
window.localStorage.setItem("lastzoom", map.getZoom()); window.localStorage.setItem("lastzoom", map.getZoom());
@ -1386,13 +1385,15 @@ function setMarker(data) {
marker._popup.dname = data.name; marker._popup.dname = data.name;
marker.lay = lay; // and the layer it is on marker.lay = lay; // and the layer it is on
var rightmenuMarker = L.popup({offset:[0,-12]}).setContent("<b>"+data.name+"</b><br/>"+rightcontext); if (rightcontext.length > 0) {
marker.on('contextmenu', function(e) { var rightmenuMarker = L.popup({offset:[0,-12]}).setContent("<b>"+data.name+"</b><br/>"+rightcontext);
if (hiderightclick !== true) { marker.on('contextmenu', function(e) {
rightmenuMarker.setLatLng(e.latlng); if (hiderightclick !== true) {
map.openPopup(rightmenuMarker); rightmenuMarker.setLatLng(e.latlng);
} map.openPopup(rightmenuMarker);
}); }
});
}
marker.on('click', function(e) { marker.on('click', function(e) {
ws.send(JSON.stringify({action:"click",name:marker.name,layer:marker.lay,icon:marker.icon,iconColor:marker.iconColor,SIDC:marker.SIDC,draggable:true,lat:parseFloat(marker.getLatLng().lat.toFixed(6)),lon:parseFloat(marker.getLatLng().lng.toFixed(6))})); ws.send(JSON.stringify({action:"click",name:marker.name,layer:marker.lay,icon:marker.icon,iconColor:marker.iconColor,SIDC:marker.SIDC,draggable:true,lat:parseFloat(marker.getLatLng().lat.toFixed(6)),lon:parseFloat(marker.getLatLng().lng.toFixed(6))}));
}); });
@ -1794,9 +1795,9 @@ function doCommand(cmd) {
} }
if (cmd.hasOwnProperty("panlock")) { if (cmd.hasOwnProperty("panlock")) {
if (cmd.panlock == "true" || cmd.panlock == true) { lockit = false; } if (cmd.panlock == "true" || cmd.panlock == true) { lockit = true; }
else { lockit = true; doLock(); } else { lockit = false; doLock(false); }
document.getElementById("lockit").checked = !lockit; document.getElementById("lockit").checked = lockit;
} }
// move to a new position // move to a new position
var clat = map.getCenter().lat; var clat = map.getCenter().lat;
@ -1821,7 +1822,7 @@ function doCommand(cmd) {
document.getElementById("heatall").checked = !!cmd.heatmap; document.getElementById("heatall").checked = !!cmd.heatmap;
heat.redraw(); heat.redraw();
} }
if (cmd.hasOwnProperty("panlock") && lockit === false) { doLock(); } if (cmd.hasOwnProperty("panlock") && lockit === true) { doLock(true); }
if (cmd.hasOwnProperty("zoomlock")) { if (cmd.hasOwnProperty("zoomlock")) {
if (cmd.zoomlock == "true" || cmd.zoomlock == true) { if (cmd.zoomlock == "true" || cmd.zoomlock == true) {
if (map.doubleClickZoom.enabled()) { map.removeControl(map.zoomControl); } if (map.doubleClickZoom.enabled()) { map.removeControl(map.zoomControl); }