Create ol.Size around goog.math.Size

This commit is contained in:
Tom Payne
2012-07-19 10:46:43 +02:00
parent c547404615
commit 513d8e7268
8 changed files with 47 additions and 24 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
goog.provide('ol.tilegrid.createOpenStreetMap');
goog.require('goog.math.Size');
goog.require('ol.Coordinate');
goog.require('ol.Projection');
goog.require('ol.Size');
goog.require('ol.TileGrid');
@@ -21,7 +21,7 @@ ol.tilegrid.createOpenStreetMap = function(maxZoom) {
var extent = ol.Projection.EPSG_3857_EXTENT;
var origin = new ol.Coordinate(
-ol.Projection.EPSG_3857_HALF_SIZE, ol.Projection.EPSG_3857_HALF_SIZE);
var tileSize = new goog.math.Size(256, 256);
var tileSize = new ol.Size(256, 256);
return new ol.TileGrid(resolutions, extent, origin, tileSize);
+5 -5
View File
@@ -2,9 +2,9 @@ goog.provide('ol.TileGrid');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.math.Size');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Size');
goog.require('ol.TileBounds');
goog.require('ol.TileCoord');
@@ -15,7 +15,7 @@ goog.require('ol.TileCoord');
* @param {!Array.<number>} resolutions Resolutions.
* @param {ol.Extent} extent Extent.
* @param {ol.Coordinate|!Array.<ol.Coordinate>} origin Origin.
* @param {goog.math.Size=} opt_tileSize Tile size.
* @param {ol.Size=} opt_tileSize Tile size.
*/
ol.TileGrid = function(resolutions, extent, origin, opt_tileSize) {
@@ -63,10 +63,10 @@ ol.TileGrid = function(resolutions, extent, origin, opt_tileSize) {
/**
* @private
* @type {goog.math.Size}
* @type {ol.Size}
*/
this.tileSize_ = goog.isDef(opt_tileSize) ?
opt_tileSize : new goog.math.Size(256, 256);
opt_tileSize : new ol.Size(256, 256);
};
@@ -214,7 +214,7 @@ ol.TileGrid.prototype.getTileCoordResolution = function(tileCoord) {
/**
* @return {goog.math.Size} Tile size.
* @return {ol.Size} Tile size.
*/
ol.TileGrid.prototype.getTileSize = function() {
return this.tileSize_;
+2 -2
View File
@@ -1,7 +1,7 @@
goog.require('goog.math.Size');
goog.require('goog.testing.jsunit');
goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Size');
goog.require('ol.TileCoord');
goog.require('ol.TileGrid');
@@ -18,7 +18,7 @@ function setUp() {
extent = new ol.Extent(0, 0, 100000, 100000);
origin = new ol.Coordinate(0, 0);
origins = [];
tileSize = new goog.math.Size(100, 100);
tileSize = new ol.Size(100, 100);
}