ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix multiple type errors in getFeatureInfoForPixel

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 16:42:10 +01:00
parent a93e0b85df
commit 5f0ea858ec
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/imagewmssource.js
+3 -1
View File
@@ -109,7 +109,9 @@ ol.source.ImageWMS.prototype.getFeatureInfoForPixel =
var size = map.getSize(); var size = map.getSize();
goog.asserts.assert(goog.isDefAndNotNull(size)); goog.asserts.assert(goog.isDefAndNotNull(size));
var extent = view.calculateExtent(size); var extent = view.calculateExtent(size);
var url = this.imageUrlFunction(extent, size, view.getProjection()); var projection = view.getProjection();
goog.asserts.assert(goog.isDef(projection));
var url = this.imageUrlFunction(extent, size, projection);
goog.asserts.assert(goog.isDef(url), goog.asserts.assert(goog.isDef(url),
'ol.source.ImageWMS#imageUrlFunction does not return a URL'); 'ol.source.ImageWMS#imageUrlFunction does not return a URL');
ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success, ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success,
src/ol/source/tilewmssource.js
+7 -5
View File
@@ -157,11 +157,13 @@ ol.source.TileWMS.prototype.getFeatureInfoForPixel =
function(pixel, map, success, opt_error) { function(pixel, map, success, opt_error) {
var coord = map.getCoordinateFromPixel(pixel), var coord = map.getCoordinateFromPixel(pixel),
view2D = map.getView().getView2D(), view2D = map.getView().getView2D(),
projection = view2D.getProjection(), projection = view2D.getProjection();
tileGrid = goog.isNull(this.tileGrid) ? goog.asserts.assert(goog.isDef(projection));
ol.tilegrid.getForProjection(projection) : this.tileGrid, var tileGrid = goog.isNull(this.tileGrid) ?
tileCoord = tileGrid.getTileCoordForCoordAndResolution(coord, ol.tilegrid.getForProjection(projection) : this.tileGrid;
view2D.getResolution()), var resolution = view2D.getResolution();
goog.asserts.assert(goog.isDef(resolution));
var tileCoord = tileGrid.getTileCoordForCoordAndResolution(coord, resolution),
tileExtent = tileGrid.getTileCoordExtent(tileCoord), tileExtent = tileGrid.getTileCoordExtent(tileCoord),
offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)), offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)),
url = this.tileUrlFunction(tileCoord, projection); url = this.tileUrlFunction(tileCoord, projection);