Merge remote-tracking branch 'openlayers/master' into vector-api
This commit is contained in:
@@ -57,9 +57,10 @@ brightness.bindTo('value', layer, 'brightness')
|
||||
|
||||
|
||||
var rotation = new ol.dom.Input(document.getElementById('rotation'));
|
||||
rotation.bindTo('value', map.getView(), 'rotation')
|
||||
rotation.bindTo('value', /** @type {ol.View2D} */ (map.getView()), 'rotation')
|
||||
.transform(parseFloat, String);
|
||||
|
||||
var resolution = new ol.dom.Input(document.getElementById('resolution'));
|
||||
resolution.bindTo('value', map.getView(), 'resolution')
|
||||
resolution.bindTo('value',
|
||||
/** @type {ol.View2D} */ (map.getView()), 'resolution')
|
||||
.transform(parseFloat, String);
|
||||
|
||||
@@ -6,6 +6,10 @@ goog.require('ol.dom.Input');
|
||||
goog.require('ol.layer.Tile');
|
||||
goog.require('ol.source.OSM');
|
||||
|
||||
var view = new ol.View2D({
|
||||
center: [0, 0],
|
||||
zoom: 2
|
||||
});
|
||||
var map = new ol.Map({
|
||||
layers: [
|
||||
new ol.layer.Tile({
|
||||
@@ -14,22 +18,20 @@ var map = new ol.Map({
|
||||
],
|
||||
renderers: ol.RendererHints.createFromQueryData(),
|
||||
target: 'map',
|
||||
view: new ol.View2D({
|
||||
center: [0, 0],
|
||||
zoom: 2
|
||||
})
|
||||
view: view
|
||||
});
|
||||
var view = map.getView();
|
||||
|
||||
var deviceOrientation = new ol.DeviceOrientation();
|
||||
var track = new ol.dom.Input(document.getElementById('track'));
|
||||
track.bindTo('checked', deviceOrientation, 'tracking');
|
||||
|
||||
deviceOrientation.on('change', function(event) {
|
||||
document.getElementById('alpha').innerHTML = event.target.getAlpha();
|
||||
document.getElementById('beta').innerHTML = event.target.getBeta();
|
||||
document.getElementById('gamma').innerHTML = event.target.getGamma();
|
||||
document.getElementById('heading').innerHTML = event.target.getHeading();
|
||||
deviceOrientation.on('propertychange', function(event) {
|
||||
// event.getKey() is the changed property name
|
||||
var key = event.getKey();
|
||||
var element = document.getElementById(key);
|
||||
if (element) {
|
||||
element.innerHTML = deviceOrientation.get(key);
|
||||
}
|
||||
});
|
||||
|
||||
// tilt the map
|
||||
|
||||
@@ -24,12 +24,12 @@ var map = new ol.Map({
|
||||
});
|
||||
|
||||
var geolocation = new ol.Geolocation();
|
||||
geolocation.bindTo('projection', map.getView());
|
||||
geolocation.bindTo('projection', /** @type {ol.View2D} */ (map.getView()));
|
||||
|
||||
var track = new ol.dom.Input(document.getElementById('track'));
|
||||
track.bindTo('checked', geolocation, 'tracking');
|
||||
|
||||
geolocation.on('change', function() {
|
||||
geolocation.on('propertychange', function() {
|
||||
$('#accuracy').text(geolocation.getAccuracy() + ' [m]');
|
||||
$('#altitude').text(geolocation.getAltitude() + ' [m]');
|
||||
$('#altitudeAccuracy').text(geolocation.getAltitudeAccuracy() + ' [m]');
|
||||
|
||||
Reference in New Issue
Block a user