Merge branch 'master' of github.com:openlayers/ol3 into vector

Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html

src/ol/source/bingmapssource.js

@@ -3,10 +3,14 @@ goog.provide('ol.source.BingMaps');
 
 goog.require('goog.Uri');
 goog.require('goog.array');
-goog.require('goog.events');
-goog.require('goog.events.EventType');
 goog.require('goog.net.Jsonp');
+goog.require('ol.Attribution');
+goog.require('ol.Extent');
+goog.require('ol.Projection');
+goog.require('ol.Size');
+goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
+goog.require('ol.TileUrlFunction');
 goog.require('ol.source.ImageTileSource');
 goog.require('ol.tilegrid.XYZ');
 

src/ol/source/debugtilesource.js

@@ -4,6 +4,7 @@ goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.TileCache');
 goog.require('ol.TileCoord');
+goog.require('ol.TileState');
 goog.require('ol.source.TileSource');
 goog.require('ol.tilegrid.TileGrid');
 

src/ol/source/imagetilesource.js

@@ -5,6 +5,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Extent');
 goog.require('ol.ImageTile');
 goog.require('ol.Projection');
+goog.require('ol.Tile');
 goog.require('ol.TileCache');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');

src/ol/source/openstreetmapsource.js

@@ -1,5 +1,6 @@
 goog.provide('ol.source.OpenStreetMap');
 
+goog.require('ol.Attribution');
 goog.require('ol.source.XYZ');
 
 

src/ol/source/source.js

@@ -6,7 +6,6 @@ goog.require('goog.functions');
 goog.require('ol.Attribution');
 goog.require('ol.Extent');
 goog.require('ol.Projection');
-goog.require('ol.TileUrlFunction');
 
 
 /**

src/ol/source/stamensource.js

@@ -4,6 +4,7 @@ goog.provide('ol.source.Stamen');
 goog.provide('ol.source.StamenFlavor');
 goog.provide('ol.source.StamenProvider');
 
+goog.require('ol.Attribution');
 goog.require('ol.source.XYZ');
 
 

src/ol/source/tiledwmssource.js

@@ -4,15 +4,13 @@ goog.provide('ol.source.TiledWMS');
 
 
 goog.require('goog.array');
-goog.require('goog.asserts');
 goog.require('goog.object');
 goog.require('goog.uri.utils');
-goog.require('ol.Attribution');
+goog.require('ol.Extent');
 goog.require('ol.Projection');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.source.ImageTileSource');
-goog.require('ol.tilegrid.TileGrid');
 
 
 

src/ol/source/tilejsonsource.js

@@ -1,6 +1,6 @@
 // FIXME add some error checking
 // FIXME check order of async callbacks
-// FIXME use minzoom when supported by ol.tilegrid.TileGrid
+// FIXME use minzoom when supported
 
 /**
  * @see http://mapbox.com/developers/api/
@@ -10,10 +10,12 @@ goog.provide('ol.source.TileJSON');
 goog.provide('ol.tilejson');
 
 goog.require('goog.asserts');
-goog.require('goog.events.EventType');
 goog.require('goog.net.jsloader');
-goog.require('goog.string');
+goog.require('ol.Attribution');
+goog.require('ol.Extent');
 goog.require('ol.Projection');
+goog.require('ol.TileCoord');
+goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.source.ImageTileSource');
 goog.require('ol.tilegrid.XYZ');

src/ol/source/tilesource.js

@@ -7,8 +7,7 @@ goog.require('ol.Extent');
 goog.require('ol.Projection');
 goog.require('ol.Tile');
 goog.require('ol.TileCoord');
-goog.require('ol.TileUrlFunction');
-goog.require('ol.TileUrlFunctionType');
+goog.require('ol.TileRange');
 goog.require('ol.source.Source');
 goog.require('ol.tilegrid.TileGrid');
 

src/ol/source/xyzsource.js

@@ -5,9 +5,8 @@ goog.provide('ol.source.XYZOptions');
 
 goog.require('goog.math');
 goog.require('ol.Attribution');
-goog.require('ol.Coordinate');
+goog.require('ol.Extent');
 goog.require('ol.Projection');
-goog.require('ol.Size');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');