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

Merge pull request #1149 from twpayne/bing-maps-errors

Browse Source 
Improve handling of error responses from Bing
This commit is contained in:
Tom Payne
2013-10-21 04:59:55 -07:00
parent 50cbf2fdac e4eff4658b
commit 740b6e8b56
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/bingmapssource.js
+9 -8
View File
@@ -54,17 +54,18 @@ goog.inherits(ol.source.BingMaps, ol.source.TileImage);
ol.source.BingMaps.prototype.handleImageryMetadataResponse = ol.source.BingMaps.prototype.handleImageryMetadataResponse =
function(response) { function(response) {
goog.asserts.assert( if (response.statusCode != 200 ||
response.authenticationResultCode == 'ValidCredentials'); response.statusDescription != 'OK' ||
goog.asserts.assert(response.statusCode == 200); response.authenticationResultCode != 'ValidCredentials' ||
goog.asserts.assert(response.statusDescription == 'OK'); response.resourceSets.length != 1 ||
response.resourceSets[0].length != 1) {
this.setState(ol.source.State.ERROR);
return;
}
var brandLogoUri = response.brandLogoUri; var brandLogoUri = response.brandLogoUri;
//var copyright = response.copyright; // FIXME do we need to display this? //var copyright = response.copyright; // FIXME do we need to display this?
goog.asserts.assert(response.resourceSets.length == 1); var resource = response.resourceSets[0].resources[0];
var resourceSet = response.resourceSets[0];
goog.asserts.assert(resourceSet.resources.length == 1);
var resource = resourceSet.resources[0];
var tileGrid = new ol.tilegrid.XYZ({ var tileGrid = new ol.tilegrid.XYZ({
minZoom: resource.zoomMin, minZoom: resource.zoomMin,