Rename ol.View2D to ol.View
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
}),
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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');
|
||||
@@ -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
|
||||
|
||||
4
examples/d3.js
vendored
4
examples/d3.js
vendored
@@ -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
|
||||
})
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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,8 @@ dragAndDropInteraction.on('addfeatures', function(event) {
|
||||
style: styleFunction
|
||||
})
|
||||
}));
|
||||
var view2D = map.getView();
|
||||
view2D.fitExtent(
|
||||
var view = map.getView();
|
||||
view.fitExtent(
|
||||
vectorSource.getExtent(), /** @type {ol.Size} */ (map.getSize()));
|
||||
});
|
||||
|
||||
|
||||
@@ -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,8 @@ dragAndDropInteraction.on('addfeatures', function(event) {
|
||||
source: vectorSource,
|
||||
style: styleFunction
|
||||
}));
|
||||
var view2D = map.getView();
|
||||
view2D.fitExtent(
|
||||
var view = map.getView();
|
||||
view.fitExtent(
|
||||
vectorSource.getExtent(), /** @type {ol.Size} */ (map.getSize()));
|
||||
});
|
||||
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
});
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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.View2D|undefined)}}
|
||||
* view: (ol.View|undefined)}}
|
||||
* @todo api
|
||||
*/
|
||||
olx.MapOptions;
|
||||
@@ -203,7 +203,7 @@ olx.MapOptions.prototype.target;
|
||||
/**
|
||||
* The map's view. No layer sources will be fetched unless this is specified at
|
||||
* construction time or through {@link ol.Map#setView}.
|
||||
* @type {ol.View2D|undefined}
|
||||
* @type {ol.View|undefined}
|
||||
*/
|
||||
olx.MapOptions.prototype.view;
|
||||
|
||||
@@ -488,7 +488,7 @@ olx.View2DOptions.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;
|
||||
@@ -5036,7 +5036,7 @@ olx.tilegrid.ZoomifyOptions.prototype.resolutions;
|
||||
* minResolution: (number|undefined)}}
|
||||
* @todo api
|
||||
*/
|
||||
olx.View2D.fitGeometryOptions;
|
||||
olx.View.fitGeometryOptions;
|
||||
|
||||
|
||||
/**
|
||||
@@ -5044,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 */
|
||||
|
||||
@@ -74,15 +74,15 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) {
|
||||
var deltaX = this.lastCentroid[0] - centroid[0];
|
||||
var deltaY = centroid[1] - this.lastCentroid[1];
|
||||
var map = mapBrowserEvent.map;
|
||||
var view2D = map.getView();
|
||||
var viewState = view2D.getState();
|
||||
var view = map.getView();
|
||||
var viewState = view.getState();
|
||||
var center = [deltaX, deltaY];
|
||||
ol.coordinate.scale(center, viewState.resolution);
|
||||
ol.coordinate.rotate(center, viewState.rotation);
|
||||
ol.coordinate.add(center, viewState.center);
|
||||
center = view2D.constrainCenter(center);
|
||||
center = view.constrainCenter(center);
|
||||
map.render();
|
||||
view2D.setCenter(center);
|
||||
view.setCenter(center);
|
||||
}
|
||||
this.lastCentroid = centroid;
|
||||
};
|
||||
@@ -94,12 +94,12 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) {
|
||||
ol.interaction.DragPan.prototype.handlePointerUp =
|
||||
function(mapBrowserEvent) {
|
||||
var map = mapBrowserEvent.map;
|
||||
var view2D = map.getView();
|
||||
var view = map.getView();
|
||||
if (this.targetPointers.length === 0) {
|
||||
if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) {
|
||||
var distance = this.kinetic_.getDistance();
|
||||
var angle = this.kinetic_.getAngle();
|
||||
var center = view2D.getCenter();
|
||||
var center = view.getCenter();
|
||||
goog.asserts.assert(goog.isDef(center));
|
||||
this.kineticPreRenderFn_ = this.kinetic_.pan(center);
|
||||
map.beforeRender(this.kineticPreRenderFn_);
|
||||
@@ -108,10 +108,10 @@ ol.interaction.DragPan.prototype.handlePointerUp =
|
||||
centerpx[0] - distance * Math.cos(angle),
|
||||
centerpx[1] - distance * Math.sin(angle)
|
||||
]);
|
||||
dest = view2D.constrainCenter(dest);
|
||||
view2D.setCenter(dest);
|
||||
dest = view.constrainCenter(dest);
|
||||
view.setCenter(dest);
|
||||
}
|
||||
view2D.setHint(ol.ViewHint.INTERACTING, -1);
|
||||
view.setHint(ol.ViewHint.INTERACTING, -1);
|
||||
map.render();
|
||||
return false;
|
||||
} else {
|
||||
@@ -128,15 +128,15 @@ ol.interaction.DragPan.prototype.handlePointerDown =
|
||||
function(mapBrowserEvent) {
|
||||
if (this.targetPointers.length > 0 && this.condition_(mapBrowserEvent)) {
|
||||
var map = mapBrowserEvent.map;
|
||||
var view2D = map.getView();
|
||||
var view = map.getView();
|
||||
this.lastCentroid = null;
|
||||
if (!this.handlingDownUpSequence) {
|
||||
view2D.setHint(ol.ViewHint.INTERACTING, 1);
|
||||
view.setHint(ol.ViewHint.INTERACTING, 1);
|
||||
}
|
||||
map.render();
|
||||
if (!goog.isNull(this.kineticPreRenderFn_) &&
|
||||
map.removePreRenderFunction(this.kineticPreRenderFn_)) {
|
||||
view2D.setCenter(mapBrowserEvent.frameState.viewState.center);
|
||||
view.setCenter(mapBrowserEvent.frameState.viewState.center);
|
||||
this.kineticPreRenderFn_ = null;
|
||||
}
|
||||
if (this.kinetic_) {
|
||||
|
||||
@@ -68,7 +68,7 @@ ol.interaction.Interaction.prototype.setMap = function(map) {
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {ol.Coordinate} delta Delta.
|
||||
* @param {number=} opt_duration Duration.
|
||||
*/
|
||||
@@ -92,7 +92,7 @@ ol.interaction.Interaction.pan = function(
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {number|undefined} rotation Rotation.
|
||||
* @param {ol.Coordinate=} opt_anchor Anchor coordinate.
|
||||
* @param {number=} opt_duration Duration.
|
||||
@@ -107,7 +107,7 @@ ol.interaction.Interaction.rotate =
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {number|undefined} rotation Rotation.
|
||||
* @param {ol.Coordinate=} opt_anchor Anchor coordinate.
|
||||
* @param {number=} opt_duration Duration.
|
||||
@@ -139,7 +139,7 @@ ol.interaction.Interaction.rotateWithoutConstraints =
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {number|undefined} resolution Resolution to go to.
|
||||
* @param {ol.Coordinate=} opt_anchor Anchor coordinate.
|
||||
* @param {number=} opt_duration Duration.
|
||||
@@ -162,7 +162,7 @@ ol.interaction.Interaction.zoom =
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {number} delta Delta from previous zoom level.
|
||||
* @param {ol.Coordinate=} opt_anchor Anchor coordinate.
|
||||
* @param {number=} opt_duration Duration.
|
||||
@@ -178,7 +178,7 @@ ol.interaction.Interaction.zoomByDelta =
|
||||
|
||||
/**
|
||||
* @param {ol.Map} map Map.
|
||||
* @param {ol.View2D} view View.
|
||||
* @param {ol.View} view View.
|
||||
* @param {number|undefined} resolution Resolution to go to.
|
||||
* @param {ol.Coordinate=} opt_anchor Anchor coordinate.
|
||||
* @param {number=} opt_duration Duration.
|
||||
|
||||
@@ -45,7 +45,7 @@ goog.require('ol.RendererType');
|
||||
goog.require('ol.Size');
|
||||
goog.require('ol.Tile');
|
||||
goog.require('ol.TileQueue');
|
||||
goog.require('ol.View2D');
|
||||
goog.require('ol.View');
|
||||
goog.require('ol.ViewHint');
|
||||
goog.require('ol.control');
|
||||
goog.require('ol.extent');
|
||||
@@ -125,7 +125,7 @@ ol.MapProperty = {
|
||||
* needs a view, one or more layers, and a target container:
|
||||
*
|
||||
* var map = new ol.Map({
|
||||
* view: new ol.View2D({
|
||||
* view: new ol.View({
|
||||
* center: [0, 0],
|
||||
* zoom: 1
|
||||
* }),
|
||||
@@ -748,12 +748,12 @@ goog.exportProperty(
|
||||
/**
|
||||
* Get the view associated with this map. A view manages properties such as
|
||||
* center and resolution.
|
||||
* @return {ol.View2D|undefined} The view that controls this map.
|
||||
* @return {ol.View|undefined} The view that controls this map.
|
||||
* @todo observable
|
||||
* @todo api stable
|
||||
*/
|
||||
ol.Map.prototype.getView = function() {
|
||||
return /** @type {ol.View2D} */ (this.get(ol.MapProperty.VIEW));
|
||||
return /** @type {ol.View} */ (this.get(ol.MapProperty.VIEW));
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.Map.prototype,
|
||||
@@ -1315,7 +1315,7 @@ goog.exportProperty(
|
||||
|
||||
/**
|
||||
* Set the view for this map.
|
||||
* @param {ol.View2D} view The view that controls this map.
|
||||
* @param {ol.View} view The view that controls this map.
|
||||
* @todo observable
|
||||
* @todo api stable
|
||||
*/
|
||||
@@ -1417,7 +1417,7 @@ ol.Map.createOptionsInternal = function(options) {
|
||||
values[ol.MapProperty.TARGET] = options.target;
|
||||
|
||||
values[ol.MapProperty.VIEW] = goog.isDef(options.view) ?
|
||||
options.view : new ol.View2D();
|
||||
options.view : new ol.View();
|
||||
|
||||
/**
|
||||
* @type {function(new: ol.renderer.Map, Element, ol.Map)}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
goog.provide('ol.View2D');
|
||||
goog.provide('ol.View');
|
||||
goog.provide('ol.View2DProperty');
|
||||
goog.provide('ol.ViewHint');
|
||||
|
||||
@@ -43,18 +43,18 @@ ol.ViewHint = {
|
||||
|
||||
/**
|
||||
* @classdesc
|
||||
* An ol.View2D object represents a simple 2D view of the map.
|
||||
* An ol.View object represents a simple 2D view of the map.
|
||||
*
|
||||
* This is the object to act upon to change the center, resolution,
|
||||
* and rotation of the map.
|
||||
*
|
||||
* ### The view states
|
||||
*
|
||||
* An `ol.View2D` is determined by three states: `center`, `resolution`,
|
||||
* An `ol.View` is determined by three states: `center`, `resolution`,
|
||||
* and `rotation`. To each state corresponds a getter and a setter. E.g.
|
||||
* `getCenter` and `setCenter` for the `center` state.
|
||||
*
|
||||
* An `ol.View2D` has a `projection`. The projection determines the
|
||||
* An `ol.View` has a `projection`. The projection determines the
|
||||
* coordinate system of the center, and its units determine the units of the
|
||||
* resolution (projection units per pixel). The default projection is
|
||||
* Spherical Mercator (EPSG:3857).
|
||||
@@ -66,7 +66,7 @@ ol.ViewHint = {
|
||||
* that is passed to a setter will effectively be the value set in the view,
|
||||
* and returned by the corresponding getter.
|
||||
*
|
||||
* But an `ol.View2D` object also has a *resolution constraint*, a
|
||||
* But an `ol.View` object also has a *resolution constraint*, a
|
||||
* *rotation constraint* and a *center constraint*.
|
||||
*
|
||||
* As said above no constraints are applied when the setters are used to set
|
||||
@@ -89,10 +89,10 @@ ol.ViewHint = {
|
||||
*
|
||||
* @constructor
|
||||
* @extends {ol.Object}
|
||||
* @param {olx.View2DOptions=} opt_options View2D options.
|
||||
* @param {olx.View2DOptions=} opt_options View options.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D = function(opt_options) {
|
||||
ol.View = function(opt_options) {
|
||||
goog.base(this);
|
||||
var options = goog.isDef(opt_options) ? opt_options : {};
|
||||
|
||||
@@ -111,7 +111,7 @@ ol.View2D = function(opt_options) {
|
||||
values[ol.View2DProperty.PROJECTION] = ol.proj.createProjection(
|
||||
options.projection, 'EPSG:3857');
|
||||
|
||||
var resolutionConstraintInfo = ol.View2D.createResolutionConstraint_(
|
||||
var resolutionConstraintInfo = ol.View.createResolutionConstraint_(
|
||||
options);
|
||||
|
||||
/**
|
||||
@@ -132,9 +132,9 @@ ol.View2D = function(opt_options) {
|
||||
*/
|
||||
this.minZoom_ = resolutionConstraintInfo.minZoom;
|
||||
|
||||
var centerConstraint = ol.View2D.createCenterConstraint_(options);
|
||||
var centerConstraint = ol.View.createCenterConstraint_(options);
|
||||
var resolutionConstraint = resolutionConstraintInfo.constraint;
|
||||
var rotationConstraint = ol.View2D.createRotationConstraint_(options);
|
||||
var rotationConstraint = ol.View.createRotationConstraint_(options);
|
||||
|
||||
/**
|
||||
* @private
|
||||
@@ -153,7 +153,7 @@ ol.View2D = function(opt_options) {
|
||||
goog.isDef(options.rotation) ? options.rotation : 0;
|
||||
this.setValues(values);
|
||||
};
|
||||
goog.inherits(ol.View2D, ol.Object);
|
||||
goog.inherits(ol.View, ol.Object);
|
||||
|
||||
|
||||
/**
|
||||
@@ -161,7 +161,7 @@ goog.inherits(ol.View2D, ol.Object);
|
||||
* @param {ol.Coordinate} anchor Rotation anchor.
|
||||
* @return {ol.Coordinate|undefined} Center for rotation and anchor.
|
||||
*/
|
||||
ol.View2D.prototype.calculateCenterRotate = function(rotation, anchor) {
|
||||
ol.View.prototype.calculateCenterRotate = function(rotation, anchor) {
|
||||
var center;
|
||||
var currentCenter = this.getCenter();
|
||||
if (goog.isDef(currentCenter)) {
|
||||
@@ -178,7 +178,7 @@ ol.View2D.prototype.calculateCenterRotate = function(rotation, anchor) {
|
||||
* @param {ol.Coordinate} anchor Zoom anchor.
|
||||
* @return {ol.Coordinate|undefined} Center for resolution and anchor.
|
||||
*/
|
||||
ol.View2D.prototype.calculateCenterZoom = function(resolution, anchor) {
|
||||
ol.View.prototype.calculateCenterZoom = function(resolution, anchor) {
|
||||
var center;
|
||||
var currentCenter = this.getCenter();
|
||||
var currentResolution = this.getResolution();
|
||||
@@ -199,7 +199,7 @@ ol.View2D.prototype.calculateCenterZoom = function(resolution, anchor) {
|
||||
* @return {ol.Coordinate|undefined} Constrained center.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.constrainCenter = function(center) {
|
||||
ol.View.prototype.constrainCenter = function(center) {
|
||||
return this.constraints_.center(center);
|
||||
};
|
||||
|
||||
@@ -212,7 +212,7 @@ ol.View2D.prototype.constrainCenter = function(center) {
|
||||
* @return {number|undefined} Constrained resolution.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.constrainResolution = function(
|
||||
ol.View.prototype.constrainResolution = function(
|
||||
resolution, opt_delta, opt_direction) {
|
||||
var delta = opt_delta || 0;
|
||||
var direction = opt_direction || 0;
|
||||
@@ -227,7 +227,7 @@ ol.View2D.prototype.constrainResolution = function(
|
||||
* @return {number|undefined} Constrained rotation.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.constrainRotation = function(rotation, opt_delta) {
|
||||
ol.View.prototype.constrainRotation = function(rotation, opt_delta) {
|
||||
var delta = opt_delta || 0;
|
||||
return this.constraints_.rotation(rotation, delta);
|
||||
};
|
||||
@@ -238,20 +238,20 @@ ol.View2D.prototype.constrainRotation = function(rotation, opt_delta) {
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getCenter = function() {
|
||||
ol.View.prototype.getCenter = function() {
|
||||
return /** @type {ol.Coordinate|undefined} */ (
|
||||
this.get(ol.View2DProperty.CENTER));
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'getCenter',
|
||||
ol.View2D.prototype.getCenter);
|
||||
ol.View.prototype.getCenter);
|
||||
|
||||
|
||||
/**
|
||||
* @return {Array.<number>} Hint.
|
||||
*/
|
||||
ol.View2D.prototype.getHints = function() {
|
||||
ol.View.prototype.getHints = function() {
|
||||
return goog.array.clone(this.hints_);
|
||||
};
|
||||
|
||||
@@ -263,7 +263,7 @@ ol.View2D.prototype.getHints = function() {
|
||||
* @return {ol.Extent} Extent.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.calculateExtent = function(size) {
|
||||
ol.View.prototype.calculateExtent = function(size) {
|
||||
goog.asserts.assert(this.isDef());
|
||||
var center = this.getCenter();
|
||||
var resolution = this.getResolution();
|
||||
@@ -280,14 +280,14 @@ ol.View2D.prototype.calculateExtent = function(size) {
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getProjection = function() {
|
||||
ol.View.prototype.getProjection = function() {
|
||||
return /** @type {ol.proj.Projection|undefined} */ (
|
||||
this.get(ol.View2DProperty.PROJECTION));
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'getProjection',
|
||||
ol.View2D.prototype.getProjection);
|
||||
ol.View.prototype.getProjection);
|
||||
|
||||
|
||||
/**
|
||||
@@ -295,14 +295,14 @@ goog.exportProperty(
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getResolution = function() {
|
||||
ol.View.prototype.getResolution = function() {
|
||||
return /** @type {number|undefined} */ (
|
||||
this.get(ol.View2DProperty.RESOLUTION));
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'getResolution',
|
||||
ol.View2D.prototype.getResolution);
|
||||
ol.View.prototype.getResolution);
|
||||
|
||||
|
||||
/**
|
||||
@@ -313,7 +313,7 @@ goog.exportProperty(
|
||||
* the given size.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getResolutionForExtent = function(extent, size) {
|
||||
ol.View.prototype.getResolutionForExtent = function(extent, size) {
|
||||
var xResolution = ol.extent.getWidth(extent) / size[0];
|
||||
var yResolution = ol.extent.getHeight(extent) / size[1];
|
||||
return Math.max(xResolution, yResolution);
|
||||
@@ -326,7 +326,7 @@ ol.View2D.prototype.getResolutionForExtent = function(extent, size) {
|
||||
* @param {number=} opt_power Power.
|
||||
* @return {function(number): number} Resolution for value function.
|
||||
*/
|
||||
ol.View2D.prototype.getResolutionForValueFunction = function(opt_power) {
|
||||
ol.View.prototype.getResolutionForValueFunction = function(opt_power) {
|
||||
var power = opt_power || 2;
|
||||
var maxResolution = this.maxResolution_;
|
||||
var minResolution = this.minResolution_;
|
||||
@@ -350,13 +350,13 @@ ol.View2D.prototype.getResolutionForValueFunction = function(opt_power) {
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getRotation = function() {
|
||||
ol.View.prototype.getRotation = function() {
|
||||
return /** @type {number|undefined} */ (this.get(ol.View2DProperty.ROTATION));
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'getRotation',
|
||||
ol.View2D.prototype.getRotation);
|
||||
ol.View.prototype.getRotation);
|
||||
|
||||
|
||||
/**
|
||||
@@ -365,7 +365,7 @@ goog.exportProperty(
|
||||
* @param {number=} opt_power Power.
|
||||
* @return {function(number): number} Value for resolution function.
|
||||
*/
|
||||
ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) {
|
||||
ol.View.prototype.getValueForResolutionFunction = function(opt_power) {
|
||||
var power = opt_power || 2;
|
||||
var maxResolution = this.maxResolution_;
|
||||
var minResolution = this.minResolution_;
|
||||
@@ -385,9 +385,9 @@ ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) {
|
||||
|
||||
|
||||
/**
|
||||
* @return {olx.ViewState} View2D state.
|
||||
* @return {olx.ViewState} View state.
|
||||
*/
|
||||
ol.View2D.prototype.getState = function() {
|
||||
ol.View.prototype.getState = function() {
|
||||
goog.asserts.assert(this.isDef());
|
||||
var center = /** @type {ol.Coordinate} */ (this.getCenter());
|
||||
var projection = this.getProjection();
|
||||
@@ -408,7 +408,7 @@ ol.View2D.prototype.getState = function() {
|
||||
* @return {number|undefined} Zoom.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.getZoom = function() {
|
||||
ol.View.prototype.getZoom = function() {
|
||||
var offset;
|
||||
var resolution = this.getResolution();
|
||||
|
||||
@@ -434,7 +434,7 @@ ol.View2D.prototype.getZoom = function() {
|
||||
* @param {ol.Size} size Box pixel size.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.fitExtent = function(extent, size) {
|
||||
ol.View.prototype.fitExtent = function(extent, size) {
|
||||
if (!ol.extent.isEmpty(extent)) {
|
||||
this.setCenter(ol.extent.getCenter(extent));
|
||||
var resolution = this.getResolutionForExtent(extent, size);
|
||||
@@ -453,10 +453,10 @@ ol.View2D.prototype.fitExtent = function(extent, size) {
|
||||
* Take care on the map angle.
|
||||
* @param {ol.geom.SimpleGeometry} geometry Geometry.
|
||||
* @param {ol.Size} size Box pixel size.
|
||||
* @param {olx.View2D.fitGeometryOptions=} opt_options Options.
|
||||
* @param {olx.View.fitGeometryOptions=} opt_options Options.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.fitGeometry = function(geometry, size, opt_options) {
|
||||
ol.View.prototype.fitGeometry = function(geometry, size, opt_options) {
|
||||
var options = goog.isDef(opt_options) ? opt_options : {};
|
||||
|
||||
var padding = goog.isDef(options.padding) ? options.padding : [0, 0, 0, 0];
|
||||
@@ -523,7 +523,7 @@ ol.View2D.prototype.fitGeometry = function(geometry, size, opt_options) {
|
||||
* @param {ol.Pixel} position Position on the view to center on.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.centerOn = function(coordinate, size, position) {
|
||||
ol.View.prototype.centerOn = function(coordinate, size, position) {
|
||||
// calculate rotated position
|
||||
var rotation = this.getRotation();
|
||||
var cosAngle = Math.cos(-rotation);
|
||||
@@ -546,7 +546,7 @@ ol.View2D.prototype.centerOn = function(coordinate, size, position) {
|
||||
/**
|
||||
* @return {boolean} Is defined.
|
||||
*/
|
||||
ol.View2D.prototype.isDef = function() {
|
||||
ol.View.prototype.isDef = function() {
|
||||
return goog.isDefAndNotNull(this.getCenter()) &&
|
||||
goog.isDef(this.getResolution());
|
||||
};
|
||||
@@ -558,7 +558,7 @@ ol.View2D.prototype.isDef = function() {
|
||||
* @param {ol.Coordinate=} opt_anchor The rotation center.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.rotate = function(rotation, opt_anchor) {
|
||||
ol.View.prototype.rotate = function(rotation, opt_anchor) {
|
||||
if (goog.isDef(opt_anchor)) {
|
||||
var center = this.calculateCenterRotate(rotation, opt_anchor);
|
||||
this.setCenter(center);
|
||||
@@ -573,13 +573,13 @@ ol.View2D.prototype.rotate = function(rotation, opt_anchor) {
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.setCenter = function(center) {
|
||||
ol.View.prototype.setCenter = function(center) {
|
||||
this.set(ol.View2DProperty.CENTER, center);
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'setCenter',
|
||||
ol.View2D.prototype.setCenter);
|
||||
ol.View.prototype.setCenter);
|
||||
|
||||
|
||||
/**
|
||||
@@ -587,7 +587,7 @@ goog.exportProperty(
|
||||
* @param {number} delta Delta.
|
||||
* @return {number} New value.
|
||||
*/
|
||||
ol.View2D.prototype.setHint = function(hint, delta) {
|
||||
ol.View.prototype.setHint = function(hint, delta) {
|
||||
goog.asserts.assert(0 <= hint && hint < this.hints_.length);
|
||||
this.hints_[hint] += delta;
|
||||
goog.asserts.assert(this.hints_[hint] >= 0);
|
||||
@@ -602,13 +602,13 @@ ol.View2D.prototype.setHint = function(hint, delta) {
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.setProjection = function(projection) {
|
||||
ol.View.prototype.setProjection = function(projection) {
|
||||
this.set(ol.View2DProperty.PROJECTION, projection);
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'setProjection',
|
||||
ol.View2D.prototype.setProjection);
|
||||
ol.View.prototype.setProjection);
|
||||
|
||||
|
||||
/**
|
||||
@@ -617,13 +617,13 @@ goog.exportProperty(
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.setResolution = function(resolution) {
|
||||
ol.View.prototype.setResolution = function(resolution) {
|
||||
this.set(ol.View2DProperty.RESOLUTION, resolution);
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'setResolution',
|
||||
ol.View2D.prototype.setResolution);
|
||||
ol.View.prototype.setResolution);
|
||||
|
||||
|
||||
/**
|
||||
@@ -632,13 +632,13 @@ goog.exportProperty(
|
||||
* @todo observable
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.setRotation = function(rotation) {
|
||||
ol.View.prototype.setRotation = function(rotation) {
|
||||
this.set(ol.View2DProperty.ROTATION, rotation);
|
||||
};
|
||||
goog.exportProperty(
|
||||
ol.View2D.prototype,
|
||||
ol.View.prototype,
|
||||
'setRotation',
|
||||
ol.View2D.prototype.setRotation);
|
||||
ol.View.prototype.setRotation);
|
||||
|
||||
|
||||
/**
|
||||
@@ -646,7 +646,7 @@ goog.exportProperty(
|
||||
* @param {number} zoom Zoom level.
|
||||
* @todo api
|
||||
*/
|
||||
ol.View2D.prototype.setZoom = function(zoom) {
|
||||
ol.View.prototype.setZoom = function(zoom) {
|
||||
var resolution = this.constrainResolution(
|
||||
this.maxResolution_, zoom - this.minZoom_, 0);
|
||||
this.setResolution(resolution);
|
||||
@@ -654,11 +654,11 @@ ol.View2D.prototype.setZoom = function(zoom) {
|
||||
|
||||
|
||||
/**
|
||||
* @param {olx.View2DOptions} options View2D options.
|
||||
* @param {olx.View2DOptions} options View options.
|
||||
* @private
|
||||
* @return {ol.CenterConstraintType}
|
||||
*/
|
||||
ol.View2D.createCenterConstraint_ = function(options) {
|
||||
ol.View.createCenterConstraint_ = function(options) {
|
||||
if (goog.isDef(options.extent)) {
|
||||
return ol.CenterConstraint.createExtent(options.extent);
|
||||
} else {
|
||||
@@ -669,11 +669,11 @@ ol.View2D.createCenterConstraint_ = function(options) {
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @param {olx.View2DOptions} options View2D options.
|
||||
* @param {olx.View2DOptions} options View options.
|
||||
* @return {{constraint: ol.ResolutionConstraintType, maxResolution: number,
|
||||
* minResolution: number}}
|
||||
*/
|
||||
ol.View2D.createResolutionConstraint_ = function(options) {
|
||||
ol.View.createResolutionConstraint_ = function(options) {
|
||||
var resolutionConstraint;
|
||||
var maxResolution;
|
||||
var minResolution;
|
||||
@@ -751,10 +751,10 @@ ol.View2D.createResolutionConstraint_ = function(options) {
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @param {olx.View2DOptions} options View2D options.
|
||||
* @param {olx.View2DOptions} options View options.
|
||||
* @return {ol.RotationConstraintType} Rotation constraint.
|
||||
*/
|
||||
ol.View2D.createRotationConstraint_ = function(options) {
|
||||
ol.View.createRotationConstraint_ = function(options) {
|
||||
var enableRotation = goog.isDef(options.enableRotation) ?
|
||||
options.enableRotation : true;
|
||||
if (enableRotation) {
|
||||
@@ -20,7 +20,7 @@ describe('ol.interaction.Draw', function() {
|
||||
map = new ol.Map({
|
||||
target: target,
|
||||
layers: [layer],
|
||||
view: new ol.View2D({
|
||||
view: new ol.View({
|
||||
projection: 'EPSG:4326',
|
||||
center: [0, 0],
|
||||
resolution: 1
|
||||
@@ -478,7 +478,7 @@ goog.require('goog.events.BrowserEvent');
|
||||
goog.require('goog.style');
|
||||
goog.require('ol.Map');
|
||||
goog.require('ol.MapBrowserPointerEvent');
|
||||
goog.require('ol.View2D');
|
||||
goog.require('ol.View');
|
||||
goog.require('ol.geom.GeometryType');
|
||||
goog.require('ol.geom.LineString');
|
||||
goog.require('ol.geom.MultiLineString');
|
||||
|
||||
@@ -63,7 +63,7 @@ describe('ol.Map', function() {
|
||||
style.height = '180px';
|
||||
document.body.appendChild(target);
|
||||
|
||||
view = new ol.View2D({
|
||||
view = new ol.View({
|
||||
projection: 'EPSG:4326'
|
||||
});
|
||||
map = new ol.Map({
|
||||
@@ -117,7 +117,7 @@ describe('ol.Map', function() {
|
||||
document.body.appendChild(target);
|
||||
map = new ol.Map({
|
||||
target: target,
|
||||
view: new ol.View2D({
|
||||
view: new ol.View({
|
||||
projection: 'EPSG:4326',
|
||||
center: [0, 0],
|
||||
resolution: 1
|
||||
@@ -246,7 +246,7 @@ goog.require('goog.dispose');
|
||||
goog.require('goog.dom');
|
||||
goog.require('ol.Map');
|
||||
goog.require('ol.MapEvent');
|
||||
goog.require('ol.View2D');
|
||||
goog.require('ol.View');
|
||||
goog.require('ol.interaction');
|
||||
goog.require('ol.interaction.Interaction');
|
||||
goog.require('ol.interaction.DoubleClickZoom');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
goog.provide('ol.test.View2D');
|
||||
goog.provide('ol.test.View');
|
||||
|
||||
describe('ol.View2D', function() {
|
||||
describe('ol.View', function() {
|
||||
describe('create constraints', function() {
|
||||
|
||||
describe('create resolution constraint', function() {
|
||||
@@ -8,7 +8,7 @@ describe('ol.View2D', function() {
|
||||
describe('with no options', function() {
|
||||
it('gives a correct resolution constraint function', function() {
|
||||
var options = {};
|
||||
var fn = ol.View2D.createResolutionConstraint_(options).constraint;
|
||||
var fn = ol.View.createResolutionConstraint_(options).constraint;
|
||||
expect(fn(156543.03392804097, 0, 0))
|
||||
.to.roughlyEqual(156543.03392804097, 1e-9);
|
||||
expect(fn(78271.51696402048, 0, 0))
|
||||
@@ -24,7 +24,7 @@ describe('ol.View2D', function() {
|
||||
maxZoom: 3,
|
||||
zoomFactor: 3
|
||||
};
|
||||
var info = ol.View2D.createResolutionConstraint_(options);
|
||||
var info = ol.View.createResolutionConstraint_(options);
|
||||
var maxResolution = info.maxResolution;
|
||||
expect(maxResolution).to.eql(81);
|
||||
var minResolution = info.minResolution;
|
||||
@@ -44,7 +44,7 @@ describe('ol.View2D', function() {
|
||||
var options = {
|
||||
resolutions: [97, 76, 65, 54, 0.45]
|
||||
};
|
||||
var info = ol.View2D.createResolutionConstraint_(options);
|
||||
var info = ol.View.createResolutionConstraint_(options);
|
||||
var maxResolution = info.maxResolution;
|
||||
expect(maxResolution).to.eql(97);
|
||||
var minResolution = info.minResolution;
|
||||
@@ -62,7 +62,7 @@ describe('ol.View2D', function() {
|
||||
|
||||
var defaultMaxRes = 156543.03392804097;
|
||||
function getConstraint(options) {
|
||||
return ol.View2D.createResolutionConstraint_(options).constraint;
|
||||
return ol.View.createResolutionConstraint_(options).constraint;
|
||||
}
|
||||
|
||||
it('works with only maxZoom', function() {
|
||||
@@ -129,7 +129,7 @@ describe('ol.View2D', function() {
|
||||
|
||||
var defaultMaxRes = 156543.03392804097;
|
||||
function getConstraint(options) {
|
||||
return ol.View2D.createResolutionConstraint_(options).constraint;
|
||||
return ol.View.createResolutionConstraint_(options).constraint;
|
||||
}
|
||||
|
||||
it('works with only maxResolution', function() {
|
||||
@@ -198,7 +198,7 @@ describe('ol.View2D', function() {
|
||||
|
||||
var defaultMaxRes = 156543.03392804097;
|
||||
function getConstraint(options) {
|
||||
return ol.View2D.createResolutionConstraint_(options).constraint;
|
||||
return ol.View.createResolutionConstraint_(options).constraint;
|
||||
}
|
||||
|
||||
it('respects maxResolution over minZoom', function() {
|
||||
@@ -242,7 +242,7 @@ describe('ol.View2D', function() {
|
||||
describe('create rotation constraint', function() {
|
||||
it('gives a correct rotation constraint function', function() {
|
||||
var options = {};
|
||||
var fn = ol.View2D.createRotationConstraint_(options);
|
||||
var fn = ol.View.createRotationConstraint_(options);
|
||||
expect(fn(0.01, 0)).to.eql(0);
|
||||
expect(fn(0.15, 0)).to.eql(0.15);
|
||||
});
|
||||
@@ -253,7 +253,7 @@ describe('ol.View2D', function() {
|
||||
describe('#getZoom', function() {
|
||||
var view;
|
||||
beforeEach(function() {
|
||||
view = new ol.View2D({
|
||||
view = new ol.View({
|
||||
resolutions: [512, 256, 128, 64, 32, 16]
|
||||
});
|
||||
});
|
||||
@@ -284,7 +284,7 @@ describe('ol.View2D', function() {
|
||||
|
||||
describe('#getZoom() - constrained', function() {
|
||||
it('returns correct zoom levels', function() {
|
||||
var view = new ol.View2D({
|
||||
var view = new ol.View({
|
||||
minZoom: 10,
|
||||
maxZoom: 20
|
||||
});
|
||||
@@ -316,7 +316,7 @@ describe('ol.View2D', function() {
|
||||
it('respects custom ol.DEFAULT_MIN_ZOOM', function() {
|
||||
ol.DEFAULT_MIN_ZOOM = 2;
|
||||
|
||||
var view = new ol.View2D();
|
||||
var view = new ol.View();
|
||||
|
||||
view.setZoom(1);
|
||||
expect(view.getZoom()).to.be(2);
|
||||
@@ -333,7 +333,7 @@ describe('ol.View2D', function() {
|
||||
|
||||
it('gives maxResolution precedence over minZoom', function() {
|
||||
|
||||
var view = new ol.View2D({
|
||||
var view = new ol.View({
|
||||
maxResolution: 100,
|
||||
minZoom: 2 // this should get ignored
|
||||
});
|
||||
@@ -349,7 +349,7 @@ describe('ol.View2D', function() {
|
||||
describe('fitGeometry', function() {
|
||||
var view;
|
||||
beforeEach(function() {
|
||||
view = new ol.View2D({
|
||||
view = new ol.View({
|
||||
resolutions: [200, 100, 50, 20, 10, 5, 2, 1]
|
||||
});
|
||||
});
|
||||
@@ -419,7 +419,7 @@ describe('ol.View2D', function() {
|
||||
describe('centerOn', function() {
|
||||
var view;
|
||||
beforeEach(function() {
|
||||
view = new ol.View2D({
|
||||
view = new ol.View({
|
||||
resolutions: [200, 100, 50, 20, 10, 5, 2, 1]
|
||||
});
|
||||
});
|
||||
@@ -445,6 +445,6 @@ describe('ol.View2D', function() {
|
||||
});
|
||||
});
|
||||
|
||||
goog.require('ol.View2D');
|
||||
goog.require('ol.View');
|
||||
goog.require('ol.geom.LineString');
|
||||
goog.require('ol.geom.Point');
|
||||
Reference in New Issue
Block a user