Merge pull request #2261 from tschaub/view

Rename View2D to View.

apidoc/index.md

@@ -6,7 +6,7 @@
 [Creation](ol.Map.html#Map)<br>
 [Events](ol.MapBrowserEvent.html)</td>
 <td><p>The view manages the visual parameters of the map view, like resolution or rotation.</p>
-[ol.View2D](ol.View2D.html) with center, projection, resolution and rotation</td>
+[ol.View](ol.View.html) with center, projection, resolution and rotation</td>
 <td><p>Layers are lightweight containers that get their data from [sources](ol.source.html).</p>
 [ol.layer.Tile](ol.layer.Tile.html)<br>
 [ol.layer.Image](ol.layer.Image.html)<br>

doc/quickstart.hbs

@@ -34,7 +34,7 @@ Below you'll find a complete working example.  Create a new file, copy in the co
             source: new ol.source.MapQuest({layer: 'sat'})
           })
         ],
-        view: new ol.View2D({
+        view: new ol.View({
           center: ol.proj.transform([37.41, 8.82], 'EPSG:4326', 'EPSG:3857'),
           zoom: 4
         })
@@ -88,7 +88,7 @@ The map in the application is contained in a [`<div>` HTML element](http://en.wi
         source: new ol.source.MapQuest({layer: 'sat'})
       })
     ],
-    view: new ol.View2D({
+    view: new ol.View({
       center: ol.proj.transform([37.41, 8.82], 'EPSG:4326', 'EPSG:3857'),
       zoom: 4
     })
@@ -121,10 +121,10 @@ The `layers: [ ... ]` array is used to define the list of layers available in th
 
 Layers in OpenLayers 3 are defined with a type (Image, Tile or Vector) which contains a source. The source is the protocol used to get the map tiles. You can consult the list of [available layer sources here](/en/{{ latest }}/apidoc/ol.source.html)
 
-The next part of the `Map` object is the `View`. The view allow to specify the center, resolution, and rotation of the map. Right now, only `View2D` is supported, but other views should be available at some point. The simplest way to define a view is to define a center point and a zoom level. Note that zoom level 0 is zoomed out.
+The next part of the `Map` object is the `View`. The view allow to specify the center, resolution, and rotation of the map. The simplest way to define a view is to define a center point and a zoom level.  Note that zoom level 0 is zoomed out.
 
 ```js
-    view: new ol.View2D({
+    view: new ol.View({
       center: ol.proj.transform([37.41, 8.82], 'EPSG:4326', 'EPSG:3857'),
       zoom: 4
     })

doc/tutorials/concepts.hbs

@@ -16,16 +16,16 @@ The core component of OpenLayers 3 is the map (`ol.Map`). It is rendered to a `t
 ```
 
 ## View
-`ol.Map` is not responsible for things like center, zoom level and projection of the map. Instead, these are properties of an `ol.View` instance - typically an `ol.View2D` for 2D maps. The reason for this abstraction is the idea of instantly switching e.g. between a 2D and a tilted 3D view, without the need to maintain two copies of the `layers`.
+`ol.Map` is not responsible for things like center, zoom level and projection of the map. Instead, these are properties of an `ol.View` instance.
 
 ```js
-  map.setView(new ol.View2D({
+  map.setView(new ol.View({
     center: [0, 0],
     zoom: 2
   }));
 ```
 
-An `ol.View2D` also has a `projection`. The projection determines the coordinate system of the `center` and the units for map resolution calculations. If not specified (like in the above snippet), the default projection is Spherical Mercator (EPSG:3857), with meters as map units.
+An `ol.View` also has a `projection`. The projection determines the coordinate system of the `center` and the units for map resolution calculations. If not specified (like in the above snippet), the default projection is Spherical Mercator (EPSG:3857), with meters as map units.
 
 The `zoom` option is a convenient way to specify the map resolution. The available zoom levels are determined by `maxZoom` (default: 28), `zoomFactor` (default: 2) and `maxResolution` (default is calculated in such a way that the projection's validity extent fits in a 256x256 pixel tile). Starting at zoom level 0 with a resolution of `maxResolution` units per pixel, subsequent zoom levels are calculated by dividing the previous zoom level's resolution by `zoomFactor`, until zoom level `maxZoom` is reached.
 
@@ -63,7 +63,7 @@ The above snippets can be conflated to a self contained map configuration with v
     layers: [
       new ol.layer.Tile({source: new ol.source.OSM()})
     ],
-    view: new ol.View2D({
+    view: new ol.View({
       center: [0, 0],
       zoom: 2
     }),

examples/accessible.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -12,7 +12,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/animation.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.animation');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -40,7 +40,7 @@ var rome = ol.proj.transform([12.5, 41.9], 'EPSG:4326', 'EPSG:3857');
 var bern = ol.proj.transform([7.4458, 46.95], 'EPSG:4326', 'EPSG:3857');
 var madrid = ol.proj.transform([-3.683333, 40.4], 'EPSG:4326', 'EPSG:3857');
 
-var view = new ol.View2D({
+var view = new ol.View({
   // the view's initial state
   center: istanbul,
   zoom: 6

examples/bind-input.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.dom.Input');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
@@ -20,7 +20,7 @@ var layer = new ol.layer.Tile({
 });
 layer.once('precompose', checkWebGL);
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 2
 });

examples/bing-maps.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
@@ -27,7 +27,7 @@ var map = new ol.Map({
   layers: layers,
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-6655.5402445057125, 6709968.258934638],
     zoom: 13
   })

examples/brightness-contrast.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
 
@@ -29,7 +29,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
     layers: [layer],
     renderer: 'webgl',
     target: 'map',
-    view: new ol.View2D({
+    view: new ol.View({
       center: [0, 0],
       zoom: 2
     })

examples/canvas-tiles.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
@@ -23,7 +23,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform(
         [-0.1275, 51.507222], 'EPSG:4326', 'EPSG:3857'),
     zoom: 10

examples/center.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.SimpleGeometry');
 goog.require('ol.layer.Tile');
@@ -38,7 +38,7 @@ var vectorLayer = new ol.layer.Vector({
   source: source,
   style: style
 });
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 1
 });

examples/custom-controls.js

@@ -1,6 +1,6 @@
 goog.require('ol');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.Control');
 goog.require('ol.layer.Tile');
@@ -37,7 +37,7 @@ app.RotateNorthControl = function(opt_options) {
   var handleRotateNorth = function(e) {
     // prevent #rotate-north anchor from getting appended to the url
     e.preventDefault();
-    this_.getMap().getView().getView2D().setRotation(0);
+    this_.getMap().getView().setRotation(0);
   };
 
   anchor.addEventListener('click', handleRotateNorth, false);
@@ -72,7 +72,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2,
     rotation: 1

examples/d3.js

@@ -2,7 +2,7 @@
 // this example uses d3 for which we don't have an externs file.
 goog.require('ol');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
@@ -20,7 +20,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-97, 38], 'EPSG:4326', 'EPSG:3857'),
     zoom: 4
   })

examples/device-orientation.js

@@ -1,13 +1,13 @@
 goog.require('ol.DeviceOrientation');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.dom.Input');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
 var projection = ol.proj.get('EPSG:3857');
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   projection: projection,
   extent: projection.getExtent(),

examples/drag-and-drop-image-vector.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.GPX');
 goog.require('ol.format.GeoJSON');
 goog.require('ol.format.IGC');
@@ -106,7 +106,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })
@@ -123,8 +123,9 @@ dragAndDropInteraction.on('addfeatures', function(event) {
       style: styleFunction
     })
   }));
-  var view2D = map.getView().getView2D();
+  var view = map.getView();
-  view2D.fitExtent(vectorSource.getExtent(), map.getSize());
+  view.fitExtent(
+      vectorSource.getExtent(), /** @type {ol.Size} */ (map.getSize()));
 });
 
 var displayFeatureInfo = function(pixel) {

examples/drag-and-drop.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.GPX');
 goog.require('ol.format.GeoJSON');
 goog.require('ol.format.IGC');
@@ -104,7 +104,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })
@@ -119,8 +119,9 @@ dragAndDropInteraction.on('addfeatures', function(event) {
     source: vectorSource,
     style: styleFunction
   }));
-  var view2D = map.getView().getView2D();
+  var view = map.getView();
-  view2D.fitExtent(vectorSource.getExtent(), map.getSize());
+  view.fitExtent(
+      vectorSource.getExtent(), /** @type {ol.Size} */ (map.getSize()));
 });
 
 var displayFeatureInfo = function(pixel) {

examples/drag-rotate-and-zoom.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
 goog.require('ol.layer.Tile');
@@ -17,7 +17,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/draw-and-modify-features.js

@@ -1,6 +1,6 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.events.condition');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Draw');
@@ -19,7 +19,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/draw-features.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Draw');
 goog.require('ol.layer.Tile');
@@ -39,7 +39,7 @@ var vector = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/dynamic-data.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.MultiPoint');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
@@ -15,7 +15,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/epsg-4326.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.layer.Tile');
@@ -27,7 +27,7 @@ var map = new ol.Map({
   ]),
   layers: layers,
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: 'EPSG:4326',
     center: [0, 0],
     zoom: 2

examples/export-map.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -11,7 +11,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/fractal.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.Vector');
@@ -26,7 +26,7 @@ var layer = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [layer],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 1
   })

examples/full-screen-drag-rotate-and-zoom.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.FullScreen');
 goog.require('ol.interaction');
@@ -25,7 +25,7 @@ var map = new ol.Map({
   ],
   // Use the canvas renderer because it's currently the fastest
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-33519607, 5616436],
     rotation: -Math.PI / 8,
     zoom: 8

examples/full-screen.js

@@ -1,12 +1,12 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.FullScreen');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [-9101767, 2822912],
   zoom: 14
 });

examples/geojson.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.Circle');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -188,7 +188,7 @@ var map = new ol.Map({
     vectorLayer
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/geolocation-orientation.js

@@ -1,14 +1,14 @@
 goog.require('ol.Geolocation');
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
 // creating the view
-var view = new ol.View2D({
+var view = new ol.View({
   center: ol.proj.transform([5.8713, 45.6452], 'EPSG:4326', 'EPSG:3857'),
   zoom: 19
 });
@@ -134,7 +134,7 @@ map.beforeRender(function(map, frameState) {
     previousM = m;
     // interpolate position along positions LineString
     var c = positions.getCoordinateAtM(m, true);
-    var view = frameState.view2DState;
+    var view = frameState.viewState;
     if (c) {
       view.center = getCenterWithHeading(c, -c[2], view.resolution);
       view.rotation = -c[2];

examples/geolocation.js

@@ -2,14 +2,14 @@ goog.require('ol.Feature');
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Geolocation');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.dom.Input');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 2
 });

examples/getfeatureinfo.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.TileWMS');
 
@@ -13,7 +13,7 @@ var wmsLayer = new ol.layer.Tile({
   source: wmsSource
 });
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 1
 });

examples/google-map.js

@@ -1,7 +1,7 @@
 // NOCOMPILE
 // This example uses the GMapx v3 API, which we do not have an exports file for.
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragPan');
 goog.require('ol.layer.Vector');
@@ -21,7 +21,7 @@ var gmap = new google.maps.Map(document.getElementById('gmap'), {
   streetViewControl: false
 });
 
-var view = new ol.View2D({
+var view = new ol.View({
   // make sure the view doesn't go beyond the 22 zoom levels of Google Maps
   maxZoom: 21
 });

examples/gpx.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.BingMaps');
@@ -56,7 +56,7 @@ var vector = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-7916041.528716288, 5228379.045749711],
     zoom: 12
   })

examples/heatmap-earthquakes.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Heatmap');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.KML');
@@ -32,7 +32,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/hue-saturation.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
@@ -33,7 +33,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
     layers: [layer],
     renderer: 'webgl',
     target: 'map',
-    view: new ol.View2D({
+    view: new ol.View({
       center: ol.proj.transform([-9.375, 51.483333], 'EPSG:4326', 'EPSG:3857'),
       zoom: 15
     })

examples/icon.js

@@ -1,7 +1,7 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -47,7 +47,7 @@ var rasterLayer = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [rasterLayer, vectorLayer],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 3
   })

examples/igc.js

@@ -2,7 +2,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Feature');
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
@@ -83,7 +83,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [703365.7089403362, 5714629.865071137],
     zoom: 9
   })

examples/image-filter.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
@@ -13,7 +13,7 @@ var imagery = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [imagery],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-120, 50], 'EPSG:4326', 'EPSG:3857'),
     zoom: 6
   })

examples/image-vector-layer.js

@@ -1,6 +1,6 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.GeoJSON');
@@ -35,7 +35,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 1
   })

examples/kml-earthquakes.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.KML');
@@ -54,7 +54,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/kml-timezones.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.KML');
@@ -61,7 +61,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/kml.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.KML');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -26,7 +26,7 @@ var vector = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [876970.8463461736, 5859807.853963373],
     projection: projection,
     zoom: 10

examples/layer-clipping-webgl.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -20,7 +20,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
     layers: [osm],
     renderer: 'webgl',
     target: 'map',
-    view: new ol.View2D({
+    view: new ol.View({
       center: [0, 0],
       zoom: 2
     })

examples/layer-clipping.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -10,7 +10,7 @@ var osm = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [osm],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/layer-group.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.dom.Input');
 goog.require('ol.layer.Group');
 goog.require('ol.layer.Tile');
@@ -32,7 +32,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([37.40570, 8.81566], 'EPSG:4326', 'EPSG:3857'),
     zoom: 4
   })

examples/layer-spy.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
@@ -17,7 +17,7 @@ var imagery = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [roads, imagery],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-109, 46.5], 'EPSG:4326', 'EPSG:3857'),
     zoom: 6
   })

examples/layer-swipe.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 goog.require('ol.source.OSM');
@@ -17,7 +17,7 @@ var bing = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [osm, bing],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/localized-openstreetmap.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -42,7 +42,7 @@ var map = new ol.Map({
     openSeaMapLayer
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     maxZoom: 18,
     center: [-244780.24508882355, 5986452.183179816],
     zoom: 15

examples/mapguide-untiled.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.source.MapGuide');
 
@@ -30,7 +30,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-87.7302542509315, 43.744459064634],
     projection: 'EPSG:4326',
     zoom: 12

examples/mapquest.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Group');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -34,7 +34,7 @@ var map = new ol.Map({
   layers: layers,
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform(
         [-73.979378, 40.702222], 'EPSG:4326', 'EPSG:3857'),
     zoom: 9

examples/measure.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Polygon');
 goog.require('ol.interaction');
@@ -75,7 +75,7 @@ var mouseMoveHandler = function(evt) {
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-11000000, 4600000],
     zoom: 15
   })

examples/min-max-resolution.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 goog.require('ol.source.TileJSON');
@@ -27,7 +27,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [653600, 5723680],
     zoom: 5
   })

examples/mobile-full-screen.js

@@ -1,11 +1,11 @@
 goog.require('ol.Geolocation');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 2
 });

examples/modify-features.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Modify');
 goog.require('ol.interaction.Select');
@@ -32,7 +32,7 @@ var map = new ol.Map({
   interactions: ol.interaction.defaults().extend([select, modify]),
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/modify-test.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Modify');
 goog.require('ol.interaction.Select');
@@ -243,7 +243,7 @@ var map = new ol.Map({
   interactions: ol.interaction.defaults().extend([select, modify]),
   layers: [layer],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 1000000],
     zoom: 2
   })

examples/mouse-position.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.MousePosition');
 goog.require('ol.coordinate');
@@ -27,7 +27,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/moveend.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -14,7 +14,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/navigation-controls.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.ZoomToExtent');
 goog.require('ol.layer.Tile');
@@ -22,7 +22,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/overlay.js

@@ -1,6 +1,6 @@
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.coordinate');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -15,7 +15,7 @@ var map = new ol.Map({
   layers: [layer],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/popup.js

@@ -1,6 +1,6 @@
 goog.require('ol.Map');
 goog.require('ol.Overlay');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.coordinate');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -50,7 +50,7 @@ var map = new ol.Map({
   renderer: exampleNS.getRendererFromQueryString(),
   overlays: [overlay],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/preload.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
@@ -16,7 +16,7 @@ var map1 = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map1',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-4808600, -2620936],
     zoom: 8
   })

examples/rotation.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -12,7 +12,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-25860000, 4130000],
     rotation: Math.PI / 6,
     zoom: 10

examples/rtree.js

@@ -2,7 +2,7 @@
 // FIXME this example dives into private members and will never compile :)
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
@@ -98,7 +98,7 @@ var rtree = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [vector, rtree],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/scale-line.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.dom.Input');
@@ -20,7 +20,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/select-features.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Select');
 goog.require('ol.layer.Tile');
@@ -24,7 +24,7 @@ var map = new ol.Map({
   interactions: ol.interaction.defaults().extend([select]),
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/semi-transparent-layer.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuest');
@@ -20,7 +20,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-77.93255, 37.9555], 'EPSG:4326', 'EPSG:3857'),
     zoom: 5
   })

examples/side-by-side.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
 
@@ -13,7 +13,7 @@ var domMap = new ol.Map({
   ],
   renderer: 'dom',
   target: 'domMap',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 1
   })

examples/simple.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -12,7 +12,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/stamen.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.Stamen');
@@ -20,7 +20,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform(
         [-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
     zoom: 12

examples/static-image.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Image');
 goog.require('ol.proj.Projection');
@@ -33,7 +33,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: pixelProjection,
     center: ol.extent.getCenter(pixelProjection.getExtent()),
     zoom: 2

examples/synthetic-lines.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.Vector');
@@ -48,7 +48,7 @@ var vector = new ol.layer.Vector({
   })
 });
 
-var view = new ol.View2D({
+var view = new ol.View({
   center: [0, 0],
   zoom: 0
 });

examples/synthetic-points.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Vector');
@@ -53,7 +53,7 @@ var vector = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [vector],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/teleport.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
@@ -11,7 +11,7 @@ var map = new ol.Map({
     })
   ],
   renderer: exampleNS.getRendererFromQueryString(),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/tile-vector.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.TopoJSON');
 goog.require('ol.layer.Vector');
 goog.require('ol.proj');
@@ -77,7 +77,7 @@ var map = new ol.Map({
   layers: [waterLayer, roadLayer],
   renderer: 'canvas',
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-74.0064, 40.7142], 'EPSG:4326', 'EPSG:3857'),
     maxZoom: 19,
     zoom: 14

examples/tilejson.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.TileJSON');
 
@@ -15,7 +15,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 2
   })

examples/tissot.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.geom.Polygon');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -28,7 +28,7 @@ var map = new ol.Map({
   ],
   renderer: 'canvas',
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: 'EPSG:4326',
     center: [0, 0],
     zoom: 2

examples/topojson.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.TileJSON');
@@ -39,7 +39,7 @@ var vector = new ol.layer.Vector({
 var map = new ol.Map({
   layers: [raster, vector],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 1
   })

examples/vector-labels.js

@@ -1,6 +1,6 @@
 goog.require('ol.Feature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.GeoJSON');
@@ -188,7 +188,7 @@ var map = new ol.Map({
     vectorPoints
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-8161939, 6095025],
     zoom: 8
   })

examples/vector-layer.js

@@ -1,6 +1,6 @@
 goog.require('ol.FeatureOverlay');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.GeoJSON');
@@ -53,7 +53,7 @@ var map = new ol.Map({
     vectorLayer
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [0, 0],
     zoom: 1
   })

examples/vector-osm.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.OSMXML');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -131,7 +131,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [739218, 5906096],
     maxZoom: 19,
     zoom: 17

examples/vector-wfs.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.format.GeoJSON');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
@@ -52,7 +52,7 @@ var raster = new ol.layer.Tile({
 var map = new ol.Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-8908887.277395891, 5381918.072437216],
     maxZoom: 19,
     zoom: 12

examples/wms-custom-proj.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.layer.Tile');
@@ -59,7 +59,7 @@ var map = new ol.Map({
   layers: layers,
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: projection,
     center: [660000, 190000],
     extent: extent,

examples/wms-image-custom-proj.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.proj');
 goog.require('ol.source.ImageWMS');
@@ -52,7 +52,7 @@ var map = new ol.Map({
   layers: layers,
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: projection,
     center: [660000, 190000],
     extent: extent,

examples/wms-image.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.ImageWMS');
@@ -22,7 +22,7 @@ var layers = [
 var map = new ol.Map({
   layers: layers,
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-10997148, 4569099],
     zoom: 4
   })

examples/wms-no-proj.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj.Projection');
@@ -53,7 +53,7 @@ var map = new ol.Map({
   layers: layers,
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [660000, 190000],
     projection: projection,
     zoom: 9

examples/wms-tiled.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
 goog.require('ol.source.TileWMS');
@@ -21,7 +21,7 @@ var layers = [
 var map = new ol.Map({
   layers: layers,
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-10997148, 4569099],
     zoom: 4
   })

examples/wmts-hidpi.js

@@ -1,6 +1,6 @@
 goog.require('ol.BrowserFeature');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.WMTS');
 goog.require('ol.tilegrid.WMTS');
@@ -68,7 +68,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [1823849, 6143760],
     zoom: 11
   })

examples/wmts.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
@@ -53,7 +53,7 @@ var map = new ol.Map({
     })
   ],
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-11158582, 4813697],
     zoom: 4
   })

examples/xyz-esri.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.XYZ');
@@ -22,7 +22,7 @@ var map = new ol.Map({
       })
     })
   ],
-  view: new ol.View2D({
+  view: new ol.View({
     center: ol.proj.transform([-121.1, 47.5], 'EPSG:4326', 'EPSG:3857'),
     zoom: 7
   })

examples/xyz.js

@@ -1,6 +1,6 @@
 goog.require('ol.Attribution');
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 goog.require('ol.source.XYZ');
@@ -33,7 +33,7 @@ var map = new ol.Map({
       })
     })
   ],
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-472202, 7530279],
     zoom: 12
   })

examples/zoom-constrained.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
@@ -14,7 +14,7 @@ var map = new ol.Map({
       })
     })
   ],
-  view: new ol.View2D({
+  view: new ol.View({
     center: [-13553864, 5918250],
     zoom: 11,
     minZoom: 9,

examples/zoomify.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.proj.Projection');
@@ -42,7 +42,7 @@ var map = new ol.Map({
   ],
   renderer: exampleNS.getRendererFromQueryString(),
   target: 'map',
-  view: new ol.View2D({
+  view: new ol.View({
     projection: proj,
     center: imgCenter,
     zoom: 0

examples/zoomslider.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.View2D');
+goog.require('ol.View');
 goog.require('ol.control.ZoomSlider');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuest');
@@ -21,7 +21,7 @@ var createMap = function(divId) {
   map = new ol.Map({
     layers: [layer],
     target: divId,
-    view: new ol.View2D({
+    view: new ol.View({
       center: [0, 0],
       zoom: 2
     })

externs/olx.js

@@ -110,7 +110,7 @@ olx.GeolocationOptions.prototype.projection;
  *     overlays: (ol.Collection|Array.<ol.Overlay>|undefined),
  *     renderer: (ol.RendererType|Array.<ol.RendererType|string>|string|undefined),
  *     target: (Element|string|undefined),
- *     view: (ol.IView|undefined)}}
+ *     view: (ol.View|undefined)}}
  * @todo api
  */
 olx.MapOptions;
@@ -201,10 +201,9 @@ olx.MapOptions.prototype.target;
 
 
 /**
- * The map's view. Currently {@link ol.View2D} is the only available view.
+ * The map's view.  No layer sources will be fetched unless this is specified at
- * No layer sources will be fetched unless this is specified at construction
+ * construction time or through {@link ol.Map#setView}.
- * time or through {@link ol.Map#setView}.
+ * @type {ol.View|undefined}
- * @type {ol.IView|undefined}
  */
 olx.MapOptions.prototype.view;
 
@@ -371,7 +370,7 @@ olx.ProjectionOptions.prototype.global;
  *     zoomFactor: (number|undefined)}}
  * @todo api
  */
-olx.View2DOptions;
+olx.ViewOptions;
 
 
 /**
@@ -380,7 +379,7 @@ olx.View2DOptions;
  * sources will not be fetched if this is not set.
  * @type {ol.Coordinate|undefined}
  */
-olx.View2DOptions.prototype.center;
+olx.ViewOptions.prototype.center;
 
 
 /**
@@ -390,14 +389,14 @@ olx.View2DOptions.prototype.center;
  * 270 degrees. The default is `true`.
  * @type {boolean|number|undefined}
  */
-olx.View2DOptions.prototype.constrainRotation;
+olx.ViewOptions.prototype.constrainRotation;
 
 
 /**
  * Enable rotation. Default is `true`.
  * @type {boolean|undefined}
  */
-olx.View2DOptions.prototype.enableRotation;
+olx.ViewOptions.prototype.enableRotation;
 
 
 /**
@@ -405,7 +404,7 @@ olx.View2DOptions.prototype.enableRotation;
  * outside this extent. Default is `undefined`.
  * @type {ol.Extent|undefined}
  */
-olx.View2DOptions.prototype.extent;
+olx.ViewOptions.prototype.extent;
 
 
 /**
@@ -417,7 +416,7 @@ olx.View2DOptions.prototype.extent;
  * 156543.03392804097`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.maxResolution;
+olx.ViewOptions.prototype.maxResolution;
 
 
 /**
@@ -429,7 +428,7 @@ olx.View2DOptions.prototype.maxResolution;
  * 0.0005831682455839253`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.minResolution;
+olx.ViewOptions.prototype.minResolution;
 
 
 /**
@@ -439,7 +438,7 @@ olx.View2DOptions.prototype.minResolution;
  * precedence over `maxZoom`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.maxZoom;
+olx.ViewOptions.prototype.maxZoom;
 
 
 /**
@@ -449,14 +448,14 @@ olx.View2DOptions.prototype.maxZoom;
  * precedence over `minZoom`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.minZoom;
+olx.ViewOptions.prototype.minZoom;
 
 
 /**
  * The projection. Default is `EPSG:3857` (Spherical Mercator).
  * @type {ol.proj.ProjectionLike}
  */
-olx.View2DOptions.prototype.projection;
+olx.ViewOptions.prototype.projection;
 
 
 /**
@@ -466,7 +465,7 @@ olx.View2DOptions.prototype.projection;
  * neither this nor `zoom` are defined.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.resolution;
+olx.ViewOptions.prototype.resolution;
 
 
 /**
@@ -475,7 +474,7 @@ olx.View2DOptions.prototype.resolution;
  * options are ignored.
  * @type {Array.<number>|undefined}
  */
-olx.View2DOptions.prototype.resolutions;
+olx.ViewOptions.prototype.resolutions;
 
 
 /**
@@ -483,23 +482,23 @@ olx.View2DOptions.prototype.resolutions;
  * Default is `0`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.rotation;
+olx.ViewOptions.prototype.rotation;
 
 
 /**
  * Only used if `resolution` is not defined. Zoom level used to calculate the
  * initial resolution for the view. The initial resolution is determined using
- * the `ol.View2D#constrainResolution` method.
+ * the `ol.View#constrainResolution` method.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.zoom;
+olx.ViewOptions.prototype.zoom;
 
 
 /**
  * The zoom factor used to determine the resolution constraint.  Default is `2`.
  * @type {number|undefined}
  */
-olx.View2DOptions.prototype.zoomFactor;
+olx.ViewOptions.prototype.zoomFactor;
 
 
 /**
@@ -5037,7 +5036,7 @@ olx.tilegrid.ZoomifyOptions.prototype.resolutions;
  *     minResolution: (number|undefined)}}
  * @todo api
  */
-olx.View2D.fitGeometryOptions;
+olx.View.fitGeometryOptions;
 
 
 /**
@@ -5045,28 +5044,28 @@ olx.View2D.fitGeometryOptions;
  * top, right, bottom and left padding. Default is `[0, 0, 0, 0]`.
  * @type {!Array.<number>}
  */
-olx.View2D.fitGeometryOptions.prototype.padding;
+olx.View.fitGeometryOptions.prototype.padding;
 
 
 /**
  * Constrain the resolution. Default is `true`.
  * @type {boolean|undefined}
  */
-olx.View2D.fitGeometryOptions.prototype.constrainResolution;
+olx.View.fitGeometryOptions.prototype.constrainResolution;
 
 
 /**
  * Get the nearest extent. Default is `false`.
  * @type {boolean|undefined}
  */
-olx.View2D.fitGeometryOptions.prototype.nearest;
+olx.View.fitGeometryOptions.prototype.nearest;
 
 
 /**
  * Minimum resolution that we zoom to. Default is `0`.
  * @type {number|undefined}
  */
-olx.View2D.fitGeometryOptions.prototype.minResolution;
+olx.View.fitGeometryOptions.prototype.minResolution;
 
 
 /* typedefs for object literals exposed by the library */
@@ -5090,7 +5089,7 @@ olx.View2D.fitGeometryOptions.prototype.minResolution;
  *     tileQueue: ol.TileQueue,
  *     time: number,
  *     usedTiles: Object.<string, Object.<string, ol.TileRange>>,
- *     view2DState: olx.View2DState,
+ *     viewState: olx.ViewState,
  *     viewHints: Array.<number>,
  *     wantedTiles: Object.<string, Object.<string, boolean>>}}
  * @todo api
@@ -5106,8 +5105,8 @@ olx.FrameState.prototype.pixelRatio;
 olx.FrameState.prototype.time;
 
 
-/** @type {olx.View2DState} */
+/** @type {olx.ViewState} */
-olx.FrameState.prototype.view2DState;
+olx.FrameState.prototype.viewState;
 
 
 /**
@@ -5117,16 +5116,16 @@ olx.FrameState.prototype.view2DState;
  *     rotation: number}}
  * @todo api
  */
-olx.View2DState;
+olx.ViewState;
 
 
 /** @type {ol.Coordinate} */
-olx.View2DState.prototype.center;
+olx.ViewState.prototype.center;
 
 
 /** @type {number} */
-olx.View2DState.prototype.resolution;
+olx.ViewState.prototype.resolution;
 
 
 /** @type {number} */
-olx.View2DState.prototype.rotation;
+olx.ViewState.prototype.rotation;

src/ol/animation.js

@@ -1,5 +1,3 @@
-// FIXME works for View2D only
-
 goog.provide('ol.animation');
 
 goog.require('ol.PreRenderFunction');
@@ -31,9 +29,9 @@ ol.animation.bounce = function(options) {
           return true;
         } else if (frameState.time < start + duration) {
           var delta = easing((frameState.time - start) / duration);
-          var deltaResolution = resolution - frameState.view2DState.resolution;
+          var deltaResolution = resolution - frameState.viewState.resolution;
           frameState.animate = true;
-          frameState.view2DState.resolution += delta * deltaResolution;
+          frameState.viewState.resolution += delta * deltaResolution;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {
@@ -68,11 +66,11 @@ ol.animation.pan = function(options) {
           return true;
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
-          var deltaX = sourceX - frameState.view2DState.center[0];
+          var deltaX = sourceX - frameState.viewState.center[0];
-          var deltaY = sourceY - frameState.view2DState.center[1];
+          var deltaY = sourceY - frameState.viewState.center[1];
           frameState.animate = true;
-          frameState.view2DState.center[0] += delta * deltaX;
+          frameState.viewState.center[0] += delta * deltaX;
-          frameState.view2DState.center[1] += delta * deltaY;
+          frameState.viewState.center[1] += delta * deltaY;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {
@@ -109,11 +107,11 @@ ol.animation.rotate = function(options) {
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
           var deltaRotation =
-              (sourceRotation - frameState.view2DState.rotation) * delta;
+              (sourceRotation - frameState.viewState.rotation) * delta;
           frameState.animate = true;
-          frameState.view2DState.rotation += deltaRotation;
+          frameState.viewState.rotation += deltaRotation;
           if (!goog.isNull(anchor)) {
-            var center = frameState.view2DState.center;
+            var center = frameState.viewState.center;
             ol.coordinate.sub(center, anchor);
             ol.coordinate.rotate(center, deltaRotation);
             ol.coordinate.add(center, anchor);
@@ -151,9 +149,9 @@ ol.animation.zoom = function(options) {
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
           var deltaResolution =
-              sourceResolution - frameState.view2DState.resolution;
+              sourceResolution - frameState.viewState.resolution;
           frameState.animate = true;
-          frameState.view2DState.resolution += delta * deltaResolution;
+          frameState.viewState.resolution += delta * deltaResolution;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {

src/ol/control/mousepositioncontrol.js

@@ -1,5 +1,4 @@
 // FIXME should listen on appropriate pane, once it is defined
-// FIXME works for View2D only
 
 goog.provide('ol.control.MousePosition');
 
@@ -110,8 +109,8 @@ ol.control.MousePosition.prototype.handleMapPostrender = function(mapEvent) {
   if (goog.isNull(frameState)) {
     this.mapProjection_ = null;
   } else {
-    if (this.mapProjection_ != frameState.view2DState.projection) {
+    if (this.mapProjection_ != frameState.viewState.projection) {
-      this.mapProjection_ = frameState.view2DState.projection;
+      this.mapProjection_ = frameState.viewState.projection;
       this.transform_ = null;
     }
   }

src/ol/control/rotatecontrol.js

@@ -1,5 +1,3 @@
-// FIXME works for View2D only
-
 goog.provide('ol.control.Rotate');
 
 goog.require('goog.asserts');
@@ -7,7 +5,6 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
-goog.require('ol.View2D');
 goog.require('ol.animation');
 goog.require('ol.control.Control');
 goog.require('ol.css');
@@ -118,12 +115,9 @@ ol.control.Rotate.prototype.handlePointerUp_ = function(pointerEvent) {
  */
 ol.control.Rotate.prototype.resetNorth_ = function() {
   var map = this.getMap();
-  // FIXME works for View2D only
   var view = map.getView();
   goog.asserts.assert(goog.isDef(view));
-  var view2D = view.getView2D();
+  var currentRotation = view.getRotation();
-  goog.asserts.assertInstanceof(view2D, ol.View2D);
-  var currentRotation = view2D.getRotation();
   while (currentRotation < -Math.PI) {
     currentRotation += 2 * Math.PI;
   }
@@ -138,7 +132,7 @@ ol.control.Rotate.prototype.resetNorth_ = function() {
         easing: ol.easing.easeOut
       }));
     }
-    view2D.setRotation(0);
+    view.setRotation(0);
   }
 };
 
@@ -151,7 +145,7 @@ ol.control.Rotate.prototype.handleMapPostrender = function(mapEvent) {
   if (goog.isNull(frameState)) {
     return;
   }
-  var rotation = frameState.view2DState.rotation;
+  var rotation = frameState.viewState.rotation;
   var transform = 'rotate(' + rotation * 360 / (Math.PI * 2) + 'deg)';
   if (this.autoHide_) {
     this.element.style.opacity = (rotation === 0) ? 0 : 1;

src/ol/control/scalelinecontrol.js

@@ -77,9 +77,9 @@ ol.control.ScaleLine = function(opt_options) {
 
   /**
    * @private
-   * @type {?olx.View2DState}
+   * @type {?olx.ViewState}
    */
-  this.view2DState_ = null;
+  this.viewState_ = null;
 
   /**
    * @private
@@ -156,9 +156,9 @@ goog.exportProperty(
 ol.control.ScaleLine.prototype.handleMapPostrender = function(mapEvent) {
   var frameState = mapEvent.frameState;
   if (goog.isNull(frameState)) {
-    this.view2DState_ = null;
+    this.viewState_ = null;
   } else {
-    this.view2DState_ = frameState.view2DState;
+    this.viewState_ = frameState.viewState;
   }
   this.updateElement_();
 };
@@ -190,9 +190,9 @@ goog.exportProperty(
  * @private
  */
 ol.control.ScaleLine.prototype.updateElement_ = function() {
-  var view2DState = this.view2DState_;
+  var viewState = this.viewState_;
 
-  if (goog.isNull(view2DState)) {
+  if (goog.isNull(viewState)) {
     if (this.renderedVisible_) {
       goog.style.setElementShown(this.element_, false);
       this.renderedVisible_ = false;
@@ -200,10 +200,10 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
     return;
   }
 
-  var center = view2DState.center;
+  var center = viewState.center;
-  var projection = view2DState.projection;
+  var projection = viewState.projection;
   var pointResolution =
-      projection.getPointResolution(view2DState.resolution, center);
+      projection.getPointResolution(viewState.resolution, center);
   var projectionUnits = projection.getUnits();
 
   var cosLatitude;

src/ol/control/zoomcontrol.js

@@ -1,5 +1,3 @@
-// FIXME works for View2D only
-
 goog.provide('ol.control.Zoom');
 
 goog.require('goog.asserts');
@@ -7,7 +5,6 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
-goog.require('ol.View2D');
 goog.require('ol.animation');
 goog.require('ol.control.Control');
 goog.require('ol.css');
@@ -143,12 +140,8 @@ ol.control.Zoom.prototype.handlePointerUp_ = function(delta, pointerEvent) {
  */
 ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
   var map = this.getMap();
-  // FIXME works for View2D only
   var view = map.getView();
-  goog.asserts.assert(goog.isDef(view));
+  var currentResolution = view.getResolution();
-  var view2D = view.getView2D();
-  goog.asserts.assertInstanceof(view2D, ol.View2D);
-  var currentResolution = view2D.getResolution();
   if (goog.isDef(currentResolution)) {
     if (this.duration_ > 0) {
       map.beforeRender(ol.animation.zoom({
@@ -157,7 +150,7 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
         easing: ol.easing.easeOut
       }));
     }
-    var newResolution = view2D.constrainResolution(currentResolution, delta);
+    var newResolution = view.constrainResolution(currentResolution, delta);
-    view2D.setResolution(newResolution);
+    view.setResolution(newResolution);
   }
 };

src/ol/control/zoomslidercontrol.js

@@ -1,4 +1,3 @@
-// FIXME works for View2D only
 // FIXME should possibly show tooltip when dragging?
 
 goog.provide('ol.control.ZoomSlider');
@@ -159,11 +158,11 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
     return;
   }
   goog.asserts.assert(
-      goog.isDefAndNotNull(mapEvent.frameState.view2DState));
+      goog.isDefAndNotNull(mapEvent.frameState.viewState));
   if (!this.sliderInitialized_) {
     this.initSlider_();
   }
-  var res = mapEvent.frameState.view2DState.resolution;
+  var res = mapEvent.frameState.viewState.resolution;
   if (res !== this.currentResolution_) {
     this.currentResolution_ = res;
     this.positionThumbForResolution_(res);
@@ -177,7 +176,7 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
  */
 ol.control.ZoomSlider.prototype.handleContainerClick_ = function(browserEvent) {
   var map = this.getMap();
-  var view = map.getView().getView2D();
+  var view = map.getView();
   var resolution;
   var amountDragged = this.amountDragged_(browserEvent.offsetX,
       browserEvent.offsetY);
@@ -246,7 +245,7 @@ ol.control.ZoomSlider.prototype.amountDragged_ = function(x, y) {
 ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) {
   // FIXME do we really need this affine transform?
   amount = (goog.math.clamp(amount, 0, 1) - 1) * -1;
-  var fn = this.getMap().getView().getView2D().getResolutionForValueFunction();
+  var fn = this.getMap().getView().getResolutionForValueFunction();
   return fn(amount);
 };
 
@@ -260,7 +259,7 @@ ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) {
  * @private
  */
 ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
-  var fn = this.getMap().getView().getView2D().getValueForResolutionFunction();
+  var fn = this.getMap().getView().getValueForResolutionFunction();
   var value = fn(res);
   // FIXME do we really need this affine transform?
   return (value - 1) * -1;
@@ -277,7 +276,7 @@ ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
  */
 ol.control.ZoomSlider.prototype.handleSliderChange_ = function(e) {
   var map = this.getMap();
-  var view = map.getView().getView2D();
+  var view = map.getView();
   var resolution;
   if (e.type === goog.fx.Dragger.EventType.DRAG) {
     var amountDragged = this.amountDragged_(e.left, e.top);

src/ol/control/zoomtoextentcontrol.js

@@ -1,5 +1,3 @@
-// FIXME works for View2D only
-
 goog.provide('ol.control.ZoomToExtent');
 
 goog.require('goog.asserts');
@@ -99,9 +97,9 @@ ol.control.ZoomToExtent.prototype.handlePointerUp_ = function(pointerEvent) {
 ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function() {
   var map = this.getMap();
   var view = map.getView();
-  goog.asserts.assert(goog.isDef(view));
-  var view2D = view.getView2D();
   var extent = goog.isNull(this.extent_) ?
-      view2D.getProjection().getExtent() : this.extent_;
+      view.getProjection().getExtent() : this.extent_;
-  view2D.fitExtent(extent, map.getSize());
+  var size = map.getSize();
+  goog.asserts.assert(goog.isDef(size));
+  view.fitExtent(extent, size);
 };

src/ol/extent.js

@@ -474,7 +474,7 @@ ol.extent.getEnlargedArea = function(extent1, extent2) {
  * @param {ol.Extent=} opt_extent Destination extent.
  * @return {ol.Extent} Extent.
  */
-ol.extent.getForView2DAndSize =
+ol.extent.getForViewAndSize =
     function(center, resolution, rotation, size, opt_extent) {
   var dx = resolution * size[0] / 2;
   var dy = resolution * size[1] / 2;

src/ol/featureoverlay.js

@@ -176,7 +176,7 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) {
   goog.asserts.assert(goog.isDef(replayGroup));
   var frameState = event.frameState;
   var pixelRatio = frameState.pixelRatio;
-  var resolution = frameState.view2DState.resolution;
+  var resolution = frameState.viewState.resolution;
   var i, ii, styles;
   this.features_.forEach(function(feature) {
     styles = styleFunction(feature, resolution);