Skip to content

ol.Extent as Array.<number> #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Apr 19, 2013
Merged

ol.Extent as Array.<number> #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1ad7765
Don't derive ol.TileRange from ol.Rectangle
twpayne Apr 16, 2013
0da8b0a
Don't inherit ol.PixelBounds from ol.Rectangle
twpayne Apr 16, 2013
16f70ba
Replace ol.Extent and ol.Rectangle with Array.<number>
twpayne Apr 16, 2013
b4f7259
Port function types to new extents
twpayne Apr 16, 2013
ca8647c
Port ol.tilegrid to new extents
twpayne Apr 16, 2013
7d21bd8
Port ol.Map to new extents
twpayne Apr 16, 2013
9773314
Port ol.View2D to new extents
twpayne Apr 16, 2013
e50253e
Port ol.projection to new extents
twpayne Apr 16, 2013
c2ff834
Port ol.source.BingMaps to new extents
twpayne Apr 16, 2013
e868954
Port ol.source.TileSource to new extents
twpayne Apr 16, 2013
f0c8124
Port ol.source.TileJSON to new extents
twpayne Apr 16, 2013
10354cf
Port ol.source.WMS to new extents
twpayne Apr 16, 2013
9708fb4
Port ol.source.WMTS to new extents
twpayne Apr 16, 2013
559e85b
Port ol.source.TiledWMS to new extents
twpayne Apr 16, 2013
583564e
Port ol.source.StaticImage to new extents
twpayne Apr 16, 2013
aff9f5d
Port ol.source.SingleImageWMS to new extents
twpayne Apr 16, 2013
465e24c
Port ol.renderer.canvas to new extents
twpayne Apr 16, 2013
10d1be6
Port ol.renderer.dom to new extents
twpayne Apr 16, 2013
305089d
Port ol.renderer.webgl to new extents
twpayne Apr 16, 2013
1d4eaf6
Port ol.structs.RTree to new extents
twpayne Apr 16, 2013
a413f30
Port interactions to new extents
twpayne Apr 16, 2013
01168e8
Port ol.filter.ExtentFilter to new extents
twpayne Apr 16, 2013
953f9c2
Port ol.geom to new extents
twpayne Apr 16, 2013
f81658f
Port parsers to new extents
twpayne Apr 16, 2013
a642868
Port examples to new extents
twpayne Apr 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions examples/wms-custom-proj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
goog.require('ol.Attribution');
goog.require('ol.Extent');
goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
Expand All @@ -13,10 +12,10 @@ goog.require('ol.source.TiledWMS');

var projection = ol.projection.configureProj4jsProjection({
code: 'EPSG:21781',
extent: new ol.Extent(485869.5728, 76443.1884, 837076.5648, 299941.7864)
extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
});

var extent = new ol.Extent(420000, 30000, 900000, 350000);
var extent = [420000, 900000, 30000, 350000];
var layers = [
new ol.layer.TileLayer({
source: new ol.source.TiledWMS({
Expand Down
5 changes: 2 additions & 3 deletions examples/wms-single-image-custom-proj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
goog.require('ol.Attribution');
goog.require('ol.Extent');
goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
Expand All @@ -10,10 +9,10 @@ goog.require('ol.source.SingleImageWMS');

var projection = ol.projection.configureProj4jsProjection({
code: 'EPSG:21781',
extent: new ol.Extent(485869.5728, 76443.1884, 837076.5648, 299941.7864)
extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
});

var extent = new ol.Extent(420000, 30000, 900000, 350000);
var extent = [420000, 900000, 30000, 350000];
var layers = [
new ol.layer.ImageLayer({
source: new ol.source.SingleImageWMS({
Expand Down
3 changes: 1 addition & 2 deletions examples/wms-single-image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
goog.require('ol.Extent');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
Expand All @@ -16,7 +15,7 @@ var layers = [
source: new ol.source.SingleImageWMS({
url: 'http://demo.opengeo.org/geoserver/wms',
params: {'LAYERS': 'topp:states'},
extent: new ol.Extent(-13884991, 2870341, -7455066, 6338219)
extent: [-13884991, -7455066, 2870341, 6338219]
})
})
];
Expand Down
3 changes: 1 addition & 2 deletions examples/wms-tiled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
goog.require('ol.Extent');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
Expand All @@ -15,7 +14,7 @@ var layers = [
source: new ol.source.TiledWMS({
url: 'http://demo.opengeo.org/geoserver/wms',
params: {'LAYERS': 'topp:states', 'TILED': true},
extent: new ol.Extent(-13884991, 2870341, -7455066, 6338219)
extent: [-13884991, -7455066, 2870341, 6338219]
})
})
];
Expand Down
8 changes: 4 additions & 4 deletions examples/wmts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
goog.require('ol.Extent');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.extent');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.source.OSM');
Expand All @@ -11,7 +11,7 @@ goog.require('ol.tilegrid.WMTS');

var projection = ol.projection.get('EPSG:900913');
var projectionExtent = projection.getExtent();
var size = projectionExtent.getWidth() / 256;
var size = ol.extent.getWidth(projectionExtent) / 256;
var resolutions = new Array(26);
var matrixIds = new Array(26);
for (var z = 0; z < 26; ++z) {
Expand All @@ -34,12 +34,12 @@ var map = new ol.Map({
format: 'image/png',
projection: projection,
tileGrid: new ol.tilegrid.WMTS({
origin: projectionExtent.getTopLeft(),
origin: ol.extent.getTopLeft(projectionExtent),
resolutions: resolutions,
matrixIds: matrixIds
}),
style: '_null',
extent: new ol.Extent(-13682835, 5204068, -13667473, 5221690)
extent: [-13682835, -13667473, 5204068, 5221690]
})
})
],
Expand Down
27 changes: 16 additions & 11 deletions src/ol/extent.exports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
@exportSymbol ol.Extent
@exportProperty ol.Extent.prototype.getCenter
@exportProperty ol.Extent.prototype.getHeight
@exportProperty ol.Extent.prototype.getWidth
@exportProperty ol.Extent.prototype.containsCoordinate
@exportProperty ol.Extent.prototype.containsExtent
@exportProperty ol.Extent.prototype.getBottomLeft
@exportProperty ol.Extent.prototype.getBottomRight
@exportProperty ol.Extent.prototype.getTopLeft
@exportProperty ol.Extent.prototype.getTopRight
@exportProperty ol.Extent.prototype.transform
@exportSymbol ol.extent.boundingExtent
@exportSymbol ol.extent.containsCoordinate
@exportSymbol ol.extent.containsExtent
@exportSymbol ol.extent.equals
@exportSymbol ol.extent.extend
@exportSymbol ol.extent.getBottomLeft
@exportSymbol ol.extent.getBottomRight
@exportSymbol ol.extent.getCenter
@exportSymbol ol.extent.getHeight
@exportSymbol ol.extent.getSize
@exportSymbol ol.extent.getTopLeft
@exportSymbol ol.extent.getTopRight
@exportSymbol ol.extent.getWidth
@exportSymbol ol.extent.intersects
@exportSymbol ol.extent.isEmpty
@exportSymbol ol.extent.transform
Loading