ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html
This commit is contained in:
ahocevar
2013-02-05 17:17:09 +01:00
parent dafa48da2e f735a597fe
commit 386b97cf9a
77 changed files with 259 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvaslayerrenderer.js
+1
View File
@@ -1,5 +1,6 @@
goog.provide('ol.renderer.canvas.Layer');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');
src/ol/renderer/canvas/canvasrenderer.js
+1
View File
@@ -1,4 +1,5 @@
goog.provide('ol.renderer.canvas');
goog.provide('ol.renderer.canvas.isSupported');
goog.provide('ol.renderer.canvas.Renderer');
goog.require('goog.asserts');
src/ol/renderer/canvas/canvastilelayerrenderer.js
+3 -2
View File
@@ -6,10 +6,11 @@ goog.provide('ol.renderer.canvas.TileLayer');
goog.require('goog.array');
goog.require('goog.dom');
goog.require('goog.style');
goog.require('goog.vec.Mat4');
goog.require('ol.Size');
goog.require('ol.TileRange');
goog.require('ol.Tile');
goog.require('ol.TileCoord');
goog.require('ol.TileState');
goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Layer');