Added different location support to map

mesherrors.txt

@@ -50,3 +50,60 @@ TypeError: socket.getPeerCertificate is not a function
     at TCP.onconnection (net.js:1452:8)
 
 
+-------- 9/25/2017, 1:57:36 PM --------
+
+C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1589
+                            if ((node.userloc) && (node.userloc.length != 2)) return;
+                                 ^
+
+ReferenceError: node is not defined
+    at WebSocket.<anonymous> (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1589:34)
+    at emitTwo (events.js:106:13)
+    at WebSocket.emit (events.js:191:7)
+    at Receiver.ontext (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\ws\lib\WebSocket.js:841:10)
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\ws\lib\Receiver.js:536:18
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\ws\lib\Receiver.js:368:7
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\ws\lib\PerMessageDeflate.js:249:5
+    at afterWrite (_stream_writable.js:360:3)
+    at onwrite (_stream_writable.js:351:7)
+    at WritableState.onwrite (_stream_writable.js:89:5)
+
+
+-------- 9/25/2017, 2:01:16 PM --------
+
+C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1616
+                                            command.userloc.push((Math.floor((new Date(iploc.date)) / 1000)));
+                                                                                       ^
+
+ReferenceError: iploc is not defined
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1616:88
+    at newArguments.(anonymous function) (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\executor.js:29:17)
+    at Cursor.execFn (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:484:12)
+    at callback (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\cursor.js:126:19)
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\cursor.js:193:12
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:329:14
+    at Object.async.eachSeries (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:130:20)
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:323:11
+    at fn (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:582:34)
+    at Immediate._onImmediate (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:498:34)
+
+
+-------- 9/25/2017, 2:02:08 PM --------
+
+C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1617
+                                            node.userloc = command.join(',');
+                                                                   ^
+
+TypeError: command.join is not a function
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\webserver.js:1617:68
+    at newArguments.(anonymous function) (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\executor.js:29:17)
+    at Cursor.execFn (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:484:12)
+    at callback (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\cursor.js:126:19)
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\cursor.js:193:12
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:329:14
+    at Object.async.eachSeries (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:130:20)
+    at C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\nedb\lib\datastore.js:323:11
+    at fn (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:582:34)
+    at Immediate._onImmediate (C:\Users\Default.DESKTOP-M9I88C9\Desktop\AmtWebApp\meshcentral\node_modules\async\lib\async.js:498:34)
+
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.0.8-d",
+  "version": "0.0.8-e",
   "keywords": [
     "Remote Management",
     "Intel AMT",

public/styles/ol3-contextmenu.min.css

@@ -0,0 +1,7 @@
+/*!
+ * ol3-contextmenu - v2.5.0
+ * Custom Context Menu for Openlayers
+ * https://github.com/jonataswalker/ol3-contextmenu
+ * Built: Fri Feb 24 2017 15:11:23 GMT-0300 (BRT)
+ */
+.ol-ctx-menu-container{position:absolute;padding:8px;background:#fff;color:#222;font-size:13px;border-radius:5px;box-shadow:3px 3px 5px rgba(0,0,0,.2);box-sizing:border-box}.ol-ctx-menu-container a,.ol-ctx-menu-container div,.ol-ctx-menu-container img,.ol-ctx-menu-container li,.ol-ctx-menu-container span,.ol-ctx-menu-container ul{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}.ol-ctx-menu-container a img{border:none}.ol-ctx-menu-container *,.ol-ctx-menu-container :after,.ol-ctx-menu-container :before{box-sizing:inherit}.ol-ctx-menu-container.ol-ctx-menu-hidden{opacity:0;visibility:hidden;-webkit-transition:visibility 0s linear .3s,opacity .3s;transition:visibility 0s linear .3s,opacity .3s}.ol-ctx-menu-container ul{list-style:none}.ol-ctx-menu-container li{position:relative;line-height:20px;padding:2px 5px}.ol-ctx-menu-container li:not(.ol-ctx-menu-separator):hover{cursor:pointer;background-color:#333;color:#eee}.ol-ctx-menu-container li.ol-ctx-menu-submenu .ol-ctx-menu-container{border:1px solid #eee;padding:8px;top:0;opacity:0;visibility:hidden;-webkit-transition:visibility 0s linear .3s,opacity .3s;transition:visibility 0s linear .3s,opacity .3s}.ol-ctx-menu-container li.ol-ctx-menu-submenu:hover .ol-ctx-menu-container{opacity:1;visibility:visible;-webkit-transition-delay:0s;transition-delay:0s}.ol-ctx-menu-container li.ol-ctx-menu-submenu:after{position:absolute;top:7px;right:10px;content:"";display:inline-block;width:.6em;height:.6em;border-right:.3em solid #222;border-top:.3em solid #222;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.ol-ctx-menu-container li.ol-ctx-menu-submenu:hover:after{border-color:#eee}.ol-ctx-menu-container li.ol-ctx-menu-separator{padding:0}.ol-ctx-menu-container li.ol-ctx-menu-separator hr{border:0;height:1px;background-image:-webkit-linear-gradient(right,transparent,rgba(0,0,0,.75),transparent);background-image:linear-gradient(270deg,transparent,rgba(0,0,0,.75),transparent)}.ol-ctx-menu-icon{text-indent:20px;background-size:20px auto;background-repeat:no-repeat;background-position:0}.ol-ctx-menu-zoom-in{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAABaUlEQVQ4T72U7VHCQBCGn90GtAMuNGCswFiBWIFQgWMFxg6wArECsQKhArEBiB1Qwa1zgQn5IAYcxv13k71n3919L8KJQ07M47+BzgG9TRfZ/JBuWhS6BJFHRJICYrZGZIz3z5Ct2+B7gG6I6kt+wewdkQVwjtkAkR5mC8yu26A1oItR/cTsOweQBdgutD8G7jGm2PJ2n8oqUKIpIjd4HxTM8gvaT/F+AlmWnyWaIXKF95eNguFzTYFhNsdWu9kFgFlaFMANUH3D8wDLoLgSTSD2il8NCe2ZXQBxWDGwxmyUzzOMBZ7wy7Qb2K0wQfXjMOBuhlFpZtNty5sFaTQBuTusZdymeqs1SpYKcO9HkE3KbTd9WFijMHJQ5hBNEAYNq5Qd0dhyke0GiE4QzjqfW23mHT8Hl4DG4Lce3FPE7AtbBSdsbNqpoJLgYkRnNeUV+xwJDHTnUEkxHGbhBXUs5TjJjew/KPy94g+NRaIVRYmMXwAAAABJRU5ErkJggg==")}.ol-ctx-menu-container li:hover.ol-ctx-menu-zoom-in{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAABc0lEQVQ4T71U21ECQRDsJgGdvQDECMQIxAjECMQILCPwzAAjECIQI0AiEDPQAPaWCBhrcKHuCUcV5f7dY3v6tUscefHIePhfwBBCF8CZqRCReRs1tQxDCH1VfQLQz4EsSY4AvIjIsgm8AhhCGKrqa9zwrqoLAKckB5HtguR1E2gBMITQU9VPAD8GICIGtl3e+xHJBwBT59xtHcsCYJZlUwA3kcGHbfDep51OZywi3/acZZm9vyJ5WR5o38uACmDunNt6ZwAkUxFZDwghDFT1jeSjiJinhVUBVNVJkiTDKO8CQA+AsbNQ7s1Ps0VVn5MkSfcCtmBoDZi1Bdx4eJ7zbBolrwPy3o9J3rWSHPs3A1BbjVKlYBaIyDgvu9LDXDU2RTZmXVW1oKyLxRD+OrkOrJLy5mVM0iaftDhuhVbsvBzMglzKUNW6IV/OOWtCM8MmVvEkmbwt83LaB19fdgOtVquUZJeknaDdobTwbOcvBzPcN/AXH1DFFWP7u9oAAAAASUVORK5CYII=")}.ol-ctx-menu-zoom-out{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAABU0lEQVQ4T72U7VECMRRFz3sNaAdkacC1AtcKxApcKnCsQOwAK3CtQKxAqEBsANYOqCDPyTIC+8WCw5jfybn33dxEOPGSE/P4b6BzQG89RT47ZJoWhy5B5BGRZAMxWyEyxvtnyFdt8AagS1F9KQ6YvSMyB84xGyDSw2yO2XUbtAJ0MaqfmH0XAPIA2y7tj4F7jAm2uG1yWQZKNEHkBu+Dg2njWBJNEbnC+8uaIFRuWfuG2QxbbrOrUd0A1Tc8D7AIjkur7DAAsVf8MiWMZ3ZR2m02LPIMscATfjHqBnY7TFD9OAy4zTCCPG/MUKMM5O6wkXFr9dZq7FQqqHk/hDzbFa73cFONTZFDdRyiCcKg5rrSiLaXkiI6RjjrfG6VzDs+B5eAxuDXeYpmNRGzL2wZ/wof+du4GNFpBVqqz5HA4MM5VEYYDrOs+1I6Q9u/4Q8O9wN/AGgWjBVqQjjgAAAAAElFTkSuQmCC")}.ol-ctx-menu-container li:hover.ol-ctx-menu-zoom-out{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAABYklEQVQ4T72U4VHCQBCF36tA91KAWIFYgViBWIFYgWMFYgdYgVCBWAFSgdiBFpAsFWSdxcDkQoBkhnF/ZjbfvX377ogjF4/Mw/8CVbUD4MynEJF5k2lqFapqz8yeAPRKkCXJEYAXEVnugm8BVXVgZq/FD+9mtgBwSrJfqF2QvN4FjYCq2jWzTwA/DhARh20qTdMRyQcA0xDCbZ3KCJhl2RTATaHgo+6HLMv8+xXJy+qB3l8FGoB5CKHsXcRV1b6ZvZF8FBH3NKotoJlNkiQZFONdlLtJ3rufbouZPSdJMjwIbKDQEzBrClx7eC4i33Uepmk6JnnXaOQifzMAtdGoRApugYiMI1uqKkrRWAfZo9MxM1+UZzFewl8mN4nYdVM83L7BkwbXLUrF3sfBLQDQBbDy08x8vOohXyEE71lVq9emuEk+3gZa3XYroCvwFyjP8yHJDsnxwaU08GxvS2uFhw78BbzWrxXgMbsHAAAAAElFTkSuQmCC")}

views/default.handlebars

@@ -8,6 +8,7 @@
     <meta name="format-detection" content="telephone=no" />
     <link type="text/css" href="styles/style.css" media="screen" rel="stylesheet" title="CSS" />
     <link type="text/css" href="styles/ol.css" media="screen" rel="stylesheet" title="CSS" />
+    <link type="text/css" href="styles/ol3-contextmenu.min.css" media="screen" rel="stylesheet" title="CSS" />
     <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
     <script type="text/javascript" src="scripts/meshcentral.js"></script>
     <script type="text/javascript" src="scripts/amt-0.2.0.js"></script>
@@ -21,6 +22,7 @@
     <script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
     <script type="text/javascript" src="scripts/filesaver.1.1.20151003.js"></script>
     <script type="text/javascript" src="scripts/ol.js"></script>
+    <script type="text/javascript" src="scripts/ol3-contextmenu.js"></script>
     <title>MeshCentral</title>
 </head>
 
@@ -1003,6 +1005,9 @@
                                 node.desc = message.event.node.desc;
                                 node.publicip = message.event.node.publicip;
                                 node.iploc = message.event.node.iploc;
+                                node.wifiloc = message.event.node.wifiloc;
+                                node.gpsloc = message.event.node.gpsloc;
+                                node.userloc = message.event.node.userloc;
                                 if (message.event.node.agent != undefined) {
                                     if (node.agent == undefined) node.agent = {};
                                     if (message.event.node.agent.ver != undefined) { node.agent.ver = message.event.node.agent.ver; }
@@ -1027,6 +1032,8 @@
                                 drawNotifications();
                                 refreshDevice(node._id);
                                 updateMapMarkers();
+
+                                if ((currentNode == node) && (xxdialogMode != null) && (xxdialogTag == '@xxmap')) { p10showNodeLocationDialog(); }
                             }
                             break;
                         }
@@ -1673,16 +1680,15 @@
             var boundingBox = null;
             for (var i in nodes) {
                 var loc = map_parseNodeLoc(nodes[i]);
-                if (loc) { // Draw markers for devices with locations
+                var feature = xxmap.markersSource.getFeatureById(nodes[i]._id); // Remove if present
+                if ((loc != null) && ((nodes[i].meshid == selectedMesh) || (selectedMesh == undefined))) { // Draw markers for devices with locations
                     lat = loc[0];
                     lon = loc[1];
+                    var type = loc[2];
                     if (boundingBox == null) { boundingBox = [ lat, lon, lat, lon, 0 ]; } else { if (lat < boundingBox[0]) { boundingBox[0] = lat; } if (lon < boundingBox[1]) { boundingBox[1] = lon; } if (lat > boundingBox[2]) { boundingBox[2] = lat; } if (lon > boundingBox[3]) { boundingBox[3] = lon; } }
-                    var feature = xxmap.markersSource.getFeatureById(nodes[i]._id);
+                    if (feature == null) { addFeature(nodes[i]); boundingBox[4] = 1; } else { updateFeature(nodes[i], feature); feature.setStyle(markerStyle(nodes[i], loc[2])); } // Update Feature
-                    if (nodes[i].meshid == selectedMesh || selectedMesh == undefined) {
-                        if (feature == null || feature == undefined) { addFeature(nodes[i]); boundingBox[4] = 1; } else { updateFeature(nodes[i], feature); } // Update Feature
                 } else {
-                        if (feature) { xxmap.markersSource.removeFeature(feature); } // Remove if it does not belong to that mesh
+                    if (feature) { xxmap.markersSource.removeFeature(feature); }
-                    }
                 }
             }
             return boundingBox;
@@ -1692,10 +1698,15 @@
         var map_cm_popup = new ol.Overlay({ element: Q('xmap-info-window'), positioning: 'bottom-center', stopEvent: false });
 
         // Edit Marker item
-        var map_cm_editMarker = { text: "Modify Node location", callback: function (obj) { modifyMarkerloc(obj.data); } };
+        var map_cm_editMarker = { text: "Modify node location", callback: function (obj) { modifyMarkerloc(obj.data); } };
+
+        // Clear Marker item
+        var map_cm_clearMarker = { text: "Remove node location", callback: function (obj) {
+            meshserver.Send({ action: 'changedevice', nodeid: obj.data.a, userloc: [] }); // Clear the user position marker
+        }};
 
         // Save Marker item
-        var map_cm_saveMarker = { text: "Save Node location", callback: function (obj) { saveMarkerloc(obj.data); } };
+        var map_cm_saveMarker = { text: "Save node location", callback: function (obj) { saveMarkerloc(obj.data); } };
 
         // Build a context menu for a feature
         var map_cm_nodemenu_items = [
@@ -1724,9 +1735,14 @@
 
         // Get the lat/lon from a node
         function map_parseNodeLoc(node) {
-            if (!node.iploc) return;
+            var loc = null, t = 0;
-            var loc = node.iploc.split(',');
+            if (node.iploc) { loc = node.iploc; t = 1; }
-            return [parseFloat(loc[0]) + (stringToIntHash(node._id.substring(0, 20)) / 100000000000), parseFloat(loc[1]) + (stringToIntHash(node._id.substring(20)) / 100000000000)]
+            if (node.wifiloc) { loc = node.wifiloc; t = 2; }
+            if (node.gpsloc) { loc = node.gpsloc; t = 3; }
+            if (node.userloc) { loc = node.userloc; t = 4; }
+            if ((loc == null) || (typeof loc != 'string')) return;
+            loc = loc.split(',');
+            return [ parseFloat(loc[0]) + (stringToIntHash(node._id.substring(0, 20)) / 100000000000), parseFloat(loc[1]) + (stringToIntHash(node._id.substring(20)) / 100000000000), t ]
         }
 
         // Load the entire map
@@ -1792,7 +1808,6 @@
                     }
                 });
 
-                /*
                 // Initialize context menu for openlayers
                 contextmenu = new ContextMenu({
                     width: 160,
@@ -1806,9 +1821,7 @@
                     xxmap.contextmenu.clear(); //Clear the context menu
                     if (feature) {
                         var featId = feature.getId();
-                        if (featId) { // Node feature will have an id
+                        if (featId) { addContextMenuItems(feature); } // Node feature will have an id
-                            addContextMenuItems(feature);
-                        }
                         else { // If the feature is a pointer, Get its corresponding Node feature
                             var nodeFeature = getCorrespondingFeature(feature); //return the node feature associated to pointer.
                             if (nodeFeature) { addContextMenuItems(nodeFeature); }
@@ -1817,8 +1830,8 @@
                     }
                     else { xxmap.contextmenu.extend(contextmenu_items); }
                 });
+                if (xxmap.contextmenu == null) { xxmap.contextmenu = contextmenu; }
                 xxmap.map.addControl(xxmap.contextmenu);
-                */
                 //addMeshOptions(); // Adds Mesh names to mesh dropdown
             } catch (e) {
                 QV('viewselectmapoption', false);
@@ -1832,20 +1845,20 @@
             if (existingfeature) { xxmap.markersSource.addFeature(existingfeature); } // Add that existing feature
             else { // Add new feature for this node
                 if (!lat && !lon) { var loc = map_parseNodeLoc(node); lat = loc[0]; lon = loc[1]; }
+                if ((lat < 90) && (lat > -90) && (lon < 180) && (lon > -180)) { // Check valid lat/lon
                     var feature = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.transform([lon, lat], 'EPSG:4326','EPSG:3857')), name: node.name, status: node.conn, lat: lat, lon: lon });
                     feature.setId(node._id); // Set id for the device as nodeid
                     feature.setStyle(markerStyle(node));
                     xxmap.markersSource.addFeature(feature); // Add the feature to Marker Source
                 }
             }
+        }
 
         // Removing any feature from map
         function removeFeature(node) {
-            if (node.iploc) {
             var feature = xxmap.markersSource.getFeatureById(node._id);
             if (feature) { xxmap.markersSource.removeFeature(feature); }
         }
-        }
 
         // Update feature
         function updateFeature(node, feature) {
@@ -1870,6 +1883,7 @@
         function modifyMarkerloc(ft){
             var featid = ft.getId();
             if (featid) {
+                ft.setStyle(markerStyle(getNodeFromId(ft.a), 4)); // Switch to a user marker
                 if ( !getActiveInteractions(ft)) {
                     var dragInteration = new ol.interaction.Modify({
                         features: new ol.Collection([ft]),
@@ -1891,16 +1905,25 @@
                     removeInteraction(featid);
                     var coord = ft.getGeometry().getCoordinates();
                     var v = ol.proj.transform(coord, 'EPSG:3857', 'EPSG:4326');
-                    meshserver.Send({ action: 'changelocation', nodeid: featid, value: v }); // Send them to server to save changes
+                    var vx = [ v[1], v[0] ]; // Flip the coordinates around, lat/long
+                    meshserver.Send({ action: 'changedevice', nodeid: featid, userloc: vx }); // Send them to server to save changes
                 }
             }
         }
 
         // Style the Markers
-        function markerStyle(node) {
+        function markerStyle(node, type) {
+            if (type == null) {
+                type = 0;
+                if (node.iploc) { type = 1; }
+                if (node.wifiloc) { type = 2; }
+                if (node.gpsloc) { type = 3; }
+                if (node.userloc) { type = 4; }
+            }
+            var types = ['', '-ip','-wifi','-gps','-user'];
             var color = connStateColor(node);
             var style = new ol.style.Style({
-                image: new ol.style.Icon({ color: color, anchor: [0.5, 1], src: 'images/mapmarker.png' })
+                image: new ol.style.Icon({ color: color, anchor: [0.5, 1], src: 'images/mapmarker' + types[type] + '.png' })
                 //stroke: new ol.style.Stroke({ color: '#000', width: 20 })
                 //text: new ol.style.Text({ text: 'bob!', textAlign: 'right', offsetX: -10, fill: new ol.style.Fill({ color: '#000' }), stroke: new ol.style.Stroke({ color: '#fff', width: 2 }) })
             });
@@ -1935,6 +1958,11 @@
             } else {
                 map_cm_editMarker.data = feature;
                 xxmap.contextmenu.push(map_cm_editMarker);
+                var node = getNodeFromId(feature.a);
+                if (node.userloc) {
+                    map_cm_clearMarker.data = feature;
+                    xxmap.contextmenu.push(map_cm_clearMarker);
+                }
             }
             map_cm_nodemenu_items.forEach(function (item){
                 if (item.text == 'Zoom-in to extent' || item.text == 'Zoom-out to extent') { item.data = feature; }
@@ -2047,6 +2075,7 @@
                 if (node) {
                     var feature = markersSource.getFeatureById(i);
                     var v = ol.proj.transform(coords, 'EPSG:3857', 'EPSG:4326');
+                    var vx = [ v[1], v[0] ]; // Flip the coordinates around, lat/long
                     if (button == 2) {
                         if (feature) {
                             feature.getGeometry().setCoordinates(coords);
@@ -2054,10 +2083,10 @@
                             if (activeInteraction) {
                                 saveMarkerloc(feature);
                             } else { // If this feature is not modified, then send updated coords to server.
-                                meshserver.Send({ action: 'changelocation', nodeid: node._id, value: v }); // Send them to server to save changes
+                                meshserver.Send({ action: 'changedevice', nodeid: node._id, value: vx }); // Send them to server to save changes
                             }
                         } else {
-                            meshserver.Send({ action: 'changelocation', nodeid: node._id, value: v }); // This Node is not yet added to maps.
+                            meshserver.Send({ action: 'changedevice', nodeid: node._id, value: vx }); // This Node is not yet added to maps.
                         }
                     }
                     else if (button == 1) {
@@ -2065,11 +2094,11 @@
                             feature.getGeometry().setCoordinates(coords);
                             modifyMarkerloc(feature);
                         } else {
-                            if (!node.iploc) {
+                            //if (map_parseNodeLoc(node.iploc) != null) {
                                 addFeature(node, v[0], v[1]);
                                 var newFeature = markersSource.getFeatureById(node._id);
                                 modifyMarkerloc(newFeature);
-                            }
+                            //}
                         }
                     }
                 }
@@ -2438,7 +2467,7 @@
                 if ((meshrights & 4) != 0) x += '<a style=cursor:pointer onclick=p10showDeleteNodeDialog("' + node._id + '")>Delete Device</a>';
                 x += '</div><div style=font-size:x-small>';
                 if (mesh.mtype == 2) x += '<a style=cursor:pointer onclick=p10showNodeNetInfoDialog("' + node._id + '")>Interfaces</a>&nbsp;';
-                if ((node.iploc) && (xxmap != null)) x += '<a style=cursor:pointer onclick=p10showNodeLocationDialog("' + node._id + '")>Location</a>&nbsp;';
+                if (xxmap != null) x += '<a style=cursor:pointer onclick=p10showNodeLocationDialog("' + node._id + '")>Location</a>&nbsp;';
                 x += '</div><br>'
 
                 QH('p10html3', x);
@@ -2650,26 +2679,47 @@
         // Show current location
         var d2map = null;
         function p10showNodeLocationDialog() {
-            if (xxdialogMode) return;
+            if ((xxdialogMode != null) && (xxdialogTag == '@xxmap')) { setDialogMode(0); } else { if (xxdialogMode) return; }
-            var loc = currentNode.iploc.split(',');
+            var markers = [], types = ['iploc', 'wifiloc', 'gpsloc', 'userloc'], boundingBox = null;
-            var lat = parseFloat(loc[0]);
+
-            var lng = parseFloat(loc[1]);
+            for (var loctype in types) {
-            //var x = '<div><a href="https://www.google.com/maps/preview/@' + lat + ',' + lng + ',12z" target=_blank>Open in Google maps</a></div>';
+                if (currentNode[types[loctype]] != null) {
-            var x = '<div id=d2map style=width:100%;height:300px></div>';
+                    var loc = currentNode[types[loctype]].split(','), lat = parseFloat(loc[0]), lon = parseFloat(loc[1]);
-            setDialogMode(2, "Device Location", 1, null, x);
+                    if ((lat < 90) && (lat > -90) && (lon < 180) && (lon > -180)) { // Check valid lat/lon
+                        var deviceMark = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.fromLonLat([lon, lat])) });
+                        deviceMark.setStyle(markerStyle(currentNode, parseInt(loctype) + 1));
+                        markers.push(deviceMark);
+
+                        if (boundingBox == null) { boundingBox = [ lat, lon, lat, lon, 0 ]; } else { if (lat < boundingBox[0]) { boundingBox[0] = lat; } if (lon < boundingBox[1]) { boundingBox[1] = lon; } if (lat > boundingBox[2]) { boundingBox[2] = lat; } if (lon > boundingBox[3]) { boundingBox[3] = lon; } }
+                    }
+                }
+            }
 
             // Setup the device mark layer
-            var deviceMark = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.fromLonLat([lng, lat])) });
+            var vectorSource = new ol.source.Vector({ features: markers });
-            deviceMark.setStyle(markerStyle(currentNode));
-            var vectorSource = new ol.source.Vector({ features: [deviceMark] });
             var vectorLayer = new ol.layer.Vector({ source: vectorSource });
 
+            //var x = '<div><a href="https://www.google.com/maps/preview/@' + lat + ',' + lng + ',12z" target=_blank>Open in Google maps</a></div>';
+            var x = '<div id=d2map style=width:100%;height:300px></div>';
+            setDialogMode(2, "Device Location", 1, null, x, '@xxmap');
+
+            var clng = 0, clat = 0, zoom = 8;
+            if (boundingBox != null) {
+                var clat = (boundingBox[0] + boundingBox[2]) / 2;
+                var clng = (boundingBox[1] + boundingBox[3]) / 2;
+                var cscale = Math.max(Math.abs(boundingBox[0] - boundingBox[2]), Math.abs(boundingBox[1] - boundingBox[3]));
+                var i = 360, zoom = -2;
+                while (i > cscale) { zoom++; i = i / 2; }
+            }
+
+            if (markers.length == 1) { zoom = 8; }
+
             // Setup the map
             d2map = new ol.Map({
                 target: 'd2map',
                 interactions: ol.interaction.defaults({dragPan:false, mouseWheelZoom:false}),
                 layers: [ new ol.layer.Tile({ source: new ol.source.OSM() }), vectorLayer ],
-                view: new ol.View({ center: ol.proj.fromLonLat([lng, lat]), zoom: 8 })
+                view: new ol.View({ center: ol.proj.fromLonLat([clng, clat]), zoom: zoom })
             });
         }
 

webserver.js

@@ -1586,6 +1586,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                         {
                             // Argument validation
                             if ((command.nodeid == null) || (typeof command.nodeid != 'string') || (command.nodeid.split('/').length != 3) || (command.nodeid.split('/')[1] != domain.id)) return; // Invalid domain, operation only valid for current domain
+                            if ((command.userloc) && (command.userloc.length != 2) && (command.userloc.length != 0)) return;
 
                             // Change the device
                             obj.db.Get(command.nodeid, function (err, nodes) {
@@ -1606,6 +1607,17 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                                     if (command.icon && (command.icon != node.icon)) { change = 1; node.icon = command.icon; changes.push('icon'); }
                                     if (command.name && (command.name != node.name)) { change = 1; node.name = command.name; changes.push('name'); }
                                     if (command.host && (command.host != node.host)) { change = 1; node.host = command.host; changes.push('host'); }
+                                    if (command.userloc && ((node.userloc == null) || (command.userloc[0] != node.userloc[0]) || (command.userloc[1] != node.userloc[1]))) {
+                                        change = 1;
+                                        if ((command.userloc.length == 0) && (node.userloc)) {
+                                            delete node.userloc;
+                                            changes.push('location removed');
+                                        } else {
+                                            command.userloc.push((Math.floor((new Date()) / 1000)));
+                                            node.userloc = command.userloc.join(',');
+                                            changes.push('location');
+                                        }
+                                    }
                                     if (command.desc != null && (command.desc != node.desc)) { change = 1; node.desc = command.desc; changes.push('description'); }
                                     if (command.intelamt != null) {
                                         if ((command.intelamt.user != null) && (command.intelamt.pass != undefined) && ((command.intelamt.user != node.intelamt.user) || (command.intelamt.pass != node.intelamt.pass))) { change = 1; node.intelamt.user = command.intelamt.user; node.intelamt.pass = command.intelamt.pass; changes.push('Intel AMT credentials'); }