Merge remote-tracking branch 'openlayers/master' into vector-api

examples/bind-input.js

@@ -22,14 +22,17 @@ if (!ol.webgl.SUPPORTED) {
 var layer = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
+
+var view = new ol.View2D({
+  center: [0, 0],
+  zoom: 2
+});
+
 var map = new ol.Map({
   layers: [layer],
   renderers: ol.RendererHints.createFromQueryData(),
   target: 'map',
-  view: new ol.View2D({
+  view: view
-    center: [0, 0],
-    zoom: 2
-  })
 });
 
 var visible = new ol.dom.Input(document.getElementById('visible'));
@@ -57,10 +60,7 @@ brightness.bindTo('value', layer, 'brightness')
 
 
 var rotation = new ol.dom.Input(document.getElementById('rotation'));
-rotation.bindTo('value', /** @type {ol.View2D} */ (map.getView()), 'rotation')
+rotation.bindTo('value', view, 'rotation').transform(parseFloat, String);
-    .transform(parseFloat, String);
 
 var resolution = new ol.dom.Input(document.getElementById('resolution'));
-resolution.bindTo('value',
+resolution.bindTo('value', view, 'resolution').transform(parseFloat, String);
-    /** @type {ol.View2D} */ (map.getView()), 'resolution')
-    .transform(parseFloat, String);

examples/geolocation.js

@@ -9,6 +9,11 @@ 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({
@@ -17,14 +22,11 @@ var map = new ol.Map({
   ],
   renderers: ol.RendererHints.createFromQueryData(),
   target: 'map',
-  view: new ol.View2D({
+  view: view
-    center: [0, 0],
-    zoom: 2
-  })
 });
 
 var geolocation = new ol.Geolocation();
-geolocation.bindTo('projection', /** @type {ol.View2D} */ (map.getView()));
+geolocation.bindTo('projection', view);
 
 var track = new ol.dom.Input(document.getElementById('track'));
 track.bindTo('checked', geolocation, 'tracking');

src/ol/interaction/interaction.js

@@ -3,8 +3,8 @@
 goog.provide('ol.interaction.Interaction');
 
 goog.require('goog.asserts');
-goog.require('goog.events.EventTarget');
 goog.require('ol.MapBrowserEvent');
+goog.require('ol.Observable');
 goog.require('ol.View2D');
 goog.require('ol.animation');
 goog.require('ol.easing');
@@ -13,7 +13,7 @@ goog.require('ol.easing');
 
 /**
  * @constructor
- * @extends {goog.events.EventTarget}
+ * @extends {ol.Observable}
  */
 ol.interaction.Interaction = function() {
   goog.base(this);
@@ -25,7 +25,7 @@ ol.interaction.Interaction = function() {
   this.map_ = null;
 
 };
-goog.inherits(ol.interaction.Interaction, goog.events.EventTarget);
+goog.inherits(ol.interaction.Interaction, ol.Observable);
 
 
 /**