aboutsummaryrefslogtreecommitdiff
path: root/web/simple
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-01-25 02:00:09 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-01-25 02:00:10 +1300
commitfa55a66f7aa89fbb2fbdd1a81af1b03f1fbac109 (patch)
tree6bff8f936be3a23de2ae617163694fed6e51b6cc /web/simple
parent3f959ddcd1bea187deaed720cc9036b67e80f348 (diff)
downloadtrackermap-web-fa55a66f7aa89fbb2fbdd1a81af1b03f1fbac109.tar.gz
trackermap-web-fa55a66f7aa89fbb2fbdd1a81af1b03f1fbac109.tar.bz2
trackermap-web-fa55a66f7aa89fbb2fbdd1a81af1b03f1fbac109.zip
Improve simple map view
Diffstat (limited to 'web/simple')
-rw-r--r--web/simple/app.js70
1 files changed, 47 insertions, 23 deletions
diff --git a/web/simple/app.js b/web/simple/app.js
index f43d537e..cc83c7dc 100644
--- a/web/simple/app.js
+++ b/web/simple/app.js
@@ -14,6 +14,21 @@
* limitations under the License.
*/
+if (!Array.prototype.find) {
+ Object.defineProperty(Array.prototype, "find", {
+ value: function(predicate) {
+ var value;
+ for (var i = 0; i < this.length; i++) {
+ value = list[i];
+ if (predicate.call(arguments[1], value, i, list)) {
+ return value;
+ }
+ }
+ return undefined;
+ }
+ });
+}
+
var url = window.location.protocol + '//' + window.location.host;
var token = (window.location.search.match(/token=([^&#]+)/) || [])[1];
@@ -79,34 +94,43 @@ var ajax = function (method, url, callback) {
xhr.send()
};
-ajax('GET', url + '/api/session?token=' + token, function(user) {
- ajax('GET', url + '/api/devices', function(devices) {
+ajax('GET', url + '/api/server', function(server) {
+ ajax('GET', url + '/api/session?token=' + token, function(user) {
+
+ map.getView().setCenter(ol.proj.fromLonLat([
+ user.longitude || server.longitude || 0.0,
+ user.latitude || server.latitude || 0.0
+ ]));
+ map.getView().setZoom(user.zoom || server.zoom || 2);
+
+ ajax('GET', url + '/api/devices', function(devices) {
- var socket = new WebSocket('ws' + url.substring(4) + '/api/socket');
+ var socket = new WebSocket('ws' + url.substring(4) + '/api/socket');
- socket.onclose = function (event) {
- console.log('socket closed');
- };
+ socket.onclose = function (event) {
+ console.log('socket closed');
+ };
- socket.onmessage = function (event) {
- var data = JSON.parse(event.data);
- if (data.positions) {
- for (i = 0; i < data.positions.length; i++) {
- var position = data.positions[i];
- var marker = markers[position.deviceId];
- var point = new ol.geom.Point(ol.proj.fromLonLat([position.longitude, position.latitude]));
- if (!marker) {
- var device = devices.find(function (device) { return device.id === position.deviceId });
- marker = new ol.Feature(point);
- marker.setStyle(style(device.name));
- markers[position.deviceId] = marker;
- source.addFeature(marker);
- } else {
- marker.setGeometry(point);
+ socket.onmessage = function (event) {
+ var data = JSON.parse(event.data);
+ if (data.positions) {
+ for (i = 0; i < data.positions.length; i++) {
+ var position = data.positions[i];
+ var marker = markers[position.deviceId];
+ var point = new ol.geom.Point(ol.proj.fromLonLat([position.longitude, position.latitude]));
+ if (!marker) {
+ var device = devices.find(function (device) { return device.id === position.deviceId });
+ marker = new ol.Feature(point);
+ marker.setStyle(style(device.name));
+ markers[position.deviceId] = marker;
+ source.addFeature(marker);
+ } else {
+ marker.setGeometry(point);
+ }
}
}
- }
- };
+ };
+ });
});
});