Satisfying gjslint

This commit is contained in:
Tim Schaub
2013-01-06 10:07:29 -07:00
parent 6f929efeb3
commit 39af56ecb3
+42 -12
View File
@@ -7,8 +7,16 @@ goog.require('ol.Projection');
/**
* @constructor
* @param {ol.renderer.Layer} layerRenderer Layer renderer.
*/
ol.renderer.tile.Canvas = function(layerRenderer) { ol.renderer.tile.Canvas = function(layerRenderer) {
/**
* @type {ol.renderer.Layer}
* @private
*/
this.layerRenderer_ = layerRenderer; this.layerRenderer_ = layerRenderer;
/** /**
@@ -55,8 +63,9 @@ ol.renderer.tile.Canvas = function(layerRenderer) {
}; };
/** /**
* @param size {Object|ol.Size} * @param {Object|ol.Size} size Tile size.
*/ */
ol.renderer.tile.Canvas.prototype.setSize = function(size) { ol.renderer.tile.Canvas.prototype.setSize = function(size) {
if (!(size instanceof ol.Size)) { if (!(size instanceof ol.Size)) {
@@ -71,8 +80,9 @@ ol.renderer.tile.Canvas.prototype.setSize = function(size) {
goog.style.setSize(this.canvas_, size); goog.style.setSize(this.canvas_, size);
}; };
/** /**
* @param size {Object|ol.Coordinate} * @param {Object|ol.Coordinate} origin Tile origin.
*/ */
ol.renderer.tile.Canvas.prototype.setOrigin = function(origin) { ol.renderer.tile.Canvas.prototype.setOrigin = function(origin) {
if (!(origin instanceof ol.Coordinate)) { if (!(origin instanceof ol.Coordinate)) {
@@ -82,18 +92,20 @@ ol.renderer.tile.Canvas.prototype.setOrigin = function(origin) {
this.originPixel_ = this.layerRenderer_.getPixelFromCoordinate(origin); this.originPixel_ = this.layerRenderer_.getPixelFromCoordinate(origin);
}; };
/** /**
* @param resolution {number} * @param {number} resolution Tile resolution.
*/ */
ol.renderer.tile.Canvas.prototype.setResolution = function(resolution) { ol.renderer.tile.Canvas.prototype.setResolution = function(resolution) {
this.resolution_ = resolution; this.resolution_ = resolution;
}; };
/*
* @param geoJson {Object|Array} GeoJSON or an array of GeoJSON features /**
* @param projection {ol.Projection=} * @param {Object|Array} geoJson GeoJSON or an array of GeoJSON features.
* @param {ol.Projection=} opt_projection Projection.
*/ */
ol.renderer.tile.Canvas.prototype.render = function(geoJson, projection) { ol.renderer.tile.Canvas.prototype.render = function(geoJson, opt_projection) {
var map = this.map; var map = this.map;
this.projection_ = map.getProjection(); this.projection_ = map.getProjection();
this.resolution_ = map.getResolution(); this.resolution_ = map.getResolution();
@@ -109,9 +121,12 @@ ol.renderer.tile.Canvas.prototype.render = function(geoJson, projection) {
if (features) { if (features) {
//FIXME Support geometry level projections //FIXME Support geometry level projections
projection = projection || new ol.Projection('EPSG:4326'); // @type {ol.Projection}
if (!(projection instanceof ol.Projection)) { var projection;
projection = new ol.Projection(projection); if (goog.isDef(opt_projection)) {
projection = opt_projection;
} else {
projection = new ol.Projection('EPSG:4326');
} }
for (var i = 0, ii = features.length; i < ii; ++i) { for (var i = 0, ii = features.length; i < ii; ++i) {
this.renderGeometry(features[i].geometry, projection); this.renderGeometry(features[i].geometry, projection);
@@ -119,13 +134,20 @@ ol.renderer.tile.Canvas.prototype.render = function(geoJson, projection) {
} }
}; };
/**
* @param {Object} geometry GeoJSON geometry.
* @param {ol.Projection} projection Projection.
*/
ol.renderer.tile.Canvas.prototype.renderGeometry = ol.renderer.tile.Canvas.prototype.renderGeometry =
function(geometry, projection) { function(geometry, projection) {
var i, coordinates, hole = false; var i, coordinates, hole = false;
if (geometry.type === 'Point') { if (geometry.type === 'Point') {
this.renderPosList([geometry.coordinates], projection, false, false, hole); this.renderPosList([geometry.coordinates],
projection, false, false, hole);
} else if (geometry.type === 'MultiPoint') { } else if (geometry.type === 'MultiPoint') {
this.renderPosList(geometry.coordinates, projection, false, false, hole); this.renderPosList(geometry.coordinates,
projection, false, false, hole);
} else if (geometry.type === 'LineString') { } else if (geometry.type === 'LineString') {
this.renderPosList(geometry.coordinates, projection, true, false, hole); this.renderPosList(geometry.coordinates, projection, true, false, hole);
} else if (geometry.type === 'MultiLineString') { } else if (geometry.type === 'MultiLineString') {
@@ -142,6 +164,14 @@ ol.renderer.tile.Canvas.prototype.renderGeometry =
} }
}; };
/**
* @param {Array} posList Coordinates.
* @param {ol.Projection} projection Projection.
* @param {boolean} connect Connect endpoints.
* @param {boolean} fill Fill.
* @param {boolean} hole Treat as hole.
*/
ol.renderer.tileCanvas.prototype.renderPosList = ol.renderer.tileCanvas.prototype.renderPosList =
function(posList, projection, connect, fill, hole) { function(posList, projection, connect, fill, hole) {
var position, coordinate, pixel, localX, localY; var position, coordinate, pixel, localX, localY;