Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix autorotate #3103

Merged
merged 2 commits into from
Nov 28, 2017
Merged

Fix autorotate #3103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8210ea7
Fix autorotate
llienher Nov 28, 2017
ebd6f4c
Clean handleRotate function
llienher Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 33 additions & 118 deletions src/directives/mobilegeolocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ goog.require('ol.Feature');
goog.require('ol.Geolocation');
goog.require('ol.Map');
goog.require('ol.geom.Point');
goog.require('ol.DeviceOrientation');


/**
Expand Down Expand Up @@ -116,22 +115,13 @@ ngeo.MobileGeolocationController = function($scope, $element,
})
});

/**
* @private
* @type {ol.DeviceOrientation}
*/
this.deviceOrientation;

if (options.autorotate) {
this.autorotateListener();
}

// handle geolocation error.
this.geolocation_.on('error', function(error) {
this.untrack_();
if (this.deviceOrientation) {
this.deviceOrientation.setTracking(false);
}
let msg;
switch (error.code) {
case 1:
Expand Down Expand Up @@ -296,118 +286,43 @@ ngeo.MobileGeolocationController.prototype.handleViewChange_ = function(event) {
}
};

function isIOS() {
return /iPad|iPhone|iPod/.test(navigator.userAgent) &&
!window['MSStream'];
}

// Get heading depending on devices
function headingFromDevices(deviceOrientation) {
let hdg = deviceOrientation.getHeading();
let orientation = window.orientation;
if (hdg === undefined) {
return undefined;
}
if (!isIOS()) {
hdg = -hdg;
if (window.screen.orientation.angle) {
orientation = window.screen.orientation.angle;
}

// Orientation control events
ngeo.MobileGeolocationController.prototype.autorotateListener = function() {
let currentAlpha = 0;
if (window.hasOwnProperty('ondeviceorientationabsolute')) {
window.addEventListener('deviceorientationabsolute', (evt) => {
currentAlpha = this.handleRotate_(evt.alpha, currentAlpha);
}, true);
} else if (window.hasOwnProperty('ondeviceorientation')) {
window.addEventListener('deviceorientation', (evt) => {
if (evt.webkitCompassHeading) { // check for iOS property
currentAlpha = this.handleRotate_(-evt.webkitCompassHeading, currentAlpha);
} else { // non iOS
currentAlpha = this.handleRotate_(evt.alpha - 270, currentAlpha);
}
}, true);
} else {
console.error('Orientation is not supported on this device');
}
// Normalize to be between -90 and 180
orientation = ((orientation + 179) % 360 - 179);
// Add to hdg in radian
hdg += orientation * Math.PI / 180;
return hdg;
}

// Update heading
ngeo.MobileGeolocationController.prototype.headingUpdate = function() {
let heading = headingFromDevices(this.deviceOrientation);
if (heading !== undefined) {
heading = -heading;
const currRotation = this.map_.getView().getRotation();
const diff = heading - currRotation;

if (diff > Math.PI) {
heading -= 2 * Math.PI;
}
};

/**
* Handle rotation.
* @param {number} eventAlpha .
* @param {number} currentAlpha .
* @return {number} .
* @private
*/
ngeo.MobileGeolocationController.prototype.handleRotate_ = function(eventAlpha, currentAlpha) {
if (Math.abs(eventAlpha - currentAlpha) > 0.2) {
currentAlpha = eventAlpha;
const radAlpha = currentAlpha * Math.PI / 180;
this.map_.getView().animate({
rotation: heading,
rotation: radAlpha,
duration: 350,
easing: ol.easing.linear
});
}
return currentAlpha;
};

/**
* Orientation control events
* @suppress {deprecated}
*/
ngeo.MobileGeolocationController.prototype.autorotateListener = function() {
this.deviceOrientation = new ol.DeviceOrientation();

let currHeading = 0;
const headngUpdateWhenMapRotate = throttle(this.headingUpdate, 300, this);

this.deviceOrientation.on(['change'], (event) => {
const heading = headingFromDevices(this.deviceOrientation);
if (heading === undefined) {
console.error('Heading is undefined');
return;
}

if (Math.abs(heading - currHeading) > 0.05) {
currHeading = heading;
headngUpdateWhenMapRotate();
}
});

this.deviceOrientation.setTracking(true);
};

function throttle(fn, time, context) {
let lock, args, asyncKey, destroyed;

function later() {
// reset lock and call if queued
lock = false;
if (args) {
throttled.call(context, args);
args = false;
}
}

const checkDestroyed = function() {
if (destroyed) {
throw new Error('Method was already destroyed');
}
};

function throttled(...argumentList) {
checkDestroyed();

if (lock) {
// called too soon, queue to call later
args = argumentList;
return;
}

// call and lock until later
fn.apply(context, argumentList);
asyncKey = setTimeout(later, time);
lock = true;
}

throttled.destroy = function() {
checkDestroyed();

if (asyncKey) {
clearTimeout(asyncKey);
}

destroyed = true;
};

return throttled;
}