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

Fix parsing of EX_GeographicBoundingBox when ol3 is compiled

Browse Source
This commit is contained in:
Tom Payne
2014-03-12 14:25:23 +01:00
parent 86dc90ceca
commit 1a643e1b37
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ol/format/wmscapabilitiesformat.js
View File

@@ -11,15 +11,6 @@ goog.require('ol.format.XSD');
goog.require('ol.xml'); goog.require('ol.xml');
/**
* @typedef {{westBoundLongitude: number,
* southBoundLatitude: number,
* eastBoundLongitude: number,
* northBoundLatitude: number}}
*/
ol.format.EXGeographicBoundingBoxType;
/** /**
* @constructor * @constructor
@@ -124,19 +115,28 @@ ol.format.WMSCapabilities.readEXGeographicBoundingBox_ =
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'EX_GeographicBoundingBox'); goog.asserts.assert(node.localName == 'EX_GeographicBoundingBox');
var geographicBoundingBox = ol.xml.pushParseAndPop( var geographicBoundingBox = ol.xml.pushParseAndPop(
/** @type {ol.format.EXGeographicBoundingBoxType} */ ({}), {},
ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_, ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_,
node, objectStack); node, objectStack);
if (goog.isDef(geographicBoundingBox)) { if (!goog.isDef(geographicBoundingBox)) {
return [
geographicBoundingBox.westBoundLongitude,
geographicBoundingBox.southBoundLatitude,
geographicBoundingBox.eastBoundLongitude,
geographicBoundingBox.northBoundLatitude
];
} else {
return undefined; return undefined;
} }
var westBoundLongitude = /** @type {number|undefined} */ (goog.object.get(
geographicBoundingBox, 'westBoundLongitude'));
var southBoundLatitude = /** @type {number|undefined} */ (goog.object.get(
geographicBoundingBox, 'southBoundLatitude'));
var eastBoundLongitude = /** @type {number|undefined} */ (goog.object.get(
geographicBoundingBox, 'eastBoundLongitude'));
var northBoundLatitude = /** @type {number|undefined} */ (goog.object.get(
geographicBoundingBox, 'northBoundLatitude'));
if (!goog.isDef(westBoundLongitude) || !goog.isDef(southBoundLatitude) ||
!goog.isDef(eastBoundLongitude) || !goog.isDef(northBoundLatitude)) {
return undefined;
}
return [
westBoundLongitude, southBoundLatitude,
eastBoundLongitude, northBoundLatitude
];
}; };