X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=4185e0cba0a7abfedfd2ffbeb870a776b596de42;hp=cb659f9d2f6f81967557b57fca08fd39017d3de2;hb=31f0fe16d8a1a120551f71c28d58255fc1e3cbe9;hpb=4b12da3a7069591d3ec6aceb4a949c97bc7549f2 diff --git a/js/map.js b/js/map.js index cb659f9..4185e0c 100644 --- a/js/map.js +++ b/js/map.js @@ -131,8 +131,8 @@ function initMap() { } function resizeAndDraw() { - var viewportWidth = window.innerWidth; - var viewportHeight = window.innerHeight; + var viewportWidth = Math.min(window.innerWidth, window.outerWidth); + var viewportHeight = Math.min(window.innerHeight, window.outerHeight); var canvasWidth = viewportWidth * 0.98; var canvasHeight = (viewportHeight - 100) * 0.98; @@ -475,15 +475,21 @@ function startTracking() { return; }; getStoredTrack(); - if (navigator.geolocation) { + if (gGeolocation) { gGeoWatchID = gGeolocation.watchPosition( function(position) { // Coords spec: https://developer.mozilla.org/en/XPCOM_Interface_Reference/NsIDOMGeoPositionCoords var tPoint = {time: position.timestamp, - coords: position.coords, + coords: {latitude: position.coords.latitude, + longitude: position.coords.longitude, + altitude: position.coords.altitude, + accuracy: position.coords.accuracy, + altitudeAccuracy: position.coords.altitudeAccuracy, + heading: position.coords.heading, + speed: position.coords.speed}, beginSegment: !gLastTrackPoint}; gTrack.push(tPoint); - gTrackStore.push(tPoint); + try { gTrackStore.push(tPoint); } catch(e) {} drawTrackPoint(position.coords.latitude, position.coords.longitude); if (gCenterPosition) { var posCoord = gps2xy(position.coords.latitude,