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

2
src/ol/animation.js
View File

@@ -1,10 +1,10 @@
// FIXME works for View2D only
// FIXME dependency on ol.View2D suppressed to prevent dependency loop
goog.provide('ol.animation');
goog.require('goog.fx.easing');
goog.require('ol.PreRenderFunction');
goog.require('ol.ViewHint');
goog.require('ol.easing');

2
src/ol/attribution.js
View File

@@ -1,5 +1,7 @@
goog.provide('ol.Attribution');
goog.require('ol.TileRange');
/**

1
src/ol/collection.js
View File

@@ -9,7 +9,6 @@ goog.provide('ol.CollectionEvent');
goog.provide('ol.CollectionEventType');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.events.Event');
goog.require('ol.Object');

4
src/ol/control/attributioncontrol.js
View File

@@ -8,8 +8,12 @@ goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.object');
goog.require('goog.style');
goog.require('ol.Attribution');
goog.require('ol.MapEvent');
goog.require('ol.MapEventType');
goog.require('ol.TileRange');
goog.require('ol.control.Control');
goog.require('ol.source.TileSource');

4
src/ol/control/dragboxcontrol.js
View File

@@ -5,6 +5,10 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.style');
goog.require('ol.Coordinate');
goog.require('ol.MapBrowserEvent');
goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.Pixel');
goog.require('ol.Size');
goog.require('ol.control.Control');

4
src/ol/control/mousepositioncontrol.js
View File

@@ -8,7 +8,9 @@ goog.require('goog.dom');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('goog.style');
goog.require('ol.Object');
goog.require('ol.CoordinateFormatType');
goog.require('ol.MapEvent');
goog.require('ol.MapEventType');
goog.require('ol.Pixel');
goog.require('ol.Projection');
goog.require('ol.TransformFunction');

1
src/ol/control/zoomcontrol.js
View File

@@ -7,7 +7,6 @@ goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.BrowserFeature');
goog.require('ol.Projection');
goog.require('ol.control.Control');

2
src/ol/framestate.js
View File

@@ -7,12 +7,12 @@ goog.provide('ol.PreRenderFunction');
goog.require('goog.vec.Mat4');
goog.require('ol.Color');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Size');
goog.require('ol.TileQueue');
goog.require('ol.TileRange');
goog.require('ol.View2DState');
goog.require('ol.layer.Layer');
goog.require('ol.layer.LayerState');

1
src/ol/imagetile.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.ImageTile');
goog.require('goog.array');
goog.require('goog.events');
goog.require('goog.events.EventTarget');
goog.require('goog.events.EventType');
goog.require('ol.Tile');
goog.require('ol.TileCoord');

3
src/ol/interaction/draginteraction.js
View File

@@ -1,11 +1,10 @@
goog.provide('ol.interaction.Drag');
goog.require('goog.asserts');
goog.require('goog.events.EventType');
goog.require('goog.functions');
goog.require('ol.Coordinate');
goog.require('ol.MapBrowserEvent');
goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.interaction.Interaction');

4
src/ol/interaction/dragpaninteraction.js
View File

@@ -4,7 +4,9 @@ goog.provide('ol.interaction.DragPan');
goog.require('goog.asserts');
goog.require('ol.Coordinate');
goog.require('ol.MapBrowserEvent');
goog.require('ol.Kinetic');
goog.require('ol.Pixel');
goog.require('ol.PreRenderFunction');
goog.require('ol.View2D');
goog.require('ol.ViewHint');
goog.require('ol.interaction.ConditionType');

1
src/ol/interaction/dragrotateandzoominteraction.js
View File

@@ -3,7 +3,6 @@
goog.provide('ol.interaction.DragRotateAndZoom');
goog.require('goog.math.Vec2');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View2D');
goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag');

1
src/ol/interaction/dragrotateinteraction.js
View File

@@ -1,6 +1,5 @@
goog.provide('ol.interaction.DragRotate');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View2D');
goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag');

3
src/ol/interaction/dragzoominteraction.js
View File

@@ -4,7 +4,8 @@
goog.provide('ol.interaction.DragZoom');
goog.require('ol.Extent');
goog.require('ol.MapBrowserEvent');
goog.require('ol.Size');
goog.require('ol.View2D');
goog.require('ol.control.DragBox');
goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag');

1
src/ol/interaction/keyboardpaninteraction.js
View File

@@ -4,6 +4,7 @@ goog.provide('ol.interaction.KeyboardPan');
goog.require('goog.events.KeyCodes');
goog.require('goog.events.KeyHandler.EventType');
goog.require('ol.Coordinate');
goog.require('ol.View2D');
goog.require('ol.interaction.Interaction');

1
src/ol/interaction/keyboardzoominteraction.js
View File

@@ -2,7 +2,6 @@
goog.provide('ol.interaction.KeyboardZoom');
goog.require('goog.events.KeyCodes');
goog.require('goog.events.KeyHandler.EventType');
goog.require('ol.View2D');
goog.require('ol.interaction.Interaction');

2
src/ol/interaction/mousewheelzoominteraction.js
View File

@@ -4,8 +4,8 @@ goog.provide('ol.interaction.MouseWheelZoom');
goog.require('goog.events.MouseWheelEvent');
goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View2D');
goog.require('ol.interaction.Interaction');

1
src/ol/iview2d.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.IView2D');
goog.provide('ol.View2DState');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Projection');

4
src/ol/kinetic.js
View File

@@ -1,8 +1,8 @@
goog.provide('ol.Kinetic');
goog.require('goog.array');
goog.require('ol.Pixel');
goog.require('ol.Coordinate');
goog.require('ol.PreRenderFunction');
goog.require('ol.animation');

27
src/ol/map.js
View File

@@ -10,7 +10,6 @@ goog.provide('ol.RendererHints');
goog.require('goog.Uri.QueryData');
goog.require('goog.async.AnimationDelay');
goog.require('goog.debug.Logger');
goog.require('goog.dispose');
goog.require('goog.dom');
goog.require('goog.dom.ViewportSizeMonitor');
goog.require('goog.events');
@@ -19,29 +18,35 @@ goog.require('goog.events.Event');
goog.require('goog.events.EventType');
goog.require('goog.events.KeyHandler');
goog.require('goog.events.KeyHandler.EventType');
goog.require('goog.events.MouseWheelEvent');
goog.require('goog.events.MouseWheelHandler');
goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('goog.object');
goog.require('ol.BrowserFeature');
goog.require('ol.Collection');
goog.require('ol.CollectionEvent');
goog.require('ol.CollectionEventType');
goog.require('ol.Color');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.FrameState');
goog.require('ol.IView');
goog.require('ol.Kinetic');
goog.require('ol.MapBrowserEvent');
goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.MapBrowserEventHandler');
goog.require('ol.MapEvent');
goog.require('ol.MapEventType');
goog.require('ol.Object');
goog.require('ol.ObjectEventType');
goog.require('ol.Pixel');
goog.require('ol.ResolutionConstraint');
goog.require('ol.RotationConstraint');
goog.require('ol.PostRenderFunction');
goog.require('ol.PreRenderFunction');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.TileQueue');
goog.require('ol.TransformFunction');
goog.require('ol.View');
goog.require('ol.View2D');
goog.require('ol.View2DState');
goog.require('ol.control.Attribution');
goog.require('ol.control.Control');
goog.require('ol.control.Zoom');
goog.require('ol.interaction.DblClickZoom');
goog.require('ol.interaction.DragPan');
@@ -52,14 +57,14 @@ goog.require('ol.interaction.KeyboardPan');
goog.require('ol.interaction.KeyboardZoom');
goog.require('ol.interaction.MouseWheelZoom');
goog.require('ol.interaction.condition');
goog.require('ol.renderer.Layer');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas');
goog.require('ol.renderer.canvas.Map');
goog.require('ol.renderer.dom');
goog.require('ol.renderer.canvas.isSupported');
goog.require('ol.renderer.dom.Map');
goog.require('ol.renderer.webgl');
goog.require('ol.renderer.dom.isSupported');
goog.require('ol.renderer.webgl.Map');
goog.require('ol.renderer.webgl.isSupported');
/**

1
src/ol/mapbrowserevent.js
View File

@@ -10,6 +10,7 @@ goog.require('goog.events.EventType');
goog.require('goog.style');
goog.require('ol.BrowserFeature');
goog.require('ol.Coordinate');
goog.require('ol.FrameState');
goog.require('ol.MapEvent');
goog.require('ol.Pixel');

1
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

@@ -1,5 +1,6 @@
goog.provide('ol.renderer.canvas.Layer');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');

1
src/ol/renderer/canvas/canvasrenderer.js
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');

5
src/ol/renderer/canvas/canvastilelayerrenderer.js
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');

1
src/ol/renderer/dom/domlayerrenderer.js
View File

@@ -1,6 +1,5 @@
goog.provide('ol.renderer.dom.Layer');
goog.require('ol.Coordinate');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');

4
src/ol/renderer/dom/dommaprenderer.js
View File

@@ -4,11 +4,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.Event');
goog.require('goog.style');
goog.require('ol.Coordinate');
goog.require('ol.FrameState');
goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.dom.TileLayer');

2
src/ol/renderer/dom/domrenderer.js
View File

@@ -1,4 +1,4 @@
goog.provide('ol.renderer.dom');
goog.provide('ol.renderer.dom.isSupported');
goog.require('goog.functions');

5
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -5,17 +5,16 @@ goog.provide('ol.renderer.dom.TileLayer');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.math.Vec2');
goog.require('goog.style');
goog.require('goog.vec.Mat4');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');
goog.require('ol.TileState');
goog.require('ol.ViewHint');
goog.require('ol.dom');
goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.dom.Layer');
goog.require('ol.tilegrid.TileGrid');

1
src/ol/renderer/layerrenderer.js
View File

@@ -8,6 +8,7 @@ goog.require('ol.TileRange');
goog.require('ol.layer.Layer');
goog.require('ol.layer.LayerProperty');
goog.require('ol.layer.LayerState');
goog.require('ol.source.Source');
goog.require('ol.source.TileSource');

7
src/ol/renderer/maprenderer.js
View File

@@ -6,9 +6,12 @@ goog.require('goog.asserts');
goog.require('goog.events');
goog.require('goog.functions');
goog.require('goog.vec.Mat4');
goog.require('ol.CollectionEvent');
goog.require('ol.CollectionEventType');
goog.require('ol.FrameState');
goog.require('ol.View2D');
goog.require('ol.View2DProperty');
goog.require('ol.Object');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');

5
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -5,16 +5,15 @@ goog.provide('ol.renderer.webgl.map.shader');
goog.require('goog.array');
goog.require('goog.debug.Logger');
goog.require('goog.dispose');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.Event');
goog.require('goog.events.EventType');
goog.require('goog.style');
goog.require('goog.webgl');
goog.require('ol.FrameState');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.layer.Layer');
goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.webgl.FragmentShader');

2
src/ol/renderer/webgl/webglrenderer.js
View File

@@ -1,4 +1,4 @@
goog.provide('ol.renderer.webgl');
goog.provide('ol.renderer.webgl.isSupported');
goog.require('ol.webgl');

7
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -7,16 +7,17 @@ goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Fragment');
goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Vertex');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.events.EventType');
goog.require('goog.object');
goog.require('goog.structs.PriorityQueue');
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4');
goog.require('goog.webgl');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.FrameState');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');
goog.require('ol.TileState');
goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.webgl.FragmentShader');

8
src/ol/source/bingmapssource.js
View File

@@ -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');

1
src/ol/source/debugtilesource.js
View File

@@ -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');

1
src/ol/source/imagetilesource.js
View File

@@ -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');

1
src/ol/source/openstreetmapsource.js
View File

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

1
src/ol/source/source.js
View File

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

1
src/ol/source/stamensource.js
View File

@@ -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');

4
src/ol/source/tiledwmssource.js
View File

@@ -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');

8
src/ol/source/tilejsonsource.js
View File

@@ -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');

3
src/ol/source/tilesource.js
View File

@@ -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');

3
src/ol/source/xyzsource.js
View File

@@ -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');

1
src/ol/tile.js
View File

@@ -1,7 +1,6 @@
goog.provide('ol.Tile');
goog.provide('ol.TileState');
goog.require('goog.array');
goog.require('goog.events');
goog.require('goog.events.EventTarget');
goog.require('goog.events.EventType');

1
src/ol/tilecache.js
View File

@@ -1,6 +1,5 @@
goog.provide('ol.TileCache');
goog.require('goog.dispose');
goog.require('ol.Tile');
goog.require('ol.TileRange');
goog.require('ol.structs.LinkedMap');

1
src/ol/tilegrid/tilegrid.js
View File

@@ -7,6 +7,7 @@ goog.require('goog.asserts');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.PixelBounds');
goog.require('ol.Projection');
goog.require('ol.Size');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');

2
src/ol/view.js
View File

@@ -3,8 +3,6 @@ goog.provide('ol.ViewHint');
goog.require('goog.array');
goog.require('ol.IView');
goog.require('ol.IView2D');
goog.require('ol.IView3D');
goog.require('ol.Object');

2
src/ol/view2d.js
View File

@@ -5,12 +5,14 @@ goog.provide('ol.View2D');
goog.provide('ol.View2DProperty');
goog.require('ol.Constraints');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.IView2D');
goog.require('ol.IView3D');
goog.require('ol.Projection');
goog.require('ol.ResolutionConstraint');
goog.require('ol.RotationConstraint');
goog.require('ol.Size');
goog.require('ol.View');
goog.require('ol.animation');